1.OW放 新加来源放箱号ID并做判断

2.海运出口 选择放箱号 新加字段 选择或修改时赋值提单号和分单号
3.费用中心 新加字段和检索条件
4.OW放 箱量控制不能低于已提箱数量
5.海运出口 超过截单日期 主单不用控制船名和航次
6.配箱信息 主单不需要控制 清除箱号 清除件重尺和删除
7.海运出口修改判断 箱型箱量  修改判断 可以为0  不能为空

src/views/boxManagement/boxCost/index.vue

@@ -91,7 +91,7 @@ export default {
         menuWidth: 140,
         tip: false,
         searchShow: true,
-        searchMenuSpan: 24,
+        searchMenuSpan: 18,
         border: true,
         index: true,
         addBtn: false,
@@ -117,7 +117,6 @@ export default {
             prop: "purchaseCompanyName",
             overHidden: true,
             search: true,
-            searchOrder: 1,
             type: "select",
             filterable: true,
             remote: true,
@@ -132,20 +131,19 @@ export default {
           {
             label: "系统号",
             prop: "sysNo",
+            search: true,
             overHidden: true
           },
           {
             label: "合同号",
             prop: "contractNo",
             search: true,
-            searchOrder: 2,
             overHidden: true
           },
           {
             label: "业务日期",
             prop: "purchaseDate",
             search: true,
-            searchOrder: 3,
             searchProp: "purchaseDateList",
             overHidden: true,
             type: "date",
@@ -164,7 +162,6 @@ export default {
             prop: "buxStaus",
             overHidden: true,
             search: true,
-            searchOrder: 4,
             type: "select",
             dicData: [
               {

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -951,7 +951,16 @@ export default {
             prop: "remarks",
             type: "textarea",
             minRows: 2,
-            span: 24
+            span: 12,
+            disabled: false
+          },
+          {
+            label: "箱管备注",
+            prop: "boxTubeRemarks",
+            type: "textarea",
+            minRows: 2,
+            span: 6,
+            disabled: true
           }
         ]
       },

src/views/iosBasicData/SeafreightExportF/bills/assembly/DistributionBox/containers.vue

@@ -104,8 +104,8 @@
                 size="small"
                 plain
                 :disabled="detailData.seeDisabled || selectionList.length == 0 || disabled"
-                @click.stop="allClick('拆单')"
-                >拆单</el-button
+                @click.stop="allClick('合拆票')"
+                >合拆票</el-button
               >
               <!-- <el-button type="success" size="small" plain @click.stop="$refs.splitOrder.openDialog(assemblyForm)">合票</el-button> -->
               <el-button type="success" size="small" plain @click.stop="$refs.print.openDialog()">
@@ -142,7 +142,7 @@
             v-if="assemblyForm.billType != 'MM'"
             :type="scope.type"
             :size="scope.size"
-            :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled"
+            :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled || scope.row.containerNumber"
             @click.stop="rowDel(scope.row, scope.index)"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -700,7 +700,7 @@ export default {
       this.$emit("selectionChange", [val]);
     },
     allClick(name) {
-      if (name == "拆单") {
+      if (name == "合拆票") {
         for (let item of this.selectionList) {
           if (!item.cntrNo) {
             return this.$message.error("箱号不能为空");
@@ -1260,8 +1260,14 @@ export default {
         type: "warning"
       }).then(() => {
         let arrids = [];
-        for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
-          arrids.push(item.id);
+        if (this.assemblyForm.billType != "MM") {
+          for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
+            arrids.push(item.id);
+          }
+        } else {
+          for (let item of this.assemblyForm.containersList) {
+            arrids.push(item.id);
+          }
         }
         // 清除箱号接口
         if (arrids.length) {
@@ -1283,8 +1289,14 @@ export default {
         type: "warning"
       }).then(() => {
         let arrids = [];
-        for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
-          arrids.push(item.id);
+        if (this.assemblyForm.billType != "MM") {
+          for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
+            arrids.push(item.id);
+          }
+        } else {
+          for (let item of this.assemblyForm.containersList) {
+            arrids.push(item.id);
+          }
         }
         if (arrids.length) {
           containersRevoke(arrids.join(",")).then(res => {
@@ -1302,7 +1314,7 @@ export default {
       if (this.selectionList.length > 0) {
         let arrids = [];
         for (let item of this.selectionList) {
-          if (item.containerNumber) {
+          if (item.containerNumber && this.assemblyForm.billType != "MM") {
             return this.$message.error("放箱号有值，不允许清空");
           }
           arrids.push(item.id);
@@ -1407,6 +1419,9 @@ export default {
     },
     // 删除
     rowDel(row, index) {
+      // if (row.containerNumber) {
+      //   return this.$message.error("放箱号有值，不允许删除");
+      // }
       if (row.id) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
@@ -1439,8 +1454,14 @@ export default {
         type: "warning"
       }).then(() => {
         let arrids = [];
-        for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
-          arrids.push(item.id);
+        if (this.assemblyForm.billType != "MM") {
+          for (let item of this.assemblyForm.containersList.filter(item => !item.containerNumber)) {
+            arrids.push(item.id);
+          }
+        } else {
+          for (let item of this.assemblyForm.containersList) {
+            arrids.push(item.id);
+          }
         }
         if (arrids.length) {
           containersRemove(arrids.join(",")).then(() => {

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation.vue

@@ -763,7 +763,7 @@
                       (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                       assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
                       assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
-                      overTime
+                      (overTime&&assemblyForm.billType != 'MM')
                   "
                   :buttonIf="false"
                   placeholder="请选择船名"
@@ -790,7 +790,7 @@
                       (assemblyForm.billType == 'MH' && assemblyForm.masterBillNo > 0) ||
                       assemblyForm.feeCenterListD.filter(item => item.auditStatus > 0).length ||
                       assemblyForm.feeCenterListC.filter(item => item.auditStatus > 0).length ||
-                      overTime
+                      (overTime&&assemblyForm.billType != 'MM')
                   "
                   clearable
                   placeholder="请输入航次"

src/views/iosBasicData/SeafreightExportF/bills/assembly/EntrustmentLnformation/precontainers.vue

@@ -655,6 +655,12 @@ export default {
             width: 80,
             overHidden: true
           },
+          {
+            label: "已出场",
+            prop: "outNum",
+            width: 80,
+            overHidden: true
+          },
           // {
           //   label: "实际操作占用",
           //   prop: "actualOccupyNum",
@@ -773,6 +779,8 @@ export default {
             let occupyNumSum = 0;
             for (let item of this.containerNumberItemList) {
               occupyNumSum += Number(item.occupyNum ? item.occupyNum : 0);
+              item.mblno=this.assemblyForm.mblno;
+              item.hblno=this.assemblyForm.hblno;
             }
             if (occupyNumSum != this.boxForm.quantity) {
               return this.$message.error(`明细数据所有占用箱量的和必须等于箱量:${this.boxForm.quantity}!`);
@@ -794,6 +802,8 @@ export default {
                 return this.$message.error(`放箱号:${item.containerNumber}占用数量不能低于已出场数量:${item.outNum}`);
               }
               occupyNumSum += Number(item.occupyNum ? item.occupyNum : 0);
+              item.mblno=this.assemblyForm.mblno;
+              item.hblno=this.assemblyForm.hblno;
             }
             if (occupyNumSum != this.boxForm.quantity) {
               return this.$message.error(`明细数据所有占用箱量的和必须等于箱量:${this.boxForm.quantity}!`);

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -655,6 +655,7 @@ import {
   updateVerifyData
 } from "@/api/iosBasicData/bills";
 import { dateFormat } from "@/util/date";
+import { validatenull } from "@/util/validate";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import { getBvesselsList } from "@/api/iosBasicData/bvessels";
 import DocumentCenter from "@/views/iosBasicData/SeafreightExportF/bills/assembly/DocumentCenter.vue";
@@ -2566,11 +2567,11 @@ export default {
           // }
           for (let item of this.form.preContainersList) {
             if (!item.cntrTypeCode) {
-              this.$message.warning("请选择尺码箱型");
+              this.$message.error("请选择尺码箱型");
               return;
             }
-            if (!item.quantity) {
-              this.$message.warning("请输入箱量");
+            if (validatenull(item.quantity)) {
+              this.$message.error("箱量不能为空");
               return;
             }
           }

src/views/ow/owPut/detailsPage.vue

@@ -213,8 +213,8 @@
               <template slot="boxNumber">
                 <el-input-number
                   v-model="form.boxNumber"
-                  :disabled="editDisabled || (fixData && form.whetherEnable == '是') || form.suitcaseNum != 0"
-                  :min="1"
+                  :disabled="editDisabled || (fixData && form.whetherEnable == '是')"
+                  :min="form.suitcaseNum||1"
                   :controls="false"
                   placeholder="请输入 箱量"
                   style="width: 100%;"
@@ -3496,6 +3496,7 @@ export default {
     dicChange(name, row) {
       if (name == "containerNumber") {
         if (row) {
+          this.form.srcContainerNumberId=row.id;
           this.form.containerNumber = row.containerNumber;
           this.form.boxCondition = row.boxCondition;
           this.form.polId = row.polId;
@@ -5153,6 +5154,9 @@ export default {
       this.$refs["form"].validate((valid, done) => {
         done();
         if (valid) {
+          if(!this.form.srcContainerNumberId){
+              return this.$message.error("请重新选择自有放箱号");
+          }
           for (let row of this.form.tradingBoxItemsList) {
             if (!row.code || !row.boxType || !row.boxBelongsTo || !row.boxEastName || !row.boxCategory || !row.boxStatus || !row.boxCondition) {
               this.$refs.crud.rowCell(row, row.$index);
@@ -5177,7 +5181,7 @@ export default {
           if (!this.form.actualBoxNumber) {
             this.form.actualBoxNumber = 0;
           }
-          if (this.form.rentTermList.filter(item => !item.rate).length) {
+          if (this.form.rentTermList.filter(item => !item.rate||item.rate==0).length) {
             this.$confirm("租金条款存在费率为0或空的数据，是否继续保存?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",

src/views/ow/owTask/detailsPage.vue

@@ -5808,7 +5808,7 @@ export default {
           if (!this.form.actualBoxNumber) {
             this.form.actualBoxNumber = 0;
           }
-          if (this.form.rentTermList.filter(item => !item.rate).length) {
+          if (this.form.rentTermList.filter(item => !item.rate||item.rate==0).length) {
             this.$confirm("租金条款存在费率为0或空的数据，是否继续保存?", "提示", {
               confirmButtonText: "确定",
               cancelButtonText: "取消",