修改样式

public/static/weightCheckOut.html

@@ -60,9 +60,11 @@
         margin-top: 10px;
         margin-right: 240px;
       }
-      .autograph{
-    margin-top: 10px;
-     }
+
+      .autograph {
+        margin-top: 10px;
+      }
+
       .bottom-row3 {
         margin: 10px 0;
       }
@@ -115,7 +117,8 @@
       .small-img {
         margin-right: 0;
       }
-      .sign{
+
+      .sign {
         margin-right: 100px;
       }
     </style>
@@ -124,22 +127,19 @@
     <div id="app">
       <div class="content" v-if="true">
         <div class="title">出库检斤单</div>
+        <div>{{tableData.updateDate}}</div>
         <table class="table">
           <tr class="row">
             <td class="col col-bgc">送货单位</td>
             <td class="col" colspan="4">{{tableData.seller}}</td>
-            <td class="col col-bgc">车牌号</td>
-            <td class="col" colspan="1">{{tableData.carNo}}</td>
             <td class="col col-bgc">货名</td>
-            <td class="col" colspan="1">{{tableData.goodsName}}</td>
+            <td class="col" colspan="4">{{tableData.goodsName}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">收货单位</td>
             <td class="col" colspan="4">{{tableData.buyer}}</td>
-            <td class="col col-bgc">类型</td>
-            <td class="col"colspan="1">{{tableData.type}}</td>
-            <td class="col col-bgc">检斤时间</td>
-            <td class="col" colspan="1">{{tableData.updateDate}}</td>
+            <td class="col col-bgc">检斤员</td>
+            <td class="col" colspan="4">{{tableData.backOffice}}</td>
           </tr>
           <tr class="row">
             <td class="col col-bgc">毛重（吨）</td>
@@ -149,11 +149,27 @@
             <td class="col col-bgc">净重（吨）</td>
             <td class="col" colspan="2">{{tableData.netWeight}}</td>
           </tr>
+          <tr class="row">
+            <td class="col col-bgc">运输方式</td>
+            <td class="col" colspan="2">{{tableData.outType}}</td>
+            <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>车牌号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="火运"'>车号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="散船"'>船名</td>
+            <td class="col" colspan="2"
+              v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"||tableData.outType=="火运"'>{{tableData.carNo}}
+            </td>
+            <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipName}}</td>
+            <td class="col col-bgc" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>箱号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="火运"'>车厢号</td>
+            <td class="col col-bgc" v-if='tableData.outType=="散船"'>船次</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="集装箱船"||tableData.outType=="汽运"'>
+              {{tableData.boxNo}},{{tableData.boxNoOther}}</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="火运"'>
+              {{tableData.wingNumber}},{{tableData.wingNumberOther}}</td>
+            <td class="col" colspan="2" v-if='tableData.outType=="散船"'>{{tableData.shipNumber}}</td>
+          </tr>
         </table>
         <div class="bottom">
-          <div class="bottom-row1">
-            <div>检斤员：{{tableData.backOffice}}</div>
-          </div>
           <div class="bottom-row2">
             <div class="config">收货单位签名或盖章：</div>
             <div class="autograph">客户签名：</div>
@@ -213,11 +229,11 @@
           this.smallContent = true
           this.bigContent = false
         }
-        console.log(_data,"sddsd")
+        console.log(_data, "sddsd")
         this.tableData = JSON.parse(_data)
         console.log(this.tableData)
         document.title = "粮食检斤单"
-        window.print()
+        //window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)
         };

src/layout/index/top/index.vue

@@ -342,7 +342,7 @@
     },
     methods: {
       ...mapActions('common', ['setLocalVessels']),
-      payCode() {debugger
+      payCode() {
         console.log("input", this.barCode)
         this.btnStatus = {
           status1: false,
@@ -396,7 +396,6 @@
         await getQRCodeData(tmp)
           .toPromise()
           .then((response) => {
-            debugger
             this.toPageData = response
             // 处理按钮显示状态
             // this.btnStatus 

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -1643,19 +1643,16 @@
 
   .bottom-btn {
     display: flex;
-
-    .left {
-      color: red;
-    }
-
     margin: 20px 0;
     justify-content: space-around;
     align-items: center;
+    .right{
+      width: 300px;
+      display: flex;
+    }
   }
   .white-bgc{
     background: white!important;
   }
-  #aaa::selection{
-    // background: red;
-  }
+
 </style>

src/views/warehouse/warehouseManagementTare.vue

@@ -990,14 +990,14 @@ export default {
         if (
           this.outContractNo[i].contractNo == this.deptBudgetList.contractNo
         ) {
-          this.weightbills.buyer=this.outContractNo[i].buyer
-          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
           this.weightbills.goodsName=this.outContractNo[i].goodsName
           this.deptBudgetList.goodsName = this.outContractNo[i].goodsName
           this.deptBudgetList.goodsNameKey = this.outContractNo[i].goodsNameKey
           this.deptBudgetList.grade = this.outContractNo[i].grade
           this.deptBudgetList.inOutType = this.outContractNo[i].inOutType
           if (this.outContractNo[i].inOutType == '销售出库') {
+          this.weightbills.buyer=this.outContractNo[i].buyer
+          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
             if(!this.outContractNo[i].unitContractPrice){
               this.deptBudgetList.tips =
               '买方' +
@@ -1012,6 +1012,9 @@ export default {
             }
             this.deptBudgetList.inOutTypeKey = 1
           } else if (this.outContractNo[i].inOutType == '移库出库') {
+            
+          this.weightbills.buyer=this.outContractNo[i].receiveWarehouse
+          this.weightbills.seller=localStorage.getItem('ws-pf_compName')
             this.deptBudgetList.goodsName = data.goodsName
             this.deptBudgetList.goodsNameKey = data.goodsNameKey
             this.deptBudgetList.grade = data.grade
@@ -1901,7 +1904,6 @@ export default {
               localStorage.getItem('ws-pf_staffName')
             this.deptBudgetList.inOutFlag = 1
             this.deptBudgetList.statusFlag = 3
-            
             addstorageputList(this.deptBudgetList)
               .toPromise()
               .then((response) => {
@@ -1911,12 +1913,21 @@ export default {
                 this.$message.success('添加成功')
                 if(status){
                     this.weightbills.carNo=this.deptBudgetList.carNo
+                    this.weightbills.boxNo=this.deptBudgetList.boxNo
+                    this.weightbills.boxNoOther=this.deptBudgetList.boxNoOther
+                    this.weightbills.wingNumber=this.deptBudgetList.wingNumber
+                    this.weightbills.wingNumberOther=this.deptBudgetList.wingNumberOther
+                    this.weightbills.shipName=this.deptBudgetList.shipName
+                    this.weightbills.shipNumber=this.deptBudgetList.shipNumber
                     this.weightbills.type=this.deptBudgetList.type
                     this.weightbills.grossWeight=this.deptBudgetList.grossWeight
                     this.weightbills.tare=this.deptBudgetList.tare
                     this.weightbills.netWeight=this.deptBudgetList.netWeight
+                    this.weightbills.outType=this.deptBudgetList.outType
+                    this.weightbills.backOffice=this.deptBudgetList.outType
+
                     var date=new Date()
-                    this.weightbills.updateDate=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()+' '+date.getHours()+date.getMinutes()+date.getSeconds()
+                    this.weightbills.updateDate=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()+' '+date.getHours()+':'+date.getMinutes()+':'+date.getSeconds()
                     window.open( '../../../../static/weightCheckOut.html?type=2&tableData=' +encodeURIComponent(JSON.stringify(this.weightbills)))
                 }
                 this.$router.push({