判断ETD是否进行覆盖或更新

箱信息 新加新增按钮和行删除
箱轨迹新加检索条件

src/api/iosBasicData/bills.js

@@ -441,3 +441,19 @@ export const synchronizeDataMM = (data) => {
     params: data
   })
 }
+export const verifyData = (data) => {
+  return request({
+    url: '/api/blade-los/bills/verifyData',
+    method: 'get',
+    params: data
+  })
+}
+
+export const updateVerifyData = (data) => {
+  return request({
+    url: '/api/blade-los/bills/updateVerifyData',
+    method: 'get',
+    params: data
+  })
+}
+

src/api/iosBasicData/containers.js

@@ -32,6 +32,16 @@ export const containersRemove = (ids) => {
     }
   })
 }
+// 删除
+export const removeById = (id) => {
+  return request({
+    url: '/api/blade-los/containers/removeById',
+    method: 'get',
+    params: {
+      id,
+    }
+  })
+}
 // 保存接口
 export const containersSubmit = (row) => {
   return request({

src/views/boxManagement/boxTrack/index.vue

@@ -72,6 +72,7 @@ export default {
             label: '放箱号',
             prop: 'containerNumber',
             overHidden: true,
+            search: true
           },
           {
             label: '箱型',
@@ -86,6 +87,14 @@ export default {
           {
             label: '放箱号类型',
             prop: 'boxCategory',
+            width:100,
+            search: true,
+            type: "select",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=boxCategory",
+            props: {
+              label: "dictValue",
+              value: "dictValue"
+            },
             overHidden: true,
           },
           {
@@ -116,6 +125,13 @@ export default {
           {
             label: '提单号',
             prop: 'mblno',
+            search: true,
+            overHidden: true,
+          },
+          {
+            label: '分单号',
+            prop: 'hblno',
+            search: true,
             overHidden: true,
           },
           {

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

@@ -47,6 +47,28 @@
             </div>
           </div>
         </template>
+        <template slot-scope="scope" slot="menu">
+          <!-- <el-button v-if="scope.row.edit" :type="scope.type" :size="scope.size" icon="el-icon-edit" @click.stop="rowSavefun(scope.row, scope.index)"
+            >保存
+          </el-button>
+          <el-button
+            v-else
+            :type="scope.type"
+            :size="scope.size"
+            icon="el-icon-edit"
+            :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+            @click.stop="rowCellfun(scope.row, scope.index)"
+            >编辑
+          </el-button> -->
+          <el-button
+            :type="scope.type"
+            :size="scope.size"
+            icon="el-icon-delete"
+            :disabled="detailData.seeDisabled || pleasereviewType || showLock"
+            @click.stop="rowDel(scope.row, scope.index)"
+            >{{ $t("btn118n.deleted") }}
+          </el-button>
+        </template>
         <template slot-scope="scope" slot="cntrNo">
           <el-input
             v-if="scope.row.edit"
@@ -256,6 +278,7 @@ export default {
         refreshBtn: false,
         columnBtn: false,
         menu: false,
+        menuWidth: 70,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
@@ -705,18 +728,17 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      })
-        .then(() => {
-          return containersRemove(row.id);
-        })
-        .then(() => {
+      }).then(() => {
+        containersRemove(row.id).then(() => {
           // this.onLoad(this.page);
           this.$message({
             type: "success",
             message: "操作成功!"
           });
           this.$emit("billsDetailfun");
+          this.$refs.crud.toggleSelection();
         });
+      });
     },
     // 一键删除
     handleDelete() {

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

@@ -32,6 +32,16 @@
               <el-button type="success" size="small" plain :disabled="seeDisabled" @click.stop="equalDistribution(2)"
                 >{{ $t("btn118n.packCtnrQty") }}
               </el-button>
+
+              <el-button
+                v-if="assemblyForm.billType != 'MM'"
+                type="primary"
+                size="small"
+                :disabled="seeDisabled || detailData.seeDisabled || pleasereviewType || showLock"
+                @click.stop="addRow()"
+              >
+                {{ $t("btn118n.new") }}
+              </el-button>
               <el-button type="primary" size="small" :disabled="detailData.seeDisabled || pleasereviewType || showLock" @click="rootEditfun">
                 {{ $t("btn118n.edit") }}
               </el-button>
@@ -81,7 +91,7 @@
           </div>
         </template>
         <template slot-scope="scope" slot="menu">
-          <el-button v-if="scope.row.edit" :type="scope.type" :size="scope.size" icon="el-icon-edit" @click.stop="rowSavefun(scope.row, scope.index)"
+          <!-- <el-button v-if="scope.row.edit" :type="scope.type" :size="scope.size" icon="el-icon-edit" @click.stop="rowSavefun(scope.row, scope.index)"
             >保存
           </el-button>
           <el-button
@@ -92,16 +102,38 @@
             :disabled="detailData.seeDisabled || pleasereviewType || showLock"
             @click.stop="rowCellfun(scope.row, scope.index)"
             >编辑
-          </el-button>
+          </el-button> -->
           <el-button
+            v-if="assemblyForm.billType != 'MM'"
             :type="scope.type"
             :size="scope.size"
             icon="el-icon-delete"
             :disabled="detailData.seeDisabled || pleasereviewType || showLock"
             @click.stop="rowDel(scope.row, scope.index)"
-            >删除
+            >{{ $t("btn118n.deleted") }}
           </el-button>
         </template>
+        <template slot="cntrTypeCode" slot-scope="{ row, index }">
+          <dic-select
+            v-if="row.edit && row.whetherSystemGenerate != 1"
+            v-model="row.cntrTypeCode"
+            label="cntrTypeCode"
+            :activateCreated="false"
+            :filterable="true"
+            :mockData="assemblyForm.preContainersList"
+          ></dic-select>
+          <span v-else>{{ row.cntrTypeCode }}</span>
+        </template>
+        <template slot="hblno" slot-scope="{ row, index }">
+          <el-input
+            v-if="row.edit && row.whetherSystemGenerate != 1"
+            v-model="row.hblno"
+            clearable
+            size="small"
+            placeholder="请输入HB/L NO"
+          ></el-input>
+          <span v-else>{{ row.hblno }}</span>
+        </template>
         <template slot-scope="scope" slot="cntrNo">
           <el-input
             v-if="scope.row.edit"
@@ -262,7 +294,8 @@ import {
   containersExportContainers,
   containersImportBoxNo,
   containersList,
-  luHaiTongApiDetail
+  luHaiTongApiDetail,
+  removeById
 } from "@/api/iosBasicData/containers";
 import { getAccurate } from "@/api/boxManagement/buyContainer/index.js";
 import { mapGetters } from "vuex";
@@ -351,7 +384,8 @@ export default {
         dialogClickModal: false,
         refreshBtn: false,
         columnBtn: false,
-        menu: false,
+        menu: true,
+        menuWidth: 70,
         summaryText: "合计",
         showSummary: true,
         sumColumnList: [
@@ -821,6 +855,19 @@ export default {
         this.assemblyForm.containersList = res.data.data.records;
       });
     },
+    addRow() {
+      if (this.assemblyForm.preContainersList.lengt == 0) {
+        return this.$message.error("箱型箱量没数据,不允许新建");
+      }
+      this.assemblyForm.containersList.unshift({
+        edit: true,
+        pid: this.assemblyForm.id,
+        quantity: 0,
+        grossWeight: 0,
+        measurement: 0,
+        mblno: this.assemblyForm.mblno
+      });
+    },
     equalDistribution2() {
       if (!this.assemblyForm.id) {
         this.$message({
@@ -1061,6 +1108,11 @@ export default {
         this.$message.warning("请先大保存");
         return;
       }
+      for (let item of this.assemblyForm.containersList) {
+        if (!item.cntrTypeCode) {
+          return this.$message.error("请选择箱型");
+        }
+      }
       this.$confirm("确定全部保存配箱?", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -1109,23 +1161,26 @@ export default {
       );
     },
     // 删除
-    rowDel(row) {
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-          return containersRemove(row.id);
-        })
-        .then(() => {
-          // this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
+    rowDel(row, index) {
+      if (row.id) {
+        this.$confirm("确定将选择数据删除?", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          removeById(row.id).then(() => {
+            // this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+            this.$emit("billsDetailfun");
+            this.$refs.crud.toggleSelection();
           });
-          this.$emit("billsDetailfun");
         });
+      } else {
+        this.assemblyForm.containersList.splice(index, 1);
+      }
     },
     // 一键删除
     handleDelete() {

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

@@ -1563,15 +1563,15 @@
                 </span>
                 <el-row>
                   <!-- <el-col :span="12"> -->
-                    <dic-select
-                      v-model="assemblyForm.cabinType"
-                      placeholder="舱位类型"
-                      key="id"
-                      label="dictValue"
-                      url="/blade-system/dict-biz/dictionary?code=cabinType"
-                      :disabled="detailData.seeDisabled"
-                      @selectChange="dicChange('cabinType', $event)"
-                    ></dic-select>
+                  <dic-select
+                    v-model="assemblyForm.cabinType"
+                    placeholder="舱位类型"
+                    key="id"
+                    label="dictValue"
+                    url="/blade-system/dict-biz/dictionary?code=cabinType"
+                    :disabled="detailData.seeDisabled"
+                    @selectChange="dicChange('cabinType', $event)"
+                  ></dic-select>
                   <!-- </el-col> -->
                   <!-- <el-col :span="11" :offset="1">
                     <div>
@@ -1953,6 +1953,7 @@ import { selectListLos } from "@/api/approval/processConfig";
 import _ from "lodash";
 import dicSelect from "@/components/dicSelect/main";
 import TreeSelect from "@/components/iosbasic-data/TreeSelect.vue";
+import { verifyData, updateVerifyData } from "@/api/iosBasicData/bills";
 export default {
   props: {
     detailData: {
@@ -2024,7 +2025,7 @@ export default {
           // return time.getTime() < Date.now() || time.getTime() > Date.parse(NdayDate(90))
           // 获取前后的45天 Date.parse(NdayDate(45))
           let timeDay = localStorage.getItem("timeFrame") ? localStorage.getItem("timeFrame") : 45;
-          console.log(timeDay,time.getTime() < Date.parse(NdayDate(-timeDay)) || time.getTime() > Date.parse(NdayDate(timeDay - 1)))
+          console.log(timeDay, time.getTime() < Date.parse(NdayDate(-timeDay)) || time.getTime() > Date.parse(NdayDate(timeDay - 1)));
           return time.getTime() < Date.parse(NdayDate(-timeDay)) || time.getTime() > Date.parse(NdayDate(timeDay - 1));
         }
       },
@@ -2308,30 +2309,75 @@ export default {
           type: "warning"
         })
           .then(() => {
-            let obj = {};
-            obj = {
-              date: this.assemblyForm.etd,
-              type: 1,
-              billId: this.assemblyForm.id
+            let obj = {
+              vesselId: this.assemblyForm.vesselId,
+              voyageNo: this.assemblyForm.voyageNo,
+              polId: this.assemblyForm.polId,
+              etd: this.assemblyForm.etd+" 00:00:00"
             };
-            console.log(obj);
-            synchronizationExchangeRate(obj).then(res => {
-              this.billsDetailfun();
+            verifyData(obj).then(res => {
+              if (res.data.data.etd != this.assemblyForm.etd) {
+                this.$confirm("系统检测到相同船名和航次的ETD和本单据的ETD不同,是否对ETD日期进行覆盖或更新?", "提示", {
+                  confirmButtonText: "覆盖",
+                  cancelButtonText: "更新",
+                  type: "warning"
+                })
+                  .then(() => {
+                    this.assemblyForm.etd = res.data.data.etd;
+                    this.etdSubmit(1);
+                  })
+                  .catch(() => {
+                    updateVerifyData(obj).then(res => {
+                      this.etdSubmit(1);
+                    });
+                  });
+              } else {
+                this.etdSubmit(1);
+              }
             });
           })
           .catch(() => {
-            let obj = {};
-            obj = {
-              date: this.assemblyForm.etd,
-              type: 0,
-              billId: this.assemblyForm.id
+            let obj = {
+              vesselId: this.assemblyForm.vesselId,
+              voyageNo: this.assemblyForm.voyageNo,
+              polId: this.assemblyForm.polId,
+              etd: this.assemblyForm.etd+" 00:00:00"
             };
-            synchronizationExchangeRate(obj).then(res => {
-              this.billsDetailfun();
+            verifyData(obj).then(res => {
+              if (res.data.data.etd != this.assemblyForm.etd) {
+                this.$confirm("系统检测到相同船名和航次的ETD和本单据的ETD不同,是否对ETD日期进行覆盖或更新?", "提示", {
+                  confirmButtonText: "覆盖",
+                  cancelButtonText: "更新",
+                  type: "warning"
+                })
+                  .then(() => {
+                    this.assemblyForm.etd = res.data.data.etd;
+                    this.etdSubmit(0);
+                  })
+                  .catch(() => {
+                    updateVerifyData(obj).then(res => {
+                      this.etdSubmit(0);
+                    });
+                  });
+              } else {
+                this.etdSubmit(0);
+              }
             });
           });
       }
     },
+    etdSubmit(type) {
+      let obj = {};
+      obj = {
+        date: this.assemblyForm.etd,
+        type: type,
+        billId: this.assemblyForm.id
+      };
+      console.log(obj);
+      synchronizationExchangeRate(obj).then(res => {
+        this.billsDetailfun();
+      });
+    },
     // 易燃易爆品闪点类型为数字
     dgFlashPointInput(val) {
       this.$set(this.assemblyForm, "dgFlashPoint", regularInteger(val));
@@ -3006,15 +3052,15 @@ export default {
       // }
       let arr = ["hshipperDetails", "hconsigneeDetails", "hnotifyDetails", "hnotify2Details", "foreignAgencyDetails"];
       if (arr.indexOf(name) != -1) {
-        this.assemblyForm.detail[name] = _.toUpper(this.assemblyForm.detail[name]).replace(/\n+/g, '\n');
+        this.assemblyForm.detail[name] = _.toUpper(this.assemblyForm.detail[name]).replace(/\n+/g, "\n");
       }
       let arr2 = ["marks", "commodityDescr", "bookingRemarks", "siRemarks", "forwarding", "remarks", "cyRemarks"];
       if (arr2.indexOf(name) != -1) {
-        this.assemblyForm[name] = _.toUpper(this.assemblyForm[name]).replace(/\n+/g, '\n');
+        this.assemblyForm[name] = _.toUpper(this.assemblyForm[name]).replace(/\n+/g, "\n");
       }
       let arr3 = "placeReceiptNamePrint,polNamePrint,podNamePrint,destinationNamePrint,placeDeliveryNamePrint,potNamePrint".split(",");
       if (arr3.indexOf(name) != -1) {
-        this.assemblyForm[name] = _.toUpper(this.assemblyForm[name]).replace(/\n+/g, '\n');
+        this.assemblyForm[name] = _.toUpper(this.assemblyForm[name]).replace(/\n+/g, "\n");
       }
       // this.assemblyForm[name] = textareaWrap(this.assemblyForm[name])
     },

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

@@ -637,7 +637,9 @@ import {
   revokeTransferOrder,
   synchronizeData,
   revokeLockOrder,
-  synchronizeDataMM
+  synchronizeDataMM,
+  verifyData,
+  updateVerifyData
 } from "@/api/iosBasicData/bills";
 import { dateFormat } from "@/util/date";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
@@ -1129,7 +1131,7 @@ export default {
               });
             }
           });
-          console.log(this.basicData.column)
+          console.log(this.basicData.column);
         }
       },
       deep: true, // 深度监听
@@ -2754,7 +2756,44 @@ export default {
           // 赋值 ETD 日期
           // this.form.billDate = this.form.etd ? this.form.etd.slice(0, 10) + ' 00:00:00' : null // 单据日期
           // 调用保存接口
-          this.billsSubmitfun(status);
+          // this.$confirm("此操作将永久删除该文件, 是否继续?", "提示", {
+          //   confirmButtonText: "覆盖",
+          //   cancelButtonText: "更新",
+          //   type: "warning"
+          // })
+          //   .then(() => {
+
+          //   })
+          //   .catch(() => {
+
+          //   });
+          let obj = {
+            vesselId: this.form.vesselId,
+            voyageNo: this.form.voyageNo,
+            polId: this.form.polId,
+            etd: this.form.etd+" 00:00:00"
+          };
+          verifyData(obj).then(res => {
+            if (res.data.data.etd != this.form.etd) {
+              this.$confirm("系统检测到相同船名和航次的ETD和本单据的ETD不同,是否对ETD日期进行覆盖或更新?", "提示", {
+                confirmButtonText: "覆盖",
+                cancelButtonText: "更新",
+                type: "warning"
+              })
+                .then(() => {
+                  this.form.etd = res.data.data.etd;
+                  this.billsSubmitfun(status);
+                })
+                .catch(() => {
+                  updateVerifyData(obj).then(res => {
+                    this.billsSubmitfun(status);
+                  });
+                });
+            } else {
+              this.billsSubmitfun(status);
+            }
+          });
+          // this.billsSubmitfun(status);
         }
       });
     },

src/views/iosBasicData/boxDynamic/index.vue

@@ -66,7 +66,7 @@
     </div>
     <report ref="report" :id="form.id" businessValue="OW-N" classifyCode="动态查询"></report>
     <reports :id="form.id" :assemblyForm="form" businessValue="OW-N" ref="reports"></reports>
- </div>
+  </div>
 </template>
 
 <script>
@@ -75,7 +75,7 @@ import report from "./components/report.vue";
 import reports from "@/components/boxManagement/reports.vue";
 export default {
   name: "箱动态查询",
-  components: { report,reports },
+  components: { report, reports },
   data() {
     return {
       roleName: localStorage.getItem("roleName"),
@@ -177,13 +177,17 @@ export default {
       if (!this.query.containerNumber) {
         return this.$message.error("Please enter Release Ref!");
       }
+      let obj = {
+        ...this.query,
+        code: this.query.code.replace(/ +/g, ',')
+      };
       const loading = this.$loading({
         lock: true,
         text: "loading",
         spinner: "el-icon-loading",
         background: "rgba(255,255,255,0.7)"
       });
-      containerDynamicInquiry(this.query)
+      containerDynamicInquiry(obj)
         .then(res => {
           this.form = res.data.data;
         })

src/views/ow/owPut/detailsPage.vue

@@ -255,9 +255,9 @@
                   @click="allClick('一键编辑')"
                   >一键编辑</el-button
                 >
-                <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
+                <!-- <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
                   >批量删除</el-button
-                >
+                > -->
                 <el-button type="primary" size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
                 </el-button>

src/views/ow/owReminder/index.vue

@@ -20,10 +20,10 @@
       >
         <template slot="menuLeft">
           <el-tabs v-model="query.type" type="card" @tab-click="refreshChange">
-            <el-tab-pane label="用箱提箱" name="2">
+            <el-tab-pane label="用箱提醒" name="2">
               <span slot="label">
                 <el-badge :value="badgeNum1" class="item" :max="99">
-                  用箱提箱
+                  用箱提醒
                 </el-badge>
               </span>
             </el-tab-pane>

src/views/ow/owTask/detailsPage.vue

@@ -305,9 +305,9 @@
                   @click="allClick('一键编辑')"
                   >一键编辑</el-button
                 >
-                <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
+                <!-- <el-button type="danger" plain size="small" :disabled="editDisabled || selectionList.length == 0" @click="allClick('批量删除')"
                   >批量删除</el-button
-                >
+                > -->
                 <el-button type="success" size="small" :disabled="!form.id" @click="allClick('导出')">导出</el-button>
                 <el-button type="primary" size="small" :disabled="editDisabled" @click="allClick('批量修改POD场站')">
                   批量修改POD场站
@@ -1215,7 +1215,7 @@
         >
       </span>
     </el-dialog>
-    <el-dialog append-to-body title="批量修改POD场站" :visible.sync="podDialog" width="30%" v-dialog-drag>
+    <el-dialog append-to-body title="批量修改POD场站" :visible.sync="podDialog" width="30%" :close-on-click-modal="false" v-dialog-drag>
       <span>
         <avue-form v-if="podDialog" ref="form3" v-model="podForm" :option="podOption">
           <tempalte slot="podStationCname">
@@ -1233,6 +1233,22 @@
               @selectChange="dicChange('podStationCname3', $event)"
             ></dic-select>
           </tempalte>
+          <tempalte slot="podCyContact">
+            <dic-select
+              v-model="podForm.podCyContact"
+              placeholder="目的港场站联系人"
+              :key="podForm.podStationId"
+              label="cname"
+              res="corpsAttnList"
+              :url="'/blade-los/bcorps/detail?id=' + podForm.podStationId"
+              :filterable="true"
+              :remote="true"
+              dataName="cname"
+              :allowCreate="true"
+              @selectChange="dicChange('podCyContact3', $event)"
+              :disabled="!podForm.podStationCname"
+            ></dic-select>
+          </tempalte>
         </avue-form>
       </span>
       <span slot="footer" class="dialog-footer">
@@ -1525,13 +1541,6 @@ export default {
           {
             label: "POD场站",
             prop: "podStationCname",
-            rules: [
-              {
-                required: true,
-                message: " ",
-                trigger: "blur"
-              }
-            ]
           },
           {
             label: "收箱号",
@@ -1539,13 +1548,13 @@ export default {
             disabled: false
           },
           {
-            label: "目的港场站地址",
-            prop: "podCyAddress",
+            label: "目的港场站联系人",
+            prop: "podCyContact",
             disabled: false
           },
           {
-            label: "目的港场站联系人",
-            prop: "podCyContact",
+            label: "目的港场站地址",
+            prop: "podCyAddress",
             disabled: false
           },
           {
@@ -3890,6 +3899,22 @@ export default {
           this.podForm.podStationCode = null;
           this.podForm.podStationEname = null;
           this.podForm.podStationCname = null;
+          this.podForm.podCyContact = null;
+          this.podForm.podCyAddress = null;
+          this.podForm.podCyEmail = null;
+          this.podForm.podCyTel = null;
+        }
+      }
+      if(name=='podCyContact3'){
+         if (row) {
+          this.podForm.podCyAddress = row.addr;
+          this.podForm.podCyEmail = row.email;
+          this.podForm.podCyTel = row.tel;
+        } else {
+          this.podForm.podCyContact = null;
+          this.podForm.podCyAddress = null;
+          this.podForm.podCyEmail = null;
+          this.podForm.podCyTel = null;
         }
       }
     },
@@ -5051,10 +5076,10 @@ export default {
       }
       if (name == "批量修改POD场站") {
         this.podForm = {
-          podCyAddress: this.form.podCyAddress,
-          podCyContact: this.form.podCyContact,
-          podCyEmail: this.form.podCyEmail,
-          podCyTel: this.form.podCyTel
+          // podCyAddress: this.form.podCyAddress,
+          // podCyContact: this.form.podCyContact,
+          // podCyEmail: this.form.podCyEmail,
+          // podCyTel: this.form.podCyTel
         };
         this.podDialog = true;
       }