Merge branch 'zwl-develop' into 'develop'

fix: 补充功能 See merge request !27

Merge branch 'zwl-develop' into 'develop'
fix: 补充功能 See merge request !27
张
2 parents 8524ad17 a4ffebc4
Showing 6 changed files with 135 additions and 52 deletions
src/views/project/finance/financeProfit/ProductProfit/InnerData/tableData.tsx
src/views/project/finance/financeProfit/ProductProfit/InnerProduce/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/ServiceProfit/FinanceEdit.vue
src/views/project/order/InvoiceCreate.vue
@@ -73,6 +73,7 @@ export const EDIT_INFO = [
     rules: [{ required: true }],
   },
 ];
+// 以下为明细表字段审核详情中的申请字段，用于回显
 export const APPLY_INFO = [
   {
     field: 'packetActualRmbTotalPrice',
@@ -89,6 +90,20 @@ export const APPLY_INFO = [
     rules: [{ required: true }],
   },
   {
+    field: 'paidRmbCommission',
+    component: 'Select',
+    labelWidth: 150,
+    label: '中国团队已发提成',
+    rules: [{ required: true }],
+  },
+  {
+    field: 'spainPaidRmbCommission',
+    component: 'Select',
+    labelWidth: 150,
+    label: '西班牙团队已发提成',
+    rules: [{ required: true }],
+  },
+  {
     field: 'issuedCommission',
     component: 'Select',
     labelWidth: 150,
@@ -208,7 +208,7 @@
     if (loading.value) return;
     loading.value = true;
     setDrawerProps({ confirmLoading: true });
-    if (!input1.value || !input2.value || !input3.value) {
+    if (!input3.value || !input4.value) {
       error('选项不能为空');
       loading.value = false;
       setDrawerProps({ confirmLoading: false });
@@ -92,24 +92,11 @@ export const searchFormSchema = [
         label: '待审核',
         value: 0,
       }, {
-        label: '已完成',
-        value: 1,
-      }],
-    },
-  },
-  {
-    field: 'orderCommissionStatus',
-    label: '提成发放状态',
-    component: 'Select',
-    colProps: { span: 8 },
-
-    componentProps: {
-      options: [ {
-        label: '未发放',
-        value: -1,
-      },{
         label: '已发放',
-        value: 0,
+        value: 1,
+      }, {
+        label: '应发但不发',
+        value: 2,
       }],
     },
   },
@@ -252,18 +239,6 @@ export const COLUMNS = [
     },
   },
   {
-    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: 'packNotes',
     width: 200,
@@ -278,7 +253,9 @@ export const COLUMNS = [
       } else if (column.record?.packStatus === 0) {
         return '待审核';
       } else if (column.record?.packStatus === 1) {
-        return '已审核';
+        return '已发放';
+      } else if (column.record?.packStatus === 2) {
+        return '应发但不发';
       }
     },
   },
@@ -80,7 +80,8 @@
   import { searchFormSchema, COLUMNS, allProjectNoOptions } from './data';
   import { BasicModal, useModal } from '/@/components/Modal';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { onMounted, ref, computed } from 'vue';
+  import { onMounted, ref, computed, h } from 'vue';
+  import { Modal } from 'ant-design-vue';
   import { useDrawer } from '/@/components/Drawer';
   import FinanceEdit from './FinanceEdit.vue';
   import CheckDetail from './CheckDetail.vue';
@@ -223,14 +224,15 @@
         ...(role.value === ROLE.ADMIN ? [
           {
             label: '审核通过',
-            popConfirm: {
-              title: '确认审核？',
-              confirm: () => {
-                if (record.packStatus === 0) {
-                  handleStatus(record, true);
-                }
+            onClick: () => {
+              // 如果状态为未完成(-1)，则不响应
+              if (record.packStatus === -1) {
+                createMessage.warning('请先完成财务编辑');
                 return;
-              },
+              }
+              else{
+                showAuditOptions(record);
+              }
             },
           },
         ] : []),
@@ -258,10 +260,6 @@
           label: '历史记录',
           onClick: handleHistoryDetail.bind(null, record),
         },
-        {
-          label: '设置为已发提成',
-          onClick: () => handleSetCommissionStatusSingle(record),
-        },
       ];
       return actions;
     }
@@ -312,12 +310,94 @@
  
   async function handleStatus(record, status) {
     try {
-      await setPackStatus({ orderId: record.orderId });
+      // 检查必要参数是否存在
+      if (!record.orderId) {
+        createMessage.error('缺少必要的参数：orderId');
+        return;
+      }
+      
+      // 根据不同的状态调用不同的接口
+      if (status === 'approved') {
+        await setPackStatus({ 
+          orderId: record.orderId,
+          packStatus: 1  // 已发放状态
+        });
+        createMessage.success('设置为已发放成功！');
+      } else if (status === 'sentButNotPaid') {
+        await setPackStatus({ 
+          orderId: record.orderId,
+          packStatus: 2  // 应发但不发状态
+        });
+        createMessage.success('设置为应发但不发成功！');
+      } else {
+        // 默认已发放
+        await setPackStatus({ 
+          orderId: record.orderId,
+          packStatus: 1  // 默认已发放状态
+        });
+        createMessage.success('状态更新成功！');
+      }
+      
       reload();
     } catch (error) {
-      console.error(error);
+      console.error('Error updating status:', error);
+      createMessage.error('状态更新失败：' + (error.message || '未知错误'));
     }
   }
+
+  // 显示审核选项
+  function showAuditOptions(record) {
+    // 检查当前状态
+    const isReviewed = record.packStatus === 1; // 已发放状态
+    const isSentButNotPaid = record.packStatus === 2; // 应发但不发状态
+    const hasCommission = record.copyCommission; // 是否有提成配置
+    
+    // 使用 Modal 显示选项
+    Modal.confirm({
+      title: '选择审核结果',
+      content: h('div', [
+        h('div', { style: 'margin-top: 16px;' }, [
+          // 已发放按钮
+          h('button', {
+            style: isReviewed 
+              ? 'margin-right: 8px; padding: 4px 8px; color: #666; background-color: #f5f5f5; border-radius: 2px; cursor: not-allowed; border: 1px solid #d9d9d9;' 
+              : 'margin-right: 8px; padding: 4px 8px; color: white; background-color: #40a9ff; border-radius: 2px; cursor: pointer;',
+            disabled: isReviewed, // 如果已发放则禁用
+            onClick: () => {
+              if (!isReviewed) {
+                if (hasCommission) {
+                  Modal.destroyAll();
+                  handleStatus(record, 'approved'); // 已发放
+                } else {
+                  createMessage.error('请先在系统中配置包装提成金额');
+                }
+              }
+            }
+          }, isReviewed ? '已发放' : '已发放'),
+          // 应发但不发按钮
+          h('button', {
+            style: (isReviewed || isSentButNotPaid)
+              ? 'margin-right: 8px; padding: 4px 8px; color: #666; background-color: #f5f5f5; border-radius: 2px; cursor: not-allowed; border: 1px solid #d9d9d9;' 
+              : 'margin-right: 8px; padding: 4px 8px; color: white; background-color: #40a9ff; border-radius: 2px; cursor: pointer;',
+            disabled: isReviewed || isSentButNotPaid, // 如果已发放或应发但不发则禁用
+            onClick: () => {
+              if (!isReviewed && !isSentButNotPaid) {
+                if (hasCommission) {
+                  Modal.destroyAll();
+                  handleStatus(record, 'sentButNotPaid'); // 应发但不发
+                } else {
+                  createMessage.error('请先在系统中配置包装提成金额');
+                }
+              }
+            }
+          }, (isReviewed || isSentButNotPaid) ? '应发但不发' : '应发但不发'),
+        ])
+      ]),
+      onCancel: () => {
+        Modal.destroyAll();
+      }
+    });
+  }
  
   function handleHistoryDetail(record) {
     openHistoryDetail(true, {
@@ -574,12 +654,16 @@
   }
  
   const handleSetCommissionStatusSingle = async (record) => {
-    try {
-      await setCommissionStatus({ orderId: record.orderId });
-      createMessage.success('设置成功');
-      reload();
-    } catch (e) {
-      createMessage.error('设置失败');
+    if(record.copyCommission){
+      try {
+        await setCommissionStatus({ orderId: record.orderId });
+        createMessage.success('设置成功');
+        reload();
+      } catch (e) {
+        createMessage.error('设置失败');
+      }
+    }else{
+      error('请先在系统中配置包装提成金额');
     }
   };
  
@@ -231,7 +231,7 @@
     //   id: update.value.data.id,
     //   bgUrl: update.value.data.bgUrl,
     // };
-    if (!input1.value || !input2.value || !input3.value || !input4.value) {
+    if (!input1.value || !input2.value || !input3.value || !input4.value || !input5.value) {
       error('选项不能为空');
       loading.value = false;
       setDrawerProps({ confirmLoading: false });
@@ -21,6 +21,7 @@
           :max-count="1"
           :action="uploadUrl"
           @change="handleChange"
+          @preview="openPic"
         >
           <a-button> 上传报关单 </a-button>
         </a-upload>
@@ -85,6 +86,7 @@
   }
   function handleChange(info) {
     if (info.file.status == 'done') {
+      info.file.url = info.file.response.data.fileUrl; // 确保 onPreview 能拿到 url
       bgUrl.value = info.file.response.data.fileUrl;
     }
   }
@@ -97,4 +99,9 @@
       fileList.value = [];
     }
   }
+  function openPic(file) {
+  const url = file.url || file.thumbUrl;
+  if (!url) return;
+  window.open(url, '_blank');
+}
 </script>