fix: 更改数值显示逻辑

sanmu
1 parent 1b499e8a
Showing 4 changed files with 44 additions and 12 deletions
src/views/project/order/FormDetail/index.vue
src/views/project/order/ProfitAnalysis.vue
src/views/project/order/tableData.tsx
vite.config.ts
@@ -216,19 +216,37 @@
               });
               // 利润分析
               profitFormPanelRef.value.fields = { ...data.lockFields?.profitAnalysisFields } || {};
+              // if (data?.orderUpdateInfoVO?.profitAnalysisFields) {
+              //   // 编辑了但是还没审核，先将页面的值变化
+              //   profitFormPanelRef?.value?.setFieldsValue({
+              //     ...toRaw(data?.orderUpdateInfoVO?.profitAnalysisFields),
+              //     packetPrice: packetPrice?.relationValue || 0,
+              //     exchangeRate: exchangeRate?.settingValue,
+              //   });
+              // } else {
               profitFormPanelRef?.value?.setFieldsValue({
                 ...toRaw(data.profitAnalysisInfo),
                 packetPrice: packetPrice?.relationValue || 0,
                 exchangeRate: exchangeRate?.settingValue,
               });
+              // }
+              profitFormPanelRef?.value?.clearValidate();
             }
             if (reportFormPanelRef.value) {
               // 项目报告书
               reportFormPanelRef.value.fields = { ...data.lockFields?.reportFields } || {};
+              // if (data?.orderUpdateInfoVO?.reportFields) {
+              //   data?.orderUpdateInfoVO?.reportFields;
+              //   // 编辑了但是还没审核，先将页面的值变化
+              //   reportFormPanelRef?.value?.setFieldsValue({
+              //     ...data?.orderUpdateInfoVO?.reportFields,
+              //   });
+              // } else {
               reportFormPanelRef?.value?.setFieldsValue({
                 ...toRaw(data.reportInfo),
               });
+              // }
             }
             if (trackFormPanelRef.value) {
               // 跟单信息
@@ -82,20 +82,24 @@
         {
           field: 'customerTotalPrice',
           label: '客户总金额',
+          render: (val) => '$ ' + (val || ''),
         },
         {
           field: 'packetTotalPrice',
           label: '供应商总价',
+          render: (val) => '¥ ' + (val || ''),
         },
         {
           field: 'productionDepartmentTotalPrice',
           label: '包装费用',
           show: isTracker,
+          render: (val) => '$' + (val || ''),
         },
         {
           field: 'profitRate',
           label: '总利润率',
           show: isTracker,
+          render: (val) => (Number(val || 0) * 100).toFixed(2) + '%',
         },
       ];
@@ -240,7 +240,10 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'customerTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.customerTotalPrice;
+
+          return `${record?.profitAnalysisInfo?.customerCurrency || ''} ${
+            record?.profitAnalysisInfo?.customerTotalPrice || ''
+          }`;
         },
       },
       {
@@ -260,7 +263,9 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'productionDepartmentTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.productionDepartmentTotalPrice;
+          return `${record?.profitAnalysisInfo?.productionDepartmentCurrency || ''} ${
+            record?.profitAnalysisInfo?.productionDepartmentTotalPrice || ''
+          }`;
         },
       },
       {
@@ -269,9 +274,9 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'packetPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return `${record?.profitAnalysisInfo?.packetCurrency || ''} ${
-            record?.profitAnalysisInfo?.packetPrice || ''
-          }`;
+          return record?.profitAnalysisInfo?.packetPrice !== undefined
+            ? `$ ${record?.profitAnalysisInfo?.packetPrice || 0}`
+            : '';
         },
       },
       {
@@ -280,7 +285,9 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'packetTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.packetTotalPrice;
+          return record?.profitAnalysisInfo?.packetTotalPrice !== undefined
+            ? '$ ' + record?.profitAnalysisInfo?.packetTotalPrice
+            : '';
         },
       },
       {
@@ -298,7 +305,10 @@ export const ORDER_LIST_PROFIT_FIELDS = [
         dataIndex: 'profitRate',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.profitRate;
+          // 保留两位小数
+          return record?.profitAnalysisInfo?.profitRate !== undefined
+            ? (record?.profitAnalysisInfo?.profitRate * 100).toFixed(2) + '%'
+            : '';
         },
       },
       {
@@ -420,7 +430,7 @@ export const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'barcodeStickerArrivalTime',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.trackStageInfo?.barcodeStickerArrivalTime;
+          return formatToDate(record?.trackStageInfo?.barcodeStickerArrivalTime);
         },
       },
       {
@@ -429,7 +439,7 @@ export const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'latestArrivalTime',
         customRender: (column) => {
           const { record } = column || {};
-          return formatToDate(record?.trackStageInfo?.latestArrivalTime);
+          return record?.trackStageInfo?.latestArrivalTime;
         },
       },
       {
@@ -438,7 +448,7 @@ export const ORDER_LIST_TRACK_FIELDS = [
         dataIndex: 'latestBkTime',
         customRender: (column) => {
           const { record } = column || {};
-          return formatToDate(record?.trackStageInfo?.latestBkTime);
+          return record?.trackStageInfo?.latestBkTime;
         },
       },
     ],
@@ -20,8 +20,8 @@ export default defineApplicationConfig({
     server: {
       proxy: {
         '/basic-api/order': {
-          target: 'http://localhost:8000',
-          // target: 'http://39.108.227.113:8000',
+          // target: 'http://localhost:8000',
+          target: 'http://39.108.227.113:8000',
           // target: 'http://39.108.227.113:3000/mock/35',
           // http://39.108.227.113:8000/order/erp/captcha/get_img_captcha_code
           changeOrigin: true,