前端

public/static/payprint.html

@@ -156,7 +156,7 @@
       }
 
       .center {
-        height: 145vh;
+        height: 140vh;
       }
 
       .part2 {
@@ -164,6 +164,15 @@
         background: red;
       }
 
+      .part5 {
+        width: 100%
+      }
+
+      .paymentScreenshot {
+        width: 100%;
+        height: 130vh
+      }
+
       /* .onlypz-center{
         height: 130vh;
       } */
@@ -174,6 +183,12 @@
       <div v-if="selectPrint">
         <div v-for="(item,index) in printData1" :key="index">
           <div class="content">
+            <div class="part5" v-if="isShowPrintType5">
+              <div class="header1">
+                付款回执单
+              </div>
+              <img :src=" printData1[index].paymentScreenshot" class="paymentScreenshot" />
+            </div>
             <div class="center" v-if="isShowPrintType3">
               <div class="header1">{{ printData1[index].compName}}结算凭证</div>
               <div class="line"></div>
@@ -243,11 +258,12 @@
                   <td class="col col-bgc">等级</td>
                   <td class="col col-bgc">水分%</td>
                   <td class="col col-bgc">杂质%</td>
+                  <td class="col col-bgc">容重（克/升）</td>
                   <td class="col col-bgc">毛重</td>
                   <td class="col col-bgc">皮重</td>
                   <td class="col col-bgc">扣杂重</td>
                   <td class="col col-bgc">净重</td>
-                  <td class="col col-bgc">纯重</td>
+                  <!-- <td class="col col-bgc">纯重</td> -->
                 </tr>
                 <tr class="row">
                   <td class="col">{{ printData1[index].goodsName}}</td>
@@ -262,16 +278,17 @@
                   <td class="col">
                     {{ printData1[index].qualityInspectionManagement.impurity}}
                   </td>
+                  <td class="col">  {{printData1[index].weighingManagement.qualityInspectionManagement?printData1[index].weighingManagement.qualityInspectionManagement.bulkDensity:''}}</td>
                   <td class="col">{{ printData1[index].grossWeight}}</td>
                   <td class="col">{{ printData1[index].tare}}</td>
                   <td class="col">
-                    {{
-                    printData1[index].weighingManagement.buckleMiscellaneous}}
+                    {{printData1[index].weighingManagement?printData1[index].weighingManagement.buckleMiscellaneous:''}}
                   </td>
                   <td class="col">{{ printData1[index].netWeight}}</td>
-                  <td class="col">{{ printData1[index].pureWeight}}</td>
+                  <!-- <td class="col">{{ printData1[index].pureWeight}}</td> -->
                 </tr>
                 <tr class="row">
+                  <td class="col col-bgc">纯重</td>
                   <td class="col col-bgc" v-if="printData1[index].type == '潮粮'">
                     净重单价
                   </td>
@@ -286,9 +303,10 @@
                   <td class="col col-bgc">其他补助</td>
                   <td class="col col-bgc">称重扣款</td>
                   <td class="col col-bgc">运费扣款</td>
-                  <td class="col col-bgc">卸车扣款</td>
+                  <!-- <td class="col col-bgc">卸车扣款</td> -->
                 </tr>
                 <tr class="row">
+                  <td class="col">{{ printData1[index].pureWeight}}</td>
                   <td class="col " v-if="printData1[index].type == '潮粮'">
                     {{printData1[index].tidalGrainPrice}}
                   </td>
@@ -303,9 +321,10 @@
                   <td class="col ">{{ printData1[index].otherSubsidy}}</td>
                   <td class="col ">{{ printData1[index].weighingDeduction}}</td>
                   <td class="col ">{{ printData1[index].freightDeduction}}</td>
-                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
+                  <!-- <td class="col ">{{ printData1[index].unloadDeduction}}</td> -->
                 </tr>
                 <tr class="row">
+                  <td class="col col-bgc">卸车扣款</td>
                   <td class="col col-bgc">质量扣款</td>
                   <td class="col col-bgc">其他扣款</td>
                   <td class="col col-bgc" v-if="printData.type == '潮粮'">
@@ -314,9 +333,10 @@
                   <td class="col col-bgc">合计应付</td>
                   <td class="col col-bgc">购粮性质</td>
                   <td class="col col-bgc">车牌号</td>
-                  <td class="col col-bgc" colspan="5">记事</td>
+                  <td class="col col-bgc" colspan="4">记事</td>
                 </tr>
                 <tr class="row">
+                  <td class="col ">{{ printData1[index].unloadDeduction}}</td>
                   <td class="col ">{{ printData1[index].qualityDeduction}}</td>
                   <td class="col ">{{ printData1[index].otherDeduction}}</td>
                   <td class="col " v-if="printData1[index].type == '潮粮'">
@@ -330,7 +350,7 @@
                     printData1[index].qualityInspectionManagement.natureOfGrainPurchase}}
                   </td>
                   <td class="col ">{{ printData1[index].carNo}}</td>
-                  <td class="col " colspan="5">
+                  <td class="col " colspan="4">
                     {{ printData1[index].remarks}}
                   </td>
                 </tr>
@@ -522,6 +542,12 @@
       </div>
 
       <div class="content" v-else>
+        <div class="part5" v-if="isShowPrintType5">
+          <div class="header1">
+            付款回执单
+          </div>
+          <img :src="printData.paymentScreenshot" class="paymentScreenshot" />
+        </div>
         <div class="center part1" v-if="isShowPrintType3">
           <div class="header1">{{ printData.compName}}结算凭证</div>
           <div class="line"></div>
@@ -1024,6 +1050,7 @@
         isShowPrintType2: false,
         isShowPrintType3: false,
         isShowPrintType4: false,
+        isShowPrintType5:false,
         showType: [],
         printData: {},
         printData1: [],
@@ -1082,18 +1109,19 @@
             localStorage.getItem('selectPrint_selectPrintList')
           )
           for (let i = 0; i < this.printData1.length; i++) {
-            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 28) {
+            if(!this.printData1[i].identityAuthenticationInfo.compAddress) this.printData1[i].identityAuthenticationInfo.compAddress=''
+            if (this.printData1[i].identityAuthenticationInfo.compAddress.length > 24) {
               this.printData1[i].identityAuthenticationInfo.compAddress = this.printData1[i]
                 .identityAuthenticationInfo
-                .compAddress.substring(0, 28)
+                .compAddress.substring(0, 24)
             }
           }
         } else {
           this.printData = JSON.parse(_data)
           //地址过长截取
-          if (this.printData.identityAuthenticationInfo.compAddress.length > 28) {
+          if (this.printData.identityAuthenticationInfo.compAddress.length > 24) {
             this.printData.identityAuthenticationInfo.compAddress = this.printData.identityAuthenticationInfo
-              .compAddress.substring(0, 28)
+              .compAddress.substring(0, 24)
           }
           this.selectPrint = false
         }
@@ -1157,6 +1185,9 @@
               case '打印检斤单':
                 this.isShowPrintType4 = !this.isShowPrintType4
                 break
+                case '打印回执单':
+                  this.isShowPrintType5 = !this.isShowPrintType5
+                  break
             }
           }
         } else {

public/static/warehousePrint.html

@@ -172,47 +172,70 @@
       }
 
       .center {
-       height: calc(100vh - 8px);
+        height: calc(100vh - 8px);
       }
     </style>
   </head>
   <body>
     <div id="app">
       <div class="center">
-        <div class="title">黑龙江中天昊元贸易有限公司-{{warehouseName}}仓库<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
+        <div class="title">黑龙江中天昊元贸易有限公司<span v-if="type == '2'">出</span><span v-if="type == '3'">入</span>库单</div>
+        <div class='title12'>
+          <span>仓库名：</span>
+          <span>{{warehouseName}}</span>
+          <span>质检员:</span>
+          <span>{{printData[0].qualityInspector}}</span>
+          <span>复检员：</span>
+          <span>{{printData[0].reInspector}}</span>
+          <span>检斤员：</span>
+          <span>{{printData[0].agent}}</span>
+          <p>
+            <span>值班日期：</span>
+            <span>{{startDate}}</span>
+            <span>到</span>
+            <span>{{endDate}}</span>
+          </p>
+          <p>
+            <span>货名：</span>
+            <span>玉米</span>
+            <span style="margin-left:100px">质量单位：吨</span>
+          </p>
+        </div>
         <table class="table">
-            <tr class="row">
-                 <th v-if="type == '2'">出库日期</th>
-                 <th v-if="type == '3'">入库日期</th>
-                 <th>合同/业务编号</th>
-                 <th>客户</th>
-                 <th>货名</th>
-                 <th>车牌号</th>
-                 <th>箱号</th>
-                 <th>车厢号</th>
-                 <th>毛重</th>
-                 <th>皮重</th>
-                 <th>净重</th>
-            </tr>
-            <!-- <div v-for="(item,index) in printData"> -->
-         <tr class="row" v-for="(item,index) in printData">
+          <tr class="row">
+            <th v-if="type == '2'">出库日期</th>
+            <th v-if="type == '3'">入库日期</th>
+            <th>车牌号</th>
+            <th>仓位号</th>
+            <th>箱一号</th>
+            <th>箱二号</th>
+            <th>毛重</th>
+            <th>皮重</th>
+            <th>净重</th>
+          </tr>
+          <tr class="row" v-for="(item,index) in printData">
             <td class="col">{{item.inOutDate}}</td>
-            <td class="col">{{item.contractNo}}</td>
-            <td class="col">{{item.companyName}}</td>
-            <td class="col">{{item.goodsName}}</td>
             <td class="col">{{item.carNo}}</td>
-            <td class="col">{{item.boxNo}}<span v-if="item.boxNoOther">,</span>{{item.boxNoOther}}</td>
-            <td class="col">{{item.boxNo}}<span v-if="item.boxNoOther">,</span>{{item.boxNoOther}}</td>
+            <td class="col">{{item.binNumber}}</td>
+            <td class="col">{{item.boxNo}}</td>
+            <td class="col">{{item.boxNo}}</td>
             <td class="col">{{item.grossWeight}}</td>
             <td class="col">{{item.tare}}</td>
             <td class="col">{{item.netWeight}}</td>
           </tr>
-        <!-- </div> -->
+          <tr class="row">
+            <td class="col">合计</td>
+            <td class="col"></td>
+            <td class="col"></td>
+            <td class="col"></td>
+            <td class="col"></td>
+            <td class="col">{{maoZhong.toFixed(3)}}</td>
+            <td class="col">{{piZhong.toFixed(3)}}</td>
+            <td class="col">{{jingZhong.toFixed(3)}}</td>
+          </tr>
         </table>
-        <!-- <div class="bottom">
-        </div> -->
       </div>
-    
+
     </div>
   </body>
   <script src="https://cdn.jsdelivr.net/npm/vue@2"></script>
@@ -222,22 +245,26 @@
       el: '#app',
       data: {
         showType: [],
-        printData: [
-            {
-                identityAuthenticationInfo:{},
-                qualityInspectionManagement:{},
-                weighingManagement:{},
-                customerNumberCard:{},
-            }
-        ],
+        printData: [{
+          identityAuthenticationInfo: {},
+          qualityInspectionManagement: {},
+          weighingManagement: {},
+          customerNumberCard: {},
+        }],
         printData1: [],
         customerList: {},
         customerList1: [],
-       
+
         date: '',
-        warehouseName:"",
-        type:"",
-     
+        warehouseName: "",
+        type: "",
+        maoZhong: 0,
+        piZhong: 0,
+        jingZhong: 0,
+        binNos: [],
+        binNoShow: "",
+        startDate: "",
+        endDate: "",
       },
       computed: {},
       methods: {
@@ -273,10 +300,14 @@
         this.date = new Date().toLocaleString()
         this.type = decodeURIComponent(this.getQueryVariable('type'))
         this.warehouseName = decodeURIComponent(this.getQueryVariable('warehouseName'))
+        this.startDate = this.getQueryVariable('startDate')
+        this.endDate =this.getQueryVariable('endDate')
         this.printData = JSON.parse(sessionStorage.getItem('inOutWarehouse_Print'))
-        console.log("磅单",this.printData)
-        
-        console.log(this.printData % 17)
+        for (var count = 0; count < this.printData.length; count++) {
+          this.maoZhong += this.printData[count].grossWeight
+          this.piZhong += this.printData[count].tare
+          this.jingZhong += this.printData[count].netWeight
+        }
         // document.title = this.printData.compName + '结算凭证'
         window.print()
         window.onafterprint = function(event) {

public/static/weightCheck.html

@@ -22,12 +22,7 @@
         width: 1000px;
         padding: 30px 20px 20px 20px;
         font-size: 18px;
-        height: 90vh;
-        /* position: absolute; */
-        /*        top: 0;
-        bottom: 0;
-        left: 0;
-        right: 0; */
+        height: 660px;
       }
 
       .a5-content {

src/App.vue

@@ -97,4 +97,8 @@ input::-webkit-inner-spin-button {
 input[type='number'] {
       -moz-appearance: textfield !important;
     }
+    .el-input.is-disabled .el-input__inner{
+      background: #f9FAFC!important;
+      color: #8890B1!important;
+    }
 </style>

src/store/modules/user.js

@@ -192,7 +192,7 @@ const actions = {
           commit('SET_GUIDE_INFO', [])
           commit('permission/SET_ROUTES', [], { root: true }) // 清空路由，因为有权限管理
           localStorage.removeItem('wf-pf_admin-token')
-          // clearStorage()
+          clearStorage()
           resetRouter()
           notification.end() // 取消监听通知
           resolve()

src/views/contractManagement/purchaseContractAdd.vue

@@ -86,7 +86,7 @@
              -->
             <ws-select  v-model="deptBudgetList.seller" placeholder="请选择卖方名称" class="typeselect" 
             @change="sellerSelect">
-            <ws-option v-for="item in customerinfo" :key="item.customerName"  :label="item.customerName"
+            <ws-option v-for="(item,index) in customerinfo" :key="index"  :label="item.customerName"
               :value="item.customerName" />
           </ws-select>
         </ws-form-item>

src/views/houseSelfCollect/component/paymentPrint.vue

@@ -47,11 +47,12 @@
         <td class="col col-bgc">等级</td>
         <td class="col col-bgc">水分%</td>
         <td class="col col-bgc">杂质%</td>
+        <td class="col col-bgc">容重（克/升）</td>
         <td class="col col-bgc">毛重</td>
         <td class="col col-bgc">皮重</td>
         <td class="col col-bgc">扣杂重</td>
         <td class="col col-bgc">净重</td>
-        <td class="col col-bgc">纯重</td>
+        <!-- <td class="col col-bgc">纯重</td> -->
       </tr>
       <tr class="row">
         <td class="col">{{ printData.goodsName}}</td>
@@ -59,13 +60,14 @@
         <td class="col">{{ printData.qualityInspectionManagement.grade}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.waterContent}}</td>
         <td class="col">{{ printData.qualityInspectionManagement.impurity}}</td>
+        <td class="col">{{ printData.qualityInspectionManagement.bulkDensity}}</td>
         <td class="col">{{ printData.grossWeight}}</td>
         <td class="col">{{ printData.tare}}</td>
         <td class="col">{{ printData.weighingManagement.buckleMiscellaneous}}</td>
         <td class="col">{{ printData.netWeight}}</td>
-        <td class="col">{{ printData.pureWeight}}</td>
       </tr>
       <tr class="row">
+        <td class="col col-bgc">纯重</td>
         <td class="col col-bgc"  v-if="printData.type == '潮粮'">净重单价</td>
         <td class="col col-bgc" v-if="printData.type == '干粮'">单价</td>
         <td class="col col-bgc">扣单价</td>
@@ -76,9 +78,10 @@
         <td class="col col-bgc">其他补助</td>
         <td class="col col-bgc">称重扣款</td>
         <td class="col col-bgc">运费扣款</td>
-        <td class="col col-bgc">卸车扣款</td>
+        <!-- <td class="col col-bgc">卸车扣款</td> -->
       </tr>
       <tr class="row">
+        <td class="col">{{ printData.pureWeight}}</td>
         <td class="col " v-if="printData.type == '潮粮'">{{printData.tidalGrainPrice}}</td>
         <td class="col " v-if="printData.type == '干粮'">{{printData.qualityInspectionManagement.dryGrainPrice}}</td>
         <td class="col ">{{ printData.unitDeduction}}</td>
@@ -89,25 +92,27 @@
         <td class="col ">{{ printData.otherSubsidy}}</td>
         <td class="col ">{{ printData.weighingDeduction}}</td>
         <td class="col ">{{ printData.freightDeduction}}</td>
-        <td class="col ">{{ printData.unloadDeduction}}</td>
+        <!-- <td class="col ">{{ printData.unloadDeduction}}</td> -->
       </tr>
       <tr class="row">
+        <td class="col col-bgc">卸车扣款</td>
         <td class="col col-bgc">质量扣款</td>
         <td class="col col-bgc">其他扣款</td>
         <td class="col col-bgc" v-if="printData.type == '潮粮'">纯重单价</td>
         <td class="col col-bgc">合计应付</td>
         <td class="col col-bgc">购粮性质</td>
         <td class="col col-bgc">车牌号</td>
-        <td class="col col-bgc" colspan="5">记事</td>
+        <td class="col col-bgc" colspan="4">记事</td>
       </tr>
       <tr class="row">
+        <td class="col ">{{ printData.unloadDeduction}}</td>
         <td class="col ">{{ printData.qualityDeduction}}</td>
         <td class="col ">{{ printData.otherDeduction}}</td>
         <td class="col " v-if="printData.type == '潮粮'">{{ printData.solidGrainPrice}}</td>
         <td class="col ">{{ printData.calculationPayable}}</td>
         <td class="col ">{{ printData.qualityInspectionManagement.natureOfGrainPurchase}}</td>
         <td class="col ">{{ printData.carNo}}</td>
-        <td class="col " colspan="5">{{ printData.remarks}}</td>
+        <td class="col " colspan="4">{{ printData.remarks}}</td>
       </tr>
       <tr class="row">
         <td class="col col-bgc">实付金额</td>

src/views/houseSelfCollect/paymentManagement.vue

@@ -11,7 +11,7 @@
             <el-checkbox label="打印银行卡（正反面）" name="type" class="label-width" @change="selectType"></el-checkbox>
             <el-checkbox label="打印结算凭证" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <el-checkbox label="打印检斤单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
-            <el-checkbox label="打印付款单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
+            <el-checkbox label="打印回执单" name="type" class="label-width" @change="selectType($event)"></el-checkbox>
             <!-- <el-checkbox label="打印发票" name="type" class="label-width" @change="selectType($event)"></el-checkbox> -->
           </el-checkbox-group>
         </div>
@@ -94,7 +94,7 @@
         </template>
       </el-table-column>
       <el-table-column class="table_td" prop="carNo" label="车牌号"></el-table-column>
-      <el-table-column class="table_td" prop="goodsName" width="60" label="货名"></el-table-column>
+      <el-table-column class="table_td" prop="goodsName" width="70" label="货名"></el-table-column>
       <el-table-column class="table_td" prop="type" width="60" label="类型"></el-table-column>
       <el-table-column class="table_td" prop="tidalGrainPrice" width="140" label="净重单价（元/公斤）"></el-table-column>
       <el-table-column class="table_td" prop="unitDeduction" width="130" label="扣单价（元/公斤）"></el-table-column>
@@ -127,7 +127,11 @@
           <span v-else>已开票</span>
         </template>
       </el-table-column>
+<<<<<<< HEAD
       <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="500">
+=======
+      <el-table-column class="table_td" prop="collectionEdPayable" label="操作" width="450">
+>>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
         <template scope="scope">
           <span v-hasPermission="`acquisitionManagement.acquisitionPay.add`">
             <el-button v-if="
@@ -380,7 +384,7 @@
             '打印银行卡（正反面）',
             '打印结算凭证',
             '打印检斤单',
-            '打印付款单'
+            '打印回执单'
             // '打印发票'
           ],
         },
@@ -447,6 +451,7 @@
       })
     },
     methods: {
+<<<<<<< HEAD
       imgshow(){
         this.deleteshow=false
         console.log(11111)
@@ -456,6 +461,9 @@
         this.dialogVisible = true;
       },
       previewPayOrder(val){debugger
+=======
+      previewPayOrder(val){
+>>>>>>> 8b8a6ad600972213308e628164112ce037ce8786
       this.paymentReceipt = val.paymentScreenshot
       this.isPreviewPayOrder = true
      console.log(val.paymentScreenshot)

src/views/houseSelfCollect/weighingManagement.vue

@@ -185,8 +185,8 @@
         jjSelectPrintList: [],
         radio: 'A4',
         value2: [],
-        startDate: "",
-        endDate: "",
+        startDate: '',
+        endDate: '',
         excelPrintData: [],
         isExcelPrint: false,
       }
@@ -215,6 +215,7 @@
         // }
       },
       handleChange(file, fileList) {
+        this.jjSelectPrintList = []
         this.fileTemp = file.raw
         let fileName = file.raw.name
         let fileType = fileName.substring(fileName.lastIndexOf('.') + 1);
@@ -247,7 +248,7 @@
         var reader = new FileReader();
         //if (!FileReader.prototype.readAsBinaryString) {
         FileReader.prototype.readAsBinaryString = function(f) {
-          var binary = "";
+          var binary = '';
           var rABS = false; //是否将文件读取为二进制字符串
           var pt = this;
           var wb; //读取完成的数据
@@ -417,7 +418,8 @@
       weightCheck(row, num) {
         console.log(this.cangid)
         // 质检是否是已确定状态
-        let _isGoweightCheck = this.isConfirmQuality(row)
+        // let _isGoweightCheck = this.isConfirmQuality(row)
+        let _isGoweightCheck = true
         if (_isGoweightCheck) {
           this.$router.push({
             path: 'weightCheck',

src/views/houseSelfCollect/weightCheck.vue

@@ -41,12 +41,11 @@
         </div>
       </div>
       <div class="right">
-        <ws-form>
-          <div style="margin: 0 auto">
-
+        <ws-form class='right-content'>
+          <div class="left">
             <div class="tab">
-              <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重（{{mList.length}}）</div>
-              <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重（{{pList.length}}）</div>
+              <div class="tab-item" :class="index==0?'active':''" @click="tabClick(0)"> 待称毛重（{{mListTop.length}}）</div>
+              <div class="tab-item" :class="index==1?'active':''" @click="tabClick(1)">待称皮重（{{pListTop.length}}）</div>
             </div>
             <div class="title">基本信息</div>
             <ws-info-table>
@@ -67,21 +66,17 @@
                 <ws-input v-model="weighingList.carNumber" placeholder="请输入车牌号" maxlength="100" size="small" disabled />
               </ws-form-item>
               <ws-form-item label="箱号-1" span="1" prop="boxNo">
-            <ws-input disabled v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
-            <ws-input disabled v-model="inspect.boxNoOther" placeholder="请输入箱号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-1" span="1" prop="titleNo">
-            <ws-input disabled v-model="inspect.titleNo" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
-          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
-            <ws-input disabled v-model="inspect.titleNoOther" placeholder="请输入封号" maxlength="20"
-              size="small" />
-          </ws-form-item>
+                <ws-input disabled v-model="inspect.boxNo" placeholder="请输入箱号" maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+                <ws-input disabled v-model="inspect.boxNoOther" placeholder="请输入箱号" maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-1" span="1" prop="titleNo">
+                <ws-input disabled v-model="inspect.titleNo" placeholder="请输入封号" maxlength="20" size="small" />
+              </ws-form-item>
+              <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+                <ws-input disabled v-model="inspect.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
+              </ws-form-item>
               <ws-form-item label="货名" span="1" prop="goodsName">
                 <ws-input v-model="weighingList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
               </ws-form-item>
@@ -91,13 +86,13 @@
                   size="small" :disabled="disabled" />
                 <ws-input type="number" @mousewheel.native.prevent v-else v-model="weighingList.grossWeight"
                   @input="calculation" placeholder="未获取到毛重" maxlength="100" size="small" disabled />
+                <el-button type="primary" :class="index ==0 ? '' : 'butCss'" @click="openPort">重新获取</el-button>
               </ws-form-item>
-              <el-button type="primary" :class="index ==0 ? '' : 'butCss'" @click="openPort">重新获取</el-button>
               <ws-form-item label="皮重（公斤）" span="1" prop="tare" v-if="information == '皮重'">
                 <ws-input type="number" @mousewheel.native.prevent v-model="weighingList.tare" @input="calculation"
                   placeholder="未获取到皮重" maxlength="100" size="small" :disabled="disabled" />
+                <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               </ws-form-item>
-              <el-button type="primary" v-if="index != 0" @click="openPort">重新获取</el-button>
               <div class="formItem">
                 <ws-form-item label="扣重（公斤）" span="1" prop="buckleWeightRatio"
                   v-if="information == '皮重' && paramType == '2'">
@@ -117,18 +112,20 @@
               <el-button @click="print" v-if="this.information == '皮重'" type="primary">保存并打印</el-button>
             </div>
           </div>
-          <div class="bottom">
-            <el-table ref="singleTable" :data="carList" height="550" highlight-current-row
-              @current-change="handleCurrentChange" style="width: 100%;overflow:auto">
+          <div class="car-right">
+            <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
+              style="width: 100%;overflow:auto;height:680px">
               <el-table-column property="number" label="编号">
               </el-table-column>
               <el-table-column property="carNumber" label="车牌号">
               </el-table-column>
+               <el-table-column property="status" label="状态">
+              </el-table-column>
             </el-table>
             <div style="text-align: center">
               <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-                :current-page="currentPage" :page-size="pageSize"
-                layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal">
+                :current-page="currentPage" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+                :total="deptBudgetTotal">
               </el-pagination>
             </div>
             <!-- <div class="table-title">
@@ -187,10 +184,10 @@
       weighingList: { //深度监听，可监听到对象、数组的变化
         handler(val, oldVal) {
           if (val.tare) {
-            if(this.weighingList.buckleMiscellaneous){
-               this.weighingList.netWeight = this.weighingList.grossWeight - val.tare - this.weighingList.buckleMiscellaneous
-            }
-            else{
+            if (this.weighingList.buckleMiscellaneous) {
+              this.weighingList.netWeight = this.weighingList.grossWeight - val.tare - this.weighingList
+                .buckleMiscellaneous
+            } else {
               this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
             }
           }
@@ -221,7 +218,7 @@
           grossWeight: 0,
           tare: 0,
           buckleMiscellaneous: 0,
-          netWeight:0
+          netWeight: 0
         },
         tpyeNo: 1,
         disabled: true,
@@ -238,7 +235,11 @@
         paramType: '1',
         warehouseName: '',
         result1: '00',
-        allowEdit:0,
+        allowEdit: 0,
+        mListTop:[],
+        mListBottom:[],
+        pListTop:[],
+        pListBottom:[]
       }
     },
     activated() {
@@ -342,16 +343,23 @@
             if (_list[i].paymentManagement.status != '待结算' || _list[i].paymentManagement
               .approveStatus) {
               continue
-            } 
-          } 
-          if (_list[i].status == '已质检' || _list[i].status == '已称毛重') {
-            this.mList.push(_list[i])
+            }
           }
-
-          if ((_list[i].status == '已称皮重' || _list[i].status == '已称毛重')) {
-            this.pList.push(_list[i])
+          if (_list[i].status == '已质检') {
+            this.mListTop.push(_list[i])
+          }
+           if (_list[i].status == '已称毛重') {
+            this.mListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称皮重') {
+            this.pListBottom.push(_list[i])
+          }
+          if (_list[i].status == '已称毛重') {
+              this.pListTop.push(_list[i])
           }
         }
+       this.mList= this.mListTop.concat(this.mListBottom)
+       this.pList= this.pListTop.concat(this.pListBottom)
         if (this.information == '毛重') {
           this.index = 0
           this.carList = this.mList
@@ -419,6 +427,10 @@
         }
       },
       tabClick(val) {
+        this.mListTop=[]
+        this.mListBottom=[]
+        this.pListTop=[]
+        this.pListBottom=[]
         this.carWeightInfo.carNumber = ''
         this.weighingList = []
         this.index = val
@@ -446,7 +458,7 @@
       },
       async closePort() {
         console.log('closePort');
-        if(this.reader){
+        if (this.reader) {
           this.reader.cancel()
         }
       },
@@ -480,7 +492,8 @@
             // console.log("receData",receData);
             var flag = false;
             var flag1 = false;
-            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库'||this.warehouseName == '克东千红库'||this.warehouseName == '鲅鱼圈祥腾库'||this.warehouseName == '哈尔滨依兰库')) {
+            if (this.warehouseName && (this.warehouseName == '山东诸城迈饶库' || this.warehouseName == '克东千红库' || this
+                .warehouseName == '鲅鱼圈祥腾库' || this.warehouseName == '哈尔滨依兰库')) {
               for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '+') {
@@ -499,15 +512,14 @@
                   this.weighingList.tare = parseInt(result)
                 }
               }
-            }
-            else if (this.warehouseName && (this.warehouseName == '顺诚粮库'||this.warehouseName == '鲅鱼圈金信库')) {
+            } else if (this.warehouseName && (this.warehouseName == '顺诚粮库' || this.warehouseName == '鲅鱼圈金信库')) {
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 console.log(tmp)
                 if (String.fromCharCode(value[0]) == '.') {
                   flag = true
                 }
-                if (flag && result.length < 9 && tmp != '='&& tmp != '.') {
+                if (flag && result.length < 9 && tmp != '=' && tmp != '.') {
                   result += tmp
                 }
               }
@@ -521,49 +533,48 @@
                   this.weighingList.tare = parseInt(result)
                 }
               }
-            }
-            else {
+            } else {
               // console.log(value)
-              for(var i=0;i<value.length;i++){
+              for (var i = 0; i < value.length; i++) {
                 var tmp = String.fromCharCode(value[i])
-                
-                if((value[0] != 49 && value[0] != 2)){
-                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
+
+                if ((value[0] != 49 && value[0] != 2)) {
+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
                     flag1 = true
-                  }
-                  else{
+                  } else {
                     break
                   }
                 }
-                if (tmp == String.fromCharCode(32) ) {
+                if (tmp == String.fromCharCode(32)) {
                   flag = true
                 }
-                if (flag && result.length < 7 && tmp != String.fromCharCode(32)&&!(value[value.length-1] == 48&&value[value.length-2] == 48)) {
+                if (flag && result.length < 7 && tmp != String.fromCharCode(32) && !(value[value.length - 1] == 48 &&
+                    value[value.length - 2] == 48)) {
                   result += tmp
                 }
                 if (flag1 && tmp != String.fromCharCode(32)) {
-                  if((value[value.length-1] == 48&&value[value.length-2] == 48)){
-                    if(i == 0 ){
+                  if ((value[value.length - 1] == 48 && value[value.length - 2] == 48)) {
+                    if (i == 0) {
                       this.result1 = tmp + '0'
                     }
                   }
                 }
               }
               if (this.tpyeNo != 2) {
-                console.log(parseInt(result)+''+parseInt(this.result1))
+                console.log(parseInt(result) + '' + parseInt(this.result1))
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.grossWeight =  parseInt(result+this.result1)
+                  this.weighingList.grossWeight = parseInt(result + this.result1)
                 }
-                if (parseInt(result) == 0&&parseInt(this.result1) == 0) {
-                  this.weighingList.grossWeight =  0
+                if (parseInt(result) == 0 && parseInt(this.result1) == 0) {
+                  this.weighingList.grossWeight = 0
                 }
-               
+
               } else {
                 if (parseInt(result) || parseInt(result) == 0) {
-                  this.weighingList.tare =  parseInt(result+this.result1)
+                  this.weighingList.tare = parseInt(result + this.result1)
                 }
-                if (parseInt(result) == 0&&parseInt(this.result1) == 0) {
-                  this.weighingList.tare =  0
+                if (parseInt(result) == 0 && parseInt(this.result1) == 0) {
+                  this.weighingList.tare = 0
                 }
               }
             }
@@ -577,8 +588,8 @@
         }
       },
       cancel() {
-        
-        if(this.reader){
+
+        if (this.reader) {
           this.reader.cancel()
         }
         this.$router.push({
@@ -631,6 +642,9 @@
         // })
       },
       print() {
+        if (this.reader) {
+          this.reader.cancel()
+        }
         if (!this.weighingList.grossWeight) {
           this.$message({
             message: '毛重不能为空',
@@ -720,7 +734,7 @@
               //毛检保存前进行校验
               getamount({
                   compId: localStorage.getItem('ws-pf_compId'),
-                  customerNumberCard:this.weighingList.customerNumberCard,
+                  customerNumberCard: this.weighingList.customerNumberCard,
                   goodsName: this.weighingList.goodsName,
                 })
                 .toPromise()
@@ -758,7 +772,7 @@
                           grossWeight(this.weighingList)
                           .toPromise()
                           .then((response) => {
-                            if(this.reader){
+                            if (this.reader) {
                               this.reader.cancel()
                             }
                             this.$notify.success({
@@ -787,7 +801,7 @@
               tare(this.weighingList)
                 .toPromise()
                 .then((response) => {
-                  if(this.reader){
+                  if (this.reader) {
                     this.reader.cancel()
                   }
                   this.$notify.success({
@@ -831,10 +845,11 @@
 
   .ws-info-table {
     border: none;
+    height: 610px;
   }
 
   .ws-info-table .el-form-item {
-    width: 50%;
+    width: 100%;
     border: none;
   }
 
@@ -875,6 +890,8 @@
   }
 
   .substance {
+      padding-bottom: 20px;
+      overflow-y: scroll;
     .active {
       background: #5878e8;
       color: white;
@@ -882,9 +899,9 @@
 
     // background: #ffffff;
     width: 100%;
+    height: calc(100vh - 125px);
     border-radius: 4px;
     margin: 0 auto;
-    padding-top: 20px;
     display: flex;
 
     .left {
@@ -929,10 +946,10 @@
     }
 
     .right {
-      width: 60%;
+      width: 70%;
       padding: 20px;
+      height: 750px;
       background: white;
-      margin-right: 20px;
       border-radius: 10px;
 
       .tab {
@@ -982,8 +999,9 @@
     font-size: 16px;
     // background: #f6f7fc;
   }
-  /deep/.el-table td{
-   background: #e7e8ef; 
+
+  /deep/.el-table td {
+    background: #e7e8ef;
   }
 
   /deep/.el-table--enable-row-transition .el-table__body td {
@@ -1039,4 +1057,27 @@
   .weight {
     font-size: 68px;
   }
+
+  .right-content {
+    display: flex;
+
+    .left {
+      position: relative;
+
+      .but {
+        position: absolute;
+        left: 0;
+        right: 0;
+        margin: auto;
+      }
+    }
+
+    .left,
+    .right {
+      width: 50%;
+    }
+  }
+  .car-right{
+    width: 50%;
+  }
 </style>

src/views/warehouse/warehouseManagementGross.vue

@@ -1159,6 +1159,10 @@ export default {
     },
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',
@@ -1774,6 +1778,10 @@ export default {
         })
     },
     temporaryStorage() {
+      
+        if(this.reader){
+          this.reader.cancel()
+        }
       if (!this.deptBudgetList.goodsName) {
         this.$message({
           message: '货名不能为空',

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -1235,6 +1235,10 @@ export default {
     },
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -957,6 +957,10 @@ export default {
     typeChange(e) {},
     //提交按钮
     submit() {
+      
+      if(this.reader){
+        this.reader.cancel()
+      }
       if (!this.dataList.goodsName) {
         this.$message({
           message: '货名不能为空',