commit

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -413,7 +413,11 @@
                             </div>
                         </div>
                     </div>
-                    <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+                        <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                        <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                    </div>
+                    <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
                         <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
                             <el-input
                                     v-model="plForm.technicalRequir"
@@ -494,6 +498,7 @@
         name: "bzjdStep1-1",
         data() {
             return {
+                itermsConditions: '',
                 commentText1: '',
                 itemsNum: '',
                 BDtext: false,
@@ -657,8 +662,8 @@
                     for (let a = 0; a < this.itemList.length; a++) {
                         for (let b = 0; b < res.data.length; b++) {
                             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
+                                this.itemList[a].itemsId2 = res.data[b].itemsId
-                                this.itemList[a].targetStand = res.data[b].targetStand
+                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
                             }
                         }
                     }
@@ -670,8 +675,8 @@
                     }, res => {
                         for (let a = 0; a < this.itemList.length; a++) {
                             for (let b = 0; b < res.data.length; b++) {
-                                if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+                                if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
-                                    this.itemList[a].itemsId2 = res.data[b].itemsId
+                                    this.itemList[a].itemsId = res.data[b].itemsId
                                 }
                             }
                         }
@@ -686,6 +691,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {
@@ -701,6 +710,7 @@
                 })
             },
             itemEdit (row, type, index) {
+                this.itermsConditions = row.itermsConditions
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -714,6 +724,8 @@
                     this.PLmodalTitle = '编辑'
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.BDtext = true
+                    } else if (!row.itemsId || !row.itemsId2) {
+                        this.BDtext = true
                     } else {
                         this.BDtext = false
                         this.leftData = res.data.leftString
@@ -787,12 +799,12 @@
                 this.$http.get('lawss/sarStandCompareHis/page', {
                     page: 1,
                     pageSize: 9999,
-                    newNumOrName: this.form.itemsNum
+                    newNumOrName: this.form.itemsNum,
+                    newFileType: this.form.fileType,
                 }, {
                     _this: this
                 }, res => {
                     this.standInfoList3 = res.data.list
-                    console.log(res);
                 }, e => {
                 })
             },

src/pages/processCenter/pages/creatProcess/bzjd/step1.vue

@@ -421,6 +421,10 @@
               </div>
             </div>
           </div>
+          <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+            <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+            <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+          </div>
           <el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
             <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
               <el-input
@@ -503,6 +507,7 @@ export default {
   name: "bzjdStep1",
   data() {
     return {
+      itermsConditions: '',
       commentText1: '',
       itemsNum: '',
       BDtext: false,
@@ -663,28 +668,28 @@ export default {
     getBDList () {
       this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
         standHisId: this.form.oldNumber,
-        leftOrRight: 'RIGHT'
+        leftOrRight: 'LEFT'
       }, {
         _this: this
       }, res => {
         for (let a = 0; a < this.itemList.length; a++) {
           for (let b = 0; b < res.data.length; b++) {
             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-              this.itemList[a].itemsId = res.data[b].itemsId
+              this.itemList[a].itemsId2 = res.data[b].itemsId
-              this.itemList[a].targetStand = res.data[b].targetStand
+              this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
             }
           }
         }
         this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
           standHisId: this.form.oldNumber,
-          leftOrRight: 'LEFT'
+          leftOrRight: 'RIGHT'
         }, {
           _this: this
         }, res => {
           for (let a = 0; a < this.itemList.length; a++) {
             for (let b = 0; b < res.data.length; b++) {
-              if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) {
+              if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
-                this.itemList[a].itemsId2 = res.data[b].itemsId
+                this.itemList[a].itemsId = res.data[b].itemsId
               }
             }
           }
@@ -699,6 +704,10 @@ export default {
         newItemId: id2,
         flag: 1
       }
+      if (!id || !id2) {
+        this.$message.warning('暂无找到相似的文本')
+        return
+      }
       this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
         _this: this
       }, res => {
@@ -714,6 +723,7 @@ export default {
       })
     },
     itemEdit (row, type, index) {
+      this.itermsConditions = row.itermsConditions
       let itemsEoPage = {
         oldItemId: row.itemsId,
         newItemId: row.itemsId2,
@@ -727,6 +737,8 @@ export default {
         this.PLmodalTitle = '编辑'
         if (res.data.leftString === '' && res.data.rightString === '') {
           this.BDtext = true
+        } else if (!row.itemsId || !row.itemsId2) {
+          this.BDtext = true
         } else {
           this.BDtext = false
           this.leftData = res.data.leftString

src/pages/processCenter/pages/creatProcess/bzjd/step3.vue

@@ -353,10 +353,10 @@
                 title="编辑"
                 :visible.sync="modalshowflag2"
                 :wrapperClosable="false"
-                :size="form.itemsNum1 ? '1200px' : '800px'">
+                size="1200px">
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
-                    <div style="width: 600px; border-right: 1px solid #ccc;">
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1">
                         <div v-if="BDtext" style="width: 100%; height: 100%;display: flex; align-items: center; justify-content: center;">无相似文本</div>
                         <div v-else style="height: 100%;">
                             <div style="margin: 10px 5px;">比对条款: {{ editForm.itemsNum }}</div>
@@ -367,6 +367,10 @@
                             </div>
                         </div>
                     </div>
+                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1">
+                        <div v-if="itermsConditions" v-html="itermsConditions" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
+                        <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
+                    </div>
                     <el-form :model="editForm" class="label-input-form" ref="plForm" label-width=150>
                     <el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
@@ -463,6 +467,7 @@
         name: "bzjdStep3",
         data() {
             return {
+                itermsConditions: '',
                 AOLIGEI: '',
                 commentText3: '',
                 BDtext: false,
@@ -553,29 +558,30 @@
                     leftOrRight: 'LEFT'
                 }, {
                     _this: this
-                }, res => {
-                    for (let a = 0; a < this.itemList.length; a++) {
-                        for (let b = 0; b < res.data.length; b++) {
-                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
-                                this.itemList[a].itemsId = res.data[b].itemsId
-                            }
-                        }
-                    }
-                }, e => {
-                })
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    leftOrRight: 'RIGHT'
-                }, {
-                    _this: this
                 }, res => {
                     for (let a = 0; a < this.itemList.length; a++) {
                         for (let b = 0; b < res.data.length; b++) {
                             if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
                                 this.itemList[a].itemsId2 = res.data[b].itemsId
+                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
                             }
                         }
                     }
+                    this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                        standHisId: this.oldNumber,
+                        leftOrRight: 'RIGHT'
+                    }, {
+                        _this: this
+                    }, res => {
+                        for (let a = 0; a < this.itemList.length; a++) {
+                            for (let b = 0; b < res.data.length; b++) {
+                                if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) {
+                                    this.itemList[a].itemsId = res.data[b].itemsId
+                                }
+                            }
+                        }
+                    }, e => {
+                    })
                 }, e => {
                 })
             },
@@ -585,6 +591,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {
@@ -600,6 +610,7 @@
                 })
             },
             itemEdit (row) {
+                this.itermsConditions = row.itermsConditions
                 let itemsEoPage = {
                     oldItemId: row.itemsId,
                     newItemId: row.itemsId2,
@@ -610,6 +621,8 @@
                     }, res => {
                     if (res.data.leftString === '' && res.data.rightString === '') {
                         this.BDtext = true
+                    } else if (!row.itemsId || !row.itemsId2) {
+                        this.BDtext = true
                     } else {
                         this.BDtext = false
                         this.leftData = res.data.leftString
@@ -899,6 +912,7 @@
                         })
                         this.getBDList()
                         this.itemList = itemList
+                        console.log(itemList);
                         this.loading = false
                     }).catch(e => {
                     })

src/pages/processCenter/pages/creatProcess/bzjd/step4.vue

@@ -361,6 +361,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {

src/pages/processCenter/pages/creatProcess/bzjd/step5.vue

@@ -361,6 +361,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {

src/pages/processCenter/pages/creatProcess/bzjd/step6.vue

@@ -359,6 +359,10 @@
                     newItemId: id2,
                     flag: 1
                 }
+                if (!id || !id2) {
+                    this.$message.warning('暂无找到相似的文本')
+                    return
+                }
                 this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, {
                     _this: this
                 }, res => {