Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/charts/index.js

@@ -1,8 +1,2 @@
-/**
- * @fileOverview 图标数据
- */
-// 动态请求前缀
-const baseUrl = process.env.VUE_APP_API_CERTIFICATE
 
-// 证书模块
-export const API_GET_GETCHARTSDATA = `${baseUrl}/biInfoController/selectBiInfo`
+export const API_GET_GETCHARTSDATA = `/biInfoController/selectBiInfo`

src/model/home/index.js

@@ -25,4 +25,4 @@ export const getFileList = appRx.get(API_GET_GETFILELIST, errorCatcher, errorHan
 export const getCurrentUserInfo = appRx.get(API_GET_GETCURRENTUSERINFO, errorCatcher, errorHandle, filter)
 
 export const getStaffHomeShowList = appRx.get(API_GET_GETSTAFFHOMESHOWLIST, errorCatcher, errorHandle, filter)
-export const getChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)
+export const gChartsData = appRx.get(API_GET_GETCHARTSDATA, errorCatcher, errorHandle, filter)

src/views/contractManagement/futuresPurchaseContract.vue

@@ -104,7 +104,7 @@
 						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " alt="" />
-					<img width="16" height="17" style="
+					<img width="16" height="17" v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;

src/views/contractManagement/futuresSalesContract.vue

@@ -105,7 +105,7 @@
 						src="../../../public/img/bianji.png" @click="handleEdit(scope.row)" v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.edit`
             " alt="" />
-					<img width="16" height="17" style="
+					<img width="16"  v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'" height="17" style="
               vertical-align: text-top;
               position: relative;
               top: -1px;

src/views/contractManagement/purchaseContract.vue

@@ -243,6 +243,7 @@
               top: -1px;
               margin: 0 6px;
             "
+             v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'"
             src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.buyContract.buyContractInfo.delete`

src/views/contractManagement/salesContract.vue

@@ -248,6 +248,7 @@
               top: -1px;
               margin: 0 6px;
             "
+             v-if="scope.row.status != '执行中'&&scope.row.status != '已完成'"
             src="../../../public/img/shanchu.png"
             v-hasPermission="
               `contractManagement.salesContract.salesContractInfo.delete`

src/views/home/index.vue

@@ -10,7 +10,7 @@
             <img src="../../../public/img/8b2c7255e9b19c71d68b33a08f20f74.png" alt="">
 
           </div>
-          <div class="right">
+         <div class="right">
             <div class="top">
               {{ nowDate }}
             </div>
@@ -54,15 +54,15 @@
                 <div class="left-card">
                   <div class="item">
                     <p>在途车辆</p>
-                    <p><span class="number">76</span><span class="number-text">台</span></p>
+                    <p><span class="number">{{carCount1}}</span><span class="number-text">台</span></p>
                   </div>
                   <div class="item">
                     <p>装货车辆</p>
-                    <p><span class="number" style="color:#ffa523;">86</span><span class="number-text">台</span></p>
+                     <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span></p>
                   </div>
                   <div class="item">
                     <p>卸货车辆</p>
-                    <p><span class="number" style="color: #2483ff;">16</span><span class="number-text">台</span></p>
+                     <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span></p>
                   </div>
                 </div>
               </el-col>
@@ -83,14 +83,14 @@
                 <div class="left">
                   <img src="../../../public/img/1637204557176-s4AMbBA8.png" alt="">
                   <span>总库存量</span>
-                  <span class="content3-number blue">27631</span>
+                  <span class="content3-number blue">{{inventoryCost}}</span>
                   <span style="margin-top: 10px;">吨</span>
                 </div>
                 <div class="right">
                   <img src="../../../public/img/1637204768818-70JRjz0H.png" alt="">
                   <span>库存价值</span>
-                  <span class="content3-number yellow">37745671</span>
-                  <span style="margin-top: 10px;">吨</span>
+                  <span class="content3-number yellow">{{inventoryValue}}</span>
+                  <span style="margin-top: 10px;">元</span>
                 </div>
               </div>
             </el-row>
@@ -160,7 +160,7 @@
     noticeNumber,
     queryCircularManagementReceiveList,
     getStaffHomeShowList,
-    getChartsData
+    gChartsData
   } from '@/model/home/index'
   import {
     getUserVesselList,
@@ -211,10 +211,16 @@
 
     data() {
       return {
+        totalReserves:'',
+        inventoryCost:'',
+        inventoryValue:'',
+        carCount1:'',
+        carCount2:'',
+        carCount3:'',
         chartsData: [],
         nowDate: null, //存放年月日变量
         nowTime: null, //存放时分秒变量
-        timer: "", //定义一个定时器的变量
+        timer: '', //定义一个定时器的变量
         currentTime: new Date(), // 获取当前时间
         timer: '',
         dialogVisible: false,
@@ -322,9 +328,9 @@
       //获取快捷路口列表
       this.getRouteList()
       // this.checkUserInfoDialog()
-      {
+      // {
         this.timer = setInterval(this.getTime, 1000);
-      }
+      // }
     },
     beforeDestroy() {
       clearInterval(this.timer);
@@ -351,9 +357,15 @@
       //    }, 2000);
       //获取新闻列表
       // this.getNewList()
-      getChartsData().toPromise().then(res => {
+      gChartsData().toPromise().then(res => {
         console.log(res)
         this.chartsData = res
+        this.carCount1 = res[6].biViewInfoList[0].count
+        this.carCount2 = res[6].biViewInfoList[1].count
+        this.carCount3 = res[6].biViewInfoList[2].count
+        this.inventoryCost = res[7].biViewInfoList[0].count
+        this.inventoryValue =  res[7].biViewInfoList[1].count
+        this.totalReserves = res[8].biViewInfoList
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -413,22 +425,22 @@
         this.second = check(second);
 
         function check(i) {
-          const num = (i < 10) ? ("0" + i) : i;
+          const num = (i < 10) ? ('0' + i) : i;
           return num;
         }
-        this.nowDate = year + "-" + this.month + "-" + this.day;
-        this.nowTime = this.hour + ":" + this.minute + ":" + this.second;
+        this.nowDate = year + '-' + this.month + '-' + this.day;
+        this.nowTime = this.hour + ':' + this.minute + ':' + this.second;
       },
       initCharts() {
         let app = this;
-        var roseCharts = document.getElementsByClassName("roseChart");
+        var roseCharts = document.getElementsByClassName('roseChart');
         for (let i = 0; i < roseCharts.length; i++) {
           let myChart = app.$echarts.init(roseCharts[i]);
           let color = []
           let data = []
-          let text = ""
-          let formatter = ""
-          let graphicText = '\n\n总计\n\n' + this.chartsData[i].total
+          let text = ''
+          let formatter = ''
+          let graphicText = ''
           switch (i) {
             case 0:
               // 圆环图各环节的颜色
@@ -443,6 +455,8 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
+              graphicText = ' \n\n总量合计\n\n' +Number(this.chartsData[i].total).toFixed(2)
+
               break;
             case 1:
               // 圆环图各环节的颜色
@@ -457,6 +471,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+                graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -471,6 +486,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -485,7 +501,7 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-              break;
+               graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
             case 4:
               // 圆环图各环节的颜色
               color = ['#247ef4', '#3a3b40'];
@@ -499,6 +515,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 5:
               // 圆环图各环节的颜色
@@ -513,6 +530,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
+               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
           }
           myChart.setOption({
@@ -530,7 +548,7 @@
               selectedMode: true, // 图例选择的模式，控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择，可以设成 false 关闭。
               top: '10%',
               left: 'center',
-              con: "circle",
+              con: 'circle',
               itemWidth: 10, // 设置宽度
               itemHeight: 10, // 设置高度
               itemGap: 40, // 设置间距
@@ -591,55 +609,25 @@
               data: data // 系列中的数据内容数组。
             }]
           })
-          myChart.off("click");
-          myChart.on("click", function(params) {
+          myChart.off('click');
+          myChart.on('click', function(params) {
             //  var a = params.dataIndex
-            console.log(params, "我被点击了");
+            console.log(params, '我被点击了');
             app.dialogVisible = true
           })
         }
-
+        debugger
+        console.log(this.totalReserves)
+        let _x = []
+        let _y = []
+        for(let i = 0;i<this.totalReserves.length;i++){
+          _x.push(this.totalReserves[i].name)
+          _y.push(this.totalReserves[i].count)
+        }
+        
         // 柱状图
         let myChart7 = app.$echarts.init(this.$refs.myEchart7);
         var zoption = {
-          // ----  标题 -----
-          // title: {
-          //   text: '',//主标题
-          //   textStyle: {
-          //     color: 'red'
-          //   },
-          //   subtext: '',//副标题
-          //   subtextStyle: {
-          //     color: 'blue'
-          //   },
-          //   padding: [0, 0, 10, 100]  // 位置
-          // },
-          // ---- legend ----
-          // legend: {
-          //   type: 'plain',  // 图列类型，默认为 'plain'
-          //   top: '1%',  // 图列相对容器的位置 top\bottom\left\right
-          //   selected: {
-          //     // '销量': true  // 图列选择，图形加载出来会显示选择的图列，默认为true
-          //   },
-          //   textStyle: {  // 图列内容样式
-          //     color: '#fff',  // 字体颜色
-          //     backgroundColor: 'black'  // 字体背景色
-          //   },
-          //   tooltip: {  // 图列提示框，默认不显示
-          //     show: true,
-          //     color: '#666'
-          //   },
-          //   data: [   // 图列内容
-          //     {
-          //       name: '', //上方标题内容
-          //       icon: 'circle',
-          //       textStyle: {
-          //         color: '#666',  // 单独设置某一个图列的颜色
-          //         backgroundColor: '#fff' // 单独设置某一个图列的字体背景色
-          //       }
-          //     }
-          //   ]
-          // },
           grid: {
             left: '0',
             right: '0',
@@ -660,55 +648,10 @@
               color: '#fff'
             }
           },
-          // ---- gird区域 ---
-          // gird: {
-          //   show: false,    // 是否显示直角坐标系网格
-          //   top: 10,  // 相对位置 top\bottom\left\right
-          //   containLabel: false, // gird 区域是否包含坐标轴的刻度标签
-          //   tooltip: {
-          //     show: true,
-          //     trigger: 'item',   // 触发类型
-          //     textStyle: {
-          //       color: '#666'
-          //     }
-          //   }
-          // },
+        
           //  ------  X轴 ------
           xAxis: {
-            // show: true,  // 是否显示
-            // position: 'bottom',  // x轴的位置
-            // offset: 0, // x轴相对于默认位置的偏移
-            // type: 'category',   // 轴类型， 默认为 'category'
-            // name: '',    // 轴名称
-            // nameLocation: 'end',  // 轴名称相对位置
-            // nameTextStyle: {   // 坐标轴名称样式
-            //   color: '#666',
-            //   padding: [5, 0, 0, -5]
-            // },
-            // nameGap: 30, // 坐标轴名称与轴线之间的距离
-            // nameRotate: 0,  // 坐标轴名字旋转
-            // axisLine: {       // 坐标轴 轴线
-            //   show: true,  // 是否显示
-            //   // symbol: ['none', 'arrow'],  // 是否显示轴线箭头
-            //   // symbolSize: [8, 8], // 箭头大小
-            //   // symbolOffset: [0, 7],  // 箭头位置
-            //   // ------   线 ---------
-            //   lineStyle: {
-            //     color: '#666',
-            //     width: 1,
-            //     type: 'solid'
-            //   }
-            // },
-            // axisTick: {    // 坐标轴 刻度
-            //   show: true,  // 是否显示
-            //   inside: true,  // 是否朝内
-            //   length: 3,     // 长度
-            //   lineStyle: {   // 默认取轴线的样式
-            //     color: '#666',
-            //     width: 1,
-            //     type: 'solid'
-            //   }
-            // },
+          
             axisLabel: { // 坐标轴标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -718,58 +661,20 @@
               interval: 0,
               rotate: 40
             },
-            // splitLine: {    // gird区域中的分割线
-            //   show: false,  // 是否显示
-            //   lineStyle: {
-            //     // color: 'red',
-            //     // width: 1,
-            //     // type: 'solid'
-            //   }
-            // },
+         
             splitArea: { // 网格区域
               show: false // 是否显示，默认为false
             },
-            data: ['玉米', '玉米（潮粮）', '玉米（酒精）', '玉米（机收）', '混合麦', '白小麦', '大豆', '水稻', '高粱', '玉米淀粉', '豆粕']
+            data: _x
           },
           //   ------   y轴  ----------
           yAxis: {
-            // show: true,  // 是否显示
-            // position: 'left', // y轴位置
-            // offset: 0, // y轴相对于默认位置的偏移
-            // type: 'value',  // 轴类型，默认为 ‘category’
-            // // name: '销量',   // 轴名称
-            // nameLocation: 'end', // 轴名称相对位置value
-            // nameTextStyle: {    // 坐标轴名称样式
-            //   color: '#fff',
-            //   padding: [5, 0, 0, 5]  // 坐标轴名称相对位置
-            // },
-            // nameGap: 15, // 坐标轴名称与轴线之间的距离
-            // nameRotate: 270,  // 坐标轴名字旋转
-
+          
             axisLine: { // 坐标轴 轴线
               show: false, // 是否显示
-              //  -----   箭头 -----
-              // symbol: ['none', 'arrow'],  // 是否显示轴线箭头
-              // symbolSize: [8, 8],  // 箭头大小
-              // symbolOffset: [0, 7], // 箭头位置
-
-              // ----- 线 -------
-              // lineStyle: {
-              //   color: '#666',
-              //   width: 1,
-              //   type: 'solid'
-              // }
+           
             },
-            // axisTick: {      // 坐标轴的刻度
-            //   show: true,    // 是否显示
-            //   inside: true,  // 是否朝内
-            //   length: 3,      // 长度
-            //   lineStyle: {
-            //     color: '#666',  // 默认取轴线的颜色
-            //     width: 1,
-            //     type: 'solid'
-            //   }
-            // },
+           
             axisLabel: { // 坐标轴的标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -784,10 +689,7 @@
                 width: 1,
                 type: 'dashed'
               }
-            },
-            // splitArea: {     // 网格区域
-            //   show: false   // 是否显示，默认为false
-            // }
+            }
           },
           //  -------   内容数据 -------
           series: [{
@@ -811,14 +713,12 @@
             label: {
               show: true,
               position: 'top',
-              color: "#b0b1b3"
+              color: '#b0b1b3'
             },
-            data: [3000, 4000, 4200, 4500, 6000, 5600, 4500, 5020, 4500, 5400, 4300]
+            data: _y
           }]
         };
-
         myChart7.setOption(zoption)
-
       },
       handleClose(done) {
         this.$confirm('确认关闭？')
@@ -1214,7 +1114,7 @@
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             if (parseInt(result)) {
               console.log('result:', result);
               this.text = parseInt(result)
@@ -1978,4 +1878,5 @@
     right: 10px;
     bottom: 10px;
   }
+
 </style>

src/views/houseSelfCollect/component/inspectInfoPrint.vue

@@ -11,6 +11,16 @@
         <td class="col col-bgc">车牌号</td>
         <td class="col">{{ printData.carNumber }}</td>
       </tr>
+      <tr class="row">
+        <td class="col col-bgc">箱号-1</td>
+        <td class="col">{{ printData.boxNo }}</td>
+        <td class="col col-bgc">箱号-2</td>
+        <td class="col">{{ printData.boxNoOther }}</td>
+        <td class="col col-bgc">封号-1</td>
+        <td class="col">{{ printData.titleNo }}</td>
+        <td class="col col-bgc">封号-2</td>
+        <td class="col">{{ printData.titleNoOther }}</td>
+      </tr>
       <tr class="row">
         <td class="col col-bgc">收货单位</td>
         <td class="col" colspan="2">{{ printData.compName }}</td>

src/views/houseSelfCollect/customerManagement.vue

@@ -35,15 +35,16 @@
           <span v-else>{{ scope.$index + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column prop="customerName" label="客户"></el-table-column>
+      <el-table-column prop="customerName" label="供应商"></el-table-column>
       <el-table-column prop="customerPhone" label="手机号"></el-table-column>
+      <el-table-column prop="payeeName" label="收款人"></el-table-column>
+      <el-table-column prop="completedQuantity" label="已完成量(吨)"></el-table-column>
       <el-table-column prop="bankCard" label="银行卡号"></el-table-column>
       <el-table-column prop="bankDeposit" label="开户行">
         <template slot-scope="scope">
-          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div> 
+          <div>{{scope.row.bankDeposit}}-{{scope.row.bankDepositBranch}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="payeeName" label="收款人"></el-table-column>
       <el-table-column prop="authenticationStatus" label="状态"></el-table-column>
       <el-table-column prop="address" label="操作" width="300">
         <template slot-scope="scope">
@@ -106,7 +107,7 @@
            this.qrcode = response
           })
         }
-        
+
       },
       //创建客户
       createCustomer(row, num) {

src/views/houseSelfCollect/inspectInfo.vue

@@ -41,6 +41,22 @@
               <ws-input v-model="inspect.carNumber" placeholder="请输入车牌号" maxlength="10" size="small"
                 :disabled="disabled" />
             </ws-form-item>
+            <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input :disabled="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="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="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="disabled" v-model="inspect.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
             <ws-form-item label="货名" span="1" prop="goodsName">
               <ws-select v-model="inspect.goodsName" placeholder="" class="typeselect" :disabled="disabled1"
                 @change="waterContentChange">
@@ -73,9 +89,15 @@
             <ws-form-item label="净重单价（元/公斤）" span="1" prop="tidalGrainPrice" v-if="inspect.type == '潮粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.tidalGrainPrice" placeholder="请输入净重单价" maxlength="10" size="small" :disabled="disabled2" />
             </ws-form-item>
-            <ws-form-item label="干粮单价（元/公斤）" span="1" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
+            <ws-form-item label="干粮单价（元/公斤）" span="2" prop="dryGrainPrice" v-if="inspect.type == '干粮'">
               <ws-input type="number" @mousewheel.native.prevent v-model="inspect.dryGrainPrice" placeholder="请输入干粮单价" maxlength="10" size="small"  :disabled="disabled2" />
             </ws-form-item>
+            <el-row>
+                <ws-form-item label="复检备注" span="2" prop="reMemo" v-if="information == '编辑复检'">
+                  <ws-input type="textarea" v-model="inspect.reMemo" placeholder="请输入复检备注" maxlength="300"/>
+               </ws-form-item>
+            </el-row>
+           
           </ws-info-table>
 
           <div class="title">质检数据</div>
@@ -370,6 +392,34 @@
           })
           return
         }
+        if (this.inspect.boxNo&&this.inspect.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.inspect.boxNoOther&&this.inspect.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.inspect.titleNo&&this.inspect.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.inspect.titleNoOther&&this.inspect.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.inspect.goodsName) {
           this.$message({
             message: '货名不能为空',
@@ -944,8 +994,12 @@
 
   /deep/.ws-info-table .el-form-item .el-form-item__content {
     border: none;
+    overflow: auto!important;
+    height: 55px;
   }
-
+/deep/.el-textarea__inner{
+  width: 100%;
+}
   .title {
     font-size: 16px;
     font-weight: 600;

src/views/houseSelfCollect/inspectionManagement.vue

@@ -34,6 +34,14 @@
 			<el-table-column prop="qualityNo" width="100" label="编号"></el-table-column>
 			<el-table-column prop="customerName" label="客户"></el-table-column>
 			<el-table-column prop="carNumber" label="车牌号"></el-table-column>
+			<el-table-column prop="boxNo" label="箱号-1">
+			</el-table-column>
+			<el-table-column prop="boxNoOther" label="箱号-2">
+			</el-table-column>
+			<el-table-column prop="titleNo" label="封号-1">
+			</el-table-column>
+			<el-table-column prop="titleNoOther" label="封号-2">
+			</el-table-column>
 			<el-table-column prop="goodsName" label="货名"></el-table-column>
 			<el-table-column prop="waterContent" label="水分（%）" width="120">
 				<template scope="scope">

src/views/houseSelfCollect/paymentManagement.vue

@@ -73,7 +73,7 @@
       <template slot="right">
       </template>
     </BaseHeaderLayout>
-    <el-table :data="paymentList" style="width: 100%; margin-top: 20px" ref="paymentList" border height="600"
+    <el-table :data="paymentList" ref='table' style="width: 100%; margin-top: 20px" border height="600"
       @row-click="handleRowClick" @selection-change="handleSelectionChange" :summary-method="getSummaries" show-summary>
       <el-table-column :selectable="selectInit" type="selection" width="55"></el-table-column>
       <el-table-column type="index" label="序号" width="50">
@@ -373,6 +373,12 @@ import download from '../../components/WsDownload/download'
 
       // this.getList()
     },
+    updated(){
+      
+this.$nextTick(() => {
+   this.$refs['table'].doLayout();
+}) 
+    },
     methods: {
       datechange(){
         this.getList()
@@ -730,7 +736,7 @@ import download from '../../components/WsDownload/download'
                this.warehouseNameKey = this.$route.query.warehouseName
             }else{
                if (_wareHouse) {
-              this.warehouseNameKey = _wareHouse.id
+              this.warehouseNameKey = _wareHouse.value
               this.warehouseName = _wareHouse.value
             } else {
               this.warehouseNameKey = this.warehouseList[0].id
@@ -844,8 +850,10 @@ import download from '../../components/WsDownload/download'
       },
       screen(num) {
         if(num==0){
+          this.searchType = -1
           this.invoicing=num
         }else{
+          this.invoicing=''
           this.searchType = num
         }
         this.getList()

src/views/houseSelfCollect/weighingManagement.vue

@@ -35,6 +35,26 @@
       <el-table-column prop="number" width="150" label="编号"></el-table-column>
       <el-table-column prop="customer" label="客户"></el-table-column>
       <el-table-column prop="carNumber" label="车牌号"></el-table-column>
+      <el-table-column prop="boxNo" label="箱号-1">
+        <template slot-scope="scope">
+          <div v-if='scope.row.qualityInspectionManagement.boxNo'>{{scope.row.qualityInspectionManagement.boxNo}}</div>
+        </template>
+			</el-table-column>
+			<el-table-column prop="boxNoOther" label="箱号-2">
+        <template slot-scope="scope">
+          <div v-if='scope.row.qualityInspectionManagement.boxNoOther'>{{scope.row.qualityInspectionManagement.boxNoOther}}</div>
+        </template>
+			</el-table-column>
+			<el-table-column prop="titleNo" label="封号-1">
+        <template slot-scope="scope">
+          <div v-if='scope.row.qualityInspectionManagement.titleNo'>{{scope.row.qualityInspectionManagement.titleNo}}</div>
+        </template>
+			</el-table-column>
+			<el-table-column prop="titleNoOther" label="封号-2">
+        <template slot-scope="scope">
+          <div v-if='scope.row.qualityInspectionManagement.titleNoOther'>{{scope.row.qualityInspectionManagement.titleNoOther}}</div>
+        </template>
+			</el-table-column>
       <el-table-column prop="goodsName" label="货名"></el-table-column>
       <el-table-column prop="type" label="类型"></el-table-column>
       <el-table-column prop="grossWeight" label="毛重（公斤）" width="120"></el-table-column>
@@ -259,6 +279,10 @@
             customer: row.customer,
             storageNumber: row.storageNumber,
             carNumber: row.carNumber,
+            boxNo: row.qualityInspectionManagement.boxNo,
+            boxNoOther: row.qualityInspectionManagement.boxNoOther,
+            titleNo: row.qualityInspectionManagement.titleNo,
+            titleNoOther: row.qualityInspectionManagement.titleNoOther,
             goodsName: row.goodsName,
             grossWeight: row.grossWeight,
             tare: row.tare,

src/views/houseSelfCollect/weightCheck.vue

@@ -66,6 +66,22 @@
               <ws-form-item label="车牌号" span="1" prop="carNumber">
                 <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-form-item label="货名" span="1" prop="goodsName">
                 <ws-input v-model="weighingList.goodsName" placeholder="请输入货名" maxlength="100" size="small" disabled />
               </ws-form-item>
@@ -484,6 +500,7 @@
               }
             }
             else if (this.warehouseName && (this.warehouseName == '顺城粮库'||this.warehouseName == '鲅鱼圈金信库')) {
+              console.log(value)
               for (var i = value.length - 1; i >= 0; i--) {
                 var tmp = String.fromCharCode(value[i])
                 if (tmp == '=') {
@@ -493,6 +510,7 @@
                   result += tmp
                 }
               }
+              console.log(parseInt(result))
               if (this.tpyeNo != 2) {
                 if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.grossWeight = parseInt(result)
@@ -504,6 +522,7 @@
               }
             }
             else {
+              // console.log(value)
               for(var i=0;i<value.length;i++){
                 var tmp = String.fromCharCode(value[i])
                 
@@ -530,17 +549,25 @@
                 }
               }
               if (this.tpyeNo != 2) {
+                console.log(parseInt(result)+''+parseInt(this.result1))
                 if (parseInt(result) || parseInt(result) == 0) {
                   this.weighingList.grossWeight =  parseInt(result+this.result1)
                 }
+                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)
                 }
+                if (parseInt(result) == 0&&parseInt(this.result1) == 0) {
+                  this.weighingList.tare =  0
+                }
               }
             }
 
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();
@@ -549,6 +576,10 @@
         }
       },
       cancel() {
+        
+        if(this.reader){
+          this.reader.cancel()
+        }
         this.$router.push({
           path: 'weighingManagement'
         })

src/views/outboundManagement/weighing.vue

@@ -282,7 +282,7 @@
 						}
 					}
 				}
-				setTimeout(1000)
+				// setTimeout(1000)
 				// value 是一个 Uint8Array
 				}
 				await port.close();

src/views/warehouse/warehouseManagementDelivery.vue

@@ -236,6 +236,22 @@
               />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>
@@ -1073,6 +1089,34 @@ export default {
         })
         return
       }
+      if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther&&this.deptBudgetList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNo&&this.deptBudgetList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNoOther&&this.deptBudgetList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
       if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空！',

src/views/warehouse/warehouseManagementEdit.vue

@@ -132,7 +132,8 @@
     billoperatehis,
     getLook,
     edit,
-    delPosition
+    delPosition,
+    getstaff
   } from '@/model/warehouse/index'
   import {
     regionData,
@@ -222,16 +223,29 @@
     },
     activated() {
       this.loaddata()
-      getstafffind({
-          roles: 'd6a5c8a52da544309259f91f75de1ec6'
-        })
-        .toPromise()
-        .then((response) => {
-          this.options = response
-          this.optionsOther = response
-          this.staffList1 = response
-          this.staffList = response
-        })
+      // getstafffind({
+      //     roles: 'd6a5c8a52da544309259f91f75de1ec6'
+      //   })
+      //   .toPromise()
+      //   .then((response) => {
+      //     this.options = response
+      //     this.optionsOther = response
+      //     this.staffList1 = response
+      //     this.staffList = response
+      //   })
+      getstaff({
+        compId: localStorage.getItem('ws-pf_compId')
+      })
+      .toPromise()
+      .then((response) => {
+        this.options = response
+        this.optionsOther = response
+        this.staffList = response
+        this.staffList1 = response
+        // for(var i=0;i<response.length;i++){
+        //   this.optionsOther.push(response[i].staffName+" "+response[i].staffMobilePhone)
+        // }
+      })
       this.showType = this.isShow
     },
     computed: {
@@ -251,7 +265,7 @@
     },
     methods: {
       getAddress(data) {
-        console.log("getAddress", data)
+        console.log('getAddress', data)
         this.deptBudgetList.warehousePrivate = data[0]
         this.deptBudgetList.warehouseCity = data[1]
         this.deptBudgetList.warehouseArea = data[2]

src/views/warehouse/warehouseManagementGross.vue

@@ -140,6 +140,22 @@
                 :value="item.carNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input :disabled="disabled1" v-model="deptBudgetList.cost" placeholder="请输入成本" size="small" type="number"
               @mousewheel.native.prevent />
@@ -541,7 +557,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();
@@ -914,6 +930,34 @@
           })
           return
         }
+        if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther&&this.deptBudgetList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNo&&this.deptBudgetList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNoOther&&this.deptBudgetList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空',
@@ -1759,7 +1803,7 @@
             } else if (this.outContractNo[i].inOutType == '贸易服务入库') {
               this.deptBudgetList.inOutTypeKey = 5
             } else if (this.outContractNo[i].inOutType == '退库') {
-              if(this.deptBudgetList1[i].contractNo){
+              if(this.outContractNo[i].contractNo){
                 this.deptBudgetList.tips='买方'+this.outContractNo[i].buyer
               }
               else{

src/views/warehouse/warehouseManagementNoComplete.vue

@@ -75,6 +75,14 @@
           <el-table-column prop="contractNo" label="合同编号">
           </el-table-column>
           <el-table-column prop="carNo" label="车牌号"> </el-table-column>
+          <el-table-column prop="boxNo" label="箱号-1">
+					</el-table-column>
+					<el-table-column prop="boxNoOther" label="箱号-2">
+					</el-table-column>
+					<el-table-column prop="titleNo" label="封号-1">
+					</el-table-column>
+					<el-table-column prop="titleNoOther" label="封号-2">
+					</el-table-column>
           <el-table-column prop="agent" label="经办人"> </el-table-column>
           <el-table-column prop="backOffice" label="内勤"> </el-table-column>
           <el-table-column prop="updateDate" label="保存时间">

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -77,6 +77,14 @@
           <el-table-column prop="contractNo" label="合同编号">
           </el-table-column>
           <el-table-column prop="carNo" label="车牌号"> </el-table-column>
+          <el-table-column prop="boxNo" label="箱号-1">
+					</el-table-column>
+					<el-table-column prop="boxNoOther" label="箱号-2">
+					</el-table-column>
+					<el-table-column prop="titleNo" label="封号-1">
+					</el-table-column>
+					<el-table-column prop="titleNoOther" label="封号-2">
+					</el-table-column>
           <el-table-column prop="agent" label="经办人"> </el-table-column>
           <el-table-column prop="backOffice" label="内勤"> </el-table-column>
           <el-table-column prop="updateDate" label="保存时间">

src/views/warehouse/warehouseManagementNoWeightIn.vue

@@ -127,6 +127,22 @@
                 :value="item.carNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="dataList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="dataList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="dataList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="dataList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input :disabled='disabled1' v-model="dataList.cost" placeholder="请输入成本" size="small" />
             <img width="17" height="18" style="vertical-align: text-top; position: relative; top: -1px"
@@ -552,7 +568,7 @@
                 this.dataList.tare = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();
@@ -971,6 +987,34 @@
           })
           return
         }
+        if (this.dataList.boxNo&&this.dataList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.boxNoOther&&this.dataList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNo&&this.dataList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNoOther&&this.dataList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.dataList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

src/views/warehouse/warehouseManagementNoWeightOut.vue

@@ -116,6 +116,22 @@
                 :value="item.carNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="dataList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="dataList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="dataList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="dataList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
@@ -488,7 +504,7 @@
                 this.dataList.grossWeight = parseInt(result + this.result1)
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();
@@ -793,6 +809,34 @@
           })
           return
         }
+        if (this.dataList.boxNo&&this.dataList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.boxNoOther&&this.dataList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNo&&this.dataList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNoOther&&this.dataList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.dataList.contractNo) {
           this.$message({
             message: '合同编号不能为空',

src/views/warehouse/warehouseManagementPerfectDelivery.vue

@@ -229,6 +229,22 @@
               />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>
@@ -748,6 +764,34 @@ export default {
         })
         return
       }
+      if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther&&this.deptBudgetList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNo&&this.deptBudgetList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNoOther&&this.deptBudgetList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
       if (!this.dataList.contractNo) {
         this.$message({
           message: '合同编号不能为空',

src/views/warehouse/warehouseManagementPerfectput.vue

@@ -245,6 +245,22 @@
               />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="dataList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="dataList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="dataList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="dataList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input
             :disabled='disabled1'
@@ -1024,6 +1040,34 @@ export default {
         })
         return
       }
+      if (this.dataList.boxNo&&this.dataList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.boxNoOther&&this.dataList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNo&&this.dataList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.dataList.titleNoOther&&this.dataList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
       if (!this.dataList.contractNo) {
         this.$message({
           message: '合同编号不能为空',

src/views/warehouse/warehouseManagementPut.vue

@@ -310,6 +310,22 @@
               />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
           <ws-form-item label="成本" span="1" prop="cost">
             <ws-input
               :disabled="disabled1"
@@ -1043,6 +1059,34 @@ export default {
         })
         return
       }
+      if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther&&this.deptBudgetList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNo&&this.deptBudgetList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNoOther&&this.deptBudgetList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
       if (!this.deptBudgetList.contractNo) {
         this.$message({
           message: '合同编号不能为空',

src/views/warehouse/warehouseManagementRecord.vue

@@ -127,6 +127,14 @@
 							<span style="color: #8890b1">{{ scope.row.carNo }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column prop="boxNo" label="箱号-1">
+					</el-table-column>
+					<el-table-column prop="boxNoOther" label="箱号-2">
+					</el-table-column>
+					<el-table-column prop="titleNo" label="封号-1">
+					</el-table-column>
+					<el-table-column prop="titleNoOther" label="封号-2">
+					</el-table-column>
 					<el-table-column prop="agent" label="经办人">
 					</el-table-column>
 					<el-table-column prop="backOffice" label="操作人" width="120px">
@@ -135,7 +143,7 @@
 						<template slot-scope="scope">
 							<!-- <img width="18" height="20" style="vertical-align: text-top; position: relative; top: -1px"
 								src="../../../public/img/fujian.png" @click="fujian(scope.row)" alt="" /> -->
-          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
+          					<el-button @click="print(scope.row)" v-if="scope.row.inOutType != '收购入库'&&scope.row.inOutType != '期初'"  v-hasPermission="`acquisitionManagement.acquisitionWeight.print`">打印</el-button >
 
 						</template>
 					</el-table-column>

src/views/warehouse/warehouseManagementTare.vue

@@ -136,6 +136,22 @@
                 :value="item.carNo" />
             </el-select>
           </ws-form-item>
+          <ws-form-item label="箱号-1" span="1" prop="boxNo">
+            <ws-input v-model="deptBudgetList.boxNo" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="箱号-2" span="1" prop="boxNoOther">
+            <ws-input v-model="deptBudgetList.boxNoOther" placeholder="请输入箱号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-1" span="1" prop="titleNo">
+            <ws-input v-model="deptBudgetList.titleNo" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="封号-2" span="1" prop="titleNoOther">
+            <ws-input v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
@@ -470,7 +486,7 @@
                 }
               }
             }
-            setTimeout(1000)
+            // setTimeout(1000)
             // value 是一个 Uint8Array
           }
           await port.close();
@@ -1112,6 +1128,34 @@
           })
           return
         }
+        if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
+          this.$message({
+            message: '箱号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.boxNoOther&&this.deptBudgetList.boxNoOther.length > 20) {
+          this.$message({
+            message: '箱号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNo&&this.deptBudgetList.titleNo.length > 20) {
+          this.$message({
+            message: '封号-1输入错误',
+            type: 'warning',
+          })
+          return
+        }
+        if (this.deptBudgetList.titleNoOther&&this.deptBudgetList.titleNoOther.length > 20) {
+          this.$message({
+            message: '封号-2输入错误',
+            type: 'warning',
+          })
+          return
+        }
         if (!this.deptBudgetList.contractNo) {
           this.$message({
             message: '合同编号不能为空！',