From 676078300d56bdeb4c56649d6a1f6050cba79219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Tue, 5 Nov 2024 10:12:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Lowflow/penal/ApprovalAttr.vue | 20 ++-- .../TenantAuditStepModal.vue | 15 +++ .../baseinfo/clientflowtemplate/columns.tsx | 102 +++++++++++++----- 3 files changed, 103 insertions(+), 34 deletions(-) diff --git a/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue b/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue index eeedd0a0..a3f1dbe9 100644 --- a/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue +++ b/src/views/baseinfo/clientflowtemplate/Lowflow/penal/ApprovalAttr.vue @@ -149,13 +149,13 @@ }) } }) - const AuditTypeList = ref([]) - GetTaskTypeConstList().then((res) => { - AuditTypeList.value.splice(0) - res.data.forEach((item) => { - AuditTypeList.value.push(item) - }) - }) + // const AuditTypeList = ref([]) + // GetTaskTypeConstList().then((res) => { + // AuditTypeList.value.splice(0) + // res.data.forEach((item) => { + // AuditTypeList.value.push(item) + // }) + // }) watch( () => node.users, (newVal, oldVal) => { @@ -244,12 +244,12 @@ 或签（其中一名审批人通过或驳回即可） - + + 选择文件 -

请先保存,再进行文件上传。

@@ -215,33 +222,38 @@ newFileList.splice(index, 1) upFileList.value = newFileList } - function ChangeUpload(e) { - const postData = new FormData() - const list = unref(upFileList) - list.forEach((item) => { - postData.append('formCollection[]', item) - }) - postData.append('linkId', props.id) - postData.append('typeCode', formData.typeCode) - postData.append('typeName', formData.typeName) - loading.value = true - AddMultiFiles(postData) - .then((res) => { - loading.value = false - visible.value = false - upFileList.value = [] - if (props.showFileList) { - dsFileList.value.init() - emits('handleSuccess', { id: res.data }) - } else { - emits('handleSuccess') - } - createMessage.success('上传成功！') - }) - .catch((res) => { - loading.value = false - createMessage.error('上传失败！') - }) + async function ChangeUpload() { + let FnUp = (id) => { + console.log('FnUp', 1111111111) + const postData = new FormData() + const list = unref(upFileList) + // list.forEach((item) => { + // postData.append('formCollection[]', item) + // }) + postData.append('formCollection', list[list.length - 1]) + postData.append('linkId', id) + postData.append('typeCode', formData.typeCode) + postData.append('typeName', formData.typeName) + loading.value = true + AddMultiFiles(postData) + .then((res) => { + loading.value = false + visible.value = false + upFileList.value = [] + if (props.showFileList) { + dsFileList.value.init() + emits('handleSuccess', { id: res.data }) + } else { + emits('handleSuccess') + } + createMessage.success('上传成功！') + }) + .catch((res) => { + loading.value = false + createMessage.error('上传失败！') + }) + } + emits('FnUpload', FnUp) } function beforeUpload(file) { // 判断文件大小 @@ -282,7 +294,7 @@ // 附件列表组件 const dsFileList = ref(null) - const emits = defineEmits(['handleSuccess', 'FnTriggerSave']) + const emits = defineEmits(['handleSuccess', 'FnTriggerSave', 'FnUpload']) // 提交上传 const handleOk = async () => { const res = await fileForm.value.validateFields() diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue index f5f0847c..6edd13f4 100644 --- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue @@ -64,6 +64,7 @@ :succinct="true" :id="rowId" @FnTriggerSave="FnTriggerSave" + @FnUpload="FnUpload" @handleSuccess="handleSuccess" :SetSelect="{ show: true, @@ -234,6 +235,12 @@ } const dsFile = ref() + async function FnUpload(FnUp) { + if (!rowId.value) { + await handleSave(false) + } + FnUp(rowId.value) + } async function FnTriggerSave() { await handleSave(false) if (rowId.value) { From 0c0a275e0d1dfb0512fe4380508642274e099b46 Mon Sep 17 00:00:00 2001 From: yujinlong Date: Tue, 5 Nov 2024 16:06:45 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix=EF=BC=9A=E8=B4=A2=E7=A8=8E=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E6=8A=A5=E9=94=80=E5=8D=95=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expenseAccount/detail/components/SearchTable.vue | 2 +- src/views/financialTax/expenseAccount/detail/index.vue | 7 +++++-- src/views/financialTax/expenseAccount/index.vue | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue index 32c80678..c0fed4bd 100644 --- a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue +++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue @@ -139,7 +139,7 @@ const calcSelectedAmount = computed(() => { let totalAmount = 0 totalAmount = [...props.hasSelectedRows, ...getSelectRows()].reduce((pre, cur) => { - return plus(pre + Number(cur?.totalAmount || 0)) + return plus(pre + Number(cur?.totalWithTax || 0)) }, 0) return numberThousandFormat(totalAmount) }) diff --git a/src/views/financialTax/expenseAccount/detail/index.vue b/src/views/financialTax/expenseAccount/detail/index.vue index f269369c..ed1a1fad 100644 --- a/src/views/financialTax/expenseAccount/detail/index.vue +++ b/src/views/financialTax/expenseAccount/detail/index.vue @@ -154,7 +154,7 @@ const calcSumAmount = computed(() => { return billTableData.value?.reduce((acc, cur) => { - return plus(acc, cur?.amount || 0) + return plus(acc, cur?.totalWithTax || 0) }, 0) }) @@ -218,9 +218,12 @@ // 获取额外Query参数 const getActionExtraQuery = (index) => { const obj = appStore.getIdsData + console.log('expenseAccount', obj['expenseAccount']) + console.log('index', index) + if (obj && obj['expenseAccount']) { const preData = obj['expenseAccount'][index] - const pageType = [0, 2, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW' + const pageType = [0, 4].includes(preData.reimbursementType) ? 'EDIT' : 'VIEW' return { type: pageType, diff --git a/src/views/financialTax/expenseAccount/index.vue b/src/views/financialTax/expenseAccount/index.vue index 0ccae8cb..bf96eb46 100644 --- a/src/views/financialTax/expenseAccount/index.vue +++ b/src/views/financialTax/expenseAccount/index.vue @@ -119,7 +119,7 @@ } const getActionOptList = (record: BillItem): ActionItem[] => { - const canEditable = [0, 2, 4].includes(record.reimbursementType) + const canEditable = [0, 4].includes(record.reimbursementType) return [ { customIcon: h('i', { @@ -173,7 +173,7 @@ }) } function GoDetailed(row: BillItem) { - const pageType = [0, 2, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW' + const pageType = [0, 4].includes(row.reimbursementType) ? 'EDIT' : 'VIEW' go({ path: '/expenseAccountDetail', query: { From 03c952b1e0f189adeb40ab43f2880c628d19f9df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Tue, 5 Nov 2024 16:27:44 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E7=AE=80=E5=8C=96=20?= =?UTF-8?q?=E8=AF=86=E5=88=ABexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/File/index.vue | 1 - .../BuyCtn/TenantAuditStepModal.vue | 44 +++++++++++++++++-- .../RentIn/TenantAuditStepModal.vue | 34 ++++++++++++-- .../RentOneWay/TenantAuditStepModal.vue | 34 ++++++++++++-- .../RentOneWayIn/TenantAuditStepModal.vue | 34 ++++++++++++-- .../RentOut/TenantAuditStepModal.vue | 34 ++++++++++++-- .../SellCtn/TenantAuditStepModal.vue | 34 ++++++++++++-- 7 files changed, 196 insertions(+), 19 deletions(-) diff --git a/src/components/File/index.vue b/src/components/File/index.vue index 097e1ea1..c3371c1d 100644 --- a/src/components/File/index.vue +++ b/src/components/File/index.vue @@ -224,7 +224,6 @@ } async function ChangeUpload() { let FnUp = (id) => { - console.log('FnUp', 1111111111) const postData = new FormData() const list = unref(upFileList) // list.forEach((item) => { diff --git a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue index e2847185..02f55067 100644 --- a/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/BuyCtn/TenantAuditStepModal.vue @@ -86,12 +86,26 @@ --> + { + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false, false) @@ -374,9 +410,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) diff --git a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue index a5851984..f963e9fa 100644 --- a/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentIn/TenantAuditStepModal.vue @@ -91,9 +91,13 @@ { + if (res.succeeded) { + activeKey.value = '1' + refresh(true) + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false, false) @@ -436,9 +462,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue index 4bf1d52a..9157571a 100644 --- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue @@ -90,9 +90,13 @@ { + if (res.succeeded) { + activeKey.value = '1' + refresh(true) + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false) @@ -374,9 +400,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) diff --git a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue index c14f56f1..07355bbd 100644 --- a/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOneWayIn/TenantAuditStepModal.vue @@ -55,9 +55,13 @@ { + if (res.succeeded) { + activeKey.value = '1' + refresh(true) + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false) @@ -319,9 +345,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue index a6ffabd5..30228b66 100644 --- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue @@ -92,9 +92,13 @@ { + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false, false) @@ -448,9 +474,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue index c9846b48..098b9480 100644 --- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue +++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue @@ -90,9 +90,13 @@ { + if (res.succeeded) { + activeKey.value = '1' + refresh(true) + notification.success({ message: res.message, duration: 3 }) + } + }) + } async function DealExcel() { if (!rowId.value) { await handleSave(false, false) @@ -424,9 +450,11 @@ fileId: dsFile.value.dsFileList.SelectId, } ApiDealExcel(ApiData).then((res) => { - activeKey.value = '1' - refresh() - notification.success({ message: res.message, duration: 3 }) + if (res.succeeded) { + activeKey.value = '1' + refresh() + notification.success({ message: res.message, duration: 3 }) + } }) } else { notification.warning({ message: '请先在电子文档中勾选一个文件。', duration: 3 }) From 48d62f13e7892a3c2a3d9faf316eaa7115f3b3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <14166000+zhangtonghai@user.noreply.gitee.com> Date: Tue, 5 Nov 2024 17:53:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=BA=E6=9E=84=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=20=E8=8B=B1=E6=96=87=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E8=8B=B1=E6=96=87=E6=88=B7=E5=A4=B4?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E8=8B=B1=E6=96=87=E9=93=B6=E8=A1=8C?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/org/columns.tsx | 48 +++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/src/views/system/org/columns.tsx b/src/views/system/org/columns.tsx index b5124cb0..3ccdb32d 100644 --- a/src/views/system/org/columns.tsx +++ b/src/views/system/org/columns.tsx @@ -491,8 +491,8 @@ export const BankColumns: BasicColumn[] = [ align: 'left', }, { - title: '银行名称2', - dataIndex: 'bankName2', + title: '英文银行名称', + dataIndex: 'bankEnName', width: 230, align: 'left', }, @@ -508,6 +508,12 @@ export const BankColumns: BasicColumn[] = [ width: 230, align: 'left', }, + { + title: '英文银行地址', + dataIndex: 'bankEnAddress', + width: 230, + align: 'left', + }, { title: 'ABA代码', dataIndex: 'aba', @@ -520,6 +526,12 @@ export const BankColumns: BasicColumn[] = [ width: 230, align: 'left', }, + { + title: '英文户头名称', + dataIndex: 'accountEnName', + width: 230, + align: 'left', + }, { title: '科目代码', dataIndex: 'subjectCode', @@ -629,6 +641,15 @@ export const BankformSchema: FormSchema[] = [ span: 12, }, }, + { + label: '英文银行名称', + field: 'bankEnName', + component: 'Input', + defaultValue: '', + colProps: { + span: 12, + }, + }, { label: '银行账户', field: 'bankAccountNo', @@ -638,6 +659,16 @@ export const BankformSchema: FormSchema[] = [ span: 12, }, }, + + { + label: 'ABA代码', + field: 'aba', + component: 'Input', + defaultValue: '', + colProps: { + span: 12, + }, + }, { label: '银行地址', field: 'bankAddress', @@ -648,8 +679,8 @@ export const BankformSchema: FormSchema[] = [ }, }, { - label: 'ABA代码', - field: 'aba', + label: '英文银行地址', + field: 'bankEnAddress', component: 'Input', defaultValue: '', colProps: { @@ -665,6 +696,15 @@ export const BankformSchema: FormSchema[] = [ span: 12, }, }, + { + label: '英文户头名称', + field: 'accountEnName', + component: 'Input', + defaultValue: '', + colProps: { + span: 12, + }, + }, { label: '科目代码', field: 'subjectCode', From 2e42974af1edef74c9bd01453827be783aed462e Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 5 Nov 2024 18:10:26 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=8F=91=E7=A5=A8+=E4=BB=BB=E5=8A=A1+?= =?UTF-8?q?=E8=88=B1=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/views/bookingcabin/CabinManagement/api.ts | 8 + .../CabinManagement/detail/index.vue | 8 +- src/views/operation/bill/columns.tsx | 50 +- src/views/operation/bill/index.vue | 1402 +++++++++-------- src/views/taskmanage/index.vue | 19 +- 6 files changed, 773 insertions(+), 716 deletions(-) diff --git a/.env.development b/.env.development index cfb9b86b..5298f821 100644 --- a/.env.development +++ b/.env.development @@ -13,7 +13,7 @@ VITE_PUBLIC_PATH = / # Cross-domain proxy, you can configure multiple # Please note that no line breaks # VITE_PROXY = [["/basic-api","http://60.209.125.238"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 +VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 # Delete console VITE_DROP_CONSOLE = false diff --git a/src/views/bookingcabin/CabinManagement/api.ts b/src/views/bookingcabin/CabinManagement/api.ts index 14893db8..85bacd42 100644 --- a/src/views/bookingcabin/CabinManagement/api.ts +++ b/src/views/bookingcabin/CabinManagement/api.ts @@ -188,4 +188,12 @@ export function SaveRolling(parameter) { method: 'post', data: parameter }) +} + +export function GetRollingList(parameter) { + return request({ + url: '/opApi/BookingSlotService/GetRollingList', + method: 'get', + params: parameter + }) } \ No newline at end of file diff --git a/src/views/bookingcabin/CabinManagement/detail/index.vue b/src/views/bookingcabin/CabinManagement/detail/index.vue index 6e211037..38470e9b 100644 --- a/src/views/bookingcabin/CabinManagement/detail/index.vue +++ b/src/views/bookingcabin/CabinManagement/detail/index.vue @@ -294,7 +294,7 @@ import { GetCtnSelectList, GetClientListByCode } from '/@/api/common' import DsFile from '/@/components/File/index.vue' import { ref, nextTick, onMounted, watch } from 'vue' import { - BookingSlotSave, BookingSlotDetail, SaveRolling + BookingSlotSave, BookingSlotDetail, SaveRolling,GetRollingList } from '../api' import { GetCustomerServiceList, GetSaleList, GetVouchingClerkList @@ -740,6 +740,11 @@ function getDetail() { } loading.value = false }) + GetRollingList({ slotId: id.value }).then(res=>{ + if(res.succeeded){ + setTableData(res.data) + } + }) } const rollLoad = ref(false) function handleSaveRoll(){ @@ -932,6 +937,7 @@ function handleClick(item) { item.ctnNum = 1 }) } + // 比较对象 function compareObjects(oldObj, newObj) { const differences = {}; diff --git a/src/views/operation/bill/columns.tsx b/src/views/operation/bill/columns.tsx index fd04ba4f..1f3a1fca 100644 --- a/src/views/operation/bill/columns.tsx +++ b/src/views/operation/bill/columns.tsx @@ -215,6 +215,12 @@ export const columns: BasicColumn[] = [ width: 100, align: 'left', }, + { + title: '分单号', + dataIndex: 'hblNo', + width: 100, + align: 'left', + }, { title: '提单签发状态', dataIndex: 'statusName', @@ -222,11 +228,29 @@ export const columns: BasicColumn[] = [ align: 'left', }, { - title: '签单方式', + title: '提单类型', dataIndex: 'blTypeName', width: 100, align: 'left', }, + { + title: '业务类型', + dataIndex: 'busiTypeName', + width: 100, + align: 'left', + }, + { + title: '签单方式', + dataIndex: 'issueType', + width: 100, + align: 'left', + }, + { + title: '主单分单', + dataIndex: 'masterHBillName', + width: 100, + align: 'left', + }, { title: '最近操作人', dataIndex: 'updateUserName', @@ -247,7 +271,7 @@ export const columns: BasicColumn[] = [ }, { title: '结算方式', - dataIndex: 'createByName', + dataIndex: 'stlName', width: 100, align: 'left', }, @@ -299,12 +323,6 @@ export const columns: BasicColumn[] = [ width: 100, align: 'left', }, - { - title: '业务类型', - dataIndex: 'busiTypeName', - width: 100, - align: 'left', - }, { title: '起运港', dataIndex: 'loadPort', @@ -397,31 +415,31 @@ export const detailColumns: BasicColumn[] = [ { title: '操作人', dataIndex: 'createUserName', - width: 100, + width: 80, align: 'left', }, { title: '操作时间', dataIndex: 'createTime', - width: 120, + width: 130, align: 'left', }, { title: '动作', dataIndex: 'actionName', - width: 100, + width: 80, align: 'left', }, { title: '结果', dataIndex: 'result', - width: 50, + width: 45, align: 'left', }, { title: '备注', dataIndex: 'note', - width: 100, + width: 90, align: 'left', }, ] @@ -435,17 +453,17 @@ export const feeColumns: BasicColumn[] = [ { title: 'RMB应收欠费(超期)', dataIndex: 'noPayAmountCNY', - width: 140, + width: 130, }, { title: 'USD应收欠费(超期)', dataIndex: 'noPayAmountUSD', - width: 140, + width: 130, }, { title: '合计应收欠费(超期)', dataIndex: 'noPayAmountTotal', - width: 140, + width: 130, }, diff --git a/src/views/operation/bill/index.vue b/src/views/operation/bill/index.vue index a84d805a..f602cc0f 100644 --- a/src/views/operation/bill/index.vue +++ b/src/views/operation/bill/index.vue @@ -1,779 +1,791 @@ - diff --git a/src/views/taskmanage/index.vue b/src/views/taskmanage/index.vue index 10761fb8..844f3693 100644 --- a/src/views/taskmanage/index.vue +++ b/src/views/taskmanage/index.vue @@ -1636,8 +1636,21 @@ function handleClickTree(row, index) { item.active = false }) taskType.value = '' - console.log(arr1) - setColumns(arr1) + const arr = [] as any + columsAll.value.forEach((item) => { + if (item.taskTypeCode === 'BASIC') { + JSON.parse(item.content).forEach((item) => { + if (item.checked) { + arr.push(item) + } + }) + } + }) + if (arr.length == 0) { + setColumns(columns) + } else { + setColumns(arr) + } } reload() @@ -1987,7 +2000,7 @@ function handleClickTree(row, index) { width: 15px; } -:deep(.ant-table-tbody .ant-table-row td){ +:deep(.ant-table-tbody .ant-table-row td) { border-right: 1px solid #f0f0f0 !important; text-align: center; } From 99c8af5a42ef8aecd758e2dfe57accc43f2e9090 Mon Sep 17 00:00:00 2001 From: sunzehua Date: Tue, 5 Nov 2024 18:12:03 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E5=8F=91=E7=A5=A8+=E4=BB=BB=E5=8A=A1+?= =?UTF-8?q?=E8=88=B1=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 5298f821..cfb9b86b 100644 --- a/.env.development +++ b/.env.development @@ -13,7 +13,7 @@ VITE_PUBLIC_PATH = / # Cross-domain proxy, you can configure multiple # Please note that no line breaks # VITE_PROXY = [["/basic-api","http://60.209.125.238"],["/upload","http://localhost:3300/upload"]] -VITE_PROXY=[["/api","http://60.209.125.238:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 +VITE_PROXY=[["/api","http://118.190.144.189:3008"],["/stage-api","https://www.666cxf.com/stage-api"]] # 开发 测试环境 # Delete console VITE_DROP_CONSOLE = false