From 969f6e4912ec0535e014a92720daea289acc8c5b Mon Sep 17 00:00:00 2001 From: sunzehua Date: Wed, 31 Jul 2024 17:43:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/File/list.vue | 2 +- src/views/taskmanage/api.ts | 2 +- src/views/taskmanage/columns.tsx | 84 ++++++++++----------- src/views/taskmanage/components/pdf.vue | 12 +-- src/views/taskmanage/index.vue | 59 +++++---------- src/views/taskmanage/taskList/cutModify.vue | 70 ++++++++--------- 6 files changed, 101 insertions(+), 128 deletions(-) diff --git a/src/components/File/list.vue b/src/components/File/list.vue index 39b66718..1ec17982 100644 --- a/src/components/File/list.vue +++ b/src/components/File/list.vue @@ -128,7 +128,7 @@ } // 预览 const previewFile = (item) => { - let fileURL = `http://118.190.144.189:3008/LinkAttach/${item.filePath}` + let fileURL = `http://118.190.144.189:3008//${item.filePath}` window.open(fileURL) } const showIcon = (v) => { diff --git a/src/views/taskmanage/api.ts b/src/views/taskmanage/api.ts index bd9abb94..5817dd4b 100644 --- a/src/views/taskmanage/api.ts +++ b/src/views/taskmanage/api.ts @@ -512,7 +512,7 @@ export function GetVGMMissingInfoByTaskId(parameter) { export function CutDateGetInfoByTaskId(parameter) { return request({ - url: '/TaskManageCutDate/GetInfoByTaskId', + url: '/taskApi/TaskManageCutDateChange/GetInfoByTaskId', method: 'get', params: parameter }) diff --git a/src/views/taskmanage/columns.tsx b/src/views/taskmanage/columns.tsx index 05ce3048..4ac2c67f 100644 --- a/src/views/taskmanage/columns.tsx +++ b/src/views/taskmanage/columns.tsx @@ -86,48 +86,48 @@ export const searchFormSchema: FormSchema[] = [ } }, }, - { - field: 'taskCategory', - label: '任务分类', - component: 'Select', - required: false, - dynamicDisabled: false, - colProps: { span: 4 }, - componentProps: ({ formModel }) => { - return { - options: categoryData.value, - fieldNames: { - label: 'name', - value: 'code' - }, - showSearch: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - } - }, - }, - { - field: 'status', - label: '任务状态', - component: 'Select', - required: false, - dynamicDisabled: false, - colProps: { span: 4 }, - componentProps: ({ formModel }) => { - return { - options: statusData.value, - fieldNames: { - label: 'name', - value: 'code' - }, - showSearch: true, - filterOption: (input: string, option: any) => { - return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 - }, - } - }, - }, + // { + // field: 'taskCategory', + // label: '任务分类', + // component: 'Select', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 4 }, + // componentProps: ({ formModel }) => { + // return { + // options: categoryData.value, + // fieldNames: { + // label: 'name', + // value: 'code' + // }, + // showSearch: true, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // }, + // { + // field: 'status', + // label: '任务状态', + // component: 'Select', + // required: false, + // dynamicDisabled: false, + // colProps: { span: 4 }, + // componentProps: ({ formModel }) => { + // return { + // options: statusData.value, + // fieldNames: { + // label: 'name', + // value: 'code' + // }, + // showSearch: true, + // filterOption: (input: string, option: any) => { + // return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 + // }, + // } + // }, + // }, diff --git a/src/views/taskmanage/components/pdf.vue b/src/views/taskmanage/components/pdf.vue index f4be29af..9c5e8f4e 100644 --- a/src/views/taskmanage/components/pdf.vue +++ b/src/views/taskmanage/components/pdf.vue @@ -71,12 +71,12 @@ function init() { var patt = new RegExp('filename=([^;]+\\.[^\\.;]+);*') var result = patt.exec(contentDisposition) as any console.log(patt,result,contentDisposition,res) - // var filename = result[1] - // var reg = /^["](.*)["]$/g - // pdfName.value = decodeURI(filename.replace(reg, '$1')) - // if (res.data.size > 150) { - // pdfUrl.value = window.URL.createObjectURL(new Blob([res.data], { type: 'application/pdf;charset=utf-8' })) - // } + var filename = result[1] + var reg = /^["](.*)["]$/g + pdfName.value = decodeURI(filename.replace(reg, '$1')) + if (res.data.size > 150) { + pdfUrl.value = window.URL.createObjectURL(new Blob([res.data], { type: 'application/pdf;charset=utf-8' })) + } } pdfLoad.value = false }) diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue index b0f4ab60..f43ec211 100644 --- a/src/views/taskmanage/index.vue +++ b/src/views/taskmanage/index.vue @@ -32,10 +32,11 @@
- {{ item.total }} - {{ - item.name - }} +
+ + {{item.name}} +
+
{{ item.total }}
@@ -206,16 +207,6 @@ onClick: () => { handleEdit(record) }, - }, - { - icon: 'ant-design:delete-outlined', - tooltip: '删除', - popConfirm: { - title: '是否要删除？', - okText: '是', - cancelText: '否', - confirm: handleDelete.bind(null, record), - }, } ]" /> @@ -454,27 +445,7 @@ function selectTreeLevel(list, key, topKey) { }) return arr } -const startData = [ - { tasK_BASE_TYPE: 'VGM_COMPARE', tasK_TITLE: 'VGM_COMPARE' }, - { tasK_BASE_TYPE: 'SI_FEEDBACK', tasK_TITLE: 'SI_FEEDBACK' }, - { tasK_BASE_TYPE: 'ORIGINAL_LOST', tasK_TITLE: 'ORIGINAL_LOST' }, - { tasK_BASE_TYPE: 'ABORT_CHANGE_SHIP', tasK_TITLE: 'ABORT_CHANGE_SHIP' }, - { tasK_BASE_TYPE: 'CHANGE_SHIP', tasK_TITLE: 'CHANGE_SHIP' }, - { tasK_BASE_TYPE: 'PER_BILL', tasK_TITLE: 'PER_BILL' }, - { tasK_BASE_TYPE: 'INVOICE_BILL_MAIL', tasK_TITLE: 'INVOICE_BILL_MAIL' }, - { tasK_BASE_TYPE: 'TRNAS_PLAN_HAS_CHANGE', tasK_TITLE: 'TRNAS_PLAN_HAS_CHANGE' }, - { tasK_BASE_TYPE: 'POD_DISCHARGE_FULL', tasK_TITLE: 'POD_DISCHARGE_FULL' }, - { tasK_BASE_TYPE: 'CUT_MODIFY', tasK_TITLE: 'CUT_MODIFY' }, - { tasK_BASE_TYPE: 'VGM_MISSING', tasK_TITLE: 'VGM_MISSING' }, - { tasK_BASE_TYPE: 'CAUTION_NOTICE', tasK_TITLE: 'CAUTION_NOTICE' }, - { tasK_BASE_TYPE: 'VGM_FEEDBACK', tasK_TITLE: 'VGM_FEEDBACK' }, - { tasK_BASE_TYPE: 'ROLLING_NOMINATION', tasK_TITLE: 'ROLLING_NOMINATION' }, - { tasK_BASE_TYPE: 'CANCELLATION', tasK_TITLE: 'CANCELLATION' }, - { tasK_BASE_TYPE: 'BC_MODIFY', tasK_TITLE: 'BC_MODIFY' }, - { tasK_BASE_TYPE: 'BC', tasK_TITLE: 'BC' }, - { tasK_BASE_TYPE: 'DRAFT', tasK_TITLE: 'DRAFT' }, - { tasK_BASE_TYPE: 'TRUCK_DISPATCH', tasK_TITLE: 'TRUCK_DISPATCH' }, -] + const columns = [ { dataIndex: 'tasK_TYPE_NAME', width: 100, title: '任务类型' }, { dataIndex: 'tasK_TITLE', width: 200, title: '任务标题' }, @@ -515,9 +486,6 @@ const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }] if (item.FieldName === 'task_TYPE') { item.ConditionalType = 0 } - if (item.FieldName === 'status') { - item.ConditionalType = 0 - } if (item.FieldName === 'taskRecvName') { item.ConditionalType = 0 } @@ -1207,9 +1175,16 @@ function handleClickTree(row, index) { .box-item { cursor: pointer; margin-bottom: 10px; + display: flex; + justify-content: space-between; + align-items: center; &:hover { - background: rgba(245, 249, 252, 1); + + .box-text { + background: rgba(245, 249, 252, 1); + color: rgba(37, 122, 250, 1); + } } &.active { @@ -1237,8 +1212,12 @@ function handleClickTree(row, index) { } .box-text { + padding: 4px 7px; font-size: 14px; - padding: 2px 7px; + font-weight: 400; + line-height: 14px; + flex:1; + margin-right: 10px; } .bottom-box { diff --git a/src/views/taskmanage/taskList/cutModify.vue b/src/views/taskmanage/taskList/cutModify.vue index c3253601..3367b1e3 100644 --- a/src/views/taskmanage/taskList/cutModify.vue +++ b/src/views/taskmanage/taskList/cutModify.vue @@ -1,18 +1,22 @@ @@ -20,42 +24,41 @@ import { ref, onMounted } from 'vue' import { CutDateGetInfoByTaskId } from '../api' import { useMessage } from '../../../hooks/web/useMessage' -import { BasicTable, useTable, TableAction } from '/@/components/Table' import taskButton from '../components/taskButton.vue' const { createMessage } = useMessage() import { useRoute } from 'vue-router' const route = useRoute() const spinning = ref(false) -const taskData = ref({}) as any +const taskData = ref([]) as any const taskPKId = ref(route.query.taskPKId) onMounted(() => { - + getInfo() }) const columns = [ { dataIndex: 'mblNo', title: '提单号', key: 'mblNo', - width:100, + width: 100, align: 'center' }, { title: '船名/航次', dataIndex: 'vessel', - width:100, + width: 100, key: 'vessel', align: 'center', }, { title: '样单截止时间', dataIndex: 'siCutDateTxt', - width:100, + width: 100, key: 'siCutDateTxt', align: 'center' }, { title: '开港时间', - width:100, + width: 100, dataIndex: 'cyOpenDateTxt', key: 'cyOpenDateTxt', align: 'center' @@ -64,12 +67,11 @@ const columns = [ title: '截港时间', dataIndex: 'cyCutoffTimeTxt', key: 'cyCutoffTimeTxt', - width:100, + width: 100, align: 'center' }, { title: '舱单-入港清单截止时间', - width:100, dataIndex: 'manifestCutDateTxt', key: 'manifestCutDateTxt', align: 'center' @@ -77,14 +79,13 @@ const columns = [ { title: 'MDGF提交截止时间', dataIndex: 'mdgfCutDateTxt', - width:100, key: 'mdgfCutDateTxt', align: 'center' }, { title: 'VGM截止时间', dataIndex: 'vgmCutoffTimeTxt', - width:100, + width: 100, key: 'vgmCutoffTimeTxt', align: 'center' }, @@ -92,12 +93,11 @@ const columns = [ title: '海关放行截止时间', dataIndex: 'closingDateTxt', key: 'closingDateTxt', - width:100, align: 'center' }, { title: '已发通知', - width:100, + width: 100, dataIndex: 'bookingId', key: 'bookingId', align: 'center', @@ -105,24 +105,18 @@ const columns = [ { title: '订舱', dataIndex: 'bookingId1', - width:100, + width: 100, key: 'bookingId1', align: 'center' } ] -const [registerTable, { reload, setLoading, getForm, getSelectRows, setProps }] = useTable({ - api: async (p) => { - const res: API.DataResult = await CutDateGetInfoByTaskId(p) - return new Promise((resolve) => { - resolve({ - data:res.data, total: res.count - }) - taskData.value = res.data[0] - }) - }, - immediate: false, - columns, -}) + +function getInfo() { + CutDateGetInfoByTaskId({ taskPKId: taskPKId.value }).then(res => { + + }) +} + function loadingStart() { spinning.value = true }