fix: bug修复042701

boyang
1 parent 455e7b29
Showing 12 changed files with 58 additions and 20 deletions
src/views/project/approve/ProduceFieldPanel.vue
src/views/project/approve/ProfitFieldPanel.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/ApproveReason.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/FinanceEdit.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/data.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerData/index.vue
src/views/project/finance/financeProfit/ProductProfit/InnerData/tableData.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/HistoryDetail.vue
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/ApproveReason.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/index.vue
@@ -130,7 +130,7 @@
       const [registerTable, { reload }] = useTable({
         scroll: false,
         api: props.isApproved ? getApprovedListApi : getWaitListApi,
-        searchInfo: { typeIn: [60, 70] },
+        searchInfo: { typeIn: [80, 90] },
         columns,
         useSearchForm: false,
         formConfig: getFormConfig('true'),
@@ -85,7 +85,11 @@
           dataIndex: 'auditRoleCodes',
           width: 150,
           customRender: (column) => {
-            return '业务研发净利字段';
+            if (column.record.type === 'FIELD_EDIT_APPLY') {
+              return '业务利润字段编辑申请';
+            } else if (column.record.type === 'INNER_PROFIT_FIELD_EDIT_APPLY') {
+              return '内部利润字段编辑申请';
+            }
           },
         },
         {
@@ -32,8 +32,9 @@
       orderId: baseFieldValues.value.orderId,
       productionActualPrice: baseFieldValues.value.productionActualPrice,
       productionDepartmentPredictPrice: baseFieldValues.value.productionDepartmentPredictPrice,
+      productionDepartmentPredictUnitPrice: baseFieldValues.value.productionDepartmentPredictUnitPrice,
       applyRemark: baseFieldValues.value.applyRemark,
-      type: 70,
+      type: 90,
     });
     emit('success');
     setTimeout(() => {
@@ -142,18 +142,18 @@
   const orderCount = ref();
   const id = ref();
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
+    console.log(data,'5656fdsfa');
     // 方式1
     if (data.data?.lockFields) {
       status1.value = data.data?.lockFields?.productionDepartmentPredictPrice;
       status2.value = data.data?.lockFields?.productionActualPrice;
-      status3.value = data.data?.lockFields?.productionDepartmentPredictUnitprice;
+      status3.value = data.data?.lockFields?.productionDepartmentPredictUnitPrice;
     }
-
     id.value = data.data.orderId;
-    input1.value = data.data?.productionDepartmentPredictPrice.toFixed(2);
-    input2.value = data.data?.productionActualPrice.toFixed(2);
+    input1.value = data.data?.productionDepartmentPredictPrice?.toFixed(2);
+    input2.value = data.data?.productionActualPrice?.toFixed(2);
     orderCount.value = data.data?.orderCount;
-    input3.value = data.data?.productionDepartmentPredictUnitprice.toFixed(2);
+    input3.value = data.data?.productionDepartmentPredictUnitPrice?.toFixed(2);
     resetFields();
     setDrawerProps({ confirmLoading: false });
     // setFieldsValue({
@@ -177,7 +177,7 @@
         productionDepartmentPredictPrice: input1.value,
         productionActualPrice: input2.value,
         orderCount: orderCount.value,
-        productionDepartmentPredictUnitprice: input3.value,
+        productionDepartmentPredictUnitPrice: input3.value,
       });
       emit('success');
       closeDrawer();
@@ -139,9 +139,9 @@ export const COLUMNS = [
   {
     title: '生产科预算单价￥',
     width: 150,
-    dataIndex: 'productionDepartmentPredictUnitprice',
+    dataIndex: 'productionDepartmentPredictUnitPrice',
     customRender: (column) => {
-      return column.record?.productionDepartmentPredictUnitprice?.toFixed(2);
+      return column.record?.productionDepartmentPredictUnitPrice?.toFixed(2);
     },
   },
   {
@@ -170,7 +170,7 @@
           popConfirm: {
             title: '确认审批？',
             confirm: () => {
-              if (record.status === 0 && role.value === ROLE.ADMIN) {
+              if (record.innerProduceStatus === 0 && role.value === ROLE.ADMIN) {
                 handleStatus(record, true);
               }
               return;
@@ -344,6 +344,7 @@
       .catch((error) => {
         console.error(error);
       });
+    handleClearChoose();
     reload();
   }
@@ -34,6 +34,13 @@ export const FIELDS_BASE_INFO = [
     label: '实际发生费用',
     rules: [{ required: true }],
   },
+  {
+    field: 'productionDepartmentPredictUnitPrice',
+    component: 'Select',
+    labelWidth: 150,
+    label: '生产科预算单价',
+    rules: [{ required: true }],
+  },
 ];
 export const EDIT_INFO = [
@@ -58,5 +65,12 @@ export const EDIT_INFO = [
     label: '实际发生费用',
     rules: [{ required: true }],
   },
+  {
+    field: 'productionDepartmentPredictUnitPrice',
+    component: 'Select',
+    labelWidth: 150,
+    label: '生产科预算单价',
+    rules: [{ required: true }],
+  },
 ];
@@ -134,12 +134,22 @@
       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 getProjectOptLog({ orderId: data, type: 30, page: page, pageSize: 20 });
+          const res = await getProjectOptLog({ 
+            projectNoPrefix: data, 
+            type: 30, 
+            page: page, 
+            pageSize: 20 
+          });
           list1.value = res.items;
           total1.value = res.total;
           page1.value = page;
         } else {
-          const res = await getProjectOptLog({ orderId: data, type: 1, page: page, pageSize: 20 });
+          const res = await getProjectOptLog({ 
+            projectNoPrefix: data, 
+            type: 1, 
+            page: page, 
+            pageSize: 20 
+          });
           list2.value = res.items;
           total2.value = res.total;
           page2.value = page;
@@ -171,7 +171,7 @@
           popConfirm: {
             title: '确认审核？',
             confirm: () => {
-              if (record.status === 0 && role.value === ROLE.ADMIN) {
+              if (record.innerProductionStatus === 0 && role.value === ROLE.ADMIN) {
                 handleStatus(record, true);
               }
               return;
@@ -254,7 +254,7 @@
   async function handleStatus(record, status) {
     try {
       await setInnerProfitSetStatus({ 
-        projectNo: record.projectNo, 
+        projectNo: record.projectNoPrefix, 
         customerCode: record.customerCode
       });
       reload();
@@ -405,6 +405,7 @@
       .catch((error) => {
         console.error(error);
       });
+    handleClearChoose();
     reload();
   }
 </script>
@@ -32,7 +32,7 @@
       orderId: baseFieldValues.value.orderId,
       packetActualRmbTotalPrice: baseFieldValues.value.packetActualRmbTotalPrice,
       applyRemark: baseFieldValues.value.applyRemark,
-      type: 60,
+      type: 80,
     });
     emit('success');
     setTimeout(() => {
@@ -176,7 +176,7 @@
           popConfirm: {
             title: '确认审核？',
             confirm: () => {
-              if (record.status === 0 && role.value === ROLE.ADMIN) {
+              if (record.packStatus === 0 && role.value === ROLE.ADMIN) {
                 handleStatus(record, true);
               }
               return;
@@ -347,6 +347,7 @@
       .catch((error) => {
         console.error(error);
       });
+    handleClearChoose();
     reload();
   }
   async function onSelect(record, selected: boolean) {
@@ -79,6 +79,11 @@
     bordered: true,
     columns: COLUMNS,
     clickToRowSelect: false,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+    },
     rowKey: (record) => record.detailProjectNo || record.id || record.serialNumber,
     rowSelection: {
       type: 'checkbox',
@@ -115,7 +120,7 @@
           popConfirm: {
             title: '确认审核？',
             confirm: () => {
-              if (record.status === 0 && role.value === ROLE.ADMIN) {
+              if (record.developmentStatus === 0 && role.value === ROLE.ADMIN) {
                 handleStatus(record, true);
               }
               return;
@@ -187,7 +192,7 @@
     try {
       await setBusinessProfitSetStatus({ 
         customerCode: record.customerCode,
-        projectNo: record.projectNo
+        projectNo: record.projectNoPrefix,
       });
       reload();
     } catch (error) {
@@ -247,6 +252,7 @@
       .catch((error) => {
         console.error(error);
       });
+    handleClearChoose();
     reload();
   }