fix: 优化导出体验

sanmu
1 parent 4674a9ae
Showing 6 changed files with 32 additions and 12 deletions
src/api/project/order.ts
src/views/project/order/ExportModal.vue
src/views/project/order/FormDetail/ReportFormPanel.vue
src/views/project/order/FormDetail/index.vue
src/views/project/order/RateModal.vue
src/views/project/order/tableData.tsx
@@ -130,8 +130,9 @@ export const orderExport = async (data: any = {}) =&gt; {
   const userStore = useUserStoreWithOut();
  
   const token = userStore.getToken;
+  message.info('正在导出中...');
  
-  axios({
+  return axios({
     url: '/basic-api' + Api.EXPORT,
     method: 'post',
     responseType: 'blob',
@@ -12,7 +12,9 @@
   >
     <CheckboxGroup v-model:value="checkedList" :options="options" />
     <div className="mt-6">
-      <a-button type="primary" @click="handleExport" className="ml-4">导出</a-button>
+      <a-button type="primary" @click="handleExport" className="ml-4" :loading="exportLoading"
+        >导出</a-button
+      >
     </div>
   </BasicModal>
 </template>
@@ -54,6 +56,7 @@
         // 'inspectionStageFields',
       ]);
       const loading = ref(true);
+      const exportLoading = ref(false);
       const activeUser = ref();
       const info = ref();
       const searchData = ref({});
@@ -143,7 +146,9 @@
  
         //导出选中的订单
         fieldVO.orderIds = props.ids;
+        exportLoading.value = true;
         await orderExport({ ...searchData.value, fieldVO });
+        exportLoading.value = false;
  
         closeModal();
       }
@@ -158,6 +163,7 @@
         activeUser,
         exchangeRate,
         checkedList,
+        exportLoading,
       };
     },
   });
@@ -50,6 +50,7 @@
             ...item,
             field: `${item.field}`,
             componentProps: {
+              ...item.componentProps,
               ...(item.component === 'Select' && { showSearch: true }),
               ...(item.component === 'Select' && { options: options[optionsField] }),
               disabled: getDisable(
@@ -238,7 +238,7 @@
               });
  
               //原始的包装费用
-              originPackagePrice.value = data.profitAnalysisInfo.packetPrice;
+              originPackagePrice.value = data.profitAnalysisInfo?.packetPrice;
  
               const exchangeRate = find(configList.value, (item) => {
                 return item.settingCode === 'exchangeRate';
@@ -357,6 +357,9 @@
                 if (!forms.profitAnalysisInfo.profitType) {
                   forms.profitAnalysisInfo.profitType = '0';
                 }
+
+                //默认没有修改包装费用
+                forms.profitAnalysisInfo.isEditPacketPrice = false;
               } else if (activeKey.value === '3') {
                 // 项目报告书
                 await reportFormPanelRef?.value?.validate();
@@ -379,8 +382,6 @@
                 forms.inspectionStageInfo = inspectionFormPanelRef?.value?.getFieldsValue() || {};
               }
  
-              //默认没有修改包装费用
-              forms.profitAnalysisInfo.isEditPacketPrice = false;
               //如果包装费用有修改过，那么传参isEditPacketPrice为true
               if (
                 originPackagePrice.value != -1 &&
@@ -389,9 +390,9 @@
                 forms.profitAnalysisInfo.isEditPacketPrice = true;
               }
  
-              await orderUpdate(forms);
-              closeDrawer();
-              emit('success', {});
+              // await orderUpdate(forms);
+              // closeDrawer();
+              // emit('success', {});
             }
           } else {
             await baseFormPanelRef?.value?.validate();
@@ -3,7 +3,7 @@
     v-bind="$attrs"
     destroyOnClose
     @register="register"
-    title="利润分析表"
+    title="比重计算"
     width="600px"
     @visible-change="handleShow"
     :footer="null"
@@ -816,6 +816,9 @@ export const FIELDS_REPORT_INFO = [
     optionField: 'ideaSourceRate',
     labelWidth: 150,
     label: '想法来源占比',
+    componentProps: {
+      precision: 2,
+    },
     rules: [{ required: true }],
   },
   {
@@ -831,6 +834,9 @@ export const FIELDS_REPORT_INFO = [
     component: 'InputNumber',
     labelWidth: 150,
     label: '手工初型1占比',
+    componentProps: {
+      precision: 2,
+    },
     rules: [{ required: true }],
   },
   {
@@ -845,6 +851,9 @@ export const FIELDS_REPORT_INFO = [
     component: 'InputNumber',
     labelWidth: 150,
     label: '手工初型2占比',
+    componentProps: {
+      precision: 2,
+    },
     rules: [{ required: true }],
   },
 ];
@@ -1035,6 +1044,8 @@ export const FIELDS_PROFIT_INFO = [
     field: 'productionDepartmentPrice',
     component: 'InputNumber',
     label: '生产科单价¥',
+    componentProps: { precision: 2 },
+
     rules: [{ required: true }],
   },
   // {
@@ -1072,21 +1083,21 @@ export const FIELDS_PROFIT_INFO = [
     label: '利润率',
     component: 'InputNumber',
     field: 'profitRate',
-    fieldComponent: { disabled: true },
+    componentProps: { precision: 2 },
     // rules: [{ required: true }],
   },
   {
     label: '包装费用$',
     component: 'InputNumber',
     field: 'packetPrice',
-    fieldComponent: { disabled: true },
+    componentProps: { precision: 2 },
     // rules: [{ required: true }],
   },
   {
     label: '汇率',
     component: 'InputNumber',
     field: 'exchangeRate',
-    fieldComponent: { disabled: true },
+    componentProps: { precision: 2 },
     // rules: [{ required: true }],
   },
   // {