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

src/views/warehouse/warehouseManagementDelivery.vue

@@ -260,6 +260,14 @@
             <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="航次" span="1" prop="shipNumber">
+            <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="船名" span="1" prop="shipName">
+            <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>

src/views/warehouse/warehouseManagementNoWeight.vue

@@ -85,6 +85,14 @@
 					</el-table-column>
 					<el-table-column prop="titleNoOther" label="封号-2">
 					</el-table-column>
+          <el-table-column prop="wingNumber" label="车厢号-1">
+					</el-table-column>
+					<el-table-column prop="wingNumberOther" label="车厢号-2">
+					</el-table-column>
+          <el-table-column prop="shipNumber" label="航次">
+					</el-table-column>
+					<el-table-column prop="shipName" label="船名">
+					</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/warehouseManagementPerfectDelivery.vue

@@ -253,6 +253,14 @@
             <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="航次" span="1" prop="shipNumber">
+            <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="船名" span="1" prop="shipName">
+            <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <div class="small-title">上传磅单照片</div>

src/views/warehouse/warehouseManagementTare.vue

@@ -160,6 +160,14 @@
             <ws-input v-model="deptBudgetList.wingNumberOther" placeholder="请输入车厢号" maxlength="20"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="航次" span="1" prop="shipNumber">
+            <ws-input v-model="deptBudgetList.shipNumber" placeholder="请输入航次" maxlength="20"
+              size="small" />
+          </ws-form-item>
+          <ws-form-item label="船名" span="1" prop="shipName">
+            <ws-input v-model="deptBudgetList.shipName" placeholder="请输入船名" maxlength="20"
+              size="small" />
+          </ws-form-item>
         </ws-info-table>
       </div>
       <!-- <div class="small-title">上传磅单照片</div>
@@ -328,8 +336,8 @@
           type: '干粮',
           addressUrl: '',
           warehouseInOutDetail: {},
-          grossWeight: 0,
-          tare: 0
+          grossWeight: '',
+          tare: ''
         },
         historyList: [],
 
@@ -697,14 +705,6 @@
           })
           return
         }
-
-        if (!this.deptBudgetList.carNo) {
-          this.$message({
-            message: '车牌号不能为空',
-            type: 'warning',
-          })
-          return
-        }
         if (this.deptBudgetList.carNo.length > 7) {
           this.$message({
             message: '车牌号输入错误,请输入7个字符之内',
@@ -1123,23 +1123,6 @@
           })
           return
         }
-        if (!this.deptBudgetList.carNo) {
-          this.$message({
-            message: '车牌号不能为空！',
-            type: 'warning',
-          })
-          return
-        }
-        if (
-          this.deptBudgetList.carNo.length < 6 &&
-          this.deptBudgetList.carNo.length <= 8
-        ) {
-          this.$message({
-            message: '车牌号输入有误！',
-            type: 'warning',
-          })
-          return
-        }
         if (this.deptBudgetList.boxNo&&this.deptBudgetList.boxNo.length > 20) {
           this.$message({
             message: '箱号-1输入错误',