Merge branch 'refs/heads/by' into real1122

boyang
2 parents 52586d31 03d2a1f5
Showing 9 changed files with 223 additions and 7 deletions
src/api/project/invoice.ts
src/views/project/approve/PayPanel.vue
src/views/project/approve/index.vue
src/views/project/finance/pay/DeductShow.vue
src/views/project/finance/pay/EditRefundTime.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/receive/DeductShow.vue
src/views/project/finance/receive/EditRefundTime.vue
src/views/project/finance/receive/index.vue
@@ -15,6 +15,7 @@ enum Api {
   GETINVOICEDEDUCTURL_BY_ID = '/order/erp/invoice_bill/getDeductUrl_by_id', //获取扣款信息
   REUPLOADBGURL = '/order/erp/invoice_bill/reUploadBgUrl', //更新报关单
   INVOICEEXPORTRECEIPT = '/order/erp/invoice_bill/exportReceipt', //收款单导出
+  SETBACKREFUNDDATE = '/order/erp/invoice_bill/setBackRefundDate', //必须回款日期
   PRODUCT_CREATE = '/order/erp/check_bill/create', //创建生产科应付单据
   PAYED_DATE = '/order/erp/check_bill/get_payed_date', //获取生产科应回款日期
@@ -30,6 +31,7 @@ enum Api {
   GETDEDUCTURL_BY_ID = '/order/erp/check_bill/getDeductUrl_by_id', //获取扣款信息
   GETINVOICEURL_BY_ID = '/order/erp/check_bill/getInvoiceUrl_by_id', //获取扣款信息
   EXPORTRECEIPT = '/order/erp/check_bill/exportReceipt', //付款单导出
+  SETPADYEDDATE = '/order/erp/check_bill/setPayedDate', //修改应付款日期
 }
 export const getRefundDate = async (params: any, data?: any) => {
@@ -250,3 +252,17 @@ export const getInvoiceExportReceipt = async (params: any) =&gt; {
     params,
   });
 };
+
+export const getSetBackRefundDate = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.SETBACKREFUNDDATE,
+    params,
+  });
+};
+
+export const getSetPayedDate = async (params: any) => {
+  return await defHttp.post<any>({
+    url: Api.SETPADYEDDATE,
+    params,
+  });
+};
@@ -461,7 +461,7 @@
           window.open('', '', '').document.write(`<!DOCTYPE html>
       <html>
         <body style="display: flex; justify-content: center; align-items: center;">
-          <img src='${url}' width="500px" height="500px"/>
+          <img src='${url}' width="300px" height="auto"/>
         </body>
       </html>`);
         } else if (isPdfUrl(baseUrl)) {
@@ -10,10 +10,28 @@
       <a-tab-pane key="5" tab="项目报告书待审核" v-if="role !== ROLE.FINANCE">
         <ReportPanel />
       </a-tab-pane>
-      <a-tab-pane key="7" tab="应收款待审核" v-if="role == ROLE.FINANCE || role == ROLE.ADMIN">
+      <a-tab-pane
+        key="7"
+        tab="应收款待审核"
+        v-if="
+          role == ROLE.FINANCE ||
+          role == ROLE.ADMIN ||
+          role == ROLE.BUSINESS ||
+          role == ROLE.TRACKER
+        "
+      >
         <ReceivePanel />
       </a-tab-pane>
-      <a-tab-pane key="9" tab="应付款待审核" v-if="role == ROLE.FINANCE || role == ROLE.ADMIN">
+      <a-tab-pane
+        key="9"
+        tab="应付款待审核"
+        v-if="
+          role == ROLE.FINANCE ||
+          role == ROLE.ADMIN ||
+          role == ROLE.BUSINESS ||
+          role == ROLE.TRACKER
+        "
+      >
         <PayPanel />
       </a-tab-pane>
       <a-tab-pane key="2" tab="字段已审核" v-if="role !== ROLE.FINANCE">
@@ -25,10 +43,28 @@
       <a-tab-pane key="6" tab="项目报告书已审核" v-if="role !== ROLE.FINANCE">
         <ReportPanel isApproved />
       </a-tab-pane>
-      <a-tab-pane key="8" tab="应收款已审核" v-if="role == ROLE.FINANCE || role == ROLE.ADMIN">
+      <a-tab-pane
+        key="8"
+        tab="应收款已审核"
+        v-if="
+          role == ROLE.FINANCE ||
+          role == ROLE.ADMIN ||
+          role == ROLE.BUSINESS ||
+          role == ROLE.TRACKER
+        "
+      >
         <ReceivePanel isApproved />
       </a-tab-pane>
-      <a-tab-pane key="10" tab="应付款已审核" v-if="role == ROLE.FINANCE || role == ROLE.ADMIN">
+      <a-tab-pane
+        key="10"
+        tab="应付款已审核"
+        v-if="
+          role == ROLE.FINANCE ||
+          role == ROLE.ADMIN ||
+          role == ROLE.BUSINESS ||
+          role == ROLE.TRACKER
+        "
+      >
         <PayPanel isApproved />
       </a-tab-pane>
     </a-tabs>
@@ -85,7 +85,7 @@
       window.open('', '', '').document.write(`<!DOCTYPE html>
       <html>
         <body style="display: flex; justify-content: center; align-items: center;">
-          <img src='${url}' width="500px" height="500px"/>
+          <img src='${url}' width="300px" height="auto"/>
         </body>
       </html>`);
     } else if (isPdfUrl(baseUrl)) {
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="修改应付款日期"
+    width="500px"
+    :bodyStyle="{ height: '240px' }"
+    @visible-change="handleShow"
+    @ok="handleOk"
+  >
+    请选择日期：
+    <a-date-picker v-model:value="date" />
+    <div style="height: 10px"></div>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref } from 'vue';
+  import { getSetPayedDate } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const id = ref();
+  const date = ref();
+  const emit = defineEmits(['success']);
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    id.value = data.data.id;
+  });
+  function formatDate(input: string): string {
+    // 创建一个 Date 对象
+    const date = new Date(input);
+
+    // 获取年月日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，所以要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+
+    // 返回格式化后的日期字符串
+    return `${year}-${month}-${day}`;
+  }
+  const isDisabled = ref(false);
+  async function handleOk() {
+    if (isDisabled.value) {
+      error('请勿连续点击生成按钮,需要等待三秒再点击生成');
+      return;
+    }
+    const formattedDate = formatDate(date.value);
+    isDisabled.value = true;
+    setTimeout(() => {
+      isDisabled.value = false;
+    }, 3000);
+    getSetPayedDate({ id: id.value, payedDate: formattedDate });
+    emit('success');
+    closeModal();
+  }
+  function handleShow(visible: boolean) {
+    if (!visible) {
+      date.value = null;
+    }
+  }
+</script>
@@ -16,6 +16,7 @@
         <DeductShow @register="registerDeductShow" />
         <InvoiceShow @register="registerInvoiceShow" />
         <Commit @register="registerCommit" @success="handleSuccess" />
+        <EditRefundTime @register="registerEditRefundTime" @success="handleSuccess" />
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
@@ -74,6 +75,14 @@
                 label: '扣款单',
                 onClick: handleDeductShow.bind(null, record),
               },
+              ...(role == ROLE.ADMIN
+                ? [
+                    {
+                      label: '修改应付款日期',
+                      onClick: handleEditRefundTime.bind(null, record),
+                    },
+                  ]
+                : []),
             ]"
           />
           <TableAction
@@ -106,6 +115,7 @@
   import DeductShow from './DeductShow.vue';
   import InvoiceShow from './InvoiceShow.vue';
   import Commit from './Commit.vue';
+  import EditRefundTime from './EditRefundTime.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { useModal } from '/@/components/Modal';
   import { getCheck, checkDelete, checkCommit, checkDetail } from '@/api/project/invoice';
@@ -120,6 +130,7 @@
   const [registerInvoiceUpload, { openModal: openInvoiceUpload }] = useModal();
   const [registerDeductShow, { openModal: openDeductShow }] = useModal();
   const [registerCommit, { openModal: openCommit }] = useModal();
+  const [registerEditRefundTime, { openModal: openEditRefundTime }] = useModal();
   const [registerInvoiceShow, { openModal: openInvoiceShow }] = useModal();
   const [registerInvoiceDetail, { openDrawer: openCheckDetail }] = useDrawer();
   const userStore = useUserStoreWithOut();
@@ -362,6 +373,19 @@
       data: record,
     });
   }
+  function handleEditRefundTime(record) {
+    // 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 });
+    openEditRefundTime(true, {
+      data: record,
+    });
+  }
   const { createMessage } = useMessage();
   const { error } = createMessage;
@@ -95,7 +95,7 @@
       window.open('', '', '').document.write(`<!DOCTYPE html>
       <html>
         <body style="display: flex; justify-content: center; align-items: center;">
-          <img src='${url}' width="500px" height="500px"/>
+          <img src='${url}' width="300px" height="auto"/>
         </body>
       </html>`);
     } else if (isPdfUrl(baseUrl)) {
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    title="修改必须回款日期"
+    width="500px"
+    :bodyStyle="{ height: '240px' }"
+    @ok="handleOk"
+    @visible-change="handleShow"
+  >
+    请选择日期：
+    <a-date-picker v-model:value="date" />
+    <div style="height: 10px"></div>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { BasicModal, useModalInner } from '@/components/Modal';
+  import { ref } from 'vue';
+  import { getSetBackRefundDate } from '@/api/project/invoice';
+  import { useMessage } from '/@/hooks/web/useMessage';
+
+  const id = ref();
+  const date = ref();
+  const emit = defineEmits(['success']);
+  const { createMessage } = useMessage();
+  const { error } = createMessage;
+  const [register, { closeModal }] = useModalInner(async (data) => {
+    id.value = data.data.id;
+  });
+  function formatDate(input: string): string {
+    // 创建一个 Date 对象
+    const date = new Date(input);
+
+    // 获取年月日
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，所以要加 1
+    const day = String(date.getDate()).padStart(2, '0');
+
+    // 返回格式化后的日期字符串
+    return `${year}-${month}-${day}`;
+  }
+  const isDisabled = ref(false);
+  async function handleOk() {
+    if (isDisabled.value) {
+      error('请勿连续点击生成按钮,需要等待三秒再点击生成');
+      return;
+    }
+    const formattedDate = formatDate(date.value);
+    isDisabled.value = true;
+    setTimeout(() => {
+      isDisabled.value = false;
+    }, 3000);
+    getSetBackRefundDate({ id: id.value, backRefundDate: formattedDate });
+    emit('success');
+    closeModal();
+  }
+  function handleShow(visible: boolean) {
+    if (!visible) {
+      date.value = null;
+    }
+  }
+</script>
@@ -15,6 +15,7 @@
         <InvoiceDetail @register="registerInvoiceDetail" />
         <DeductShow @register="registerDeductShow" />
         <Commit @register="registerCommit" @success="handleSuccess" />
+        <EditRefundTime @register="registerEditRefundTime" @success="handleSuccess" />
         <ReUploadBgUrl @register="registerReUploadBgUrl" @success="handleSuccess" />
       </template>
       <template #bodyCell="{ column, record }">
@@ -68,6 +69,14 @@
                 label: '扣款单',
                 onClick: handleDeductShow.bind(null, record),
               },
+              ...(role == ROLE.ADMIN
+                ? [
+                    {
+                      label: '修改必须回款日期',
+                      onClick: handleEditRefundTime.bind(null, record),
+                    },
+                  ]
+                : []),
             ]"
           />
         </template>
@@ -85,6 +94,7 @@
   import InvoiceDetail from './InvoiceDetail.vue';
   import DeductShow from './DeductShow.vue';
   import Commit from './Commit.vue';
+  import EditRefundTime from './EditRefundTime.vue';
   import ReUploadBgUrl from './ReUploadBgUrl.vue';
   import { useDrawer } from '/@/components/Drawer';
   import { getInvoice, deleteInvoice, commit, getBaseInvoice } from '@/api/project/invoice';
@@ -100,6 +110,7 @@
   const [registerTrackEdit, { openDrawer: openTrackEdit }] = useDrawer();
   const [registerInvoiceDetail, { openDrawer: openInvoiceDetail }] = useDrawer();
   const [registerCommit, { openModal: openCommit }] = useModal();
+  const [registerEditRefundTime, { openModal: openEditRefundTime }] = useModal();
   const [registerReUploadBgUrl, { openModal: openReUploadBgUrl }] = useModal();
   const [registerDeductShow, { openModal: openDeductShow }] = useModal();
   const checkedKeys = ref<Array<string | number>>([]);
@@ -267,6 +278,11 @@
       data: record,
     });
   }
+  function handleEditRefundTime(record) {
+    openEditRefundTime(true, {
+      data: record,
+    });
+  }
   function handleInvoiceDetail(record) {
     openInvoiceDetail(true, {
       data: record,