feat: add new column

sanmu
1 parent 8ef6b19d
Showing 10 changed files with 258 additions and 101 deletions
src/api/project/order.ts
src/utils/project.ts
src/views/project/approve/ProfitPanel.vue
src/views/project/order/CheckDetail.vue
src/views/project/order/ExportModal.vue
src/views/project/order/FormDetail/ProfitFormPanel.vue
src/views/project/order/FormDetail/index.vue
src/views/project/order/HistoryDetail.vue
src/views/project/order/ProfitAnalysis.vue
src/views/project/order/tableData.tsx
@@ -14,6 +14,7 @@ enum Api {
   QUERY_PROJECT_NO_AND_INNER_NO = '/order/erp/order/queryProjectNoAndInnerNo', //查询项目号和内部编号
   EXPORT = '/order/erp/order/export',
   UPLOAD = '/api/localStorage/uploadOss',
+  PROFIT_RATE = '/order/erp/profit/calculate', // 编辑订单实时获取利润率
   DICT_INIT = '/order/erp/dictionary/get_all',
   DICT_ADD = '/order/erp/dictionary/add',
@@ -63,6 +64,10 @@ export const orderCreate = async (data: any) =&gt; {
   return res;
 };
+export const getOrderProfitRate = async (data: any) => {
+  return defHttp.post<any>({ url: Api.PROFIT_RATE, data });
+};
+
 export const queryProjectNoAndInnerNo = async (data: any) => {
   const res = await defHttp.post<any>({ url: Api.QUERY_PROJECT_NO_AND_INNER_NO, data });
   return res;
 export const getDisable = (code, id, value) => {
-  return code === 'LOCKED' && !!id && value;
+  return code === 'LOCKED' && !!id && (value || value === 0);
 };
 // 利润分析的权限校验
 export const getProfitDisable = (field, code, id, value) => {
   // 包装费用,汇率不允许修改
-  if (['packetPrice', 'exchangeRate'].includes(field)) {
+  if (['packetPrice', 'exchangeRate', 'profitRate'].includes(field)) {
     return true;
   }
   // code是lock，编辑并且value存在，才需要审核
-  return code === 'LOCKED' && !!id && value;
+  return code === 'LOCKED' && !!id && (value || value === 0);
 };
 // 基本信息的权限校验 客户编码、项目号、生产科、内部编号、业务员 才需要审核
@@ -141,16 +141,17 @@
         openDrawer(true, { data });
         id.value = data.id;
         fieldInfos.value = (FIELDS_PROFIT_INFO as any)
-          .concat({
-            label: '利润率',
-            field: 'profitRate',
-          })
           .map((field) => {
             if (field.field === 'profitType') {
               return {
                 label: field.label,
                 value: data.fieldInfos.profitAnalysisFields[field.field] == 0 ? '方式1' : '方式2',
               };
+            } else if (field.field === 'profitRate') {
+              return {
+                label: field.label,
+                value: (data.fieldInfos.profitAnalysisFields[field.field] * 100).toFixed(2) + '%',
+              };
             }
             return {
               label: field.label,
@@ -72,7 +72,12 @@
           span: 6,
         },
       }))
-      .filter((item) => item.field !== 'packetPrice' && item.field !== 'exchangeRate');
+      .filter(
+        (item) =>
+          item.field !== 'packetPrice' &&
+          item.field !== 'exchangeRate' &&
+          item.field !== 'profitRate',
+      );
   export default defineComponent({
     components: { BasicDrawer, BasicForm },
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     destroyOnClose
     @register="register"
-    title="利润分析表"
+    title="导出"
     width="500px"
     :height="100"
     wrapClassName="h-[260px]"
@@ -12,7 +12,7 @@
   >
     <CheckboxGroup v-model:value="checkedList" :options="options" />
     <div className="mt-6">
-      <a-button type="primary" @click="handleCalc" className="ml-4">导出</a-button>
+      <a-button type="primary" @click="handleExport" className="ml-4">导出</a-button>
     </div>
   </BasicModal>
 </template>
@@ -92,7 +92,7 @@
         }
       }
-      async function handleCalc() {
+      async function handleExport() {
         const fieldVO: any = {};
         checkedList.value.forEach((item) => {
           if (item === 'baseFields') {
@@ -108,8 +108,13 @@
           } else if (item === 'profitAnalysisFields') {
             if (props.role === ROLE.TRACKER) {
               fieldVO.profitAnalysisFields = ORDER_LIST_PROFIT_FIELDS[0].children
-                .filter(
-                  (k) => k.dataIndex === 'customerPrice' || k.dataIndex === 'customerTotalPrice',
+                .filter((k) =>
+                  [
+                    'customerPrice',
+                    'customerRmbPrice',
+                    'customerTotalPrice',
+                    'customerRmbTotalPrice',
+                  ].includes(k.dataIndex),
                 )
                 .map((item) => ({
                   [item.dataIndex]: 'selected',
@@ -144,7 +149,7 @@
         handleShow,
         info,
         manualPreform,
-        handleCalc,
+        handleExport,
         activeUser,
         exchangeRate,
         checkedList,
@@ -2,13 +2,15 @@
   <BasicForm @register="registerForm" />
 </template>
 <script lang="ts">
-  import { computed, defineComponent, reactive, ref, toRaw } from 'vue';
+  import { computed, defineComponent, reactive, ref, nextTick } from 'vue';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { FIELDS_PROFIT_INFO } from '../tableData';
   import { getProfitDisable } from '/@/utils/project';
-  import { get } from 'lodash-es';
+  import { debounce, get } from 'lodash-es';
   import { useOrderInfo } from '/@/hooks/component/order';
   import { useOrderStoreWithOut } from '/@/store/modules/order';
+  import message from '/@/views/form-design/utils/message';
+  import { getOrderProfitRate } from '/@/api/project/order';
   export default defineComponent({
     components: { BasicForm },
@@ -23,6 +25,10 @@
       profitFormData: {
         type: Object,
       },
+      orderCount: {
+        type: Number,
+        default: 0,
+      },
     },
     emits: ['success'],
     setup(props, { emit }) {
@@ -30,6 +36,43 @@
       const orderStore = useOrderStoreWithOut();
       const { exchangeRate } = useOrderInfo(orderStore);
+      const updateProfitRate = debounce(async (field) => {
+        const values = getFieldsValue();
+        const {
+          profitType,
+          packetPrice,
+          exchangeRate = 0,
+          customerPrice,
+          customerRmbPrice,
+          productionDepartmentPrice,
+          profitRate,
+        } = values;
+        if (customerPrice && exchangeRate && packetPrice && customerRmbPrice) {
+          const customerTotalPrice = (customerPrice * (props.orderCount || 0)).toFixed(2); // 客户总价，美元
+          const productionDepartmentTotalPrice = (
+            productionDepartmentPrice * (props.orderCount || 0)
+          ).toFixed(2); // 生成科总价￥
+          const packetTotalPrice = (packetPrice * (props.orderCount || 0)).toFixed(2); // 包装费用总价
+          if (
+            customerPrice &&
+            customerRmbPrice &&
+            productionDepartmentPrice &&
+            // 只修改单价和部门才会计算利润率
+            ['customerPrice', 'customerRmbPrice', 'productionDepartmentPrice'].includes(field)
+          ) {
+            const res = await getOrderProfitRate({
+              profitType: profitType || '0',
+              packetTotalPrice,
+              productionDepartmentTotalPrice,
+              customerTotalPrice,
+              exchangeRate,
+            });
+            if (profitRate !== (res * 100).toFixed(2)) {
+              setFieldsValue({ profitRate: (res * 100).toFixed(2) + '%' });
+            }
+          }
+        }
+      }, 300);
       const schemas = computed(() => {
         const options = {
@@ -51,6 +94,29 @@
                 props.id,
                 get(props.profitFormData, `${item.field}`),
               ),
+              onChange: async (val) => {
+                const values = getFieldsValue();
+                const { exchangeRate = 0, customerPrice, customerRmbPrice } = values || {};
+                // 修改的客户单价
+                if (item.field === 'customerPrice' && val !== customerPrice) {
+                  if (exchangeRate !== 0) {
+                    await setFieldsValue({ customerRmbPrice: val * exchangeRate });
+                  } else {
+                    message.error('汇率等于0，美元人民币之间无法转换');
+                  }
+                }
+                // 值不相等才变化，不然无限循环了
+                if (item.field === 'customerRmbPrice' && val !== customerRmbPrice) {
+                  if (exchangeRate !== 0) {
+                    await setFieldsValue({ customerPrice: val / exchangeRate });
+                  } else {
+                    message.error('汇率等于0，美元人民币之间无法转换');
+                  }
+                }
+                nextTick(() => {
+                  updateProfitRate(item.field);
+                });
+              },
             },
             colProps: {
               span: 24,
@@ -81,4 +147,3 @@
     },
   });
 </script>
-../constant
@@ -33,7 +33,12 @@
         >
           <span className="text-red-600">{{ checkingMsg }}</span>
-          <ProfitFormPanel ref="profitFormPanelRef" :id="id" :profitFormData="profitFormData" />
+          <ProfitFormPanel
+            ref="profitFormPanelRef"
+            :orderCount="orderCount"
+            :id="id"
+            :profitFormData="profitFormData"
+          />
         </TabPanel>
         <TabPanel
           key="3"
@@ -131,6 +136,7 @@
       const reportFormPanelRef = ref();
       const trackFormPanelRef = ref();
       const inspectionFormPanelRef = ref();
+      const orderCount = ref(0);
       // 编辑从接口获取的value
       const baseFormData = ref();
@@ -187,9 +193,10 @@
           return;
         }
         id.value = data.id;
-        profitFormData.value = data.profitAnalysisInfo;
+        profitFormData.value =
+          data?.orderUpdateInfoVO?.profitAnalysisFields || data.profitAnalysisInfo;
         inspectFormData.value = data.inspectionStageInfo;
-        reportFormData.value = data.reportInfo;
+        reportFormData.value = data?.orderUpdateInfoVO?.reportFields || data.reportInfo;
         trackFormData.value = data.trackStageInfo;
         // 方式1
@@ -205,6 +212,8 @@
         };
         if (id.value) {
+          orderCount.value = data.orderCount;
+
           setTimeout(() => {
             // 基本信息
             if (baseFormPanelRef.value) {
@@ -231,7 +240,7 @@
               profitFormPanelRef.value.fields = { ...data.lockFields?.profitAnalysisFields } || {};
               if (data?.orderUpdateInfoVO?.profitAnalysisFields) {
-                const { customerPrice, productionDepartmentPrice } =
+                const { customerPrice, productionDepartmentPrice, customerRmbPrice } =
                   data?.orderUpdateInfoVO?.profitAnalysisFields || {};
                 //给个审核中提示
@@ -241,6 +250,7 @@
                 profitFormPanelRef?.value?.setFieldsValue({
                   ...toRaw(data?.orderUpdateInfoVO?.profitAnalysisFields),
                   customerPrice: Number(customerPrice || 0),
+                  customerRmbPrice: Number(customerRmbPrice || 0),
                   productionDepartmentPrice: Number(productionDepartmentPrice || 0),
                   packetPrice: packetPrice?.relationValue || 0,
                   exchangeRate: exchangeRate?.settingValue,
@@ -317,14 +327,24 @@
               closeDrawer();
               emit('success', {});
             } else {
+              // 利润分析
               if (activeKey.value === '2') {
                 await profitFormPanelRef?.value?.validate();
                 forms.profitAnalysisInfo = profitFormPanelRef?.value?.getFieldsValue() || {};
+                delete forms.profitAnalysisInfo.profitRate;
+                forms.profitAnalysisInfo.customerRmbPrice =
+                  forms.profitAnalysisInfo.customerRmbPrice.toFixed(2); // 客户单价¥
+                forms.profitAnalysisInfo.customerRmbTotalPrice = (
+                  forms.profitAnalysisInfo.customerRmbPrice * orderCount.value
+                ).toFixed(2); // 客户总价¥
+                forms.profitAnalysisInfo.customerPrice =
+                  forms.profitAnalysisInfo.customerPrice.toFixed(2); // 客户单价$
                 // 方式如果没有变化，默认方式1
                 if (!forms.profitAnalysisInfo.profitType) {
                   forms.profitAnalysisInfo.profitType = '0';
                 }
               } else if (activeKey.value === '3') {
+                // 项目报告书
                 await reportFormPanelRef?.value?.validate();
                 // 比重相加等于1
                 const values = reportFormPanelRef?.value?.getFieldsValue() || {};
@@ -385,6 +405,7 @@
         handleSubmit,
         businessUsers,
         checkingMsg,
+        orderCount,
       };
     },
   });
@@ -132,13 +132,14 @@
       const activeKey = ref(1);
       const getOrderOptLogFunc = async (data, index, page) => {
+        console.log('%c [ data ]-135', 'font-size:13px; background:pink; color:#bf2c9f;', data);
         if (index === 1) {
-          const res = await getOrderOptLog({ orderId: data.id, page: page, pageSize: 20 });
+          const res = await getOrderOptLog({ orderId: data, page: page, pageSize: 20 });
           list1.value = res.records;
           total1.value = res.total;
           page1.value = page;
         } else {
-          const res = await getOrderAuditLog({ orderId: data.id, page: page, pageSize: 20 });
+          const res = await getOrderAuditLog({ orderId: data, page: page, pageSize: 20 });
           list2.value = res.records;
           total2.value = res.total;
           page2.value = page;
@@ -11,10 +11,10 @@
     <div className="mb-2">
       公式：
       <Select
-        className="w-[200px]"
+        className="w-[240px]"
         :options="[
-          { label: '公式1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/客户总金额', value: '0' },
-          { label: '公式2：1 -（LOCAL总金额/汇率 / (客户总金额-包装费用总金额)', value: '1' },
+          { label: '公式1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/ 客户总金额', value: '0' },
+          { label: '公式2：1 -（LOCAL总金额 / 汇率 / (客户总金额-包装费用总金额)', value: '1' },
         ]"
         v-model:value="profitType"
         placeholder="请选择"
@@ -49,7 +49,7 @@
 <script lang="ts">
   import { computed, defineComponent, onMounted, ref, toRaw, watch } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
-  import { Description, DescItem, useDescription } from '/@/components/Description/index';
+  import { Description, DescItem } from '/@/components/Description/index';
   import { orderAnalysis } from '/@/api/project/order';
   import { Select, Space } from 'ant-design-vue';
   import { useOrderStoreWithOut } from '/@/store/modules/order';
@@ -82,18 +82,18 @@
         {
           field: 'customerTotalPrice',
           label: '客户总金额',
-          render: (val) => '$ ' + (val || ''),
+          render: (val) => '$ ' + (val || 0).toFixed(2),
         },
         {
           field: 'packetTotalPrice',
           label: '供应商总价',
-          render: (val) => '¥ ' + (val || ''),
+          render: (val) => '¥ ' + (val || 0).toFixed(2),
         },
         {
           field: 'productionDepartmentTotalPrice',
           label: '包装费用',
           show: isTracker,
-          render: (val) => '$' + (val || ''),
+          render: (val) => '$' + (val || 0).toFixed(2),
         },
         {
           field: 'profitRate',
@@ -224,72 +224,95 @@ export const ORDER_LIST_PROFIT_FIELDS = [
     dataIndex: 'profitAnalysisInfo',
     children: [
       {
-        title: '客户单价',
+        title: '客户单价$',
         width: 150,
         dataIndex: 'customerPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return `${record?.profitAnalysisInfo?.customerCurrency || ''} ${
-            record?.profitAnalysisInfo?.customerPrice || ''
-          }`;
+          return record?.profitAnalysisInfo?.customerPrice;
+          // ? `$ ${record?.profitAnalysisInfo?.customerPrice}`
+          // : '';
         },
       },
       {
-        title: '客户总价',
+        title: '客户单价¥',
         width: 150,
-        dataIndex: 'customerTotalPrice',
+        dataIndex: 'customerRmbPrice',
         customRender: (column) => {
           const { record } = column || {};
-
-          return `${record?.profitAnalysisInfo?.customerCurrency || ''} ${
-            record?.profitAnalysisInfo?.customerTotalPrice || ''
-          }`;
+          return record?.profitAnalysisInfo?.customerRmbPrice;
+          // ? `¥ ${record?.profitAnalysisInfo?.customerRmbPrice}`
+          // : '';
         },
       },
       {
-        title: '生产科单价',
+        title: '客户总金额$',
         width: 150,
-        dataIndex: 'productionDepartmentPrice',
+        dataIndex: 'customerTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return `${record?.profitAnalysisInfo?.productionDepartmentCurrency || ''} ${
-            record?.profitAnalysisInfo?.productionDepartmentPrice || ''
-          }`;
+
+          return record?.profitAnalysisInfo?.customerTotalPrice;
+          // ? `$ ${record?.profitAnalysisInfo?.customerTotalPrice}`
+          // : '';
         },
       },
       {
-        title: '生产科总价',
+        title: '客户总金额¥',
         width: 150,
-        dataIndex: 'productionDepartmentTotalPrice',
+        dataIndex: 'customerRmbTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return `${record?.profitAnalysisInfo?.productionDepartmentCurrency || ''} ${
-            record?.profitAnalysisInfo?.productionDepartmentTotalPrice || ''
-          }`;
+
+          return record?.profitAnalysisInfo?.customerRmbTotalPrice;
+          // ? `¥ ${record?.profitAnalysisInfo?.customerRmbTotalPrice}`
+          // : '';
         },
       },
       {
-        title: '包装费用',
+        title: '生产科单价¥',
         width: 150,
-        dataIndex: 'packetPrice',
+        dataIndex: 'productionDepartmentPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.packetPrice !== undefined
-            ? `$ ${record?.profitAnalysisInfo?.packetPrice || 0}`
-            : '';
+          return record?.profitAnalysisInfo?.productionDepartmentPrice;
+          // ? `¥ ${record?.profitAnalysisInfo?.productionDepartmentPrice}`
+          // : '';
         },
       },
       {
-        title: '包装费用合计',
+        title: '生产科总价¥',
         width: 150,
-        dataIndex: 'packetTotalPrice',
+        dataIndex: 'productionDepartmentTotalPrice',
         customRender: (column) => {
           const { record } = column || {};
-          return record?.profitAnalysisInfo?.packetTotalPrice !== undefined
-            ? '$ ' + record?.profitAnalysisInfo?.packetTotalPrice
-            : '';
+          return record?.profitAnalysisInfo?.productionDepartmentTotalPrice;
+          // ? `¥ ${record?.profitAnalysisInfo?.productionDepartmentTotalPrice}`
+          // : '';
         },
       },
+      // {
+      //   title: '包装费用$',
+      //   width: 150,
+      //   dataIndex: 'packetPrice',
+      //   customRender: (column) => {
+      //     const { record } = column || {};
+      //     return record?.profitAnalysisInfo?.packetPrice !== undefined;
+      //     // ? `$ ${record?.profitAnalysisInfo?.packetPrice}`
+      //     // : '';
+      //   },
+      // },
+      // {
+      //   title: '包装费用合计$',
+      //   width: 150,
+      //   dataIndex: 'packetTotalPrice',
+      //   customRender: (column) => {
+      //     const { record } = column || {};
+      //     return record?.profitAnalysisInfo?.packetTotalPrice !== undefined;
+      //     // ? '$ ' + record?.profitAnalysisInfo?.packetTotalPrice.toFixed(2)
+      //     // : '';
+      //   },
+      // },
       {
         title: '汇率',
         width: 150,
@@ -314,7 +337,7 @@ export const ORDER_LIST_PROFIT_FIELDS = [
       {
         title: '利润率计算方式',
         width: 150,
-        dataIndex: 'profitRate',
+        dataIndex: 'profitType',
         customRender: (column) => {
           const { record } = column || {};
           return record?.profitAnalysisInfo?.profitType === '0'
@@ -960,54 +983,98 @@ export const FIELDS_PROFIT_INFO = [
   {
     field: 'customerPrice',
     component: 'InputNumber',
-    label: '客户单价',
+    label: '客户单价$',
+    rules: [{ required: true }],
+    componentProps: {
+      precision: 2,
+    },
+  },
+  {
+    field: 'customerRmbPrice',
+    component: 'InputNumber',
+    label: '客户单价¥',
+    componentProps: {
+      precision: 2,
+    },
     rules: [{ required: true }],
   },
   // {
+  //   field: 'customerPrice',
+  //   component: 'InputNumber',
+  //   label: '客户总金额',
+  //   rules: [{ required: true }],
+  // },
+  // {
+  //   field: 'customerPrice',
+  //   component: 'InputNumber',
+  //   label: '客户总金额(人民币)',
+  //   rules: [{ required: true }],
+  // },
+  // {
   //   field: 'customerTotalPrice',
   //   component: 'InputNumber',
   //   label: '客户总价',
   //   rules: [{ required: true }],
   // },
-  {
-    field: 'customerCurrency',
-    component: 'Select',
-    label: '客户单价货币单位',
-    labelWidth: 400,
-    rules: [{ required: true }],
-    componentProps: {
-      options: [
-        { label: '$', value: '$' },
-        { label: '￥', value: '￥' },
-      ],
-    },
-  },
+  // {
+  //   field: 'customerCurrency',
+  //   component: 'Select',
+  //   label: '客户单价货币单位',
+  //   labelWidth: 400,
+  //   rules: [{ required: true }],
+  //   componentProps: {
+  //     options: [
+  //       { label: '$', value: '$' },
+  //       { label: '￥', value: '￥' },
+  //     ],
+  //   },
+  // },
   {
     field: 'productionDepartmentPrice',
     component: 'InputNumber',
-    label: '生产科单价',
+    label: '生产科单价¥',
     rules: [{ required: true }],
   },
+  // {
+  //   field: 'productionDepartmentCurrency',
+  //   component: 'Select',
+  //   label: '生产科货币单位',
+  //   rules: [{ required: true }],
+  //   componentProps: {
+  //     options: [
+  //       { label: '$', value: '$' },
+  //       { label: '￥', value: '￥' },
+  //     ],
+  //   },
+  // },
+  // {
+  //   field: 'productionDepartmentPrice',
+  //   component: 'InputNumber',
+  //   label: '生产科总价￥',
+  //   rules: [{ required: true }],
+  // },
   {
-    field: 'productionDepartmentCurrency',
+    label: '计算利润方式',
     component: 'Select',
-    label: '生产科货币单位',
-    rules: [{ required: true }],
+    field: 'profitType',
     componentProps: {
+      defaultValue: '0',
       options: [
-        { label: '$', value: '$' },
-        { label: '￥', value: '￥' },
+        { label: '公式1：1 -（LOCAL总金额 / 汇率 + 包装总金额）/ 客户总金额', value: '0' },
+        { label: '公式2：1 -（LOCAL总金额 / 汇率 / (客户总金额 - 包装费用总金额)', value: '1' },
       ],
     },
+    // rules: [{ required: true }],
+  },
+  {
+    label: '利润率',
+    component: 'InputNumber',
+    field: 'profitRate',
+    fieldComponent: { disabled: true },
+    // rules: [{ required: true }],
   },
-  // {
-  //   field: 'productionDepartmentPrice',
-  //   component: 'InputNumber',
-  //   label: '生产科总价￥',
-  //   rules: [{ required: true }],
-  // },
   {
-    label: '包装费用',
+    label: '包装费用$',
     component: 'InputNumber',
     field: 'packetPrice',
     fieldComponent: { disabled: true },
@@ -1046,19 +1113,6 @@ export const FIELDS_PROFIT_INFO = [
   //   field: 'exchangeRate',
   //   // rules: [{ required: true }],
   // },
-  {
-    label: '计算利润方式',
-    component: 'Select',
-    field: 'profitType',
-    componentProps: {
-      defaultValue: '0',
-      options: [
-        { label: '方式一: 1 -（LOCAL单价 / 汇率 + 包装费用）/ 客户单价', value: '0' },
-        { label: '方式二: 1 -（LOCAL单价/汇率 / (客户单价-包装费用)', value: '1' },
-      ],
-    },
-    // rules: [{ required: true }],
-  },
 ];
 //质量检测信息