Merge branch 'zwl-develop' into 'develop'

fix: 项目号宽度修改，客户单价精度修改 See merge request !9

Merge branch 'zwl-develop' into 'develop'
fix: 项目号宽度修改，客户单价精度修改 See merge request !9
张
2 parents 5284b2e1 959b28bc
Showing 7 changed files with 11 additions and 7 deletions
src/views/project/config/TablePanel.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/data.tsx
src/views/project/order/FormDetail/index.vue
src/views/project/order/tableData.tsx
@@ -153,7 +153,11 @@
       if (props.column === 3) {
         await saveConfig({ id: record.id, settingValue: record.settingValue });
       } else {
-        await saveConfig({ id: record.id, relationValue: record.relationValue, relationName: record.relationName });
+        await saveConfig({
+          id: record.id,
+          relationValue: record.relationValue,
+          relationName: record.relationName,
+        });
       }
       handleCancel(record);
  
@@ -99,7 +99,7 @@ export const COLUMNS = [
   {
     title: '项目号',
     dataIndex: 'projectNo',
-    width: 100,
+    width: 140,
   },
   {
     title: '生产科',
@@ -102,7 +102,7 @@ export const COLUMNS = [
   {
     title: '项目号',
     dataIndex: 'projectNoPrefix',
-    width: 100,
+    width: 140,
   },
   {
     title: '生产科',
@@ -99,7 +99,7 @@ export const COLUMNS = [
   {
     title: '项目号',
     dataIndex: 'projectNo',
-    width: 100,
+    width: 140,
   },
   {
     title: '生产科',
@@ -108,7 +108,7 @@ export const COLUMNS = [
   {
     title: '项目号',
     dataIndex: 'projectNoPrefix',
-    width: 100,
+    width: 140,
   },
   {
     title: '订单总数量',
@@ -385,7 +385,7 @@
                 forms.profitAnalysisInfo = profitFormPanelRef?.value?.getFieldsValue() || {};
                 delete forms.profitAnalysisInfo.profitRate;
                 forms.profitAnalysisInfo.customerRmbPrice =
-                  forms.profitAnalysisInfo.customerRmbPrice.toFixed(2); // 客户单价¥
+                  forms.profitAnalysisInfo.customerRmbPrice.toFixed(4); // 客户单价¥
                 forms.profitAnalysisInfo.customerRmbTotalPrice = (
                   forms.profitAnalysisInfo.customerRmbPrice * orderCount.value
                 ).toFixed(2); // 客户总价¥
@@ -1285,7 +1285,7 @@ export const FIELDS_PROFIT_INFO = [
     component: 'InputNumber',
     label: '客户单价¥',
     componentProps: {
-      precision: 2,
+      precision: 4,
     },
     rules: [{ required: true }],
   },