Merge branch 'develop' into 'FOTON'

commit

See merge request LAWS/laws-system-front-FOTON!297

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

@@ -653,20 +653,6 @@
                 }
             },
             getBDList () {
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.form.oldNumber,
-                    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].itemsId2 = res.data[b].itemsId
-                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
-                            }
-                        }
-                    }
                 this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
                     standHisId: this.form.oldNumber,
                     leftOrRight: 'RIGHT'
@@ -675,8 +661,22 @@
                 }, 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) {
+                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
                                 this.itemList[a].itemsId = res.data[b].itemsId
+                                this.itemList[a].targetStand = res.data[b].targetStand
+                            }
+                        }
+                    }
+                    this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                        standHisId: this.form.oldNumber,
+                        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].targetStand === res.data[b].itemsDisplayNum) {
+                                    this.itemList[a].itemsId2 = res.data[b].itemsId
                                 }
                             }
                         }

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

@@ -666,20 +666,6 @@ export default {
       }
     },
     getBDList () {
-      this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-        standHisId: this.form.oldNumber,
-        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].itemsId2 = res.data[b].itemsId
-              this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
-            }
-          }
-        }
       this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
         standHisId: this.form.oldNumber,
         leftOrRight: 'RIGHT'
@@ -688,8 +674,22 @@ export default {
       }, 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) {
+            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
               this.itemList[a].itemsId = res.data[b].itemsId
+              this.itemList[a].targetStand = res.data[b].targetStand
+            }
+          }
+        }
+        this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+          standHisId: this.form.oldNumber,
+          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].targetStand === res.data[b].itemsDisplayNum) {
+                this.itemList[a].itemsId2 = res.data[b].itemsId
               }
             }
           }

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

@@ -553,20 +553,6 @@
                 });
             },
             getBDList () {
-                this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
-                    standHisId: this.oldNumber,
-                    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].itemsId2 = res.data[b].itemsId
-                                this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum
-                            }
-                        }
-                    }
                 this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
                     standHisId: this.oldNumber,
                     leftOrRight: 'RIGHT'
@@ -575,8 +561,22 @@
                 }, 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) {
+                            if (this.itemList[a].itemsNum === res.data[b].itemsNum) {
                                 this.itemList[a].itemsId = res.data[b].itemsId
+                                this.itemList[a].targetStand = res.data[b].targetStand
+                            }
+                        }
+                    }
+                    this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
+                        standHisId: this.oldNumber,
+                        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].targetStand === res.data[b].itemsDisplayNum) {
+                                    this.itemList[a].itemsId2 = res.data[b].itemsId
                                 }
                             }
                         }