Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -1863,7 +1863,16 @@ export default {
         }
         return true
 
-      }
+      }else if (type == 3) {
+          for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
+            console.log(name)
+            if (this.companyNameOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+
+        }
 
     },
     print() {
@@ -2280,14 +2289,22 @@ export default {
                       .warehouseName == '洮南向阳乡金昊' || this
                         .warehouseName == '白城内陆港' || this
                           .warehouseName == '山东园丰库'|| this
-                          .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库')) {
+                          .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='佳屹农仓储库')) {
                     if (this.weighingList.seller && this.weighingList.buyer) {
                       let cang = {}
                       cang.value = this.weighingList.seller
                       cang.label = this.weighingList.seller
-                      if (this.check(this.weighingList.seller, 1)) {
-                        this.ewCustomerOptions.push(cang)
+                      if(this.warehouseName=='佳屹农仓储库'){
+                        if (this.check(this.weighingList.seller, 3)) {
+                          this.companyNameOptions.push(cang)
+                          this.companyName=this.weighingList.seller
+                        }
+                      }else{
+                        if (this.check(this.weighingList.seller, 1)) {
+                          this.ewCustomerOptions.push(cang)
+                        }
                       }
+                      
                       let cang1 = {}
                       cang1.value = this.weighingList.buyer
                       cang1.label = this.weighingList.buyer
@@ -2406,13 +2423,23 @@ export default {
                             .warehouseName == '洮南向阳乡金昊' || this
                               .warehouseName == '白城内陆港' || this
                                 .warehouseName == '山东园丰库' || this
-                                  .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库')) {
+                                  .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库'||this.warehouseName=='佳屹农仓储库')) {
                             if (this.weighingList.seller && this.weighingList.buyer) {
                               let cang = {}
                               cang.value = this.weighingList.seller
                               cang.label = this.weighingList.seller
-                              if (this.check(this.weighingList.seller, 1)) {
-                                this.ewCustomerOptions.push(cang)
+                              // if (this.check(this.weighingList.seller, 1)) {
+                              //   this.ewCustomerOptions.push(cang)
+                              // }
+                              if(this.warehouseName=='佳屹农仓储库'){
+                                if (this.check(this.weighingList.seller, 3)) {
+                                  this.companyNameOptions.push(cang)
+                                  this.companyName=this.weighingList.seller
+                                }
+                              }else{
+                                if (this.check(this.weighingList.seller, 1)) {
+                                  this.ewCustomerOptions.push(cang)
+                                }
                               }
                               let cang1 = {}
                               cang1.value = this.weighingList.buyer

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -1167,6 +1167,15 @@
           }
           return true
 
+        } else if (type == 3) {
+          for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
+            console.log(name)
+            if (this.companyNameOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+
         }
 
       },
@@ -1179,13 +1188,23 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库')) {
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
                 cang.label = this.modification[_num].seller
-                if (this.check(this.modification[_num].seller, 1)) {
-                  this.ewCustomerOptions.push(cang)
+                // if (this.check(this.modification[_num].seller, 1)) {
+                //   this.ewCustomerOptions.push(cang)
+                // }
+                if(this.warehouseName=='佳屹农仓储库'){
+                  if (this.check(this.modification[_num].seller, 3)) {
+                    this.companyNameOptions.push(cang)
+                    this.companyName=this.modification[_num].seller
+                  }
+                }else{
+                  if (this.check(this.modification[_num].seller, 1)) {
+                    this.ewCustomerOptions.push(cang)
+                  }
                 }
                 let cang1 = {}
                 cang1.value = this.modification[_num].buyer
@@ -1200,13 +1219,23 @@
           this.isShowPrintType = true
           
         } else {
-          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller
               cang.label = row.seller
-              if (this.check(row.seller, 1)) {
-                this.ewCustomerOptions.push(cang)
+              // if (this.check(row.seller, 1)) {
+              //   this.ewCustomerOptions.push(cang)
+              // }
+              if(this.warehouseName=='佳屹农仓储库'){
+                if (this.check(row.seller, 3)) {
+                this.companyNameOptions.push(cang)
+                this.companyName=row.seller
+              }
+              }else{
+                if (this.check(row.seller, 1)) {
+                  this.ewCustomerOptions.push(cang)
+                }
               }
               let cang1 = {}
               cang1.value = row.buyer

src/views/outboundManagement/weighingManagementNew.vue

@@ -1402,6 +1402,15 @@
           }
           return true
 
+        } else if (type == 3) {
+          for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
+            console.log(name)
+            if (this.companyNameOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+
         }
 
       },
@@ -1772,7 +1781,7 @@
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
                         .warehouseName == '山东园丰库'|| this
-                        .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'){
+                        .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='佳屹农仓储库'){
                           this.weighingList = response
                       this.inspect = JSON.parse(
                         JSON.stringify(this.weighingList)
@@ -1781,9 +1790,17 @@
                             let cang = {}
                             cang.value = this.weighingList.contractManagement.seller
                             cang.label = this.weighingList.contractManagement.seller
-                            if (this.check(this.weighingList.contractManagement.seller, 1)) {
-                              this.ewCustomerOptions.push(cang)
+                            if(this.warehouseName=='佳屹农仓储库'){
+                              if (this.check(this.weighingList.contractManagement.seller, 3)) {
+                                this.companyNameOptions.push(cang)
+                                this.companyName=this.weighingList.contractManagement.seller
+                              }
+                            }else{
+                              if (this.check(this.weighingList.contractManagement.seller, 1)) {
+                                this.ewCustomerOptions.push(cang)
                               }
+                            }
+                            
                               let cang1 = {}
                               cang1.value = this.weighingList.contractManagement.buyer
                               cang1.label = this.weighingList.contractManagement.buyer
@@ -1812,7 +1829,6 @@
                     type: 'success',
                   })
                   this.inspect = JSON.parse(JSON.stringify(this.weighingList))
-
                   // this.isShowPrint = true
                   this.weighingList = {
                     grossWeight: 0,

src/views/outboundManagement/weighingManagementrecord.vue

@@ -616,13 +616,21 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+            
+            if (this.modification[_num].serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
               if (this.modification[_num].seller && this.modification[_num].buyer) {
                 let cang = {}
                 cang.value = this.modification[_num].seller
                 cang.label = this.modification[_num].seller
-                if (this.check(this.modification[_num].seller, 1)) {
-                  this.ewCustomerOptions.push(cang)
+                if(this.warehouseName=='佳屹农仓储库'){
+                  if (this.check(this.modification[_num].seller, 3)) {
+                  this.companyNameOptions.push(cang)
+                  this.companyName=this.modification[_num].seller
+                }
+                }else{
+                  if (this.check(this.modification[_num].seller, 1)) {
+                    this.ewCustomerOptions.push(cang)
+                  }
                 }
                 let cang1 = {}
                 cang1.value = this.modification[_num].buyer
@@ -635,14 +643,22 @@
           }
           this.isShowPrintType = true
         } else {
-          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'|| this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
+          if (row.serviceManagementType == '2' && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库'|| this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库')) {
             if (row.seller && row.buyer) {
               let cang = {}
               cang.value = row.seller
               cang.label = row.seller
-              if (this.check(row.seller, 1)) {
-                this.ewCustomerOptions.push(cang)
+              if(this.warehouseName=='佳屹农仓储库'){
+                if (this.check(row.seller, 3)) {
+                this.companyNameOptions.push(cang)
+                this.companyName=row.seller
+              }
+              }else{
+                if (this.check(row.seller, 1)) {
+                  this.ewCustomerOptions.push(cang)
+                }
               }
+              
               let cang1 = {}
               cang1.value = row.buyer
               cang1.label = row.buyer
@@ -674,6 +690,15 @@
           }
           return true
 
+        } else if (type == 3) {
+          for (var _tmp = 0; _tmp < this.companyNameOptions.length; _tmp++) {
+            console.log(name)
+            if (this.companyNameOptions[_tmp].label == name) {
+              return false
+            }
+          }
+          return true
+
         }
 
       },