From 6cfb2f8bc0f6c33f844afe89cd27b064de201f11 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Wed, 29 Dec 2021 16:10:51 +0800 Subject: [PATCH] commit --- .../InputForAllStandards.vue | 1 + .../InputForAllStandards2.vue | 1 + .../pages/creatProcess/bzjd/step1-6.vue | 108 +++++++++--------- .../enterpriseStandardPlan/index.vue | 37 +++--- 4 files changed, 82 insertions(+), 65 deletions(-) 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/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 650a9363a..a62d6235f 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -204,10 +204,10 @@ - + @@ -321,7 +321,7 @@
- +
- + @@ -343,13 +343,14 @@
- + @@ -359,6 +360,7 @@
@@ -367,6 +369,7 @@