修改审核

boyang
1 parent 1faf485d
Showing 11 changed files with 168 additions and 31 deletions
src/api/project/invoice.ts
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
src/views/project/finance/pay/pay.data.tsx
src/views/project/finance/receive/DeductShow.vue
src/views/project/finance/receive/index.vue
src/views/project/finance/receive/receive.data.tsx
src/views/project/order/ExportModal.vue
src/views/project/order/ProductProfit.vue
src/views/project/order/ServiceProfit.vue
src/views/project/order/index.vue
@@ -11,6 +11,7 @@ enum Api {
   UPDATE_AMOUNT = '/order/erp/invoice_bill/update_amount_info', //更新其他金额信息
   INVOICE_DELETE = '/order/erp/invoice_bill/delete_by_id', //删除数据
   COMMIT = '/order/erp/invoice_bill/commit_apply', //提交审核
+  GETINVOICEDEDUCTURL_BY_ID = '/order/erp/invoice_bill/getDeductUrl_by_id', //获取扣款信息
  
   PRODUCT_CREATE = '/order/erp/check_bill/create', //创建生产科应付单据
   PAYED_DATE = '/order/erp/check_bill/get_payed_date', //获取生产科应回款日期
@@ -163,6 +164,13 @@ export const exportCheckAnalysis = async (params: any) =&gt; {
   });
 };
  
+export const getInvoiceDeductUrlById = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.GETINVOICEDEDUCTURL_BY_ID,
+    params,
+  });
+};
+
 export const getDeductUrlById = async (params: any) => {
   return await defHttp.post<any>({
     url: Api.GETDEDUCTURL_BY_ID,
@@ -46,6 +46,7 @@
     :showOkBtn="!isApproved && role === ROLE.ADMIN"
   >
     <Description
+      v-if="!mockData.invoiceName"
       class="mt-4"
       layout="vertical"
       :collapseOptions="{ canExpand: true, helpMessage: 'help me' }"
@@ -53,6 +54,13 @@
       :data="mockData"
       :schema="schema"
     />
+    <a
+      v-if="mockData.invoiceName"
+      :href="mockData.invoiceUrl"
+      target="_blank"
+      rel="noopener noreferrer"
+      >{{ mockData.invoiceName }}</a
+    >
     <template #appendFooter>
       <a-button v-if="!isApproved && role === ROLE.ADMIN" @click="handleFalse"> 不通过</a-button>
     </template>
@@ -97,6 +105,7 @@
       const fieldInfos = ref({});
       const baseInfos = ref({});
       const id = ref('');
+      const showInvoice = ref(false);
  
       const mockData = ref();
       const actualPayCalculate = ref(0);
@@ -154,9 +163,9 @@
           customRender: (column) => {
             const { record } = column || {};
             if (record?.type === 40) {
-              return '生产科应付款';
+              return '应付帐单申请';
             } else if (record?.type == 50) {
-              return '生产科发票';
+              return '生产科发票申请';
             }
           },
         },
@@ -166,8 +175,11 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            console.log(record, '56565repro');
-            return record?.fieldInfos?.checkBillOrderDO?.deductDept;
+            if (record?.type === 40) {
+              return record?.fieldInfos?.checkBillOrderDO?.deductDept;
+            } else if (record?.type == 50) {
+              return record?.fieldInfos?.checkBillOrderDO?.productionName;
+            }
           },
         },
       ];
@@ -190,7 +202,7 @@
  
       const [registerTable, { reload }] = useTable({
         api: props.isApproved ? getApprovedListApi : getWaitListApi,
-        searchInfo: { type: 40 },
+        searchInfo: { type: 4050 },
         // scroll: {
         //   scrollToFirstRowOnChange: true,
         // },
@@ -231,8 +243,18 @@
       function handleProfitModal() {}
  
       async function handleDetail(data) {
+        if (data.type == 50) {
+          showInvoice.value = true;
+        }
         openModal(true, { data });
         mockData.value = data.fieldInfos.checkBillOrderDO;
+        const match = mockData.value.invoiceUrl.match(/aliyuncs\.com\/(.*?)\?/);
+        if (match && match[1]) {
+          // 对提取的部分进行解码
+          mockData.value.invoiceName = decodeURIComponent(match[1]);
+        } else {
+          mockData.value.invoiceName = mockData.value.invoiceUrl;
+        }
         id.value = data.id;
       }
  
@@ -289,6 +311,7 @@
         handlePreview,
         mockData,
         schema,
+        showInvoice,
       };
     },
   });
@@ -140,7 +140,6 @@
           dataIndex: 'invoiceNo',
           width: 150,
           customRender: (column) => {
-            console.log(column, '5656coapprove');
             const { record } = column || {};
             return record?.fieldInfos?.invoiceBillOrderDO?.invoiceNo;
           },
@@ -226,7 +225,6 @@
       async function handleDetail(data) {
         openModal(true, { data });
         mockData.value = data.fieldInfos.invoiceBillOrderDO;
-        console.log(data, 5656777);
         id.value = data.id;
       }
  
@@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [
   {
     title: '生产科实际应付金额',
     dataIndex: 'actualPayedAmount',
-    width: 120,
+    width: 150,
   },
   {
     title: '生产科发票上传',
@@ -106,19 +106,16 @@ export const columns: BasicColumn[] = [
     dataIndex: 'actualPayedAmount3',
     width: 120,
   },
-  //需修改
   {
-    title: '生产科发票',
-    dataIndex: 'invoiceStatus',
+    title: '生产科发票审核',
+    dataIndex: 'departmentInvoiceStatus',
     width: 120,
     customRender: (column) => {
-      if (column.record.invoiceStatus == -1) {
-        return '未提交审核';
-      } else if (column.record.invoiceStatus == 0) {
+      if (column.record.departmentInvoiceStatus == 0) {
         return '待审核';
-      } else if (column.record.invoiceStatus == 1) {
+      } else if (column.record.departmentInvoiceStatus == 10) {
         return '审核通过';
-      } else if (column.record.invoiceStatus == 2) {
+      } else if (column.record.departmentInvoiceStatus == 20) {
         return '审核驳回';
       }
     },
@@ -132,9 +129,9 @@ export const columns: BasicColumn[] = [
         return '未提交审核';
       } else if (column.record.status == 0) {
         return '待审核';
-      } else if (column.record.status == 1) {
+      } else if (column.record.status == 10) {
         return '审核通过';
-      } else if (column.record.status == 2) {
+      } else if (column.record.status == 20) {
         return '审核驳回';
       }
     },
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="扣款单"
+    width="700px"
+    :bodyStyle="{ height: '240px' }"
+    @ok="handleOk"
+  >
+    <a-list item-layout="horizontal" :data-source="itemArray">
+      <template #renderItem="{ item }">
+        <a-list-item>
+          <a-list-item-meta>
+            <template #title>
+              <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
+            </template>
+          </a-list-item-meta>
+        </a-list-item>
+      </template>
+    </a-list>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { computed, ref } from 'vue';
+  import type { UploadProps, UploadChangeParam } from 'ant-design-vue';
+  import { InboxOutlined } from '@ant-design/icons-vue';
+  import { message } from 'ant-design-vue';
+  import { getInvoiceDeductUrlById } from '@/api/project/invoice';
+
+  interface Item {
+    name: string;
+    url: string;
+  }
+
+  const list = ref();
+  const id = ref();
+  const itemArray = ref<Item[]>([]);
+
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    itemArray.value = [];
+    const res = await getInvoiceDeductUrlById({ id: data.data.id });
+    console.log(res, '5656resssdata');
+    for (let item in res) {
+      const url = res[item];
+      const name = item;
+      // 将 name 和 url 放入对象并添加到数组中
+      itemArray.value.push({ name, url });
+    }
+  });
+
+  async function handleOk() {
+    itemArray.value = [];
+    closeModal();
+  }
+</script>
@@ -12,6 +12,7 @@
         <InvoiceAnalysis @register="registerInvoiceAnalysis" />
         <TrackEdit @register="registerTrackEdit" @success="handleSuccess" />
         <InvoiceDetail @register="registerInvoiceDetail" />
+        <DeductShow @register="registerDeductShow" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -39,6 +40,10 @@
                 label: '删除',
                 onClick: handleDelete.bind(null, record),
               },
+              {
+                label: '扣款单',
+                onClick: handleDeductShow.bind(null, record),
+              },
             ]"
           />
         </template>
@@ -54,6 +59,7 @@
   import TrackEdit from './TrackEdit.vue';
   import InvoiceAnalysis from './InvoiceAnalysis.vue';
   import InvoiceDetail from './InvoiceDetail.vue';
+  import DeductShow from './DeductShow.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { getInvoice, deleteInvoice, commit, getBaseInvoice } from '@/api/project/invoice';
   import { useModal } from '/@/components/Modal';
@@ -68,6 +74,7 @@
   const [registerFinanceEdit, { openDrawer: openFinanceEdit }] = useDrawer();
   const [registerTrackEdit, { openDrawer: openTrackEdit }] = useDrawer();
   const [registerInvoiceDetail, { openDrawer: openInvoiceDetail }] = useDrawer();
+  const [registerDeductShow, { openModal: openDeductShow }] = useModal();
   const checkedKeys = ref<Array<string | number>>([]);
   const userStore = useUserStoreWithOut();
   const user = userStore.getUserInfo;
@@ -214,6 +221,11 @@
       reload();
     }, 50);
   }
+  function handleDeductShow(record) {
+    openDeductShow(true, {
+      data: record,
+    });
+  }
   function handleCommit(record) {
     commit({ id: record.id });
     setTimeout(() => {
@@ -71,7 +71,8 @@ export const columns: BasicColumn[] = [
       if (deductUrl == undefined) {
         return;
       }
-      return <FilePptOutlined style="font-size:25px" onClick={() => window.open(deductUrl)} />;
+      // return <FilePptOutlined style="font-size:25px" onClick={() => window.open(deductUrl[0])} />;
+      return <FilePptOutlined style="font-size:25px" />;
     },
   },
   {
@@ -108,9 +109,9 @@ export const columns: BasicColumn[] = [
         return '未提交审核';
       } else if (column.record.status == 0) {
         return '待审核';
-      } else if (column.record.status == 1) {
+      } else if (column.record.status == 10) {
         return '审核通过';
-      } else if (column.record.status == 2) {
+      } else if (column.record.status == 20) {
         return '审核驳回';
       }
     },
@@ -112,7 +112,13 @@
           ];
         }
  
-        // 质检不能导出任何
+        if (props.role === ROLE.INSPECT) {
+          return [
+            { label: '基本信息', value: 'baseFields' },
+            { label: '质检信息', value: 'inspectionStageFields' },
+          ];
+        }
+
         return [
           { label: '基本信息', value: 'baseFields' },
           { label: '质检信息', value: 'inspectionStageFields' },
@@ -145,11 +145,15 @@
   const projectNo = ref(); // 项目号
   const projectStartTime = ref(); // 项目开发开始时间
   const filteredItems = ref();
+  const ids = ref();
  
   const [register, { closeModal }] = useModalInner(async (data) => {
     res.value = data.data;
     customerCode.value = data.customerCode[0][0];
-    projectNo.value = data.projectNo[0][0];
+    const extractedValues = ref<string[]>(data.projectNo.map((item) => item[0]));
+    projectNo.value = extractedValues.value;
+    ids.value = data.data;
+    console.log(data.projectNo, '5656projectNo');
     console.log(Input2.value, 565656);
     filteredItems.value = data.filteredItems;
   });
@@ -160,6 +164,7 @@
         {
           customerCode: customerCode.value,
           projectNo: projectNo.value,
+          ids: ids.value,
           projectStartTime: projectStartTime.value,
           projectEndTime: projectEndTime.value,
           productionDepartmentPredictPrice: productionDepartmentPredictPrice.value,
@@ -206,6 +211,8 @@
       projectEndTime.value = null;
       productionDepartmentPredictPrice.value = null;
       productionActualPrice.value = null;
+      projectNo.value = null;
+      ids.value = null;
     }
   }
   function formatDateTime(dateTime: string): string {
@@ -218,6 +225,7 @@
     const res = await calculateInnerProfitRatio({
       customerCode: customerCode.value,
       projectNo: projectNo.value,
+      ids: ids.value,
       projectStartTime: projectStartTime.value,
       projectEndTime: projectEndTime.value,
       productionDepartmentPredictPrice: productionDepartmentPredictPrice.value,
@@ -147,6 +147,20 @@
           <td style="border: 1px solid black"></td>
         </tr>
         <tr>
+          <td style="border: 1px solid black" colspan="2">实际汇率</td>
+          <td style="border: 1px solid black"
+            ><a-input v-model:value="actualRatio" placeholder="请输入"
+          /></td>
+          <td style="border: 1px solid black"></td>
+        </tr>
+        <tr>
+          <td style="border: 1px solid black" colspan="2">实际跟单费用</td>
+          <td style="border: 1px solid black"
+            ><a-input v-model:value="actualdocumentaryPrice" placeholder="请输入"
+          /></td>
+          <td style="border: 1px solid black"></td>
+        </tr>
+        <tr>
           <td style="border: 1px solid black" colspan="2">实际跟单单价=实际跟单费用/件数</td>
           <td style="border: 1px solid black">{{ actualRmbPrice }}</td>
           <td style="border: 1px solid black"></td>
@@ -203,8 +217,9 @@
   const chinaRatio = ref(0);
   const actualRmbPrice = ref(0); //实际跟单单价
   const actualPrice = ref(0); //实际跟单单价折算美金
-  const actualRatio = ref(6.2); //实际汇率
+  const actualRatio = ref(); //实际汇率
   const customerTotalPrice = ref(); //客户总价合计
+  const actualdocumentaryPrice = ref(); //实际跟单费用
   const actualRatioProfitPrice = ref(); //汇率收益
   const grossProfit = ref(); //毛利润合计
   const actualRatiactualRatioProfitPriceo = ref(); //汇率收益计算
@@ -218,6 +233,7 @@
   const productionDepartmentTotalPrice = ref(); //生成科总价￥
   const totalProfitPrice = ref(); //综合收益计算
   const spainRatioProfitPrice = ref(); //西班牙提成金额
+  const ids = ref();
  
   // const orderRes = await getOrderList({});
   // console.log(orderRes, '5656orderRes');
@@ -225,7 +241,9 @@
     res.value = data.data;
     orderList.value = data.res;
     customerCode.value = data.customerCode[0][0];
-    projectNo.value = data.projectNo[0][0];
+    ids.value = data.data;
+    const extractedValues = ref<string[]>(data.projectNo.map((item) => item[0]));
+    projectNo.value = extractedValues.value;
     console.log(orderList.value, 565656);
   });
   async function handleOk() {
@@ -235,11 +253,13 @@
         {
           customerCode: customerCode.value,
           projectNo: projectNo.value,
+          ids: ids.value,
           projectStartTime: projectStartTime.value,
           projectEndTime: projectEndTime.value,
           produceStartTime: produceStartTime.value,
           produceEndTime: produceEndTime.value,
           developTotalPrice: developTotalPrice.value,
+          actualdocumentaryPrice: actualdocumentaryPrice.value,
           copyTotalPrice: copyTotalPrice.value,
           spainRatio: spainRatio.value,
           chinaRatio: chinaRatio.value,
@@ -291,7 +311,9 @@
       produceEndTime.value = null;
       customerCode.value = null;
       projectNo.value = null;
+      ids.value = null;
       developTotalPrice.value = null;
+      actualdocumentaryPrice.value = null;
       copyTotalPrice.value = null;
       packetActualTotalPrice.value = null;
     }
@@ -340,11 +362,13 @@
     const params = {
       customerCode: customerCode.value,
       projectNo: projectNo.value,
+      ids: ids.value,
       projectStartTime: projectStartTime.value,
       projectEndTime: projectEndTime.value,
       produceStartTime: produceStartTime.value,
       produceEndTime: produceEndTime.value,
       developTotalPrice: developTotalPrice.value,
+      actualdocumentaryPrice: actualdocumentaryPrice.value,
       copyTotalPrice: copyTotalPrice.value,
       spainRatio: spainRatio.value,
       chinaRatio: chinaRatio.value,
@@ -357,11 +381,13 @@
     const res = await calculateBusinessProfit({
       customerCode: customerCode.value,
       projectNo: projectNo.value,
+      ids: ids.value,
       projectStartTime: projectStartTime.value,
       projectEndTime: projectEndTime.value,
       produceStartTime: produceStartTime.value,
       produceEndTime: produceEndTime.value,
       developTotalPrice: developTotalPrice.value,
+      actualdocumentaryPrice: actualdocumentaryPrice.value,
       copyTotalPrice: copyTotalPrice.value,
       spainRatio: spainRatio.value,
       chinaRatio: chinaRatio.value,
@@ -155,12 +155,14 @@
                 :style="{ borderRadius: '5px 5px 5px 5px' }"
                 type="primary"
                 @click="handleProductProfitModal"
+                v-if="role === ROLE.ADMIN || role === ROLE.FINANCE"
                 >内部生产净利润分析</a-button
               >
               <a-button
                 :style="{ borderRadius: '5px 5px 5px 5px' }"
                 type="primary"
                 @click="handleServiceProfitModal"
+                v-if="role === ROLE.ADMIN || role === ROLE.FINANCE"
                 >业务/研发净利润分析</a-button
               >
               <a-button
@@ -177,7 +179,6 @@
                 v-if="role === ROLE.ADMIN"
                 >比重计算</a-button
               >
-              <!-- 质检角色不能导出任何信息 -->
               <a-button
                 :style="{ borderRadius: '5px 5px 5px 5px' }"
                 type="primary"
@@ -186,7 +187,8 @@
                   role === ROLE.ADMIN ||
                   role === ROLE.TRACKER ||
                   role === ROLE.BUSINESS ||
-                  role === ROLE.FINANCE
+                  role === ROLE.FINANCE ||
+                  role === ROLE.INSPECT
                 "
                 >导出</a-button
               >
@@ -990,10 +992,10 @@
           error('勾选订单的客户编码需一致');
           return;
         }
-        if (selectedProjectNos.value.length > 1) {
-          error('勾选订单的项目号需一致');
-          return;
-        }
+        // if (selectedProjectNos.value.length > 1) {
+        //   error('勾选订单的项目号需一致');
+        //   return;
+        // }
         const form = getForm();
         const values = form.getFieldsValue();
         const resAll = await getOrderList({});