From 6abbaf0ef836f85c76527e395d0c49a542b2ed4a Mon Sep 17 00:00:00 2001 From: sunzehua Date: Fri, 2 Aug 2024 19:00:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=BC=E5=BC=8F=E5=8D=95?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/lstDraftCompareRlt/api.ts | 44 + src/components/lstDraftCompareRlt/index.vue | 581 ++++++++++++ src/views/operation/seaexport/columns.tsx | 10 + src/views/operation/seaexport/index.vue | 837 ++++++++++-------- src/views/system/user/columns.tsx | 5 - .../taskmanage/components/taskButton.vue | 13 +- src/views/taskmanage/index.vue | 4 +- src/views/taskmanage/taskList/Amendment.vue | 14 +- src/views/taskmanage/taskList/BcEditing.vue | 16 +- .../taskmanage/taskList/Cancellation.vue | 15 +- 10 files changed, 1132 insertions(+), 407 deletions(-) create mode 100644 src/components/lstDraftCompareRlt/api.ts create mode 100644 src/components/lstDraftCompareRlt/index.vue diff --git a/src/components/lstDraftCompareRlt/api.ts b/src/components/lstDraftCompareRlt/api.ts new file mode 100644 index 00000000..61708040 --- /dev/null +++ b/src/components/lstDraftCompareRlt/api.ts @@ -0,0 +1,44 @@ +import { request } from '/@/utils/request' +import { DataResult, PageRequest } from '/@/api/model/baseModel' + + +export function GetShippingOrderCompareResult(data) { + return request({ + url: '/taskApi/TaskShippingOrderCompare/GetShippingOrderCompareResult', + method: 'get', + params: data, + }) +} + +export function GetDraftCompareResultInfo(data) { + return request({ + url: '/taskApi/TaskDraftCompare/GetDraftCompareResultInfo', + method: 'post', + data: data, + }) +} + +export function DownloadFileByBC(parameter) { + return request({ + url: '/taskApi/TaskManage/DownloadFile', + method: 'get', + params: parameter, + responseType: 'blob' + }) +} + +export function SaveDraftComparellanual(parameter) { + return request({ + url: '/taskApi/TaskDraftCompare/SaveDraftCompareManual', + method: 'post', + data: parameter + }) +} + +export function ExcuteShippingOrderCompareBatch(parameter) { + return request({ + url: '/taskApi/TaskShippingOrderCompare/ExcuteShippingOrderCompareBatch', + method: 'post', + data: parameter + }) +} \ No newline at end of file diff --git a/src/components/lstDraftCompareRlt/index.vue b/src/components/lstDraftCompareRlt/index.vue new file mode 100644 index 00000000..c3543eed --- /dev/null +++ b/src/components/lstDraftCompareRlt/index.vue @@ -0,0 +1,581 @@ + + + \ No newline at end of file diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index f6ddfdae..bcdb0cd4 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/src/views/operation/seaexport/columns.tsx @@ -346,6 +346,16 @@ export const FeeStatus = [ ] //列表 export const columns: BasicColumn[] = [ + { + dataIndex: 'lstDraftCompareRlt', + title: '格式单比对', + width: 120, + }, + { + dataIndex: 'lstShipOrderCompareRlt', + title: '下货纸比对', + width: 120, + }, { dataIndex: 'customerNo', title: '委托编号', diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue index c1f7dfaf..d0afa7bf 100644 --- a/src/views/operation/seaexport/index.vue +++ b/src/views/operation/seaexport/index.vue @@ -88,60 +88,106 @@ + + + +
合计
- +
- +
- + @@ -168,12 +214,9 @@

{{ TaskShippingOrderCompareData.mBlNo }}

-
+

{{ item.fieldName }}:

{{ item.reqVal }}

{{ item.fieldName }}:

@@ -191,16 +234,11 @@

箱信息：（场站数据）

-
+

{{ item.fieldName }}:

{{ item.reqVal }}

{{ item.fieldName }}:

@@ -210,351 +248,384 @@
+ diff --git a/src/views/system/user/columns.tsx b/src/views/system/user/columns.tsx index 3caff341..a6e8204d 100644 --- a/src/views/system/user/columns.tsx +++ b/src/views/system/user/columns.tsx @@ -425,10 +425,6 @@ export const formSchema: FormSchema[] = [ componentProps: { mode: 'multiple', api: getRoleList, -<<<<<<< HEAD - resultField: 'data', - }, -======= resultField: 'data' } }, @@ -438,7 +434,6 @@ export const formSchema: FormSchema[] = [ slot: 'signatureUrl', component: 'Input', colProps: { span: 24 } ->>>>>>> 49017ea2aced552bb6eb77d9b4eb5b6a5c6d08b9 }, ] diff --git a/src/views/taskmanage/components/taskButton.vue b/src/views/taskmanage/components/taskButton.vue index 5817ad45..c0bca436 100644 --- a/src/views/taskmanage/components/taskButton.vue +++ b/src/views/taskmanage/components/taskButton.vue @@ -32,9 +32,9 @@
接收人
- - + {{ item.label }} @@ -64,6 +64,9 @@ const userLoad = ref(false) const UserVisible = ref(false); const UserList = ref([]) as any const UserId = ref([]) as any //转移任务的用户id +const filterOption = (input: string, option: any) => { + return option.key.toLowerCase().indexOf(input.toLowerCase()) >= 0; +}; const emit = defineEmits(['loadingStart', 'loadingStop']) function OpenUser() { UserVisible.value = true @@ -95,11 +98,7 @@ function UserhandleOk() { }) } -function filterOption(input, option) { - return ( - option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0 - ); -} + // 完成任务 function FnCompleteTask() { const ApiData = [props.id] diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue index daba744b..6dc093cd 100644 --- a/src/views/taskmanage/index.vue +++ b/src/views/taskmanage/index.vue @@ -251,11 +251,11 @@ import { ref, onMounted, watch,onActivated } from 'vue' import { formatParams } from '/@/hooks/web/common' import { searchFormSchema } from './columns' -import { useOptionsStore } from '/@/store/modules/options' -const optionsStore = useOptionsStore() import { BasicTable, useTable, TableAction } from '/@/components/Table' import { useMessage } from '../../hooks/web/useMessage' import { useRoute, useRouter } from 'vue-router'; +import { useOptionsStore } from '/@/store/modules/options' +const optionsStore = useOptionsStore() const { createMessage } = useMessage() const route = useRoute(); const router = useRouter(); diff --git a/src/views/taskmanage/taskList/Amendment.vue b/src/views/taskmanage/taskList/Amendment.vue index 5eb8b688..1209da2f 100644 --- a/src/views/taskmanage/taskList/Amendment.vue +++ b/src/views/taskmanage/taskList/Amendment.vue @@ -4,10 +4,18 @@ - + - - + + + + + + + + + + diff --git a/src/views/taskmanage/taskList/BcEditing.vue b/src/views/taskmanage/taskList/BcEditing.vue index fb1b148d..b5826b31 100644 --- a/src/views/taskmanage/taskList/BcEditing.vue +++ b/src/views/taskmanage/taskList/BcEditing.vue @@ -4,10 +4,18 @@ - - - + + + + + + + + + + + + diff --git a/src/views/taskmanage/taskList/Cancellation.vue b/src/views/taskmanage/taskList/Cancellation.vue index c23a5ffd..06765925 100644 --- a/src/views/taskmanage/taskList/Cancellation.vue +++ b/src/views/taskmanage/taskList/Cancellation.vue @@ -4,9 +4,18 @@ - - - + + + + + + + + + + + +