Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

客户属性字典更换
36 changed files with 153 additions and 114 deletions
--- a/src/components/CostEntry/components/applyModify.tsx
+++ b/src/components/CostEntry/components/applyModify.tsx
@ -74,7 +74,7 @@ export const formSchema: FormSchema[] = [
      return {
        api: () => {
          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              resolve(res)
            })
          })
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@ -242,7 +242,7 @@
      type: 'dropdown',
      visible: true,
      source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
        const dict = results.map((item) => {
          return item.name + '-' + item.value 
        })
@ -672,7 +672,7 @@
              }
            }
            // 根据客户类别带出相应的费用对象
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              const item = res.filter((item) => {
                return list.value[changes[0][0]]['customerTypeText'] && list.value[changes[0][0]]['customerTypeText'].includes(item.name)
              })
@ -701,7 +701,7 @@
        }
        // 修改客户类别
        if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
            const item = res.filter((item) => {
              return changes[0][3].includes(item.name)
            })
--- a/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/src/components/Table/src/components/settings/ColumnSetting.vue
@ -222,7 +222,6 @@
            ...item,
          })
        })
-        console.log(ret)
        return ret
      }

--- a/src/hooks/web/warterMark.ts
+++ b/src/hooks/web/warterMark.ts
@ -0,0 +1,64 @@
+/*
+ * @Desc: 水印hooks
+ * @Author: lijj
+ * @Date: 2024-11-14 09:57:21
+ */
+const domSymbol = Symbol('watermark-dom')
+
+export function useWatermark(
+  op = 0.15,
+  appendEl: HTMLElement | null = document.body
+) {
+  let func: any = () => {}
+  const id = domSymbol.toString()
+  const clear = () => {
+    const domId = document.getElementById(id)
+    if (domId) {
+      const el = appendEl
+      el && el.removeChild(domId)
+    }
+    window.removeEventListener('resize', func)
+  }
+  const createWatermark = (str: string) => {
+    clear()
+
+    const can = document.createElement('canvas')
+    can.width = 300
+    can.height = 240
+
+    const cans = can.getContext('2d')
+    if (cans) {
+      cans.rotate((-25 * Math.PI) / 120)
+      cans.font = '15px Vedana'
+      cans.fillStyle = `rgba(0, 0, 0, ${op})`
+      cans.textAlign = 'left'
+      cans.textBaseline = 'middle'
+      cans.fillText(str, can.width / 20, can.height)
+    }
+
+    const div = document.createElement('div')
+    div.id = id
+    div.style.pointerEvents = 'none'
+    div.style.top = '0px'
+    div.style.left = '0px'
+    div.style.position = 'absolute'
+    div.style.zIndex = '100000000'
+    div.style.width = document.documentElement.clientWidth + 'px'
+    div.style.height = document.documentElement.clientHeight - 80 + 'px'
+    div.style.background =
+      'url(' + can.toDataURL('image/png') + ') left top repeat'
+    const el = appendEl
+    el && el.appendChild(div)
+    return id
+  }
+
+  function setWatermark(str: string) {
+    createWatermark(str)
+    func = () => {
+      createWatermark(str)
+    }
+    window.addEventListener('resize', func)
+  }
+
+  return { setWatermark, clear }
+}
--- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue
@ -616,7 +616,7 @@
      source: async (query, process) => {
        const res = ContainerOwnerDict.value.length
          ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
        if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
        const dict = res.map((res) => {
          return res.pinYinCode
@ -753,7 +753,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
@ -765,7 +765,7 @@
        if (changes[0][1] === 'CtnFlowStateId') {
          const res = CtnFlowStateDict.value.length
            ? CtnFlowStateDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!CtnFlowStateDict.value.length) CtnFlowStateDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/BuyCtn/columns.tsx
+++ b/src/views/ContainerManagement/BuyCtn/columns.tsx
@ -137,7 +137,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -232,7 +232,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -335,7 +335,7 @@ export const formSearchBoxSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@ -229,7 +229,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -563,7 +563,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@ -516,7 +516,7 @@
    //   source: async (query, process) => {
    //     const res = ContainerOwnerDict.value.length
    //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
    //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
    //     const dict = res.map((res) => {
    //       return res.pinYinCode
@ -626,7 +626,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/CustFeeDui/columns.tsx
+++ b/src/views/ContainerManagement/CustFeeDui/columns.tsx
@ -136,7 +136,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'id',
--- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue
@ -679,7 +679,7 @@
    //   source: async (query, process) => {
    //     const res = ContainerOwnerDict.value.length
    //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
    //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
    //     const dict = res.map((res) => {
    //       return res.pinYinCode
@ -870,7 +870,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
@ -991,7 +991,7 @@
    //   source: async (query, process) => {
    //     const res = ContainerOwnerDict.value.length
    //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
    //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
    //     const dict = res.map((res) => {
    //       return res.pinYinCode
@ -1172,7 +1172,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@ -198,7 +198,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -446,7 +446,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -541,7 +541,7 @@ export const formSearchBoxSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'id',
@ -565,7 +565,7 @@ export const formSearchBoxSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetCtnSelectList,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'ctnName',
        showName: 'ctnName',
        valueField: 'ctnName',
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@ -623,7 +623,7 @@
      source: async (query, process) => {
        const res = ContainerOwnerDict.value.length
          ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
        if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
        const dict = res.map((res) => {
          return res.pinYinCode
@ -853,7 +853,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/RentOneWay/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWay/columns.tsx
@ -170,7 +170,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -406,7 +406,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -501,13 +501,13 @@ export const formSearchBoxSchema: FormSchema[] = [
  //   required: false,
  //   dynamicDisabled: false,
  //   colProps: { span: 6 },
-  //   // api: GetSupplierListByCode({ code: 'isLeasing' }),
+  //   // api: GetSupplierListByCode({ code: 'leasing' }),
  //   componentProps: ({ formModel }) => {
  //     return {
  //       allowClear: true,
  //       showSearch: true,
-  //       api: GetSupplierListByCode({ code: 'isLeasing' }),
-  //     params: { code: 'isLeasing' },
+  //       api: GetSupplierListByCode({ code: 'leasing' }),
+  //     params: { code: 'leasing' },
  //       labelField: 'pinYinCode',
  //       showName: 'shortName',
  //       valueField: 'shortName',
@ -591,7 +591,7 @@ export const formSearchBoxSchema: FormSchema[] = [
  //       allowClear: true,
  //       showSearch: true,
  //       api: GetSupplierListByCode,
-  //     params: { code: 'isLeasing' },
+  //     params: { code: 'leasing' },
  //       labelField: 'pinYinCode',
  //       showName: 'shortName',
  //       valueField: 'shortName',
--- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue
@ -569,7 +569,7 @@
      source: async (query, process) => {
        const res = ContainerOwnerDict.value.length
          ? ContainerOwnerDict.value
-          : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+          : (await GetSupplierListByCode({ code: 'leasing' }))?.data
        if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
        const dict = res.map((res) => {
          return res.pinYinCode
@ -796,7 +796,7 @@
        if (changes[0][1] === 'oldContainerOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/RentOneWayIn/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWayIn/columns.tsx
@ -174,7 +174,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -410,7 +410,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -504,7 +504,7 @@ export const formSearchBoxSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@ -695,7 +695,7 @@
    //   source: async (query, process) => {
    //     const res = ContainerOwnerDict.value.length
    //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
    //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
    //     const dict = res.map((res) => {
    //       return res.pinYinCode
@ -897,7 +897,7 @@
        if (changes[0][1] === 'ctnOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
@ -1032,7 +1032,7 @@
    //   source: async (query, process) => {
    //     const res = ContainerOwnerDict.value.length
    //       ? ContainerOwnerDict.value
-    //       : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+    //       : (await GetSupplierListByCode({ code: 'leasing' }))?.data
    //     if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
    //     const dict = res.map((res) => {
    //       return res.pinYinCode
@ -1234,7 +1234,7 @@
        if (changes[0][1] === 'ctnOwner') {
          const res = ContainerOwnerDict.value.length
            ? ContainerOwnerDict.value
-            : (await GetSupplierListByCode({ code: 'isLeasing' }))?.data
+            : (await GetSupplierListByCode({ code: 'leasing' }))?.data
          if (!ContainerOwnerDict.value.length) ContainerOwnerDict.value = res
          const item = res.filter((item) => {
            return item.pinYinCode === changes[0][3]
--- a/src/views/ContainerManagement/RentOut/columns.tsx
+++ b/src/views/ContainerManagement/RentOut/columns.tsx
@ -207,7 +207,7 @@ export const searchFormSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -454,7 +454,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
@ -543,13 +543,13 @@ export const formSearchBoxSchema: FormSchema[] = [
    required: false,
    dynamicDisabled: false,
    colProps: { span: 6 },
-    // api: GetSupplierListByCode({ code: 'isLeasing' }),
+    // api: GetSupplierListByCode({ code: 'leasing' }),
    componentProps: ({ formModel }) => {
      return {
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/ContainerManagement/SellCtn/columns.tsx
+++ b/src/views/ContainerManagement/SellCtn/columns.tsx
@ -198,7 +198,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@ -337,7 +337,7 @@ export const formSchema: FormSchema[] = [
        allowClear: true,
        showSearch: true,
        api: GetSupplierListByCode,
-        params: { code: 'isLeasing' },
+        params: { code: 'leasing' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/baseinfo/accountMaintenance/columns.tsx
+++ b/src/views/baseinfo/accountMaintenance/columns.tsx
@ -11,7 +11,7 @@ const accountTypeDict = ref([])
 getDictOption('account_type').then((data) => {
  accountTypeDict.value = data
 })
-getDictOption('djy_cust_prop').then((data) => {
+getDictOption('infoclient-ArrclientTag').then((data) => {
  customTypeDict.value = data
 })
 // 客户名称下拉框数据
--- a/src/views/baseinfo/accountMaintenance/index.vue
+++ b/src/views/baseinfo/accountMaintenance/index.vue
@ -58,7 +58,7 @@
      const res: API.DataResult = await ApiList(p)
      // 处理下拉框数据
      const adicts = await getDictOption('account_type')
-      const ddicts = await getDictOption('djy_cust_prop')
+      const ddicts = await getDictOption('infoclient-ArrclientTag')
      res?.data.forEach((row) => {
        adicts.forEach((item) => {
          if (item.value == row.accountType) {
--- a/src/views/baseinfo/infoclient/Data/ClientTag.json
+++ b/src/views/baseinfo/infoclient/Data/ClientTag.json
@ -1,23 +0,0 @@
-[
-  { "label": "船公司", "value": "isCarrier" },
-  { "label": "订舱口", "value": "isBooking" },
-  { "label": "场站", "value": "isYard" },
-  { "label": "车队", "value": "isTruck" },
-  { "label": "委托单位", "value": "isController" },
-  { "label": "报关行", "value": "isCustom" },
-  { "label": "代理(国外)", "value": "isAgent" },
-  { "label": "代理(国内)", "value": "isAgentCn" },
-  { "label": "快递公司", "value": "isExpress" },
-  { "label": "航空公司", "value": "isAirLines" },
-  { "label": "国外发货人", "value": "isShipper" },
-  { "label": "通知人", "value": "isNotifyParty" },
-  { "label": "仓库", "value": "isWareHouse" },
-  { "label": "码头", "value": "isWharf" },
-  { "label": "保险公司", "value": "isInsurer" },
-  { "label": "租箱公司", "value": "isLeasing" },
-  { "label": "贸易代理", "value": "isTradingAgency" },
-  { "label": "其他", "value": "isOther" },
-  { "label": "船代", "value": "isShipAgency" },
-  { "label": "经营单位", "value": "isEnterprise" },
-  { "label": "国内发货人", "value": "isShipperCn" }
-]
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@ -613,7 +613,7 @@ export const searchFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'id',
@ -1006,7 +1006,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'id',
@ -1219,7 +1219,7 @@ export const detailsFormSchema: FormSchema[] = [
      return {
        api: () => {
          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              resolve(res)
            })
          })
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/feeField.vue
@ -216,7 +216,7 @@
  }
  const SetData = async (data) => {
    list.value.splice(0)
-    const customerTypeList: any = await getDictOption('djy_cust_prop')
+    const customerTypeList: any = await getDictOption('infoclient-ArrclientTag')
    const unitList: any = await feeUnitDict2()
    const unitList2: any = await getDictOption('fee_unit')
    console.log(unitList, unitList2)
@ -322,7 +322,7 @@
      data: 'customerTypeText',
      type: 'dropdown',
      source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
        console.log(results)
        const dict = results.map((item) => {
          return item.value + '-' + item.name
@ -540,7 +540,7 @@

        // 修改客户类别
        if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
            const item = res.filter((item) => {
              return changes[0][3].includes(item.name)
            })
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@ -638,7 +638,7 @@ export const searchFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'id',
@ -920,7 +920,7 @@ export const viewSearchFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'id',
@ -1321,7 +1321,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'id',
@ -1507,7 +1507,7 @@ export const detailsFormSchema: FormSchema[] = [
      return {
        api: () => {
          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              resolve(res)
            })
          })
--- a/src/views/fee/FeeCustTemplate/feeField.vue
+++ b/src/views/fee/FeeCustTemplate/feeField.vue
@ -218,7 +218,7 @@
  }
  const SetData = async (data) => {
    list.value.splice(0)
-    const customerTypeList: any = await getDictOption('djy_cust_prop')
+    const customerTypeList: any = await getDictOption('infoclient-ArrclientTag')
    const unitList: any = await feeUnitDict2()
    const unitList2: any = await getDictOption('fee_unit')
    console.log(unitList, unitList2)
@ -329,7 +329,7 @@
      data: 'customerTypeText',
      type: 'dropdown',
      source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
        const dict = results.map((item) => {
          return item.value + '-' + item.name
        })
@ -546,7 +546,7 @@

        // 修改客户类别
        if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
            const item = res.filter((item) => {
              return changes[0][3].includes(item.name)
            })
--- a/src/views/fee/code/columns.tsx
+++ b/src/views/fee/code/columns.tsx
@ -251,7 +251,7 @@ export const formSchema: FormSchema[] = [
      return {
        api: () => {
          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              resolve(res)
            })
          })
@ -285,7 +285,7 @@ export const formSchema: FormSchema[] = [
      return {
        api: () => {
          return new Promise((resolve) => {
-            getDictOption('djy_cust_prop').then((res) => {
+            getDictOption('infoclient-ArrclientTag').then((res) => {
              resolve(res)
            })
          })
--- a/src/views/fee/template/components/feeField.vue
+++ b/src/views/fee/template/components/feeField.vue
@ -156,7 +156,7 @@
      data: 'customerTypeText',
      type: 'dropdown',
      source: async (query, process) => {
-        const results = await getDictOption('djy_cust_prop')
+        const results = await getDictOption('infoclient-ArrclientTag')
        console.log(results)
        const dict = results.map((item) => {
          return item.value + '-' + item.name
@ -462,7 +462,7 @@
        }
        // 修改客户类别
        if (changes[0][1] === 'customerTypeText') {
-          getDictOption('djy_cust_prop').then((res) => {
+          getDictOption('infoclient-ArrclientTag').then((res) => {
            const item = res.filter((item) => {
              return changes[0][3].includes(item.name)
            })
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@ -302,7 +302,7 @@ export const searchFormSchema: FormSchema[] = [
    componentProps: () => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isContract' },
+        params: { code: 'contract' },
        labelField: 'pinYinCode',
        valueField: 'id',
        showName: 'shortName',
@ -327,7 +327,7 @@ export const searchFormSchema: FormSchema[] = [
    componentProps: () => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        valueField: 'forwarderId',
        showName: 'description',
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@ -4,7 +4,7 @@
 * @Date: 2024-04-29 11:54:04
 -->
 <template>
-  <div class="sea-export-detail" :class="{ 'ds-view-box': source != 'edit' }">
+  <div ref="seaExportDetail" class="sea-export-detail" :class="{ 'ds-view-box': source != 'edit' }">
    <a-tabs
      size="small"
      class="main-tab mt10"
@ -226,7 +226,9 @@
  
  import { useMultipleTabStore } from '/@/store/modules/multipleTab'
  import { Divider } from 'ant-design-vue'
-  
+  import { useWatermark } from '/@/hooks/web/warterMark'
+  // 水印容器
+  const seaExportDetail = ref(null)
  const go = useGo()
  // 页面loading
  const loading = ref(false)
@ -482,11 +484,8 @@
        bookingDetails.value = res.data
        // 如果是审批页面切状态是已审单弹出选择现舱非现舱
        inPageLoading.value = false
-        // 如果存在表单修改规则，重新更新表单
-        // if (res.data.formSetList && res.data.formSetList.length) {
-        //   const formSetContent = JSON.parse(res.data.formSetList[0].content)
-          // RefbasicInfo.value.updateSchema()
-        // }
+        const { setWatermark, clear } = useWatermark(0.2, seaExportDetail.value)
+        // setWatermark('待订舱')
      })
      .catch(() => {
        loading.value = false
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
@ -276,7 +276,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isTruck' },
+        params: { code: 'truck' },
        labelField: 'pinYinCode',
        valueField: 'shortName',
        showName: 'description',
@ -488,7 +488,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'shortName',
@ -703,7 +703,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'shortName',
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardColumns.tsx
@ -437,7 +437,7 @@ export const formSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@ -80,7 +80,7 @@
      }
    } else {
      // 新建设置默认值
-      const arr = await getDictOption('djy_cust_prop')
+      const arr = await getDictOption('infoclient-ArrclientTag')
      if (data.companyType) {
        const res = arr.filter(item => {
          return item.label == data.companyType
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@ -214,7 +214,7 @@ export const basicInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel, formActionType }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isContract' },
+        params: { code: 'contract' },
        labelField: 'pinYinCode',
        valueField: 'shortName',
        showName: 'shortName',
@ -327,7 +327,7 @@ export const basicInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isBooking' },
+        params: { code: 'booking' },
        labelField: 'pinYinCode',
        valueField: 'shortName',
        showName: 'description',
@ -2748,7 +2748,7 @@ export const otherInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isTruck' },
+        params: { code: 'truck' },
        labelField: 'pinYinCode',
        valueField: 'shortName',
        showName: 'description',
@ -2782,7 +2782,7 @@ export const otherInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isAgent' },
+        params: { code: 'agent' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'shortName',
@ -2811,7 +2811,7 @@ export const otherInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'shortName',
@ -2846,7 +2846,7 @@ export const otherInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isShipagency' },
+        params: { code: 'shipagency' },
        labelField: 'pinYinCode',
        showName: 'description',
        valueField: 'shortName',
@ -2881,7 +2881,7 @@ export const otherInfoFormSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isCustom' },
+        params: { code: 'custom' },
        labelField: 'pinYinCode',
        valueField: 'shortName',
        showName: 'description',
@ -2994,7 +2994,7 @@ export const otherInfoFormSchema: FormSchema[] = [
 // 客户类别下拉框数据
 const customTypeDict = ref([])
 const personList = ref([])
-getDictOption('djy_cust_prop').then((data) => {
+getDictOption('infoclient-ArrclientTag').then((data) => {
  customTypeDict.value = data
 })
 // 关系人表单
--- a/src/views/operation/seaexport/detail/modules/preOrder.tsx
+++ b/src/views/operation/seaexport/detail/modules/preOrder.tsx
@ -614,7 +614,7 @@ export const yardSchema: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isYard' },
+        params: { code: 'yard' },
        labelField: 'pinYinCode',
        placeholder: '场站',
        showName: 'shortName',
--- a/src/views/taskmanage/taskList/BLConfirmation/columns.tsx
+++ b/src/views/taskmanage/taskList/BLConfirmation/columns.tsx
@ -374,7 +374,7 @@ export const formSchema1: FormSchema[] = [
    componentProps: ({ formModel }) => {
      return {
        api: GetSupplierListByCode,
-        params: { code: 'isAgent' },
+        params: { code: 'agent' },
        labelField: 'pinYinCode',
        showName: 'shortName',
        valueField: 'shortName',
Author	SHA1	Message	Date
lijingjia	baa7e9a3a4	Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev	1 week ago
lijingjia	9f2f370328	客户属性字典更换	1 week ago
lijingjia	c96a0d8350	客户属性字典更换	1 week ago