修改免箱使参数

方箱号新加字段
海运出口 配箱信息 删除修改删除方式
发送下货纸新加参数判断

src/views/approveDataH/index.vue

@@ -485,6 +485,7 @@ export default {
         };
       }if (type == "FEEDAY") {
         obj = {
+          billId: row.srcBillId,
           businessType: "HYCK",
           classifyCode: "POD免箱使",
           groupCode: "POD免箱使"
@@ -521,7 +522,7 @@ export default {
           this.selectPrintingDialog = false;
           this.handleReportPreview(val.url, res.data.data.data);
         });
-      } else if (type == "FY-SQXG" || type == "FY-SQSC") {
+      } else if (type == "FY-SQXG" || type == "FY-SQSC"|| type == "FEEDAY") {
         reportsGetReportData({
           billId: this.reportsData.srcBillId,
           reportCode: val.classifyCode,

src/views/boxManagement/containerNumber/detailsPage.vue

@@ -266,6 +266,34 @@
               :disabled="editDisabled || form.whetherManuallyCreate == 1"
             ></el-input-number>
           </tempalte>
+          <template slot-scope="{}" slot="cancelNumberLabel">
+            <span style="color: #F56C6C;">取消箱量:</span>
+          </template>
+          <template slot="cancelNumber">
+            <el-input-number
+              v-model="form.cancelNumber"
+              :disabled="true"
+              :precision="0"
+              :controls="false"
+              placeholder="请输入 取消箱量"
+              style="width: 100%;"
+              class="error-input"
+            ></el-input-number>
+          </template>
+          <template slot-scope="{}" slot="boxTubeRemarksLabel">
+            <span style="color: #F56C6C;">箱管备注:</span>
+          </template>
+          <template slot="boxTubeRemarks">
+            <el-input
+              v-model="form.boxTubeRemarks"
+              :disabled="true"
+              type="textarea"
+              :autosize="{ minRows: 2, maxRows: 4 }"
+              placeholder="请输入 箱管备注"
+              style="width: 100%;"
+              class="error-input"
+            ></el-input>
+          </template>
         </avue-form>
       </trade-card>
       <trade-card title="箱明细">
@@ -470,7 +498,7 @@
               key="id"
               label="cnName"
               res="records"
-               url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0"
+              url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=场站&status=0"
               :filterable="true"
               :remote="true"
               dataName="cnName"
@@ -959,10 +987,15 @@ export default {
             prop: "remarks",
             type: "textarea",
             minRows: 2,
-            span: 12,
+            span: 6,
             disabled: false
           },
           {
+            label: "取消箱量",
+            prop: "cancelNumber",
+            disabled: true
+          },
+          {
             label: "OW备注",
             prop: "boxTubeRemarks",
             type: "textarea",
@@ -2349,4 +2382,16 @@ export default {
   font-size: 16px;
   color: #54bcbd;
 }
+::v-deep .error-input .el-input.is-disabled .el-input__inner {
+  color: #f56c6c !important;
+}
+::v-deep .error-input .el-textarea .is-disabled .el-textarea__inner {
+  color: #f56c6c !important;
+}
+::v-deep .error-input .el-input__inner {
+  color: #f56c6c !important;
+}
+::v-deep .error-input .el-textarea__inner {
+  color: #f56c6c !important;
+}
 </style>

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

@@ -146,7 +146,7 @@
             v-if="assemblyForm.billType != 'MM'"
             :type="scope.type"
             :size="scope.size"
-            :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled || scope.row.containerNumber"
+            :disabled="detailData.seeDisabled || pleasereviewType || showLock || disabled || !(!scope.row.containerNumber)"
             @click.stop="rowDel(scope.row, scope.index)"
             >{{ $t("btn118n.deleted") }}
           </el-button>
@@ -186,7 +186,7 @@
             placeholder="请输入箱号"
             @input="cntrNoInput(scope.row, 'cntrNo')"
             @change="verifyChange(scope.row, 'cntrNo')"
-            :disabled="scope.row.containerNumber&&assemblyForm.billType != 'MM'"
+            :disabled="!(!scope.row.containerNumber)&&assemblyForm.billType != 'MM'"
           ></el-input>
           <span v-else>{{ scope.row.cntrNo }}</span>
         </template>
@@ -1447,31 +1447,26 @@ export default {
       }
     },
     // 一键删除
-    handleDelete() {
-      for (let item of this.assemblyForm.containersList) {
+    handleDelete() {      
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      for (let item of this.selectionList) {
         if (!item.id) return this.$message.error("明细存在未保存数据,请点击行删除");
         if (item.quantity > 0) return this.$message.error("请先撤销,再删除配箱");
         if (item.containerNumber && this.assemblyForm.billType != "MM") {
           return this.$message.error("放箱号有值，不允许清空");
         }
       }
-      this.$confirm("确定将全部数据删除?", {
+      this.$confirm("确定将数据删除?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
         let arrids = [];
-        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(() => {
+        if (this.ids) {
+          containersRemove(this.ids).then(() => {
             // this.onLoad(this.page);
             this.$message({
               type: "success",

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

@@ -720,7 +720,7 @@ export default {
   async created() {
     this.option = await this.getColumnData(this.getColumnName(487), this.optionBack);
     this.containerOption = await this.getColumnData(this.getColumnName(488), this.containerOptionBack);
-    isProcurement({ param: "verification.cost " }).then(res => {
+    isProcurement({ param: "verification.cost" }).then(res => {
       if (res.data.data == 1) {
         this.verificationCost = true;
       }
@@ -728,9 +728,13 @@ export default {
   },
   methods: {
     sendEdi() {
-      sendVerificationPrompt({ ids: this.assemblyForm.id }).then(res => {
+      if (this.verificationCost) {
+        sendVerificationPrompt({ ids: this.assemblyForm.id }).then(res => {
+          this.$refs.sendEdi.openDialog(this.assemblyForm.id);
+        });
+      } else {
         this.$refs.sendEdi.openDialog(this.assemblyForm.id);
-      });
+      }
     },
     confirmBox() {
       this.$refs.importTemp.openDialog(this.assemblyForm);