10.31禅道

src/App.vue

@@ -14,13 +14,13 @@
 <script lang="ts" setup>
   import { ConfigProvider } from 'ant-design-vue'
   import { AppProvider } from '/@/components/Application'
-  // import { useTitle } from '/@/hooks/web/useTitle'
+  import { useTitle } from '/@/hooks/web/useTitle'
   import { useLocale } from '/@/locales/useLocale'
   // import VXETable from 'vxe-table'
   // import XEUtils from 'xe-utils'
-  // import dayjs from 'dayjs'
-  // import 'dayjs/locale/zh-cn'
-  // dayjs.locale('zh-cn')
+  import dayjs from 'dayjs'
+  import 'dayjs/locale/zh-cn'
+  dayjs.locale('zh-cn')
   // 自定义全局的格式化处理函数
   // VXETable.formats.mixin({
   //   // 格式化性别
@@ -55,6 +55,6 @@
   // })
   // support Multi-language
   const { getAntdLocale } = useLocale()
-  // useTitle()
+  useTitle()
 </script>
 

src/api/common/index.ts

@@ -63,6 +63,8 @@ enum Api {
   GetFeeCurrencySelectList = '/mainApi/ClientCommon/GetFeeCurrencySelectList',
   // 根据客户类型查询的往来单位
   GetClientListByCode = '/mainApi/ClientCommon/GetClientListByCode',
+  // 全部客户下拉
+  GetSupplierAndClientListByCode = '/mainApi/ClientCommon/GetSupplierAndClientListByCode',
   // 供应商客户类型
   GetSupplierListByCode = '/mainApi/ClientCommon/GetSupplierListByCode',
   // 费用名称下拉数据
@@ -197,6 +199,14 @@ export function GetClientListByCode(params) {
     params,
   })
 }
+// 获取全部客户下拉
+export function GetSupplierAndClientListByCode(params) {
+  return request<DataResult>({
+    url: Api.GetSupplierAndClientListByCode,
+    method: 'get',
+    params,
+  })
+}
 // 获取供应商单位下拉列表 (Auth)
 export function GetSupplierListByCode(params) {
   return request<DataResult>({

src/components/CostEntry/feeTable.vue

@@ -62,7 +62,7 @@
   import { feeStatusList } from './columns'
   import { GetList, SubmitFee, DeleteFee, ApplyAudit, Withdraw, SubmitWithAudit } from './api'
   // 结算对象下拉数据
-  import { GetClientListByCode } from '/@/api/common'
+  import { GetSupplierAndClientListByCode } from '/@/api/common'
   import { useMessage } from '/@/hooks/web/useMessage'
   // 引入字典接口
   import { getDictOption } from '/@/utils/dictUtil'
@@ -239,7 +239,7 @@
       visible: true,
       source: async (query, process) => {
         if (query && query.indexOf('~') > -1) query = query.split('~')[1]
-        GetClientListByCode({ queryKey: query }).then((res) => {
+        GetSupplierAndClientListByCode({ queryKey: query }).then((res) => {
           const { data } = res
           data.forEach((item) => {
             item['label'] = item.shortName

src/views/baseinfo/accountMaintenance/columns.tsx

@@ -177,13 +177,6 @@ export const formSchema: FormSchema[] = [
     defaultValue: '',
     colProps: { span: 12 },
   },
-  {
-    field: 'registContractName',
-    label: '用户',
-    component: 'Input',
-    defaultValue: '',
-    colProps: { span: 12 },
-  },
   {
     field: 'userId',
     label: '',
@@ -194,7 +187,7 @@ export const formSchema: FormSchema[] = [
     field: 'userName',
     label: '用户',
     component: 'ApiSelect',
-    defaultValue: '',
+    defaultValue: null,
     colProps: { span: 12 },
     componentProps: ({ formModel }) => {
       return {
@@ -214,6 +207,13 @@ export const formSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'registContractName',
+    label: '联系人',
+    component: 'Input',
+    defaultValue: '',
+    colProps: { span: 12 },
+  },
   {
     field: 'registContractEmail',
     label: '联系邮箱',

src/views/operation/paidApply/detail/columns.tsx

@@ -465,7 +465,6 @@ export const formSchema: FormSchema[] = [
     dynamicDisabled: true,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
       allowClear: true,
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD'
@@ -478,7 +477,6 @@ export const formSchema: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
       allowClear: true,
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD'
@@ -491,7 +489,6 @@ export const formSchema: FormSchema[] = [
     dynamicDisabled: false,
     colProps: { span: 4 },
     componentProps: {
-      showTime: true,
       allowClear: true,
       format: 'YYYY-MM-DD',
       valueFormat: 'YYYY-MM-DD'

src/views/operation/seaexport/columns.tsx

@@ -63,17 +63,6 @@ getDictOption('bl_type').then((res) => {
 })
 // 业务来源明细数据
 const sourceDetailId = ref([])
-// 箱型 字段转换 改按需的时候不要动
-// const CtnMapArr: any = []
-// getDictOption('seaexport_ctn_map').then((res) => {
-//   res.forEach((item) => {
-//     CtnMapArr.push({
-//       title: item.value,
-//       dataIndex: `cntr${item.name.split('CTNR')[1]}`,
-//       width: 150,
-//     })
-//   })
-// })
 
 export const searchFormSchema: FormSchema[] = [
   {
@@ -303,6 +292,31 @@ export const searchFormSchema: FormSchema[] = [
       allowClear: true,
     },
   },
+  {
+    label: '约主',
+    field: 'contractClientId',
+    component: 'ApiSelect',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: () => {
+      return {
+        api: GetSupplierListByCode,
+        params: { code: 'contract' },
+        labelField: 'pinYinCode',
+        valueField: 'id',
+        showName: 'shortName',
+        resultField: 'data',
+        immediate: false
+      }
+    },
+  },
+  {
+    field: 'contractNo',
+    label: '约号',
+    component: 'Input',
+    colProps: { span: 4 }
+  },
   {
     label: '场站',
     field: 'yard',

src/views/operation/seaexport/detail/modules/PersonModal.vue

@@ -143,7 +143,7 @@
           customerId: v.forwarderId,
           customerName: v.forwarder
         })
-      } else if (changeType == 'shipper') {
+      } else if (changeType == 'shippercn') {
         setFieldsValue({
           customerName: v.shipperCn,
           customerId: v.shipperCnId

src/views/operation/seaexport/detail/modules/baseInfo.tsx

@@ -3040,9 +3040,9 @@ export const personFormSchema: FormSchema[] = [
                     id: item.id,
                     email: item.email,
                     mobile: item.mobile,
+                    tel: item.tel
                   }
                 })
-                console.log(personList.value)
               })
             }
           }, 50)
@@ -3116,12 +3116,14 @@ export const personFormSchema: FormSchema[] = [
           if (v && obj) {
             formModel.customerContactId = obj.id
             formModel.email = obj.email
+            formModel.tel = obj.tel
             formModel.mobile = obj.mobile
           }
           if (!v && (!obj || obj == {})) {
             formModel.customerContactId = null
             formModel.email = null
             formModel.mobile = null
+            formModel.tel = null
           }
         },
       }