diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue index 56ab63891..df1f01387 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue @@ -303,7 +303,7 @@

标准法规部人员

- +
@@ -351,7 +351,7 @@

总院技术委员会主任

- +
diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index 1082a588c..0154e6ff5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -68,7 +68,10 @@ {{ '-' }} - {{ item.name }} {{ ';' }} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} @@ -256,7 +259,8 @@ export default { taskIds: this.$route.query.taskIds, pId: this.$route.query.prcId, - infoSourcesLength: '' + infoSourcesLength: '', + showHover: false } }, computed: { diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue index af7588ed4..91585107c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue @@ -68,7 +68,10 @@ {{ '-' }} - {{ item.name }} {{ ';' }} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue index a306f33cf..eb466992d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step4.vue @@ -68,7 +68,10 @@ {{ '-' }} - {{ item.name }} {{ ';' }} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue index 57af0852f..98bdec696 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue @@ -68,7 +68,10 @@ {{ '-' }} - {{ item.name }} {{ ';' }} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue index 4d7896e6d..d18b7e4e9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6-1.vue @@ -68,7 +68,10 @@ {{ '-' }} - {{ item.name }} {{ ';'}} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue index 834b8905c..f06a7af66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step6.vue @@ -71,7 +71,10 @@ {{ '-' }} - {{ item.name }} {{ ';' }} + + {{ item.name.slice(0,30) + '...' }} {{ ';' }} + + {{ item.name }} {{ ';' }} diff --git a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue index 3936aa516..948bbc6d6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue @@ -625,6 +625,8 @@ export default { }) } }) + } else { + this.$message.warning('请完成流程信息的人员选择') } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue index 0072412dc..c8efb7e7f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue @@ -645,6 +645,8 @@ export default { this.isSubmit = false }) }) + } else { + this.$message.warning('请完成流程信息的人员选择') } }) } diff --git a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue index c369e42d1..211ad41a9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue @@ -6,7 +6,7 @@
基础信息
-
流程信息
+
流程信息
@@ -352,9 +352,9 @@ export default { this.$nextTick(() => { this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData this.uploadFileLength = this.ch_pageData.fileTextList.length - this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName - this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName - this.rh_pageData.fillTel = this.$store.getters.userInfo.phone + this.ch_pageData.fillDept = this.$store.getters.userInfo.institutionName + this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName + this.ch_pageData.fillTel = this.$store.getters.userInfo.phone this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName this.roleForm = JSON.parse(JSON.stringify(item)).roleList diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 454ec21e2..1f4c883f5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -134,18 +134,12 @@ prop="XCXSSRQ" align="center" label="新车型实施日期"> - - - - { this.standardData = res.data.list; this.standardData.forEach(item => { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - }); + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); + }) this.totalNo = res.data.count; }, e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 99f5c7d9d..03321c95d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -134,18 +134,12 @@ prop="XCXSSRQ" align="center" label="新车型实施日期"> - - - - { this.standardData = res.data.list; this.standardData.forEach(item => { - if (item.attrInfoMap === null) { - this.$set(item, "ZCCSSRQ", ''); - this.$set(item, "XCXSSRQ", ''); - } else { - this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); - this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); - } + this.$set(item, "ZCCSSRQ", item.zccssrq); + this.$set(item, "XCXSSRQ", item.xcxssrq); }) this.totalNo = res.data.count; }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index c1751c57e..301e8e390 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -867,6 +867,7 @@ export default { }, //动态表单读取 getFormFieldList(item) { + console.log(item); this.$nextTick(() => { if(item.form === undefined){ this.qdform = JSON.parse(JSON.stringify(item)); @@ -911,6 +912,8 @@ export default { if(item.zrbm === '[]'){ item.zrbm = '' } + this.$set(item, 'zccssrq', item.zccssrqgj) + this.$set(item, 'xcxssrq', item.xcxssrqgj) }) }); }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 13754d111..7c7cd75bd 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -953,13 +953,6 @@ export default { this.saveLoading = false; }); }, - handleRemark(){ - this.dataList.map(item => { - if(item.involve === 'noInvolve'){ - comFlag - } - }) - }, //提交事件 handleSubmit() { let comFlag = 0 @@ -971,6 +964,9 @@ export default { if(comFlag > 0){ this.$message.warning('请填写不涉及的备注信息') }else{ + this.dataList.forEach(item => { + this.$set(item, 'standId', item.id) + }) this.isSubmit = true; this.qdform.currentPerson = this.$store.getters.userInfo.userName; this.qdform.commentText = this.commentText; diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index 4fa29cf5e..b3f30e9e3 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -965,6 +965,9 @@ export default { if(comFlag > 0){ this.$message.warning('请填写不涉及的备注信息') }else{ + this.dataList.forEach(item => { + this.$set(item, 'standId', item.id) + }) this.isSubmit = true; this.qdform.commentText = this.commentText; this.qdform.dataList = this.dataList @@ -1151,6 +1154,8 @@ export default { } }) this.handleSelectTableList.map(item => { + this.$set(item, 'involve', '涉及') + this.$set(item, 'remarks', '') let addIndex addIndex = this.dataList.findIndex(items =>{ return items.id === item.id @@ -1161,10 +1166,6 @@ export default { this.dataList.push(item) } }) - this.dataList.forEach(item => { - this.$set(item, 'involve', 'involve') - this.$set(item, 'remarks', '') - }) this.standModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue index 5957262a2..46192be92 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue @@ -442,13 +442,6 @@ export default { this.qdform.prcName = this.prcName; this.qdform["id"] = item.id; this.dataList = item.dataList - this.dataList.forEach(item => { - if(item.involve === 'involve'){ - item.involve = '涉及' - }else if(item.involve === 'noInvolve'){ - item.involve = '不涉及' - } - }) // this.projectId = item.projectId; // //获取清单id 查询对应清单下的标准 // this.detailedId = item.detailedListId; @@ -520,13 +513,6 @@ export default { this.saveLoading = false; }); }, - handleRemark(){ - this.dataList.map(item => { - if(item.involve === 'noInvolve'){ - comFlag - } - }) - }, //驳回事件 beforeBack() { if (this.commentText === null || this.commentText === undefined || this.commentText === "") { diff --git a/src/pages/processCenter/pages/phone/zczqyj/step4.vue b/src/pages/processCenter/pages/phone/zczqyj/step4.vue new file mode 100644 index 000000000..9d74bfae8 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step4.vue @@ -0,0 +1,457 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step5.vue b/src/pages/processCenter/pages/phone/zczqyj/step5.vue new file mode 100644 index 000000000..2416bc2b8 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step5.vue @@ -0,0 +1,629 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step6.vue b/src/pages/processCenter/pages/phone/zczqyj/step6.vue new file mode 100644 index 000000000..0aa4816b4 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step6.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step7.vue b/src/pages/processCenter/pages/phone/zczqyj/step7.vue new file mode 100644 index 000000000..9824ca4a2 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step7.vue @@ -0,0 +1,495 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step8.vue b/src/pages/processCenter/pages/phone/zczqyj/step8.vue new file mode 100644 index 000000000..92afa1e9d --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step8.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/zczqyj/step9.vue b/src/pages/processCenter/pages/phone/zczqyj/step9.vue new file mode 100644 index 000000000..99a585c29 --- /dev/null +++ b/src/pages/processCenter/pages/phone/zczqyj/step9.vue @@ -0,0 +1,494 @@ + + + + + diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue index 5d8122512..bad3cc6e5 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue @@ -1262,7 +1262,8 @@ export default { }); }).catch(() => { // 取消删除,清空选择 - this.selectedList = []; + // console.log(this.selectedList) + // this.selectedList = []; }) } }, diff --git a/src/router/index.js b/src/router/index.js index 86627116f..0da39dace 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2094,6 +2094,66 @@ const routes = [ title: '未符合项整改流程' } }, + { + path: '/phoneZczqyjStep4', + name: 'phoneZczqyjStep4', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step4.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep5', + name: 'phoneZczqyjStep5', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step5.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep6', + name: 'phoneZczqyjStep6', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step6.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep7', + name: 'phoneZczqyjStep7', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step7.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep8', + name: 'phoneZczqyjStep8', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step8.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, + { + path: '/phoneZczqyjStep9', + name: 'phoneZczqyjStep9', + component: () => import('@/pages/processCenter/pages/phone/zczqyj/step9.vue'), + meta: { + isBoolean: true, + requireAuth: true, + title: '政策征求意见流程' + } + }, ] },