fix: bug

sanmu
1 parent 6953c5ab
Showing 4 changed files with 39 additions and 29 deletions
src/views/project/approve/ProfitPanel.vue
src/views/project/config/TablePanel.vue
src/views/project/order/ProfitAnalysis.vue
src/views/project/order/tableData.tsx
@@ -24,7 +24,7 @@
       @ok="handleTrue"
     >
       <BaseInfo :baseInfos="baseInfos" />
-      <h2>项目报告书信息</h2>
+      <h2>利润分析信息</h2>
       <div v-for="field in fieldInfos" :key="field">
         <span className="w-[140px] inline-block text-right mr-3">{{ field.label }}:</span
         ><span>{{ field.value }}</span>
@@ -140,18 +140,24 @@
       async function handleDetail(data) {
         openDrawer(true, { data });
         id.value = data.id;
-        fieldInfos.value = FIELDS_PROFIT_INFO.map((field) => {
-          if (field.field === 'profitType') {
+        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',
+              };
+            }
             return {
               label: field.label,
-              value: data.fieldInfos.profitAnalysisFields[field.field] == 0 ? '方式1' : '方式2',
+              value: data.fieldInfos.profitAnalysisFields[field.field],
             };
-          }
-          return {
-            label: field.label,
-            value: data.fieldInfos.profitAnalysisFields[field.field],
-          };
-        }).filter((item) => !!item.value);
+          })
+          .filter((item) => !!item.value);
         baseInfos.value = FIELDS_BASE_INFO.map((field) => {
           return {
             label: field.label,
@@ -84,7 +84,11 @@
   }
   async function handleSave(record) {
-    await saveConfig({ id: record.id, settingValue: record.settingValue });
+    if (props.column === 3) {
+      await saveConfig({ id: record.id, settingValue: record.settingValue });
+    } else {
+      await saveConfig({ id: record.id, relationValue: record.relationValue });
+    }
     handleCancel(record);
     reload();
   }
@@ -18,7 +18,7 @@
         ]"
         v-model:value="profitType"
         placeholder="请选择"
-        default-value="0"
+        defaultValue="0"
       />
     </div>
     <Space>
@@ -65,7 +65,7 @@
       const loading = ref(true);
       const lines = ref(10);
       const activeRate = ref();
-      const profitType = ref('1');
+      const profitType = ref('0');
       const info = ref({});
       const [register, { setModalProps, redoModalHeight }] = useModalInner(async (data) => {
         orderIds.value = toRaw(data.data);
@@ -66,7 +66,7 @@ export const ORDER_LIST_BASE_FIELDS = [
   },
   {
-    title: 'Modelo(REFERENCE)',
+    title: 'Model(REFERENCE)',
     width: 150,
     dataIndex: 'modeleLo',
   },
@@ -114,7 +114,7 @@ export const ORDER_LIST_BASE_FIELDS = [
     dataIndex: 'productStyle',
   },
   {
-    title: '生成科拖货时间',
+    title: '生产科拖货时间',
     width: 150,
     dataIndex: 'productionDepartmentConsignTime',
     customRender: (column) => {
@@ -141,11 +141,11 @@ export const ORDER_LIST_BASE_FIELDS = [
     width: 150,
     dataIndex: 'packetType',
   },
-  {
-    title: '业务员',
-    width: 150,
-    dataIndex: 'businessPerson',
-  },
+  // {
+  //   title: '业务员',
+  //   width: 150,
+  //   dataIndex: 'businessPerson',
+  // },
 ];
 export const ORDER_LIST_REPORT_FIELDS = [
@@ -447,9 +447,8 @@ export const ORDER_LIST_INSPECT_FIELDS = [
     dataIndex: 'inspectionStageInfo',
     children: [
       {
-        title: 'midCheckApplyTime',
+        title: '中期验货申请时间',
         width: 150,
-        label: '中期验货申请时间',
         dataIndex: 'midCheckApplyTime',
         customRender: (column) => {
           const { record } = column || {};
@@ -637,13 +636,7 @@ export const FIELDS_BASE_INFO = [
     label: '生产科',
     rules: [{ required: true }],
   },
-  {
-    field: 'modeleLo',
-    component: 'Input',
-    labelWidth: 150,
-    label: 'Modelo(REFERENCE)',
-    rules: [{ required: true }],
-  },
+
   {
     field: 'innerNo',
     component: 'Select',
@@ -666,6 +659,13 @@ export const FIELDS_BASE_INFO = [
     rules: [{ required: true }],
   },
   {
+    field: 'modeleLo',
+    component: 'Input',
+    labelWidth: 150,
+    label: 'Model(REFERENCE)',
+    rules: [{ required: true }],
+  },
+  {
     field: 'collection',
     component: 'Input',
     labelWidth: 250,