From 4b4fce673b72e8378478aa98e080c608e41c10fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 14:15:11 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=E6=97=A5=E6=9C=9F=E5=9B=9E?= =?UTF-8?q?=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 3 +++ 1 file changed, 3 insertions(+) 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) }) }); }, From 08913c26010a00c768cff72739eda4e35164a53e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 9 Dec 2021 15:02:22 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzhHy-ch/step3.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 From b868fc34f1b9a531d4b15d16c3cfc6cac035392e Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 9 Dec 2021 15:03:20 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E6=94=BF=E7=AD=96=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20-=20=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E8=8A=82=E7=82=B9=20-=20=E6=89=8B=E6=9C=BA=E7=AB=AF=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/phone/zczqyj/step4.vue | 457 +++++++++++++ .../pages/phone/zczqyj/step5.vue | 629 ++++++++++++++++++ .../pages/phone/zczqyj/step6.vue | 494 ++++++++++++++ .../pages/phone/zczqyj/step7.vue | 495 ++++++++++++++ .../pages/phone/zczqyj/step8.vue | 494 ++++++++++++++ .../pages/phone/zczqyj/step9.vue | 494 ++++++++++++++ src/router/index.js | 60 ++ 7 files changed, 3123 insertions(+) create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step4.vue create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step5.vue create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step6.vue create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step7.vue create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step8.vue create mode 100644 src/pages/processCenter/pages/phone/zczqyj/step9.vue 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/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: '政策征求意见流程' + } + }, ] }, From 0071d5de536d2843889e23165069ba1251e64b82 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 9 Dec 2021 15:04:32 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=85=A5=E4=BC=9A=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E9=99=90=E5=88=B6=E9=95=BF=E5=BA=A6=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step1.vue | 4 ++-- .../pages/creatProcess/bzhHd-rh/step2.vue | 22 +++++++++++++++++-- .../pages/creatProcess/bzhHd-rh/step3.vue | 5 ++++- .../pages/creatProcess/bzhHd-rh/step4.vue | 5 ++++- .../pages/creatProcess/bzhHd-rh/step5.vue | 5 ++++- .../pages/creatProcess/bzhHd-rh/step6-1.vue | 5 ++++- .../pages/creatProcess/bzhHd-rh/step6.vue | 5 ++++- 7 files changed, 42 insertions(+), 9 deletions(-) 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..b00874457 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: { @@ -463,6 +467,20 @@ export default { /deep/ .el-table th { padding: 0px; } + + .hover_container{ + width: 50%; + color: #fff; + background-color: #8b8c89; + border: 1px solid #ccc; + border-radius: 8px; + text-align: center; + line-height: 20px; + position: absolute; + left: 50px; + z-index: 99; + transform: translateY(-88%); + } } } 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 }} {{ ';' }} From 145a526f23dfd42f495730a9091d0f07269b7daf Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 9 Dec 2021 15:08:53 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=A1=AB=E5=86=99?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzhHh-hh/step1.vue | 2 ++ src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue | 2 ++ 2 files changed, 4 insertions(+) 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('请完成流程信息的人员选择') } }) } From 4a8cb3fd2af3cc82b56939ad08a91dbad14e1dfd Mon Sep 17 00:00:00 2001 From: yanyizhou <2311759275@qq.com> Date: Thu, 9 Dec 2021 15:18:11 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=87=8D=E7=82=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA=E6=B8=85=E5=8D=95=E5=9C=A8=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=97=B6=E5=80=99=E8=A6=81=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=89=80=E9=80=89=E7=9A=84selectedList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accessStandardsAndRegulations/page/listTracking.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 = []; }) } }, From f056983a9cd83f39e41ce5869958ede410fb79e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 15:20:55 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/xmqdqr/step3.vue | 3 +++ .../processCenter/pages/creatProcess/xmqdqr/step4.vue | 9 +++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 13754d111..83ea9f6df 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -971,6 +971,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 } }, From ae63963e18aa548f369170c8376b5b072313e650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 15:23:50 +0800 Subject: [PATCH 08/11] commit --- .../pages/creatProcess/xmqdqr/step3.vue | 7 ------- .../pages/creatProcess/xmqdqr/step5.vue | 14 -------------- 2 files changed, 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 83ea9f6df..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 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 === "") { From ef31c1b885c09d1e137c372ff220374cfbb1271e Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 9 Dec 2021 16:04:48 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzhHd-rh/step2.vue | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue index b00874457..0154e6ff5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue @@ -467,20 +467,6 @@ export default { /deep/ .el-table th { padding: 0px; } - - .hover_container{ - width: 50%; - color: #fff; - background-color: #8b8c89; - border: 1px solid #ccc; - border-radius: 8px; - text-align: center; - line-height: 20px; - position: absolute; - left: 50px; - z-index: 99; - transform: translateY(-88%); - } } } From f439c51594ab28a6f70e1e35059f5ae14551d7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 16:10:03 +0800 Subject: [PATCH 10/11] commit --- src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 454ec21e2..d420e291a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -1052,7 +1052,7 @@ export default { this.getStandData(); }, getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, page: this.pageNo, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 99f5c7d9d..e5b594fca 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -984,7 +984,7 @@ export default { }, //查询项目下的标准 getStandData() { - this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", { + this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", { standType: this.standardSearch.standType, standNumber: this.standardSearch.standNumber, page: this.pageNo, From 139c221cdca432e10f31a8415aa75a6e59d1aa1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Thu, 9 Dec 2021 16:20:02 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 18 +++------------- .../pages/creatProcess/bzqdfb/step1.vue | 21 ++----------------- 2 files changed, 5 insertions(+), 34 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index d420e291a..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 e5b594fca..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 => {