diff --git a/src/views/project/approve/FieldPanel.vue b/src/views/project/approve/FieldPanel.vue index e672b15..a79d03e 100644 --- a/src/views/project/approve/FieldPanel.vue +++ b/src/views/project/approve/FieldPanel.vue @@ -2,7 +2,16 @@ <PageWrapper contentBackground> <BasicTable @register="registerTable"> <template #form-custom> custom-slot </template> + <template #bodyCell="{ column, record }"> + <template v-if="column.key === 'picUrl'"> + <img + :width="100" + :height="100" + :src="record?.orderBaseInfo?.smallPicUrl" + @click="handlePreview(record?.orderBaseInfo?.picUrl)" + /> + </template> <template v-if="column.key === 'action'"> <TableAction :actions="[ @@ -72,6 +81,7 @@ import { ROLE } from '../order//type.d'; import { useUserStoreWithOut } from '/@/store/modules/user'; import BaseInfo from './BaseInfo.vue'; + import { createImgPreview } from '/@/components/Preview'; const userStore = useUserStoreWithOut(); @@ -110,6 +120,20 @@ dataIndex: 'createBy', width: 150, }, + { + title: '内部编号', + dataIndex: 'innerNo', + width: 150, + customRender: (column) => { + const { record } = column || {}; + return record?.orderBaseInfo?.innerNo; + }, + }, + { + title: '图片', + dataIndex: 'picUrl', + width: 150, + }, ]; if (props.isApproved) { @@ -249,6 +273,11 @@ msgVisible.value = false; }; + const handlePreview = (url) => { + createImgPreview({ imageList: [url], defaultWidth: 500 }); + return false; + }; + return { handleProfitModal, registerTable, @@ -267,6 +296,7 @@ role, msgVisible, handleMsgModalClose, + handlePreview, }; }, }); diff --git a/src/views/project/approve/ProfitPanel.vue b/src/views/project/approve/ProfitPanel.vue index 5a3f315..678ec1c 100644 --- a/src/views/project/approve/ProfitPanel.vue +++ b/src/views/project/approve/ProfitPanel.vue @@ -3,6 +3,14 @@ <BasicTable @register="registerTable"> <template #form-custom> custom-slot </template> <template #bodyCell="{ column, record }"> + <template v-if="column.key === 'picUrl'"> + <img + :width="100" + :height="100" + :src="record?.orderBaseInfo?.smallPicUrl" + @click="handlePreview(record?.orderBaseInfo?.picUrl)" + /> + </template> <template v-if="column.key === 'action'"> <TableAction :actions="[ @@ -48,6 +56,7 @@ import { ROLE } from '../order//type.d'; import { useUserStoreWithOut } from '/@/store/modules/user'; import BaseInfo from './BaseInfo.vue'; + import { createImgPreview } from '/@/components/Preview'; const userStore = useUserStoreWithOut(); @@ -79,6 +88,20 @@ dataIndex: 'createBy', width: 150, }, + { + title: '内部编号', + dataIndex: 'innerNo', + width: 150, + customRender: (column) => { + const { record } = column || {}; + return record?.orderBaseInfo?.innerNo; + }, + }, + { + title: '图片', + dataIndex: 'picUrl', + width: 150, + }, ]; if (props.isApproved) { @@ -193,6 +216,12 @@ } msgVisible.value = false; }; + + const handlePreview = (url) => { + createImgPreview({ imageList: [url], defaultWidth: 500 }); + return false; + }; + return { handleProfitModal, registerTable, @@ -211,6 +240,7 @@ ROLE, msgVisible, handleMsgModalClose, + handlePreview, }; }, }); diff --git a/src/views/project/approve/ReportPanel.vue b/src/views/project/approve/ReportPanel.vue index d1b18d4..343f964 100644 --- a/src/views/project/approve/ReportPanel.vue +++ b/src/views/project/approve/ReportPanel.vue @@ -3,6 +3,14 @@ <BasicTable @register="registerTable"> <template #form-custom> custom-slot </template> <template #bodyCell="{ column, record }"> + <template v-if="column.key === 'picUrl'"> + <img + :width="100" + :height="100" + :src="record?.orderBaseInfo?.smallPicUrl" + @click="handlePreview(record?.orderBaseInfo?.picUrl)" + /> + </template> <template v-if="column.key === 'action'"> <TableAction :actions="[ @@ -48,6 +56,7 @@ import { ROLE } from '../order//type.d'; import { useUserStoreWithOut } from '/@/store/modules/user'; import BaseInfo from './BaseInfo.vue'; + import { createImgPreview } from '/@/components/Preview'; const userStore = useUserStoreWithOut(); @@ -78,6 +87,20 @@ dataIndex: 'createBy', width: 150, }, + { + title: '内部编号', + dataIndex: 'innerNo', + width: 150, + customRender: (column) => { + const { record } = column || {}; + return record?.orderBaseInfo?.innerNo; + }, + }, + { + title: '图片', + dataIndex: 'picUrl', + width: 150, + }, ]; if (props.isApproved) { @@ -176,6 +199,12 @@ const role = computed(() => { return userStore.getUserInfo?.roleSmallVO?.code; }); + + const handlePreview = (url) => { + createImgPreview({ imageList: [url], defaultWidth: 500 }); + return false; + }; + return { handleProfitModal, registerTable, @@ -194,6 +223,7 @@ ROLE, msgVisible, handleMsgModalClose, + handlePreview, }; }, }); diff --git a/src/views/project/order/FormDetail/index.vue b/src/views/project/order/FormDetail/index.vue index 1f97b1b..02eb41e 100644 --- a/src/views/project/order/FormDetail/index.vue +++ b/src/views/project/order/FormDetail/index.vue @@ -238,7 +238,8 @@ }); //原始的包装费用 - originPackagePrice.value = data.profitAnalysisInfo?.packetPrice; + originPackagePrice.value = + data.profitAnalysisInfo?.packetPrice || packetPrice?.relationValue; const exchangeRate = find(configList.value, (item) => { return item.settingCode === 'exchangeRate'; diff --git a/src/views/project/order/ProfitAnalysis.vue b/src/views/project/order/ProfitAnalysis.vue index b6b73a8..4a4b73a 100644 --- a/src/views/project/order/ProfitAnalysis.vue +++ b/src/views/project/order/ProfitAnalysis.vue @@ -103,12 +103,12 @@ }, { field: 'orderTotalNum', - label: '订单总数', + label: '订单商品数量', render: (val) => val || 0, }, { field: 'recordNum', - label: '记录数', + label: '含有利润分析的订单数', render: (val) => val || 0, }, ];