diff --git a/src/components/CustomFormComponents/InputForAllStandards.vue b/src/components/CustomFormComponents/InputForAllStandards.vue index d33c1a176..9e3ef0db1 100644 --- a/src/components/CustomFormComponents/InputForAllStandards.vue +++ b/src/components/CustomFormComponents/InputForAllStandards.vue @@ -21,6 +21,7 @@ size="mini" style="position:absolute;top: 10px;right: 0;" @click="selectLaws" + :disabled="disabled" v-if="(processModel && !disabled) || !processModel" >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}} diff --git a/src/components/CustomFormComponents/InputForAllStandards2.vue b/src/components/CustomFormComponents/InputForAllStandards2.vue index 48ffe0938..a69bd111f 100644 --- a/src/components/CustomFormComponents/InputForAllStandards2.vue +++ b/src/components/CustomFormComponents/InputForAllStandards2.vue @@ -21,6 +21,7 @@ size="mini" style="position:absolute;top: 10px;right: 0;" @click="selectLaws" + :disabled="disabled" v-if="(processModel && !disabled) || !processModel" >{{config.attrField === 'releventStand' ? '选择标准' :'手动查找'}} diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 4ef4b219b..0a73ae122 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -137,8 +137,8 @@ height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '48px'}" - row-key="id" > + - + prop="newData" + width="180" + show-overflow-tooltip + label="新车型实施日期" + align="center"> + prop="onlineData" + width="180" + show-overflow-tooltip + label="在产车型实施日期" + align="center"> - - - - + prop="applyArctic" + width="200" + label="适用车型" + show-overflow-tooltip + align="center"> + prop="unitDeptName" + label="责任部门" + width="200" + show-overflow-tooltip + align="center"> + label="责任人" + width="170" + prop="zrUserName" + show-overflow-tooltip + align="center"> + + + + + @@ -336,6 +337,7 @@ title="查看比对内容" :visible.sync="BDmodel" size="1100px"> +
比对条款: {{ itemsNum }}
相似度:{{ similarityDegree }}
@@ -355,6 +357,7 @@ export default { name: "bzjdStep1-6", data() { return { + itemsNum: '', similarityDegree: '', BDmodel: false, oldNumber: '', @@ -422,7 +425,7 @@ export default { }, e => { }) }, - checkBD (id,id2) { + checkBD (id,id2,itemsNum) { let itemsEoPage = { oldItemId: id, newItemId: id2, @@ -434,6 +437,7 @@ export default { if (res.data.leftString === '' && res.data.rightString === '') { this.$message.warning('暂无找到相似的文本') } else { + this.itemsNum = itemsNum this.leftData = res.data.leftString this.rightData = res.data.rightString this.BDmodel = true diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 8a29886b1..0bd81f495 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -485,6 +485,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 3e7de87d4..64051a107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -857,6 +857,7 @@ this.acceptShow = false this.submitShow = true } + this.commentText = data.commentText this.todoId = res.id this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 3fbce2468..1f0ab47e7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -484,6 +484,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 212b770b6..6fb68cad4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -472,6 +472,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c93f1e9da..cf5303764 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -470,6 +470,7 @@ let data = JSON.parse(res.mesg) this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsName = data.itemsName || data.form.itemsName + this.commentText = data.commentText if (data.form) { this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsNum1 = data.form.itemsNum1 || '' @@ -479,7 +480,6 @@ } this.sarType = data.standInData || data.sarType this.json = data - console.log(data.itemList); this.itemList = data.itemList this.loading = false }).catch(e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 78340e107..cd698d361 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -156,13 +156,11 @@ @@ -750,7 +747,6 @@