feat: 增加利润分析搜索

sanmu
1 parent 2c532616
Showing 2 changed files with 17 additions and 6 deletions
src/views/project/order/ProfitAnalysis.vue
src/views/project/order/index.vue
@@ -68,8 +68,10 @@
       const activeRate = ref();
       const profitType = ref('0');
       const info = ref({});
+      const searchData = ref();
       const [register, { setModalProps, redoModalHeight }] = useModalInner(async (data) => {
         orderIds.value = toRaw(data.data);
+        searchData.value = data.searchData;
         info.value = {};
       });
@@ -92,15 +94,23 @@
         {
           field: 'packetTotalPrice',
           label: '包装费用',
-          show: isTracker,
           render: (val) => '$' + (val || 0).toFixed(2),
         },
         {
           field: 'profitRate',
           label: '总利润率',
-          show: isTracker,
           render: (val) => (Number(val || 0) * 100).toFixed(2) + '%',
         },
+        {
+          field: 'orderTotalNum',
+          label: '订单总数',
+          render: (val) => val || 0,
+        },
+        {
+          field: 'recordNum',
+          label: '记录数',
+          render: (val) => val || 0,
+        },
       ];
       watch(
@@ -142,6 +152,7 @@
           orderIds: orderIds.value,
           profitType: profitType.value,
           exchangeRate: activeRate.value,
+          queryVO: searchData.value,
         });
         info.value = {
           ...(res || {}),
@@ -84,10 +84,7 @@
       <template #toolbar>
         <a-button type="primary" @click="handleRateModal">比重计算</a-button>
         <a-button type="primary" @click="handleExportModal">导出</a-button>
-        <a-button
-          type="primary"
-          @click="handleProfitModal"
-          :disabled="!checkedKeys.length || role === ROLE.TRACKER"
+        <a-button type="primary" @click="handleProfitModal" :disabled="role === ROLE.TRACKER"
           >分析利润</a-button
         >
         <a-button
@@ -246,8 +243,11 @@
       }
       function handleProfitModal() {
+        const form = getForm();
+        const values = form.getFieldsValue();
         openProfitModal(true, {
           data: checkedKeys.value,
+          searchData: values,
         });
       }