From c7f1466c4231e64e05e0874ea2b14b632e22e3c5 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Wed, 15 Sep 2021 17:26:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F?= =?UTF-8?q?=E8=A7=81=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1-1.vue | 37 +- .../pages/creatProcess/bzzqyj/step1.vue | 246 ++--- .../pages/creatProcess/bzzqyj/step2.vue | 12 +- .../pages/creatProcess/bzzqyj/step3.vue | 983 +++++++++--------- .../pages/creatProcess/bzzqyj/step4.vue | 786 +++++++------- .../pages/creatProcess/bzzqyj/step5.vue | 26 +- .../pages/creatProcess/bzzqyj/step6.vue | 37 +- .../pages/creatProcess/bzzqyj/step7.vue | 910 ++++++++-------- .../pages/creatProcess/bzzqyj/step8.vue | 912 ++++++++-------- .../pages/creatProcess/bzzqyj/step9.vue | 37 +- 10 files changed, 1991 insertions(+), 1995 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index a08c60aa6..fef4fc791 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -24,12 +24,10 @@
- -
+ +
选择标准
-
- - - - - -
+ +
选择附件
-
- { - // this.standInfoList = res.data.records - // this.total = res.data.total - // this.spinShow = false - // }, e => { - // }) }, pageChange(page) { this.standCommonlySearch.page = page @@ -561,11 +540,10 @@ export default { bringData.push(deposit.get(this.selectedList[i])); } if (bringData[0].standYear) { - this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName } else { - this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } - this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); @@ -680,6 +658,9 @@ export default { } } + .el-input__icon { + width: 15px; + } position: relative; height: 100%; diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index dd9019148..9486acad0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -12,11 +12,11 @@
@@ -24,46 +24,36 @@
- -
- 选择标准 + +
+ 选择标准
-
- - - - + disabled + v-model="form.cid" + placeholder="请输入标准编号" + clearable + /> + v-model="form.endTime" + type="date" + placeholder="请选择结束日期"> - -
- 选择附件 -
-
+
+ 选择附件 +
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -75,11 +65,11 @@
+ type="textarea" + :rows="3" + resize="none" + placeholder="请输入意见" + v-model="commentText">
@@ -169,12 +159,12 @@
- {{ opt.label }} + + {{ opt.label }} @@ -207,15 +198,17 @@ 查询 + @click="sarStandCompareHisInfo">查询 + 清空 + class="common-button-default" + size="mini" + @click="clearSearchStand">清空 +
@@ -235,8 +228,12 @@ @@ -257,37 +254,37 @@
+ ref="selection" + :data="fjList" + tooltip-effect="dark" + style="width: 100%;padding:0 0 20px 0;" + height="100%" + border + @selection-change="handleSelection2" + :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> @@ -309,7 +306,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import { saveTaskFirst } from 'api/process' +import {saveTaskFirst} from 'api/process' export default { name: "bzzqyjStep1", @@ -339,16 +336,13 @@ export default { }, formRules: { cid: [ - { required: true, message: '请输入标准编号', trigger: 'change' }, + {required: true, message: '请输入标准编号', trigger: 'change'}, ], endTime: [ - { required: true, message: '请输入标准结束日期', trigger: 'change' }, - ], - cname: [ - { required: true, message: '请输入标准名称', trigger: 'change' }, + {required: true, message: '请输入标准结束日期', trigger: 'change'}, ], fjListId: [ - { required: true, message: '请选择附件', trigger: 'change' }, + {required: true, message: '请选择附件', trigger: 'change'}, ] }, // 标准征求意见数据可库 @@ -380,16 +374,16 @@ export default { }, roleFormRules: { dockUserList: [ - { required: true, message: '请选择责任部门对接人', trigger: 'change' }, + {required: true, message: '请选择责任部门对接人', trigger: 'change'}, ], ministerUser: [ - { required: true, message: '请选择标准法规部部长', trigger: 'change' }, + {required: true, message: '请选择标准法规部部长', trigger: 'change'}, ], directorUser: [ - { required: true, message: '请选择技术管理中心主任', trigger: 'change' }, + {required: true, message: '请选择技术管理中心主任', trigger: 'change'}, ], presidentUser: [ - { required: true, message: '请选择工程研究院院长', trigger: 'change' }, + {required: true, message: '请选择工程研究院院长', trigger: 'change'}, ] }, nodeList: [], @@ -406,7 +400,7 @@ export default { ProcessFooter, ProcessTitle }, - mounted () { + mounted() { this.sarStandCompareHis() this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this @@ -420,7 +414,7 @@ export default { } }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -430,7 +424,7 @@ export default { } window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) }, - addfjList () { + addfjList() { this.$http.get('lawss/sarStandFile/queryFileInfo', { standId: this.form.standId }, {}, res => { @@ -438,18 +432,18 @@ export default { }) this.fzlistModel = true }, - handleSelection2 (data) { - if(data.length > 5) { + handleSelection2(data) { + if (data.length > 5) { this.$message.warning('最多选择5条附件') } else { this.addFjList = data } }, - closeDrawer2 () { + closeDrawer2() { this.fzlistModel = false this.addFjList = [] }, - enterDrawer2 () { + enterDrawer2() { this.fzlistModel = false this.form.fjList = this.addFjList let idList = [] @@ -462,7 +456,7 @@ export default { this.form.fjListId = idList.join(',') }, // 点击查看 - handlePreview (item) { + handlePreview(item) { let pageType if (item.standType === 'FOREIGN') { pageType = 'FOREIGN_STAND' @@ -485,7 +479,7 @@ export default { /** 标准征求意见库方法* * **********************************************/ // 清空 - clearSearchStand () { + clearSearchStand() { this.standCommonlySearch.page = 1 this.standCommonlySearch.standSort = '' this.standCommonlySearch.standNumber = '' @@ -498,32 +492,23 @@ export default { this.sarStandCompareHis() }, // 查询表格 - sarStandCompareHis () { + sarStandCompareHis() { this.spinShow = true var formData = this.standCommonlySearch this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { - _this: this - }, res => { + _this: this + }, res => { this.standInfoList = res.data.list this.total = res.data.count this.spinShow = false }) - // var form = this.standCommonlySearch - // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { - // _this: this - // }, res => { - // this.standInfoList = res.data.records - // this.total = res.data.total - // this.spinShow = false - // }, e => { - // }) }, - pageChange (page) { + pageChange(page) { this.standCommonlySearch.page = page this.sarStandCompareHis() }, // 分页每页显示数改变后方法 - pageSizeChange (pageSize) { + pageSizeChange(pageSize) { this.$store.getters.userInfo.configContent = pageSize this.standCommonlySearch.size = pageSize this.sarStandCompareHis() @@ -550,13 +535,12 @@ export default { bringData.push(deposit.get(this.selectedList[i])); } if (bringData[0].standYear) { - this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName } else { - this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName } this.form.standType = bringData[0].standType this.form.standId = bringData[0].id - this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); @@ -566,10 +550,10 @@ export default { }, /*** **********************************************/ /** 流程节点负责人的选择 *****************************/ - checkedRole2 (data) { + checkedRole2(data) { var idList = '' var nameList = '' - data.forEach( item => { + data.forEach(item => { if (nameList.length > 0) { nameList += ',' idList += ',' @@ -580,7 +564,7 @@ export default { this.roleForm.dockUserList = idList this.roleForm.dockUserListName = nameList }, - checkedRole (data) { + checkedRole(data) { if (this.type === 'ministerUser') { this.roleForm.ministerUser = data[0].id this.roleForm.ministerUserName = data[0].name @@ -592,14 +576,14 @@ export default { this.roleForm.presidentUserName = data[0].name } }, - choiceZRRS () { + choiceZRRS() { this.nodeList2 = [] - if ( this.roleForm.dockUserList.length > 0) { + if (this.roleForm.dockUserList.length > 0) { this.nodeList2 = this.roleForm.dockUserList.split(',') } this.modalshowflag2 = true }, - choiceZRR (type, title, id) { + choiceZRR(type, title, id) { this.nodeList = [] this.nodeList.push(id) this.type = type @@ -678,20 +662,27 @@ export default { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 3b464f68c..d99ad7a3a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -1,402 +1,408 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index c7688ae01..1ea8180f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -248,7 +242,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process"; +import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from "api/process"; export default { name: "bzzqyjStep5", @@ -284,7 +278,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -296,7 +290,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -410,7 +404,7 @@ export default { item.type = false; }); this.json = data; - this.data = data.summaryList + this.data = data.info if (data.introduce) { } else { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index bc6e8f871..6d6dd5e6c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -229,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand } from "api/process"; +import {inboundLiaisonDetail, processCreateStand} from "api/process"; export default { name: "bzzqyjStep6", @@ -268,7 +262,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -280,7 +274,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -387,13 +381,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg); - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - this.form.fjListId = data.fjListId + this.form.fjList = data.fjList || data.form.fjList + this.form.fjListId = data.fjListId || data.form.fjListId + this.form.cid = data.cid || data.form.cid; + this.form.endTime = data.endTime || data.form.endTime; + this.form.cname = data.cname || data.form.cname; + this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] - data.summaryList.forEach( item => { + data.info.forEach(item => { if (item.state != '3') { arr.push(item) } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 2d116fc5f..d033f81c9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -1,462 +1,472 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 75efde0eb..41223f5aa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -1,463 +1,473 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 2fb277a75..8e66c0be7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -24,7 +24,7 @@
- + - - -
-
{{ item.fileName }}
+
+ {{ item.fileName }} +
@@ -229,7 +223,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { inboundLiaisonDetail, processCreateStand } from "api/process"; +import {inboundLiaisonDetail, processCreateStand} from "api/process"; export default { name: "bzzqyjStep9", @@ -265,7 +259,7 @@ export default { }, formRules: { responUserList: [ - { required: true, message: "请选择责任人", trigger: "change" } + {required: true, message: "请选择责任人", trigger: "change"} ] }, json: {} @@ -277,7 +271,7 @@ export default { ProcessTitle }, methods: { - updataFj (item) { + updataFj(item) { let id let type = item.fileName.split('.') if (type[1] === 'pdf') { @@ -381,13 +375,14 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - this.form.cid = data.cid - this.form.endTime = data.endTime - this.form.cname = data.cname - this.form.fjList = data.fjList - this.form.fjListId = data.fjListId + this.form.fjList = data.fjList || data.form.fjList + this.form.fjListId = data.fjListId || data.form.fjListId + this.form.cid = data.cid || data.form.cid; + this.form.endTime = data.endTime || data.form.endTime; + this.form.cname = data.cname || data.form.cname; + this.oldData = JSON.parse(JSON.stringify(data.info)) var arr = [] - data.summaryList.forEach( item => { + data.info.forEach(item => { if (item.state != '3') { arr.push(item) }