Merge branch 'zwl-develop' into 'develop'

feat: 新增提成字段和设置为已发提成按钮 See merge request !20

Merge branch 'zwl-develop' into 'develop'
feat: 新增提成字段和设置为已发提成按钮 See merge request !20
张
2 parents da5aa962 3a52b75d
Showing 7 changed files with 97 additions and 2 deletions
src/api/project/invoice.ts
src/views/project/finance/financeProfit/ProductProfit/InnerData/tableData.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/ApproveReason.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/FinanceEdit.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/data.tsx
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/index.vue
src/views/project/finance/financeProfit/ServiceProfit/PackageProfit/tableData.tsx
@@ -562,3 +562,10 @@ export const setInnerProfitSetStatus = async (params: any) =&gt; {
     params,
   });
 };
+
+export const setCommissionStatus = async (data: { orderIds: number[] }) => {
+  return await defHttp.post<any>({
+    url: '/order/cost/setCommissionStatus',
+    data,
+  });
+};
@@ -89,6 +89,13 @@ export const APPLY_INFO = [
     rules: [{ required: true }],
   },
   {
+    field: 'issuedCommission',
+    component: 'Select',
+    labelWidth: 150,
+    label: '已发提成',
+    rules: [{ required: true }],
+  },
+  {
     field: 'productionDepartmentPredictPrice',
     component: 'Select',
     labelWidth: 180,
@@ -32,6 +32,7 @@
       orderId: baseFieldValues.value.orderId,
       packetActualRmbTotalPrice: baseFieldValues.value.packetActualRmbTotalPrice,
       orderScore: baseFieldValues.value.orderScore,
+      issuedCommission: baseFieldValues.value.issuedCommission,
       applyRemark: baseFieldValues.value.applyRemark,
       type: 80,
     });
@@ -31,6 +31,14 @@
         auto-size
       />
       <div style="margin: 16px 0"></div>
+      <div style="font-size: 15px">已发提成</div>
+      <a-input
+        v-model:value="input_issuedCommission"
+        placeholder="请输入"
+        :disabled="status_issuedCommission === 'LOCKED'"
+        auto-size
+      />
+      <div style="margin: 16px 0"></div>
  
       <!-- <template #titleToolbar> <a-button type="primary"> 申请编辑权限 </a-button></template> -->
       <template #appendFooter>
@@ -125,8 +133,10 @@
   const update = ref();
   const status = ref();
   const status_score = ref();
+  const status_issuedCommission = ref();
   const input1 = ref();
   const input2 = ref();
+  const input_issuedCommission = ref();
   const id = ref();
   const loading = ref(false);
   const [register, { setDrawerProps, closeDrawer }] = useDrawerInner((data) => {
@@ -134,10 +144,12 @@
     if (data.data.lockFields) {
       status.value = data.data.lockFields?.packetActualRmbTotalPrice;
       status_score.value = data.data.lockFields?.orderScore;
+      status_issuedCommission.value = data.data.lockFields?.issuedCommission;
     }
     id.value = data.data.orderId;
     input1.value = data.data?.packetActualRmbTotalPrice;
     input2.value = data.data?.orderScore;
+    input_issuedCommission.value = data.data?.issuedCommission;
     resetFields();
     setDrawerProps({ confirmLoading: false });
     setFieldsValue({
@@ -156,7 +168,7 @@
       setDrawerProps({ confirmLoading: false });
     } else {
       try {
-        if (!input2.value) {
+        if (!input2.value && !input_issuedCommission.value) {
           await getPackageEdit({
             orderId: id.value,
             packetActualRmbTotalPrice: input1.value,
@@ -166,6 +178,7 @@
             orderId: id.value,
             packetActualRmbTotalPrice: input1.value,
             orderScore: Number(input2.value),
+            issuedCommission: Number(input_issuedCommission.value),
           });
         }
         emit('success');
@@ -97,6 +97,22 @@ export const searchFormSchema = [
       }],
     },
   },
+  {
+    field: 'orderCommissionStatus',
+    label: '提成发放状态',
+    component: 'Select',
+    colProps: { span: 8 },
+
+    componentProps: {
+      options: [ {
+        label: '未发放',
+        value: -1,
+      },{
+        label: '已发放',
+        value: 0,
+      }],
+    },
+  },
 ]
 // export const COLUMNS = [
 //   {
@@ -228,6 +244,26 @@ export const COLUMNS = [
     },
   },
   {
+    title: '已发提成',
+    dataIndex: 'issuedCommission',
+    width: 120,
+    customRender: (column) => {
+      return column.record?.issuedCommission?.toFixed(2);
+    },
+  },
+  {
+    title: '提成发放状态',
+    dataIndex: 'orderCommissionStatus',
+    width: 120,
+    customRender: (column) => {
+      if (column.record?.orderCommissionStatus === null || column.record?.orderCommissionStatus === -1) {
+        return '未发放';
+      } else if (column.record?.orderCommissionStatus === 0) {
+        return '已发放';
+      }
+    },
+  },
+  {
     title: '状态',
     dataIndex: 'status',
     width: 120,
@@ -42,6 +42,7 @@
         </template> -->
       </template>
       <template #toolbar>
+
         <a-button
           type="primary"
           @click="handleExport"
@@ -54,6 +55,14 @@
           @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
@@ -75,7 +84,7 @@
 </template>
 <script setup lang="ts">
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
-  import { getPackageProfit, setPackStatus } from '@/api/project/invoice';
+  import { getPackageProfit, setPackStatus, setCommissionStatus } from '@/api/project/invoice';
   import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -568,6 +577,21 @@
     }
   }
  
+  const handleSetCommissionStatus = async () => {
+    if (!orderIds.value.length) {
+      createMessage.warning('请先选择要设置的订单');
+      return;
+    }
+    try {
+      await setCommissionStatus({ orderIds: orderIds.value });
+      createMessage.success('设置成功');
+      handleClearChoose();
+      reload();
+    } catch (e) {
+      createMessage.error('设置失败');
+    }
+  };
+
   // 监听表单字段变化
   function handleFieldValueChange(field: string, value: any) {
     // 如果是项目号字段变化且处于全选状态，同步更新查询条件
@@ -34,5 +34,12 @@ export const FIELDS_BASE_INFO = [
     label: '跟单评分',
     rules: [{ required: true }],
   },
+  {
+    field: 'issuedCommission',
+    component: 'Select',
+    labelWidth: 150,
+    label: '已发提成',
+    rules: [{ required: true }],
+  },
 ];