Merge branch 'zwl-develop' into 'develop'

fix: 修改了业务研发净利润分析表 See merge request !12

Merge branch 'zwl-develop' into 'develop'
fix: 修改了业务研发净利润分析表 See merge request !12
张
2 parents 434c4de8 10234fd5
Showing 3 changed files with 89 additions and 55 deletions
src/views/project/approve/ReceivePanel.vue
src/views/project/finance/financeProfit/ServiceProfit/ServiceProfit/data.tsx
src/views/project/order/InvoiceCreate.vue
@@ -104,7 +104,7 @@
         </tr>
       </tbody>
     </table>
-    <a v-if="showInvoice" @click="openPic(mockData.deductUrl)" rel="noopener noreferrer">{{
+    <a v-if="showInvoice" @click="openPic(mockData.deductUrl?mockData.deductUrl:mockData.bgUrl)" rel="noopener noreferrer">{{
       mockData.invoiceName
     }}</a>
     <template #appendFooter>
@@ -212,7 +212,12 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            return record?.fieldInfos?.checkBillOrderDO?.financePerson;
+            if(record?.type === 31){
+              return record.createBy;
+            }else{
+              return record?.fieldInfos?.checkBillOrderDO?.financePerson;
+            }
+          
           },
         },
         {
@@ -221,7 +226,7 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            if(record?.type === 30){
+            if(record?.type === 30 || record?.type === 31){
               return record?.fieldInfos?.invoiceFieldVO?.invoiceNo;
             }else if(record?.type === 60){
               return record?.fieldInfos?.deductionUrlFieldVO?.invoiceNo;
@@ -235,7 +240,7 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            if(record?.type === 30){
+            if(record?.type === 30 || record?.type === 31){
             const extractedValues = ref<string[]>(
               record?.fieldInfos?.invoiceFieldVO?.innerNo?.map((item) => item),
             );
@@ -254,7 +259,9 @@
             const { record } = column || {};
             if (record?.type === 30) {
               return '应收账单申请';
-            } else if (record?.type == 60) {
+            } else if (record?.type == 31) {
+              return `Invoice创建申请`;
+            }else if (record?.type == 60) {
               return `Invoice扣款单申请${record?.fieldInfos?.deductionUrlFieldVO?.deductAmount ? `(￥${record?.fieldInfos?.deductionUrlFieldVO?.deductAmount?.toFixed(2)})` : ''}`;
             }
           },
@@ -328,6 +335,7 @@
       function handleProfitModal() {}
        // 打开图片或 PDF
        function openPic(url: string) {
+         console.log(url,'测试11111111111');
         const baseUrl = url.split('?')[0];
         if (isImageUrl(baseUrl)) {
           window.open('', '', '').document.write(`<!DOCTYPE html>
@@ -347,6 +355,9 @@
         if(data.type == 60){
          showInvoice.value = true;
          mockData.value = data.fieldInfos.deductionUrlFieldVO;
+        }else if (data.type == 31){
+          showInvoice.value=true;
+          mockData.value=data.fieldInfos.invoiceFieldVO;
         }else if(data.type == 30){
           showInvoice.value=false;
           mockData.value=data.fieldInfos.invoiceFieldVO;
@@ -365,13 +376,25 @@
         otherAmount.value = mockData.value.otherAmount?.toFixed(2);
         invoiceNo.value = mockData.value.invoiceNo;
         payee.value = mockData.value.payee;
+        if(mockData.value?.deductUrl){
           const match = mockData.value?.deductUrl?.match(/aliyuncs\.com\/(.*?)\?/);
              if (match && match[1]) {
           // 对提取的部分进行解码
+          console.log(match,'我是111');
               mockData.value.invoiceName = decodeURIComponent(match[1]);
              } else {
              mockData.value.invoiceName = mockData.value?.deductUrl;
             }
+        }else if(mockData.value?.bgUrl){
+          const match = mockData.value?.bgUrl?.match(/aliyuncs\.com\/(.*?)\?/);
+             if (match && match[1]) {
+          // 对提取的部分进行解码
+          console.log(match,'我是222');
+              mockData.value.invoiceName = decodeURIComponent(match[1]);
+             } else {
+             mockData.value.invoiceName = mockData.value?.deductUrl;
+            }
+        }
       }
       async function handleTrue() {
@@ -272,54 +272,54 @@ export const COLUMNS = [
       return column.record?.developmentProfitRate?.toFixed(2);
     },
   },
-  {
-    title: '包装费用合计￥',
-    dataIndex: 'packetRmbTotalPrice',
-    width: 150,
-    customRender: (column) => {
-      return column.record?.packetRmbTotalPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '包装费用实际金额￥',
-    dataIndex: 'packetActualRmbTotalPrice',
-    width: 160,
-    customRender: (column) => {
-      return column.record?.packetActualRmbTotalPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '实际跟单单价￥',
-    dataIndex: 'actualOrderRmbPrice',
-    width: 160,
-    customRender: (column) => {
-      return column.record?.actualOrderRmbPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '实际跟单单价折算美金￥',
-    dataIndex: 'actualOrderPrice',
-    width: 190,
-    customRender: (column) => {
-      return column.record?.actualOrderPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '包装费用收益￥',
-    dataIndex: 'packetProfitRmbPrice',
-    width: 150,
-    customRender: (column) => {
-      return column.record?.packetProfitRmbPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '综合收益￥',
-    dataIndex: 'comprehensiveProfit',
-    width: 120,
-    customRender: (column) => {
-      return column.record?.comprehensiveProfit?.toFixed(2);
-    },
-  },
+  // {
+  //   title: '包装费用合计￥',
+  //   dataIndex: 'packetRmbTotalPrice',
+  //   width: 150,
+  //   customRender: (column) => {
+  //     return column.record?.packetRmbTotalPrice?.toFixed(2);
+  //   },
+  // },
+  // {
+  //   title: '包装费用实际金额￥',
+  //   dataIndex: 'packetActualRmbTotalPrice',
+  //   width: 160,
+  //   customRender: (column) => {
+  //     return column.record?.packetActualRmbTotalPrice?.toFixed(2);
+  //   },
+  // },
+  // {
+  //   title: '实际跟单单价￥',
+  //   dataIndex: 'actualOrderRmbPrice',
+  //   width: 160,
+  //   customRender: (column) => {
+  //     return column.record?.actualOrderRmbPrice?.toFixed(2);
+  //   },
+  // },
+  // {
+  //   title: '实际跟单单价折算美金￥',
+  //   dataIndex: 'actualOrderPrice',
+  //   width: 190,
+  //   customRender: (column) => {
+  //     return column.record?.actualOrderPrice?.toFixed(2);
+  //   },
+  // },
+  // {
+  //   title: '包装费用收益￥',
+  //   dataIndex: 'packetProfitRmbPrice',
+  //   width: 150,
+  //   customRender: (column) => {
+  //     return column.record?.packetProfitRmbPrice?.toFixed(2);
+  //   },
+  // },
+  // {
+  //   title: '综合收益￥',
+  //   dataIndex: 'comprehensiveProfit',
+  //   width: 120,
+  //   customRender: (column) => {
+  //     return column.record?.comprehensiveProfit?.toFixed(2);
+  //   },
+  // },
   {
     title: '文件',
     dataIndex: 'fileUrl',
@@ -9,10 +9,10 @@
     @visible-change="handleShow"
   >
     <div>
-      <div style="font-size: 15px">Invoice编号</div>
+      <div style="font-size: 15px"><span style="color: red">*</span>Invoice编号</div>
       <a-textarea v-model:value="Input1" placeholder="请输入" auto-size />
       <div style="margin: 16px 0"></div>
-      <div>报关单(请上传PDF格式)</div
+      <div><span style="color: red">*</span>报关单(请上传PDF格式)</div
       ><a-space direction="vertical" style="width: 100%" size="large">
         <a-upload
           v-model:file-list="fileList"
@@ -59,6 +59,17 @@
       error('请勿连续点击生成按钮,需要等待三秒再点击生成');
       return;
     }
+    // 校验必填项
+    if (!Input1.value.trim()) {
+      error('请填写Invoice编号');
+      isDisabled.value = false;
+      return;
+    }
+    if (!bgUrl.value) {
+      error('请上传报关单（PDF）');
+      isDisabled.value = false;
+      return;
+    }
     isDisabled.value = true;
     setTimeout(() => {
       isDisabled.value = false;