新加tbs重复判断公共方法

SOC COC 承运人默认10条
费用 付费 生成收费默认客户和客户类型

src/api/boxManagement/containerNumber/index.js

@@ -91,4 +91,11 @@ export const copyAgent = (data) => {
         method: 'get',
         params: data
     })
+}
+export const getContainerNumberOccupationRecord = (params) => {
+  return request({
+    url: '/api/blade-los/seacontainernumberitem/getContainerNumberOccupationRecord' ,
+    method: 'get',
+    params:params
+  })
 }

src/api/iosBasicData/ReceivingOrders/precontainers.js

@@ -104,4 +104,11 @@ export const sendDeliveryPaper = (row) => {
     method: 'get',
     params:row
   })
+}
+export const actualOccupyNumUpdate = (row) => {
+  return request({
+    url: '/api/blade-los/seacontainernumberitem/actualOccupyNumUpdate',
+    method: 'post',
+    data: row
+  })
 }

src/lang/en.js

@@ -245,7 +245,10 @@ export default {
     quantity: 'quantity',
     localCurrency: 'localCurrency',
     foreignCurrency: 'foreignCurrency',
-    reportNo: 'reportNo'
+    reportNo: 'reportNo',
+    occupyNum:'occupyNum',
+    actualQuantity:'actualQuantity',
+    actualOccupyNum:'actualOccupyNum'
   },
   btn118n: {
     newDD: 'newDD',

src/lang/zh.js

@@ -243,7 +243,10 @@ export default {
     quantity:'数量',
     localCurrency:'本币',
     foreignCurrency:'外币',
-    reportNo:'报表编码'
+    reportNo:'报表编码',
+    occupyNum:'操作占用',
+    actualQuantity:'实际箱量',
+    actualOccupyNum:'实际操作占用'
 
   },
   btn118n: {

src/util/util.js

@@ -1,4 +1,17 @@
 import {validatenull} from './validate'
+import store from '@/store';
+import { MessageBox } from 'element-ui';
+//检验标签是否重复
+export const verifyTags = (name) => {
+  console.log(store.getters.tagList, name)
+  const tagList = store.getters.tagList
+  if (tagList.filter(item => item.label == name).length > 0) {
+    MessageBox.alert(`请关闭重复的${name}标签,否则无法进行操作!`, '提示', { type: 'warning' });
+    return false
+  }
+  return true
+  // const tagList=state.tagList
+}
 //表单序列化
 export const serialize = data => {
   let list = [];

src/views/iosBasicData/OceanFreightImport/bills/assembly/feecenter.vue

@@ -2615,6 +2615,13 @@ export default {
       }
       let arr = selection.map(item => {
         let obj = {};
+        if (dc == "C") {
+          obj.corpType = "国内直接客户";
+          obj.corpId = this.assemblyForm.corpId;
+          obj.shortName = this.assemblyForm.shortName;
+          obj.corpCnName = this.assemblyForm.corpCnName;
+          obj.corpEnName = this.assemblyForm.corpEnName;
+        }
         obj.feeId = item.feeId;
         obj.feeCnName = item.feeCnName;
         obj.feeEnName = item.feeEnName;

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

@@ -2624,6 +2624,13 @@ export default {
       }
       let arr = selection.map(item => {
         let obj = {};
+        if(dc=='C'){
+          obj.corpType = '国内直接客户';
+          obj.corpId = this.assemblyForm.corpId;
+          obj.shortName = this.assemblyForm.shortName;
+          obj.corpCnName = this.assemblyForm.corpCnName;
+          obj.corpEnName = this.assemblyForm.corpEnName;
+        }
         obj.feeId = item.feeId;
         obj.feeCnName = item.feeCnName;
         obj.feeEnName = item.feeEnName;

src/views/iosBasicData/businessCenter/bookingCabin/index.vue

@@ -136,7 +136,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/list?current=1&size=5&corpTypeName=船公司&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/list?current=1&size=10&corpTypeName=船公司&cnName={{key}}",
             props: {
               label: "shortName",
               value: "shortName",

src/views/iosBasicData/costcenter/coc/detailsPage.vue

@@ -121,7 +121,7 @@
               key="id"
               label="shortName"
               res="records"
-              url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=船公司"
+              url="/blade-los/bcorps/selectList?current=1&size=10&corpTypeName=船公司"
               :filterable="true"
               :remote="true"
               dataName="shortName"

src/views/iosBasicData/costcenter/coc/index.vue

@@ -269,7 +269,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/list?current=1&size=5&corpTypeName=船公司&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/list?current=1&size=10&corpTypeName=船公司&cnName={{key}}",
             props: {
               label: "shortName",
               value: "shortName",

src/views/iosBasicData/costcenter/soc/detailsPage.vue

@@ -138,7 +138,7 @@
               key="id"
               label="shortName"
               res="records"
-              url="/blade-los/bcorps/selectList?current=1&size=5&corpTypeName=船公司"
+              url="/blade-los/bcorps/selectList?current=1&size=10&corpTypeName=船公司"
               :filterable="true"
               :remote="true"
               dataName="shortName"

src/views/iosBasicData/costcenter/soc/index.vue

@@ -290,7 +290,7 @@ export default {
             type: "select",
             filterable: true,
             remote: true,
-            dicUrl: "/api/blade-los/bcorps/list?current=1&size=5&corpTypeName=船公司&cnName={{key}}",
+            dicUrl: "/api/blade-los/bcorps/list?current=1&size=10&corpTypeName=船公司&cnName={{key}}",
             props: {
               label: "shortName",
               value: "shortName",

src/views/iosBasicData/financialManagement/PaymentApplication/detailsPage.vue

@@ -409,7 +409,7 @@ export default {
             label: "模板上传",
             prop: "excelFile",
             type: "upload",
-            showFileList:false,
+            showFileList: false,
             drag: true,
             loadText: "模板上传中，请稍等",
             span: 24,
@@ -1087,6 +1087,7 @@ export default {
       }
     },
     searchChange(params, done) {
+      done();
       this.page2 = {
         currentPage: 1,
         total: 0,
@@ -1096,7 +1097,6 @@ export default {
       this.pageData2 = [];
       this.tableData = [];
       this.finAccBillsVOList = [];
-      done();
       if (!this.form.id) {
         return this.$message.error("请保存数据");
       }
@@ -1113,8 +1113,8 @@ export default {
           ...this.form
         };
         finstlbillsAdd(obj).then(res => {
-        this.form.version = res.data.data.version;
-      });
+          this.form.version = res.data.data.version;
+        });
         this.finstlbillslistAccBillV1fun();
       }
     },
@@ -1472,7 +1472,7 @@ export default {
       obj.businessDateStart = this.search.businessDateStart;
       obj.businessDateEnd = this.search.businessDateEnd;
       obj.operatorName = this.search.operatorName;
-       obj.trackingNumber = this.search.trackingNumber;
+      obj.trackingNumber = this.search.trackingNumber;
       finstlbillslistAccBillByCorp(obj).then(res => {
         this.retrievePopupsType = true;
         this.retrievePopupsData = res.data.data;
@@ -1482,6 +1482,7 @@ export default {
     finstlbillslistAccBillV1fun() {
       let obj = {};
       obj.type = "2";
+      obj.operationType="付费申请";
       obj.branchId = this.form.branchId;
       obj.branchName = this.form.branchName;
       obj.corpCnName = this.form.corpId; // 付费对象
@@ -1498,7 +1499,7 @@ export default {
       obj.businessDateStart = this.search.businessDateStart;
       obj.businessDateEnd = this.search.businessDateEnd;
       obj.operatorName = this.search.operatorName;
-       obj.trackingNumber = this.search.trackingNumber;
+      obj.trackingNumber = this.search.trackingNumber;
       const loading = this.$loading({
         lock: true,
         text: "加载中",
@@ -1592,7 +1593,11 @@ export default {
           feeItemsDelete(obj)
             .then(res => {
               this.$message.success("删除成功");
-              this.getDetail(this.form.id);
+              if (this.tableData.length) {
+                this.getDetail(this.form.id, "search2");
+              } else {
+                this.getDetail(this.form.id);
+              }
             })
             .finally(() => {
               loading.close();
@@ -1622,7 +1627,11 @@ export default {
       feeItemsDelete(obj)
         .then(res => {
           this.$message.success("删除成功");
-          this.getDetail(this.form.id);
+          if (this.tableData.length) {
+            this.getDetail(this.form.id, "search2");
+          } else {
+            this.getDetail(this.form.id);
+          }
         })
         .finally(() => {
           loading.close();

src/views/iosBasicData/financialManagement/fininvoicesApplyfor/detailsPage.vue

@@ -1479,6 +1479,7 @@ export default {
     finstlbillslistAccBillV1fun() {
       let obj = {};
       obj.type = "3";
+      obj.operationType="发票申请";
       obj.branchId = this.form.branchId;
       obj.branchName = this.form.branchName;
       obj.corpCnName = this.form.corpId ? this.form.corpId : null;