更新

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -180,8 +180,8 @@
               <div class="screen_left">
                 <div @click="cutstatus(1)" :class="status==1?'select_css':'noselect_css'"
                   v-if="!(inWarehouseType == 1 && tpyeNo == 2)">未称{{information}}</div>
-                <div @click="cutstatus(2)" :class="status==2?'select_css':'noselect_css'"
-                  v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</div>
+                <!-- <div @click="cutstatus(2)" :class="status==2?'select_css':'noselect_css'"
+                  v-if="!(inWarehouseType == 1 && tpyeNo == 2)">已称{{information}}</div> -->
               </div>
               <div class="screen_right">
                 <div @click="record" v-hasPermission="`acquisitionManagement.acquisitionWeight.view`" class="jilu">记录

src/views/outboundManagement/weighingManagementNew.vue

@@ -280,9 +280,9 @@
                   <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)"
                     :type="statusType == 3 ? 'primary' : ''">未称毛重
                   </el-button>
-                  <el-button v-if="tpyeNo == 2" @click="statustypechangelist(2)"
+                  <!-- <el-button v-if="tpyeNo == 2" @click="statustypechangelist(2)"
                     :type="statusType == 2 ? 'primary' : ''">已称毛重
-                  </el-button>
+                  </el-button> -->
                 </div>
                 <div style="display: flex;">
                   <el-button @click='refreshClick(1)' type="primary">刷新</el-button>
@@ -311,13 +311,20 @@
     <div class="print-type" v-show="isShowPrintType">
       <div class="print-type-content">
         <div class="print-type-title">请选择打印类型</div>
-        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
-          <div>我司发货单位：</div>
-          <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
+         <div class="ew-print" v-if="checked||(!ddchecked&&!checked)">
+          <div class="row">
+           <div>我司发货单位：</div>
+            <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+              <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="row">
+           <div>我司收货单位：</div>
+            <el-select v-model="myCompanyCustomer" disabled style="width: 75%;">
+             
+            </el-select>
+          </div>
         </div>
         <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
@@ -506,6 +513,9 @@
         }, {
           value: '黑龙江中天昊元贸易有限公司',
           label: '黑龙江中天昊元贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
        companyNameOptions: [
          {
@@ -520,6 +530,9 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
         
         companyName: '黑龙江中天昊元贸易有限公司',
@@ -539,9 +552,13 @@
         },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
         idPrint: '',
         
+        myCompanyCustomer:'',
         ewCustomer: '厦门建发物产有限公司',
         ewradio: '',
         printSeparately: false,
@@ -1437,19 +1454,20 @@
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
                         .warehouseName == '山东园丰库'){
-                          
-                          console.log(11111111111111111111)
-                          let cang = {}
-                          cang.value = this.weighingList.seller
-                          cang.label = this.weighingList.seller
-                         if (this.check(this.weighingList.seller, 1)) {
-                          this.ewCustomerOptions.push(cang)
-                          }
-                          let cang1 = {}
-                          cang1.value = this.weighingList.buyer
-                          cang1.label = this.weighingList.buyer
-                          if (this.check(this.weighingList.buyer, 2)) {
-                            this.companyNameEWOptions.push(cang1)
+                          if(this.weighingList.contractManagement){
+                            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)
+                              }
+                              let cang1 = {}
+                              cang1.value = this.weighingList.contractManagement.buyer
+                              cang1.label = this.weighingList.contractManagement.buyer
+                              if (this.check(this.weighingList.contractManagement.buyer, 2)) {
+                                this.companyNameEWOptions.push(cang1)
+                              }
+                              this.myCompanyCustomer = this.weighingList.contractManagement.buyer
                           }
                           this.isShowPrintType = true
                         }else{
@@ -1521,25 +1539,28 @@
                         .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港'|| this
                         .warehouseName == '山东园丰库'){
-                          
-                          console.log(11111111111111111111)
-                          let cang = {}
-                          cang.value = this.weighingList.seller
-                          cang.label = this.weighingList.seller
-                         if (this.check(this.weighingList.seller, 1)) {
-                          this.ewCustomerOptions.push(cang)
-                          }
-                          let cang1 = {}
-                          cang1.value = this.weighingList.buyer
-                          cang1.label = this.weighingList.buyer
-                          if (this.check(this.weighingList.buyer, 2)) {
-                            this.companyNameEWOptions.push(cang1)
+                          if(this.weighingList.contractManagement){
+                            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)
+                              }
+                              let cang1 = {}
+                              cang1.value = this.weighingList.contractManagement.buyer
+                              cang1.label = this.weighingList.contractManagement.buyer
+                              if (this.check(this.weighingList.contractManagement.buyer, 2)) {
+                                this.companyNameEWOptions.push(cang1)
+                              }
+                              this.myCompanyCustomer = this.weighingList.contractManagement.buyer
                           }
+                          console.log(11111111111111111111)
+                          
                           this.isShowPrintType = true
                         }else{
                           this.isShowPrintType = true
                         }
-
+                      
                     })
                   if (this.reader) {
                     this.reader.cancel()
@@ -2195,6 +2216,7 @@
         //合同编号
         xialaNo({
             compId: localStorage.getItem('ws-pf_compId'),
+            loadingstatus: 1,
             flag: 5,
           })
           .toPromise()
@@ -2549,7 +2571,7 @@
     height: 320px;
     background: white;
     border-radius: 10px;
-    z-index: 2008;
+    z-index: 100;
   }
 
   /deep/.el-radio-group {
@@ -2591,6 +2613,7 @@
   .ew-print {
     padding: 0 20px;
     margin-top: 10px;
+    margin-bottom: 15px;
 
     // display: flex;
     // justify-content: space-between;

src/views/outboundManagement/weighingManagementrecord.vue

@@ -109,13 +109,20 @@
     <div class="print-type" v-show="isShowPrintType">
       <div class="print-type-content">
         <div class="print-type-title">请选择打印类型</div>
-        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
-          <div>我司发货单位：</div>
-          <!-- <div>{{companyName}}</div> -->
-          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
-            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
-            </el-option>
-          </el-select>
+        <div class="ew-print" v-if="checked||(!ddchecked&&!checked)">
+          <div class="row">
+           <div>我司发货单位：</div>
+            <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+              <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+              </el-option>
+            </el-select>
+          </div>
+          <div class="row">
+           <div>我司收货单位：</div>
+            <el-select v-model="myCompanyCustomer" disabled style="width: 75%;">
+             
+            </el-select>
+          </div>
         </div>
         <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
@@ -254,6 +261,9 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
         companyNameOptions: [
           {
@@ -268,6 +278,9 @@
         }, {
           value: '黑龙江鑫满仓粮食贸易有限公司',
           label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
         companyNameEWOptions: [{
           value: '黑龙江中天昊元贸易有限公司',
@@ -284,6 +297,9 @@
         },{
           value: '厦门建发物产有限公司',
           label: '厦门建发物产有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
         }],
         companyName: '黑龙江中天昊元贸易有限公司',
         companyNameEW: '黑龙江利润元粮食贸易有限公司',
@@ -291,7 +307,7 @@
         ewradio: '',
         ddchecked: false,
         checked: false,
-        
+        myCompanyCustomer:'',
         printSeparately: false,
         
         jjSelectPrintList: [],
@@ -433,6 +449,7 @@
               if (this.check(row.buyer, 2)) {
                 this.companyNameEWOptions.push(cang1)
               }
+              this.myCompanyCustomer = row.buyer
             }
           }
           this.idPrint = row.id
@@ -1103,6 +1120,7 @@
    .ew-print {
     padding: 0 20px;
     margin-top: 10px;
+    margin-bottom: 15px;
 
     // display: flex;
     // justify-content: space-between;