From c996cc2fa8c3df545746935454e45733f3b62b19 Mon Sep 17 00:00:00 2001 From: lijingjia Date: Wed, 28 Aug 2024 15:22:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=B7=E8=BF=90=E5=87=BA=E5=8F=A3bug?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- .../Form/src/components/InputTextArea.vue | 6 + src/views/baseinfo/ctn/columns.tsx | 21 +- .../operation/seaexport/detail/index.vue | 2 +- .../seaexport/detail/modules/baseInfo.tsx | 15 +- .../seaexport/detail/modules/cargoInfo.vue | 14 +- .../seaexport/detail/modules/mailingInfo.vue | 8 +- .../detail/modules/operationArea.vue | 3 +- .../seaexport/detail/modules/otherInfo.vue | 1 + yarn.lock | 19116 ++++++++-------- 10 files changed, 9684 insertions(+), 9506 deletions(-) diff --git a/package.json b/package.json index 4bd8452e..41707102 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "dependencies": { "@ant-design/colors": "^6.0.0", "@ant-design/icons-vue": "^6.1.0", - "@handsontable/vue3": "^14.3.0", + "@handsontable/vue3": "^14.5.0", "@iconify/iconify": "^2.2.1", "@logicflow/core": "^1.1.13", "@logicflow/extension": "^1.1.13", @@ -54,7 +54,7 @@ "echarts": "^5.3.2", "element-plus": "^2.3.12", "exceljs": "^4.3.0", - "handsontable": "^14.3.0", + "handsontable": "^14.5.0", "intro.js": "^5.1.0", "lodash-es": "^4.17.21", "mitt": "^3.0.1", diff --git a/src/components/Form/src/components/InputTextArea.vue b/src/components/Form/src/components/InputTextArea.vue index 8a954009..6fc06534 100644 --- a/src/components/Form/src/components/InputTextArea.vue +++ b/src/components/Form/src/components/InputTextArea.vue @@ -133,10 +133,16 @@ tmp = tmp.replace(/\t/gi, ' ') return tmp } + + const removeTrailingSpaces = (text) => { + return text.replace(/ \s*$/gm, '') + } // 转换大写 const textareaBlur = () => { if (cutList.length == 0 || !state.value) return state.value = ToCDB(state.value).toUpperCase() + // 清除每行最后的空格 + state.value = removeTrailingSpaces(state.value) } watch( () => state.value, diff --git a/src/views/baseinfo/ctn/columns.tsx b/src/views/baseinfo/ctn/columns.tsx index 4d994861..f29a8543 100644 --- a/src/views/baseinfo/ctn/columns.tsx +++ b/src/views/baseinfo/ctn/columns.tsx @@ -157,14 +157,12 @@ export const formSchema: FormSchema[] = [ field: 'teu', label: 'TEU', component: 'Input', - colProps: { span: 12 }, }, { field: 'cnExplain', label: '中文说明', component: 'InputTextArea', - colProps: { span: 12 }, componentProps: { rows: 2, @@ -174,20 +172,16 @@ export const formSchema: FormSchema[] = [ field: 'enExplain', label: '英文说明', component: 'InputTextArea', - colProps: { span: 12 }, componentProps: { rows: 2, }, }, { - field: 'note', - label: '备注', - component: 'InputTextArea', + field: 'orderNo', + label: '序号', + component: 'Input', colProps: { span: 12 }, - componentProps: { - rows: 2, - }, }, { field: 'status', @@ -202,4 +196,13 @@ export const formSchema: FormSchema[] = [ ], }, }, + { + field: 'note', + label: '备注', + component: 'InputTextArea', + colProps: { span: 24 }, + componentProps: { + rows: 2, + }, + }, ] diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index f5471aab..f6002b49 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -59,7 +59,7 @@
- +
{ return { api: GetShippingBillTemplateSelectList, - params: { type: 2 }, + params: { type: 2, id: formModel.wtdwId }, labelField: 'templateName', valueField: 'templateName', immediate: false, @@ -477,7 +483,7 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ componentProps: ({ formModel }) => { return { api: GetShippingBillTemplateSelectList, - params: { type: 1 }, + params: { type: 1, id: formModel.wtdwId }, labelField: 'templateName', valueField: 'templateName', resultField: 'data', @@ -518,11 +524,12 @@ export const mailingInfoFormSchemaL: FormSchema[] = [ componentProps: ({ formModel }) => { return { api: GetShippingBillTemplateSelectList, - params: { type: 3 }, + params: { type: 3, id: formModel.wtdwId }, labelField: 'templateName', valueField: 'templateName', resultField: 'data', immediate: false, + alwaysLoad: false, filterOption: (input: string, option: any) => { return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 }, @@ -2230,7 +2237,7 @@ export const otherInfoFormSchema: FormSchema[] = [ colProps: { span: 12 }, componentProps: ({ formModel }) => { return { - api: GetSaleList, + api: GetCustomerServiceList, labelField: 'pinYinCode', valueField: 'userName', showName: 'userName', diff --git a/src/views/operation/seaexport/detail/modules/cargoInfo.vue b/src/views/operation/seaexport/detail/modules/cargoInfo.vue index ef3d3820..9e05b96a 100644 --- a/src/views/operation/seaexport/detail/modules/cargoInfo.vue +++ b/src/views/operation/seaexport/detail/modules/cargoInfo.vue @@ -73,7 +73,7 @@
- + @@ -81,7 +81,7 @@ - +