diff --git a/src/assets/styles/process.less b/src/assets/styles/process.less index 8efe7eea1..57a03f168 100644 --- a/src/assets/styles/process.less +++ b/src/assets/styles/process.less @@ -7,7 +7,7 @@ line-height: 50px; } .add-form-item:last-child { - border-bottom: 0px dashed #e5e5e5; + //border-bottom: 0px dashed #e5e5e5; } .form-item-disabled { .el-form-item__label, .el-form-item__content .el-input .el-input__inner, diff --git a/src/pages/details/otherBussStandardDetails/index.vue b/src/pages/details/otherBussStandardDetails/index.vue index 64aca8617..cd58896bc 100644 --- a/src/pages/details/otherBussStandardDetails/index.vue +++ b/src/pages/details/otherBussStandardDetails/index.vue @@ -3509,7 +3509,7 @@ export default { } .basic-information-content{ & > p{ - min-height: 42px; + min-height: 43px; line-height: 43px; border-bottom: 1px solid #E5E5E5; } diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index fa40ff4bd..7d92ae364 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -1389,7 +1389,9 @@
- {{ standShowItemEO.complianceRequire }} + {{ standShowItemEO.complianceRequire ? (standShowItemEO.complianceRequire === '1' ? '是' : '否') : '-' }} + +
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 95cc2f08b..02e7df1b0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -411,7 +411,7 @@ :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
-
+
无内容
@@ -425,7 +425,7 @@
-
+
无内容
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 3ba94cc91..a24a3c56e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -484,7 +484,6 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) - console.log(data); this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a27652d21..bbd89128c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -48,6 +48,65 @@ clearable > + + + + + + + + + + + + + + + + + + + + + + + + + 根据类别、编号、中英文名称查询 + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - 根据类别、编号、中英文名称查询 - - - - - - - - - - - - -
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ea6779911..de3bbd85d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -23,69 +23,53 @@
- - - - 国内标准入库 - 海外标准入库 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 国内标准入库 + 海外标准入库 + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e06763fa3..bc7bfdb7f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -30,56 +30,120 @@ 海外标准入库 - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -102,53 +166,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 38da23b1e..196173ea5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -60,20 +60,18 @@ clearable > - - - - - - - - - - + + + @@ -121,19 +119,40 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index fb3d05ead..47b2cd752 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -30,9 +30,7 @@ 海外标准入库 - - - + - - - - - + - - - - - - + v-model="form.issueTime" + type="date" + placeholder="请选择标准发布日期" + value-format="yyyy-MM-dd"> + @@ -117,32 +101,53 @@ > - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + @@ -536,7 +544,7 @@ - + { - if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { - let taskId = { - id: this.$route.query.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.submitLoading = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - }) + this.submitLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 8908ca588..cb7e6bce9 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2948,7 +2948,7 @@ const planForm = {} planForm.id = this.form.planId planForm.planStatus = '2' - this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 15e15c331..8b1c360f5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2545,7 +2545,7 @@ const planForm = {} planForm.id = this.form.planId planForm.planStatus = '4' - this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 8918b183d..003ac380d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -2721,7 +2721,7 @@ const planForm = {} planForm.id = this.form.planId planForm.planStatus = '2' - this.$http.post("esRevisePlan/es-revise-plan/modPlan", planForm, { + this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { _this: this }, res => { if (res.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index ce8075f58..2a6017b9f 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -315,17 +315,18 @@ export default { }, // 文件上传成功 handleOnsuccess(res, file, fileList) { + console.log(res); if (res.ok) { if (this.fileTextList !== null) { this.newDataList = this.fileTextList this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } else { this.newDataList.push({ id: res.data.attId, - name: res.data.standName + name: res.data.name }) } this.fileListData.fileText = this.newDataList @@ -460,10 +461,10 @@ export default { // 提交按钮 handleSubmit() { this.isSubmit = true - let flag=false + let flag = false this.dataList.forEach(item => { if (item.fileText.length === 0) { - flag=true + flag = true this.isSubmit = false } }) diff --git a/src/pages/processCenter/pages/phone/bzdy/step4.vue b/src/pages/processCenter/pages/phone/bzdy/step4.vue index 26990a8cf..3d1bad651 100644 --- a/src/pages/processCenter/pages/phone/bzdy/step4.vue +++ b/src/pages/processCenter/pages/phone/bzdy/step4.vue @@ -273,9 +273,9 @@ this.form.title = data.title || data.form.title this.form.date = data.date || data.form.date this.json = data || data.form - this.form.file = data.form ? data.form.fileId : data.fileId - this.form.fileName = data.form ? data.form.fileName : data.fileName - this.form.fileId = data.form ? data.form.fileId : data.fileId + this.form.file = data.fileId || data.form.fileId + this.form.fileName = data.fileName || data.form.fileName + this.form.fileId = data.fileId || data.form.fileId this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.fjList = data.fjList || data.form.fjList this.commentText4 = data.commentText4 || '' diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index b271734f0..e5efb7f79 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -26,8 +26,9 @@ - + +
@@ -230,10 +231,17 @@ :saveLoading="saveLoading" @submit="handleSubmit" show-back + show-transfer + @transfer="handleTransfer" @back="handleSubmitNo" submitBTNText="同意" > + { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText4 = data.commentText4 || '' diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index 50c459427..8ef8fd6f9 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -25,8 +25,9 @@ - + +
隐藏基础信息 @@ -239,11 +240,17 @@ :saveLoading="saveLoading" @submit="handleSubmit" show-back + show-transfer + @transfer="handleTransfer" @back="handleSubmitNo" submitBTNText="同意" > - +
@@ -438,6 +445,7 @@ export default { pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText5 = data.commentText5 || '' diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index 3decd10f5..4cb7d0bf2 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -25,8 +25,9 @@ - + + 隐藏基础信息 @@ -228,10 +229,17 @@ :saveLoading="saveLoading" @submit="handleSubmit" show-back + show-transfer + @transfer="handleTransfer" @back="handleSubmitNo" submitBTNText="同意" > + { let data = JSON.parse(res.mesg) + this.form.endTime = data.endTime || data.form.endTime this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName this.commentText6 = data.commentText6 || '' diff --git a/src/pages/processCenter/pages/phone/qbfs/step5.vue b/src/pages/processCenter/pages/phone/qbfs/step5.vue index 5773497bb..dce48d3e6 100644 --- a/src/pages/processCenter/pages/phone/qbfs/step5.vue +++ b/src/pages/processCenter/pages/phone/qbfs/step5.vue @@ -36,7 +36,7 @@ @formCancel="formCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" > -
+
diff --git a/src/pages/processCenter/pages/phone/qbfz/step2.vue b/src/pages/processCenter/pages/phone/qbfz/step2.vue index aac4383fa..d32139376 100644 --- a/src/pages/processCenter/pages/phone/qbfz/step2.vue +++ b/src/pages/processCenter/pages/phone/qbfz/step2.vue @@ -2,7 +2,7 @@ - - - - diff --git a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue index 64602d669..f60557d98 100644 --- a/src/pages/processCenter/pages/phone/qbrk-product/step4.vue +++ b/src/pages/processCenter/pages/phone/qbrk-product/step4.vue @@ -30,10 +30,10 @@ :disabledState = "disabledState" :verifySarStandard = "verifySarStandard" @emitDataLoading="emitDataLoading"> -
+
-
+
-
+
-
+
-
+
-
+
@@ -241,30 +239,6 @@ export default { this.modalshowflag = true this.roleTitle = '转办处理人' }, - // 退回按钮 - handleSubmitNo() { - if (this.textarea) { - - var json = { - passInfo: 1, - actionFlag: 1, - commentText: this.textarea, - standardInfoList: this.standardInfoList, - } - const params = new FormData(); - params.set('json', JSON.stringify(json)) - params.set('userId', this.$store.getters.userInfo.account) - params.set('taskIds', this.taskIds) - completeTask(params).then(res => { - if (res.success) { - this.$message.success('驳回成功') - this.$router.push('/processCenter') - } - }) - } else { - this.$message.warning('请输入反馈意见') - } - }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index bb9928e1e..6d80bd674 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -1534,7 +1534,7 @@ export default { this.rowList = row; this.editRowData = this.rowList; if(this.editRowData.syrz === '-'){ - this.editRowData.ssrq = ""; + this.editRowData.syrz = ""; }else if(this.editRowData.syrz){ this.editRowData.syrz = this.editRowData.syrz.split(',') } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index adc18ca69..71f7f24d8 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1662,11 +1662,14 @@ - - + + - - - - -
diff --git a/src/router/index.js b/src/router/index.js index ac50a8a7f..c837743b3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2911,16 +2911,6 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } }, - { - path: '/phoneBussLibraryProduct13', - name: 'phoneBussLibraryProduct13', - component: () => import('@/pages/processCenter/pages/phone/qbrk-product/step13.vue'), - meta: { - isBoolean: true, - requireAuth: true, - title: '企标制修订流程及企业标准库流程' - } - }, ] },