修改打开图片bug

boyang
1 parent 47b3c41c
Showing 16 changed files with 208 additions and 31 deletions
src/api/project/invoice.ts
src/views/project/approve/PayPanel.vue
src/views/project/approve/ReceivePanel.vue
src/views/project/config/CreateModal.vue
src/views/project/config/data.tsx
src/views/project/finance/pay/DeductShow.vue
src/views/project/finance/pay/InvoiceShow.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/receive/DeductShow.vue
src/views/project/finance/receive/FinanceEdit.vue
src/views/project/finance/receive/InvoiceAnalysis.vue
src/views/project/finance/receive/InvoiceDetail.vue
src/views/project/finance/receive/index.vue
src/views/project/finance/receive/receive.data.tsx
src/views/project/order/ProductText.vue
src/views/project/order/ServiceProfit.vue
@@ -25,6 +25,7 @@ enum Api {
   CHECK_ANALYSIS = '/order/erp/check_bill/list_analysis_by', //分析列表
   EXPORT_CHECK_ANALYSIS = '/order/erp/check_bill/export', //导出分析列表
   GETDEDUCTURL_BY_ID = '/order/erp/check_bill/getDeductUrl_by_id', //获取扣款信息
+  GETINVOICEURL_BY_ID = '/order/erp/check_bill/getInvoiceUrl_by_id', //获取扣款信息
 }
 export const getRefundDate = async (params: any, data?: any) => {
@@ -177,3 +178,10 @@ export const getDeductUrlById = async (params: any) =&gt; {
     params,
   });
 };
+
+export const getInvoiceUrlById = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.GETDEDUCTURL_BY_ID,
+    params,
+  });
+};
@@ -54,13 +54,20 @@
       :data="mockData"
       :schema="schema"
     />
-    <a
-      v-if="mockData.invoiceName"
-      :href="mockData.invoiceUrl"
-      target="_blank"
-      rel="noopener noreferrer"
-      >{{ mockData.invoiceName }}</a
-    >
+    <a v-if="mockData.invoiceName" @click="openPic(mockData.deductUrl)" rel="noopener noreferrer">{{
+      mockData.invoiceName
+    }}</a>
+    <!-- <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> -->
     <template #appendFooter>
       <a-button v-if="!isApproved && role === ROLE.ADMIN" @click="handleFalse"> 不通过</a-button>
     </template>
@@ -108,6 +115,11 @@
       const showInvoice = ref(false);
       const mockData = ref();
+      interface Item {
+        name: string;
+        url: string;
+      }
+      const itemArray = ref<Item[]>([]);
       const actualPayCalculate = ref(0);
       const schema = [
         {
@@ -123,8 +135,8 @@
           label: '实际付款日期',
         },
         {
-          field: 'totalProductionAmount',
-          label: '生产科总金额汇总',
+          field: 'unPayedAmount',
+          label: '未付金额',
         },
         {
           field: 'totalActualPayedAmount',
@@ -163,7 +175,7 @@
           customRender: (column) => {
             const { record } = column || {};
             if (record?.type === 40) {
-              return '应付帐单申请';
+              return '应付账单申请';
             } else if (record?.type == 50) {
               return '生产科发票申请';
             }
@@ -247,13 +259,14 @@
           showInvoice.value = true;
         }
         openModal(true, { data });
+        itemArray.value = [];
         mockData.value = data.fieldInfos.checkBillOrderDO;
-        const match = mockData.value.invoiceUrl.match(/aliyuncs\.com\/(.*?)\?/);
+        const match = mockData.value.deductUrl.match(/aliyuncs\.com\/(.*?)\?/);
         if (match && match[1]) {
           // 对提取的部分进行解码
           mockData.value.invoiceName = decodeURIComponent(match[1]);
         } else {
-          mockData.value.invoiceName = mockData.value.invoiceUrl;
+          mockData.value.invoiceName = mockData.value.deductUrl;
         }
         id.value = data.id;
       }
@@ -290,6 +303,18 @@
         return false;
       };
+      function openPic(url) {
+        window.open('', '', '').document.write(`<!DOCTYPE html>
+          <html>
+            <body 
+                style="display: flex;
+                justify-content: center;
+                align-items: center;">
+              <img src='${url}' width="500px" height="500px"/>
+            </body>
+          </html>`);
+      }
+
       return {
         handleProfitModal,
         registerTable,
@@ -312,6 +337,7 @@
         mockData,
         schema,
         showInvoice,
+        openPic,
       };
     },
   });
@@ -99,7 +99,7 @@
       const mockData = ref();
       const schema: DescItem[] = [
         {
-          field: 'actualReceivableAmount',
+          field: 'totalPayAmount',
           label: '实际收款金额汇总',
         },
         {
@@ -39,17 +39,50 @@
         info.value = '';
       });
-      const { customerCode: customerCodeOptions } = useOrderInfo(orderStore);
+      const { customerCode: customerCodeOptions, productionDepartment: productDepartmentOptions } =
+        useOrderInfo(orderStore);
       var [registerForm, { getFieldsValue, validate }] = useForm({
         labelWidth: 100,
+        // schemas: [
+        //   {
+        //     field: 'settingValue',
+        //     component: 'Select',
+        //     label: '客户编码',
+        //     rules: [{ required: true }],
+        //     componentProps: {
+        //       options: customerCodeOptions,
+        //     },
+        //     colProps: {
+        //       span: 24,
+        //     },
+        //   },
+        //   {
+        //     field: 'relationValue',
+        //     component: 'InputNumber',
+        //     label:
+        //       props.column === 1
+        //         ? '利润率'
+        //         : props.column === 2
+        //         ? '包装费用'
+        //         : props.column === 5
+        //         ? '最后回款日期'
+        //         : props.column === 7
+        //         ? '销售额'
+        //         : '生产科回款日期',
+        //     rules: [{ required: true }],
+        //     colProps: {
+        //       span: 24,
+        //     },
+        //   },
+        // ],
         schemas: [
           {
             field: 'settingValue',
             component: 'Select',
-            label: '客户编码',
+            label: props.column === 8 ? '生产科' : '客户编码',
             rules: [{ required: true }],
             componentProps: {
-              options: customerCodeOptions,
+              options: props.column === 8 ? productDepartmentOptions : customerCodeOptions,
             },
             colProps: {
               span: 24,
@@ -119,7 +119,7 @@ export const COLUMNS = {
   ],
   8: [
     {
-      title: '客户编码',
+      title: '生产科',
       dataIndex: 'settingValue',
       width: 150,
     },
@@ -12,7 +12,8 @@
         <a-list-item>
           <a-list-item-meta>
             <template #title>
-              <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
+              <!-- <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a> -->
+              <a @click="openPic(item.url)">{{ item.name }}</a>
             </template>
           </a-list-item-meta>
         </a-list-item>
@@ -52,4 +53,15 @@
     itemArray.value = [];
     closeModal();
   }
+  function openPic(url) {
+    window.open('', '', '').document.write(`<!DOCTYPE html>
+          <html>
+            <body 
+                style="display: flex;
+                justify-content: center;
+                align-items: center;">
+              <img src='${url}' width="500px" height="500px"/>
+            </body>
+          </html>`);
+  }
 </script>
+<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> -->
+              <a @click="openPic(item.url)">{{ 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 { getDeductUrlById, getInvoiceUrlById } 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 getInvoiceUrlById({ id: data.data.id });
+    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();
+  }
+  function openPic(url) {
+    window.open('', '', '').document.write(`<!DOCTYPE html>
+          <html>
+            <body 
+                style="display: flex;
+                justify-content: center;
+                align-items: center;">
+              <img src='${url}' width="500px" height="500px"/>
+            </body>
+          </html>`);
+  }
+</script>
@@ -14,6 +14,7 @@
         <InvoiceUpload @register="registerInvoiceUpload" @success="handleSuccess" />
         <CheckDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
+        <InvoiceShow @register="registerInvoiceShow" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -70,6 +71,7 @@
   import CheckDetail from './CheckDetail.vue';
   import CheckSum from './CheckSum.vue';
   import DeductShow from './DeductShow.vue';
+  import InvoiceShow from './InvoiceShow.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useModal } from '/@/components/Modal';
   import { getCheck, checkDelete, checkCommit, checkDetail } from '@/api/project/invoice';
@@ -80,6 +82,7 @@
   const [registerTrackEdit, { openDrawer: openTrackEdit }] = useDrawer();
   const [registerInvoiceUpload, { openModal: openInvoiceUpload }] = useModal();
   const [registerDeductShow, { openModal: openDeductShow }] = useModal();
+  const [registerInvoiceShow, { openModal: openInvoiceShow }] = useModal();
   const [registerInvoiceDetail, { openDrawer: openCheckDetail }] = useDrawer();
   const checkedKeys = ref<Array<string | number>>([]);
@@ -393,7 +396,9 @@
     }, 50);
   }
   function handleInvoiceShow(record) {
-    window.open(record.invoiceUrl);
+    openInvoiceShow(true, {
+      data: record,
+    });
   }
   function handleDeductShow(record) {
     openDeductShow(true, {
@@ -406,7 +411,14 @@
     });
   }
   function handleCommit(record) {
-    checkCommit({ id: record.id });
+    const currentDate: string = (() => {
+      const date = new Date();
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    })();
+    checkCommit({ id: record.id, actualPayedDate: currentDate });
     setTimeout(() => {
       reload();
     }, 50);
@@ -12,7 +12,8 @@
         <a-list-item>
           <a-list-item-meta>
             <template #title>
-              <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a>
+              <!-- <a :href="item.url" target="_blank" rel="noopener noreferrer">{{ item.name }}</a> -->
+              <a @click="openPic(item.url)">{{ item.name }}</a>
             </template>
           </a-list-item-meta>
         </a-list-item>
@@ -53,4 +54,15 @@
     itemArray.value = [];
     closeModal();
   }
+  function openPic(url) {
+    window.open('', '', '').document.write(`<!DOCTYPE html>
+          <html>
+            <body 
+                style="display: flex;
+                justify-content: center;
+                align-items: center;">
+              <img src='${url}' width="500px" height="500px"/>
+            </body>
+          </html>`);
+  }
 </script>
@@ -33,7 +33,7 @@
   const emit = defineEmits(['success']);
   const schemas: FormSchema[] = [
     // {
-    //   field: 'actualReceivableAmount',
+    //   field: 'totalPayAmount',
     //   component: 'InputNumber',
     //   labelWidth: 250,
     //   colProps: {
@@ -54,7 +54,7 @@
     },
     {
       title: '实际收款金额汇总$',
-      dataIndex: 'actualReceivableAmount',
+      dataIndex: 'totalPayAmount',
       width: 50,
     },
     {
@@ -74,12 +74,12 @@
     {
       title: '客户单价$',
       width: 150,
-      dataIndex: 'orderCount',
+      dataIndex: 'customerPrice',
     },
     {
       title: '客户总价$',
       width: 150,
-      dataIndex: 'orderCount',
+      dataIndex: 'customerTotalPrice',
     },
   ];
   const invoiceNo = ref();
@@ -227,7 +227,14 @@
     });
   }
   function handleCommit(record) {
-    commit({ id: record.id });
+    const currentDate: string = (() => {
+      const date = new Date();
+      const year = date.getFullYear();
+      const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始
+      const day = String(date.getDate()).padStart(2, '0');
+      return `${year}-${month}-${day}`;
+    })();
+    commit({ id: record.id, actualRefundDate: currentDate });
     setTimeout(() => {
       reload();
     }, 50);
@@ -77,7 +77,7 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '实际应收金额$',
-    dataIndex: 'actualReceivableAmount',
+    dataIndex: 'totalPayAmount',
     width: 120,
   },
   {
@@ -130,7 +130,7 @@ export const columnsAnalysis: BasicColumn[] = [
   },
   {
     title: '实际应收金额总计$',
-    dataIndex: 'actualReceivableAmount',
+    dataIndex: 'totalPayAmount',
     width: 50,
   },
   {
@@ -145,7 +145,7 @@ export const columnsAnalysis: BasicColumn[] = [
   },
   {
     title: '实际应收金额总计$',
-    dataIndex: 'actualReceivableAmount',
+    dataIndex: 'totalPayAmount',
     width: 50,
   },
   {
@@ -173,7 +173,7 @@
       }
       //查看pdf
       function handlePdf() {
-        window.open(resText.value.productionUrl);
+        window.open(resText.value.productionUrl, '_blank');
       }
       //发送按钮
       async function handleExport() {
@@ -390,7 +390,7 @@
     allList.forEach((item) => {
       console.log(item, '5656orderList');
       console.log(item.profitAnalysisInfo.packetPrice, '5656orderList');
-      packetCalculatePrice.value += item.profitAnalysisInfo.packetPrice;
+      packetCalculatePrice.value += item?.profitAnalysisInfo?.packetPrice;
       orderCalculateCount.value += item.orderCount;
       actualRmbPrice.value += packetCalculatePrice.value / orderCalculateCount.value;
     });