同步货代代码

src/api/iosBasicData/bills.js

@@ -27,6 +27,13 @@ export const billsGetBillNo = (data) => {
     data: data
   })
 }
+export const removeHblNo = (params) => {
+  return request({
+    url: '/api/blade-los/bills/removeHblNo',
+    method: 'get',
+    params: params
+  })
+}
 // 海运出口详情
 export const billsDetail = (id) => {
   return request({

src/api/iosBasicData/containers.js

@@ -137,3 +137,11 @@ export const luHaiTongApiDetail = (params) => {
     params: params
   })
 }
+// 提取箱信息
+export const verifyData = (params) => {
+  return request({
+    url: '/api/blade-los/containers/verifyData',
+    method: 'get',
+    params: params
+  })
+}

src/api/iosBasicData/humanResources/employees.js

@@ -0,0 +1,53 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//详情
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/submit',
+        method: 'post',
+        data: data
+    })
+}
+//主表删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/remove',
+        method: 'post',
+        params: data
+    })
+}
+//入职/离职
+export const update = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/update',
+        method: 'post',
+        data: data
+    })
+}
+export const getDeptList = (data) => {
+  return request({
+    url: '/api/blade-system/dept/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/iosBasicData/humanResources/resignations.js

@@ -0,0 +1,53 @@
+import request from '@/router/axios';
+//列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//详情
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/submit',
+        method: 'post',
+        data: data
+    })
+}
+//主表删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/remove',
+        method: 'post',
+        params: data
+    })
+}
+//入职/离职
+export const update = (data) => {
+    return request({
+        url: '/api/blade-los/bstaffinformation/update',
+        method: 'post',
+        data: data
+    })
+}
+export const getDeptList = (data) => {
+  return request({
+    url: '/api/blade-system/dept/list',
+    method: 'get',
+    params: data
+  })
+}

src/api/iosBasicData/inventoryAccount.js

@@ -0,0 +1,34 @@
+import request from '@/router/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/api/blade-los/inventoryAccountStatistics/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const boxNumberProfitStatisticsSum = (data) => {
+  return request({
+    url: '/api/blade-los/inventoryAccountStatistics/sum',
+    method: 'get',
+    params: data
+  })
+}
+
+export const getCorp= (current, size, params) => {
+  return request({
+    url: '/api/blade-los/bcorps/listByType',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+

src/api/iosBasicData/reports.js

@@ -31,6 +31,15 @@ export const reportsRemove = (ids) => {
     }
   })
 }
+export const reportsRemove2 = (ids) => {
+  return request({
+    url: '/api/blade-los/reports/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
 
 export const add = (row) => {
   return request({

src/api/iosBasicData/storageFeeF.js

@@ -0,0 +1,70 @@
+import request from '@/router/axios';
+//贸易预付款列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/list',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size
+        }
+    })
+}
+//贸易预付款明细
+export const getDetail = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/detail',
+        method: 'get',
+        params: data
+    })
+}
+
+//贸易预付款保存
+export const submit = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/submit',
+        method: 'post',
+        data: data
+    })
+}
+//贸易预付款删除
+export const remove = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/remove',
+        method: 'post',
+        params: data
+    })
+}
+//贸易预付款删除
+export const itemRemove = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefeesitems/remove',
+        method: 'post',
+        params: data
+    })
+}
+
+export const calculateStorageFees = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/calculateStorageFees',
+        method: 'get',
+        params: data
+    })
+}
+
+export const confirmSettlement = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/confirmSettlement',
+        method: 'post',
+        data: data
+    })
+}
+
+export const revokeSettlement = (data) => {
+    return request({
+        url: '/api/blade-los/payablestoragefees/revokeSettlement',
+        method: 'post',
+        data: data
+    })
+}

src/util/date.js

@@ -1,3 +1,5 @@
+import { conforms } from "lodash";
+
 export const calcDate = (date1, date2) => {
   let date3 = date2 - date1;
 
@@ -204,6 +206,10 @@ export function getYearDate() {
   const date = new Date();
   return date.getFullYear()
 }
+export function getMonthDate() {
+  const date = new Date();
+  return date.getMonth()+1
+}
 
 /**
  * 获取 n 天后的日期
@@ -227,8 +233,50 @@ function addZero(num) {
   }
   return num;
 }
-
+//验证英文
 export function verifyEnglish(str) {
-  const regex = /^[A-Za-z0-9\n .,!?:()|/+-_;'"$&@%*#]+$/;
-  return regex.test(str?str:null);
+  const regex = /^[A-Za-z0-9\r\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  return regex.test(str ? str : null);
+}
+//验证符号
+export function verifySymbol(str) {
+  const regex = /^[A-Za-z0-9\r\n .,!?:()|/+-_;'"$&@%*#]+$/;
+  return regex.test(str ? str : null);
 }
+// 匹配常见全角符号的正则表达式（包括标点、字母、数字等）
+export function checkFullWidthSymbols(text) {
+  if (text) {
+    const fullWidthRegex = /[\u3000-\u303F\uFF01-\uFF5E\uFFE0-\uFFE5]/g;
+    const matchesItem = [];
+    let lines = text.split('\n')
+    let match;
+    lines.forEach((ln, index, array) => {
+      while ((match = fullWidthRegex.exec(ln)) !== null) {
+        matchesItem.push({
+          row: index + 1,         // 行号
+          index: match.index,     // 符号的位置
+          symbol: match[0]        // 符号本身
+        });
+      }
+    })
+    let matches = [];
+    matches = matchesItem.reduce((acc, item) => {
+      const existingItem = acc.find(i => i.row === item.row);
+      if (existingItem) {
+        existingItem.symbol += ` ${item.symbol}`; // 合并值
+      } else {
+        acc.push({ ...item }); // 添加新项
+      }
+      return acc;
+    }, []);
+    return {
+      hasFullWidth: matches.length > 0, // 是否包含全角符号
+      positions: matches                // 符号的详细位置和内容
+    };
+  } else {
+    return {
+      hasFullWidth: false, // 是否包含全角符号
+      positions: []                // 符号的详细位置和内容
+    };
+  }
+}

src/util/messageReminder.js

@@ -29,8 +29,28 @@ export const requiredMessage = (form,data)=>{
  */
 export const popupReminder = (form,data)=>{
   let sum = '请输入'
+  // 高雯 船公司是 QDONE 海洋网联船务(中国)有限公司 时，carrierId: 11207
+  // 判断交货地是否输入，目的港不判断
   for(let item of data) {
-    if (!form[item.value]) {
+    console.log('popupReminder', item)
+      var b=true
+      if(Array.isArray(item.vif) && item.vif.length>0){
+          b=false
+          item.vif.forEach(r=>{
+              if(r.name && form.hasOwnProperty(r.name)){
+                  if(r.op==='!='){
+                      if(form[r.name]!=r.value){
+                          b=true
+                      }
+                  }else{ // r.op === '=='
+                      if(form[r.name]==r.value){
+                          b=true
+                      }
+                  }
+              }
+          })
+      }
+    if (b && !form[item.value]) {
       sum +=item.name.toUpperCase()+' ，'
     }
   }