Merge branch 'zwl-develop' into 'develop'

fix: 设置已发提成按钮修改，新增备注功能 See merge request !21

Merge branch 'zwl-develop' into 'develop'
fix: 设置已发提成按钮修改，新增备注功能 See merge request !21
张
2 parents f1374855 e5bc083b
Showing 5 changed files with 31 additions and 30 deletions
src/api/project/invoice.ts
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/FinanceEdit.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/HistoryDetail.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
@@ -563,7 +563,7 @@ export const setInnerProfitSetStatus = async (params: any) =&gt; {
   });
 };
  
-export const setCommissionStatus = async (data: { orderIds: number[] }) => {
+export const setCommissionStatus = async (data: { orderId: number[] }) => {
   return await defHttp.post<any>({
     url: '/order/cost/setCommissionStatus',
     data,
@@ -39,6 +39,13 @@
         auto-size
       />
       <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">备注</div>
+      <a-textarea
+        v-model:value="packNotes"
+        placeholder="请输入"
+        rows="4"
+      />
+      <div style="margin: 16px 0"></div>
  
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
@@ -55,6 +62,7 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   import { ROLE } from './type.d';
  
+
   const emit = defineEmits(['success']);
   const role = computed(() => {
     return user?.roleSmallVO?.code;
@@ -130,6 +138,7 @@
   const { createMessage } = useMessage();
   const { error } = createMessage;
  
+  const packNotes = ref();
   const update = ref();
   const status = ref();
   const status_score = ref();
@@ -150,6 +159,7 @@
     input1.value = data.data?.packetActualRmbTotalPrice;
     input2.value = data.data?.orderScore;
     input_issuedCommission.value = data.data?.issuedCommission;
+    packNotes.value = data.data?.packNotes;
     resetFields();
     setDrawerProps({ confirmLoading: false });
     setFieldsValue({
@@ -168,19 +178,14 @@
       setDrawerProps({ confirmLoading: false });
     } else {
       try {
-        if (!input2.value && !input_issuedCommission.value) {
-          await getPackageEdit({
-            orderId: id.value,
-            packetActualRmbTotalPrice: input1.value,
-          });
-        } else {
-          await getPackageEdit({
-            orderId: id.value,
-            packetActualRmbTotalPrice: input1.value,
-            orderScore: Number(input2.value),
-            issuedCommission: Number(input_issuedCommission.value),
-          });
-        }
+        const params = {
+          orderId: id.value,
+          packetActualRmbTotalPrice: Number(input1.value),
+          ...(input2.value ? { orderScore: Number(input2.value) } : {}),
+          ...(input_issuedCommission.value ? { issuedCommission: Number(input_issuedCommission.value) } : {}),
+          ...(packNotes.value ? { packNotes: packNotes.value } : {}),
+        };
+        await getPackageEdit(params);
         emit('success');
       } finally {
         loading.value = false;
@@ -146,7 +146,7 @@
         } else {
           const res = await getOrderCostDetailedOptLog({
             orderId: data,
-            type: [80,81],
+            type: [80,81,82],
             page: page,
             pageSize: 20
           });
@@ -264,6 +264,11 @@ export const COLUMNS = [
     },
   },
   {
+    title: '备注',
+    dataIndex: 'packNotes',
+    width: 200,
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     width: 120,
@@ -55,14 +55,6 @@
           @click="handleAllProjectNoQuery"
           style="margin-left: 8px;position: fixed;right: 29%;top: 107.5px;"
         >全选</a-button>
-        <a-button
-          type="primary"
-          @click="handleSetCommissionStatus"
-          v-if="role == ROLE.ADMIN || role == ROLE.FINANCE"
-          :style="{ borderRadius: '5px 5px 5px 5px' }"
-        >
-          设置为已发提成
-        </a-button>
       </template>
     </BasicTable>
     <!-- <BasicModal
@@ -266,6 +258,10 @@
           label: '历史记录',
           onClick: handleHistoryDetail.bind(null, record),
         },
+        {
+          label: '设置为已发提成',
+          onClick: () => handleSetCommissionStatusSingle(record),
+        },
       ];
       return actions;
     }
@@ -577,15 +573,10 @@
     }
   }
  
-  const handleSetCommissionStatus = async () => {
-    if (!orderIds.value.length) {
-      createMessage.warning('请先选择要设置的订单');
-      return;
-    }
+  const handleSetCommissionStatusSingle = async (record) => {
     try {
-      await setCommissionStatus({ orderIds: orderIds.value });
+      await setCommissionStatus({ orderId: record.orderId });
       createMessage.success('设置成功');
-      handleClearChoose();
       reload();
     } catch (e) {
       createMessage.error('设置失败');