前端

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -2296,12 +2296,16 @@ export default {
                   })
                   this.idPrint = response
                   this.serviceManagementType=this.weighingList.serviceManagementType
-                  if ( this.warehouseName == '鲅鱼圈金信库' ||
+                  if(this.weighingList.serviceManagementType == 3){
+                    this.customerOptions.push({label:this.weighingList.seller,value:this.weighingList.seller})
+                    this.customer=this.weighingList.customer
+                  }
+                  if (this.weighingList.serviceManagementType==1&&( this.warehouseName == '鲅鱼圈金信库' ||
                     this
                       .warehouseName == '洮南向阳乡金昊' || this
                         .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
@@ -2309,10 +2313,7 @@ export default {
                       let cang1 = {}
                       cang1.value = this.weighingList.buyer
                       cang1.label = this.weighingList.buyer
-                      if(this.weighingList.serviceManagementType == 3){
-                          this.customerOptions.push({label:this.weighingList.seller,value:this.weighingList.seller})
-                        this.customer=this.weighingList.customer
-                        }
+                      
                       if(this.warehouseName=='佳屹农仓储库'){
                         this.customerOptions=[{label:this.weighingList.customer,value:this.weighingList.customer}]
                         if (this.check(this.weighingList.buyer, 3)) {

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -113,7 +113,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="shdw-style" v-if="checked&&serviceManagementType==3 || (!ddchecked && !checked && serviceManagementType==3)">
+        <div class="shdw-style" v-if="checked && serviceManagementType==3 || (!ddchecked && !checked && serviceManagementType==3)">
           <div>发货单位：</div>
           <!-- <div>{{companyName}}</div> -->
           <el-select v-model="customer" placeholder="请选择" style="width: 75%;">
@@ -1201,7 +1201,13 @@
             return
           }
           for (let _num = 0; _num < this.modification.length; _num++) {
-            if (this.warehouseName == '鲅鱼圈金信库'|| this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库') {
+            this.serviceManagementType=this.modification[_num].serviceManagementType
+            if(this.modification[_num].serviceManagementType == 3){
+                    this.customerOptions=[{label:this.modification[_num].customer,value:this.modification[_num].customer}]
+                    this.customerOptions.push({label:this.modification[_num].seller,value:this.modification[_num].seller})
+                    this.customer=this.modification[_num].customer
+                  }
+            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
@@ -1212,12 +1218,8 @@
                 // if (this.check(this.modification[_num].seller, 1)) {
                 //   this.ewCustomerOptions.push(cang)
                 // }
-                this.serviceManagementType=this.modification[_num].serviceManagementType
-                if(this.modification[_num].serviceManagementType == 3){
-                    this.customerOptions=[{label:this.modification[_num].customer,value:this.modification[_num].customer}]
-                    this.customerOptions.push({label:this.modification[_num].seller,value:this.modification[_num].seller})
-                    this.customer=this.modification[_num].customer
-                  }
+                
+                
                 if(this.warehouseName=='佳屹农仓储库'){
                   if (this.check(this.modification[_num].buyer, 3)) {
                     this.companyNameOptions.push(cang1)
@@ -1240,7 +1242,14 @@
           this.isShowPrintType = true
           
         } else {
-          if (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '洮南向阳乡金昊'||this.warehouseName=='山东园丰库'||this.warehouseName=='佳屹农仓储库') {
+          this.serviceManagementType=row.serviceManagementType
+          if(row.serviceManagementType == 3){
+            this.customerOptions=[{label:row.customer,value:row.customer}]
+            this.customerOptions.push({label:row.seller,value:row.seller})
+            this.customer=row.customer
+            console.log(this.customerOptions,this.customer,222222)
+          }
+          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
@@ -1251,14 +1260,7 @@
               let cang1 = {}
               cang1.value = row.buyer
               cang1.label = row.buyer
-              this.serviceManagementType=row.serviceManagementType
-              if(row.serviceManagementType == 3){
-                  this.customerOptions=[{label:row.customer,value:row.customer}]
-                  this.customerOptions.push({label:row.seller,value:row.seller})
-                  this.customer=row.customer
-                  console.log(this.customerOptions,this.customer,222222)
-                }
-              console.log(111111)
+              
               if(this.warehouseName=='佳屹农仓储库'){
                 if (this.check(row.buyer, 3)) {
                   this.companyNameOptions.push(cang1)