前端

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/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/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">
@@ -370,6 +386,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: '货名不能为空',

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/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>

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/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 />
@@ -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: '合同编号不能为空',
@@ -1745,9 +1789,7 @@
           }
         }
         for (var i = 0; i < this.outContractNo.length; i++) {
-          console.log(this.outContractNo[i].contractNo,this.deptBudgetList.contractNo)
           if (this.outContractNo[i].contractNo == this.deptBudgetList.contractNo) {
-            
             if (this.outContractNo[i].inOutType == '采购入库') {
               this.deptBudgetList.tips='卖方'+this.outContractNo[i].seller
               this.deptBudgetList.inOutTypeKey = 1

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"
@@ -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>
@@ -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>
@@ -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: '合同编号不能为空！',