diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index e84a1bea0..40b4e5221 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -367,6 +367,10 @@
比对条款: {{ editForm.itemsNum }}
相似度: {{ similarityDegree }}
+
+
旧标准
+
新标准
+
@@ -459,6 +463,10 @@ size="1100px">
比对条款: {{ itemsNum }}
相似度: {{ similarityDegree }}
+
+
旧标准
+
新标准
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 0ec1e73e2..2338046d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -280,6 +280,10 @@ size="1100px">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
+
+
旧标准
+
新标准
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index e11879098..255b84dd8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -285,6 +285,10 @@ size="1100px">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
+
+
旧标准
+
新标准
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c4cd42d64..07dcd9124 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -286,6 +286,10 @@ size="1100px">
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
+
+
旧标准
+
新标准
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index 3e1aac1f8..8e9667856 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -554,31 +554,7 @@ export default { standNumber: "" }, taskIds: this.$route.query.taskIds, - decomposeOptions: [{ - value: "CA", - label: "草稿", - item: "CA" - }, - { - value: "ZQYJG", - label: "征求意见稿", - item: "ZQYJG" - }, - { - value: "BPG", - label: "报批稿", - item: "BPG" - }, - { - value: "SSG", - label: "送审稿", - item: "SSG" - }, - { - value: "FBGBJBD", - label: "发布稿(必读)", - item: "FBGBJBD" - }], //分解单数据 + decomposeOptions: [], //分解单数据 standardTypeOptions: [ { value: "INLAND", @@ -674,7 +650,8 @@ export default { projectName: "", projectPlatfor: "" }] - }] + }], + fileType: '' }, choiceForm: {}, //选择标准清单列表 showColumn: true, @@ -752,11 +729,13 @@ export default { this.roleForm.ministerUserName = item.form.ministerUserName this.submitFlag = '修改节点' this.dataList.distributePerson = this.listForm.dataList[0].distributePerson - // this.$http.get("SarStandItems/sar-stand-items/getFileType", { - // standId: item.standId - // }, {}, res => { - // this.decomposeOptions = res.data; - // }); + // this.listForm.fileType = '' + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: item.standId + }, {}, res => { + this.decomposeOptions = res.data; + // decomposeOptions = ; //分解单数据 + }); }else{ this.hisListForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item)) @@ -775,11 +754,12 @@ export default { this.qualityEngineer = item.qualityEngineer this.submitFlag = '修改节点' this.dataList.distributePerson = this.listForm.dataList[0].distributePerson - // this.$http.get("SarStandItems/sar-stand-items/getFileType", { - // standId: item.standId - // }, {}, res => { - // this.decomposeOptions = res.data; - // }); + // this.listForm.fileType = '' + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: item.standId + }, {}, res => { + this.decomposeOptions = res.data; + }); } }) }, @@ -1127,18 +1107,23 @@ export default { //选择拆分标准确定事件 OkDrawer() { if (this.selectedList.length === 1) { - this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear; + if(this.selectedList[0].standYear){ + this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber + "-" + this.selectedList[0].standYear; + }else{ + this.listForm.standNumber = this.selectedList[0].standSortShow + "\xa0\xa0" + this.selectedList[0].standNumber ; + } this.listForm.standName = this.selectedList[0].standName; this.listForm.standType = this.selectedList[0].standType; this.listForm.standId = this.selectedList[0].id; this.listForm.XCXSSRQ = this.selectedList[0].xcxssrqgj; this.listForm.ZCCSSRQ = this.selectedList[0].zccssrqgj; this.listForm.id = this.selectedList[0].id; - // this.$http.get("SarStandItems/sar-stand-items/getFileType", { - // standId: this.selectedList[0].id - // }, {}, res => { - // this.decomposeOptions = res.data; - // }); + this.listForm.fileType = '' + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: this.selectedList[0].id + }, {}, res => { + this.decomposeOptions = res.data; + }); this.ListModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("您只能选择一条数据进行带入"); @@ -1278,21 +1263,23 @@ export default { this.dataList = mes.form.dataList; this.roleForm = mes.roleForm this.commentText = mes.commentText - // this.$http.get("SarStandItems/sar-stand-items/getFileType", { - // standId: mes.form.standId - // }, {}, res => { - // this.decomposeOptions = res.data; - // }); + // this.listForm.fileType = '' + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: mes.form.standId + }, {}, res => { + this.decomposeOptions = res.data; + }); }else{ this.listForm = mes.json.form; this.dataList = mes.json.form.dataList this.roleForm = mes.json.roleForm; this.commentText = mes.json.commentText; - // this.$http.get("SarStandItems/sar-stand-items/getFileType", { - // standId: mes.json.form.standId - // }, {}, res => { - // this.decomposeOptions = res.data; - // }); + // this.listForm.fileType = '' + this.$http.get("SarStandItems/sar-stand-items/getFileType", { + standId: mes.json.form.standId + }, {}, res => { + this.decomposeOptions = res.data; + }); } }); }, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 23d1ca7bf..9d3d96841 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -162,11 +162,11 @@ + -