高敬炎 2 年之前
父節點
當前提交
dbff5764f2
共有 2 個文件被更改,包括 24 次插入17 次删除
  1. 7 5
      src/views/houseSelfCollect/newWeighingManagement.vue
  2. 17 12
      src/views/houseSelfCollect/weightCheckRecord.vue

+ 7 - 5
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -278,7 +278,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="shdw-style" v-if="checked || (!ddchecked && !checked)">
+        <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%;">
@@ -495,6 +495,7 @@ export default {
       deptBudgetTotal: 0,
       pList: [],
       mList: [],
+      serviceManagementType:1,
       index: 0,
       status: 1,
       carList: [],
@@ -2294,6 +2295,7 @@ export default {
                     message: '保存成功',
                   })
                   this.idPrint = response
+                  this.serviceManagementType=this.weighingList.serviceManagementType
                   if ( this.warehouseName == '鲅鱼圈金信库' ||
                     this
                       .warehouseName == '洮南向阳乡金昊' || this
@@ -2307,16 +2309,16 @@ 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)) {
                           this.companyNameEWOptions.push(cang1)
                           this.companyName=this.weighingList.buyer
                         }
-                        if(this.weighingList.serviceManagementType == 3){
-                          this.customerOptions.push({label:this.weighingList.seller,value:this.weighingList.seller})
-                        this.customer=this.weighingList.customer
-                        }
                         
                       }else{
                         if (this.check(this.weighingList.buyer, 2)) {

+ 17 - 12
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -113,7 +113,7 @@
             </el-option>
           </el-select>
         </div>
-        <div class="shdw-style" v-if="checked || (!ddchecked && !checked)">
+        <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%;">
@@ -488,6 +488,7 @@
         customerNumberCard:'',
         positionId:'',
         warehouseInOutDetail:{},
+        serviceManagementType:1,
       }
     },
     activated() {
@@ -1211,16 +1212,18 @@
                 // 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)
                     this.companyName=this.modification[_num].buyer
                   }
-                  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
-                  }
+                  
                 }else{
                   if (this.check(this.modification[_num].buyer, 2)) {
                     this.ewCustomerOptions.push(cang1)
@@ -1248,18 +1251,20 @@
               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)
                   this.companyName=row.buyer
                 }
-                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)
-                }
+                
                
               }else{
                 if (this.check(row.buyer, 2)) {