修改审核权限

boyang
1 parent 54f17338
Showing 9 changed files with 65 additions and 265 deletions
src/views/project/approve/PayPanel.vue
src/views/project/finance/Note.vue
src/views/project/finance/NoteCheck.vue
src/views/project/finance/TrackEditCheck.vue
src/views/project/finance/finance.data.tsx
src/views/project/finance/index.vue
src/views/project/finance/pay/CheckSum.vue
src/views/project/finance/pay/index.vue
src/views/project/finance/receive.data.tsx
@@ -44,8 +44,8 @@
     width="900px"
     @ok="handleTrue"
     @visible-change="handleShow"
-    :showCancelBtn="!isApproved && role === ROLE.ADMIN"
-    :showOkBtn="!isApproved && role === ROLE.ADMIN"
+    :showCancelBtn="(!isApproved && role === ROLE.ADMIN) || (showInvoice && role === ROLE.FINANCE)"
+    :showOkBtn="(!isApproved && role === ROLE.ADMIN) || (showInvoice && role === ROLE.FINANCE)"
   >
     <!-- <Description
       v-if="!showInvoice"
@@ -228,10 +228,16 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
+            const data = ref();
             if (record?.type === 40) {
-              return record?.fieldInfos?.producePaymentCheckBillFieldVO?.financePerson;
+              data.value = record?.fieldInfos?.producePaymentCheckBillFieldVO;
             } else if (record?.type == 50) {
-              return record?.fieldInfos?.producePaymentCheckBillFieldVO?.productionName;
+              data.value = record?.fieldInfos?.checkBillOrderDO;
+            }
+            if (record?.type === 40) {
+              return data.value?.financePerson;
+            } else if (record?.type == 50) {
+              return record.createBy;
             }
           },
         },
@@ -241,13 +247,16 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            console.log(record, '565656565');
-            const extractedValues = ref<string[]>(
-              record?.fieldInfos?.producePaymentCheckBillFieldVO?.innerNo.map((item) => item),
-            );
-            // projectNo.value = extractedValues.value.join(',');
-            // return record?.fieldInfos?.producePaymentCheckBillFieldVO?.innerNo[0];
-            return extractedValues.value.join(',');
+            const data = ref();
+            if (record?.type === 40) {
+              data.value = record?.fieldInfos?.producePaymentCheckBillFieldVO;
+              const extractedValues = ref<string[]>(data.value?.innerNo.map((item) => item));
+              return extractedValues.value.join(',');
+            } else if (record?.type == 50) {
+              if (record?.orderBaseInfo) {
+                return record?.orderBaseInfo?.innerNo;
+              }
+            }
           },
         },
         {
@@ -269,7 +278,13 @@
           width: 150,
           customRender: (column) => {
             const { record } = column || {};
-            return record?.fieldInfos?.producePaymentCheckBillFieldVO?.productionName;
+            const data = ref();
+            if (record?.type === 40) {
+              data.value = record?.fieldInfos?.producePaymentCheckBillFieldVO;
+            } else if (record?.type == 50) {
+              data.value = record?.fieldInfos?.checkBillOrderDO;
+            }
+            return data.value?.productionName;
           },
         },
       ];
@@ -334,13 +349,14 @@
       async function handleDetail(data) {
         if (data.type == 50) {
           showInvoice.value = true;
+          mockData.value = data.fieldInfos.checkBillOrderDO;
         } else if (data.type == 40) {
           showInvoice.value = false;
+          mockData.value = data.fieldInfos.producePaymentCheckBillFieldVO;
         }
         openModal(true, { data });
         id.value = data.id;
         itemArray.value = [];
-        mockData.value = data.fieldInfos.producePaymentCheckBillFieldVO;
         actualPayCalculate.value = mockData.value.actualPayCalculate?.toFixed(2); // 实际付款金额计算
         checkNo.value = mockData.value.checkNo; // 对账单号
         actualPayedAmount.value = mockData.value.actualPayedAmount?.toFixed(2); // 实际应付金额
@@ -26,6 +26,7 @@
   const { error } = createMessage;
   const [register, { closeModal }] = useModalInner(async (data) => {
     id.value = data.data.invoiceId;
+    notes.value = data.data?.invoiceNotes;
   });
   const isDisabled = ref(false);
   async function handleOk() {
@@ -26,6 +26,7 @@
   const { error } = createMessage;
   const [register, { closeModal }] = useModalInner(async (data) => {
     id.value = data.data.checkId;
+    notes.value = data.data?.checkNotes;
   });
   const isDisabled = ref(false);
   async function handleOk() {
@@ -67,21 +67,9 @@
   import type { UploadProps } from 'ant-design-vue';
   import { updateDeductInfo } from '@/api/project/invoice';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import { useOrderInfo } from '/@/hooks/component/order';
-  import { useOrderStoreWithOut } from '/@/store/modules/order';
  
   const emit = defineEmits(['success']);
   const fileList = ref<UploadProps['fileList']>([]);
-  // const orderStore = useOrderStoreWithOut();
-  // const { productionDepartment: productionDepartmentOptions } = useOrderInfo(orderStore);
-  // console.log(productionDepartmentOptions.value, '565656565665orderStore');
-  // onMounted(() => {
-  //   const { productionDepartment } = useOrderInfo(orderStore);
-  //   console.log(productionDepartment.value, '565656565665orderStore1');
-  // });
-  const orderStore = useOrderStoreWithOut();
-  const { productionDepartment: productDepartmentOptions } = useOrderInfo(orderStore);
-  const productionDepartment = ref();
   const input1 = ref(0);
   const deductUrl = ref();
   const id = ref();
@@ -92,7 +80,6 @@
   // const uploadUrl = ref('');
   // const updateDeductUrl = ref('');
   const deductUrlOld = ref();
-  const selectedProductionDepartment = ref(); // 新增: 用于存储选中的生产科
   const { createMessage } = useMessage();
   const { error } = createMessage;
   const status = ref();
@@ -8,19 +8,19 @@ import { view } from &#39;@/utils/pdfShow&#39;;
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'invoiceNo',
-    label: '发票单号',
+    label: 'invoice单号',
     component: 'Input',
     colProps: { span: 8 },
   },
   {
     field: 'checkNo',
-    label: '生产科对账单号',
+    label: 'checkNo单号',
     component: 'Input',
     colProps: { span: 8 },
   },
   {
     field: 'invoiceStatus',
-    label: '发票状态',
+    label: 'invoice状态',
     component: 'Select',
     colProps: { span: 8 },
     componentProps: {
@@ -33,7 +33,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'checkNoStatus',
-    label: '对账单号状态',
+    label: 'checkNo状态',
     component: 'Select',
     colProps: { span: 8 },
     componentProps: {
@@ -76,35 +76,35 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     field: 'invoiceStartTime',
-    label: '发票开始时间',
+    label: 'invoice创建时间',
     component: 'DatePicker',
     colProps: { span: 8 },
     labelWidth: 150,
   },
   {
     field: 'invoiceEndTime',
-    label: '发票结束时间',
+    label: 'invoice结束时间',
     component: 'DatePicker',
     colProps: { span: 8 },
     labelWidth: 150,
   },
   {
     field: 'checkStartTime',
-    label: '对账开始时间',
+    label: 'checkNo创建时间',
     component: 'DatePicker',
     colProps: { span: 8 },
     labelWidth: 150,
   },
   {
     field: 'checkEndTime',
-    label: '对账结束时间',
+    label: 'checkNo结束时间',
     component: 'DatePicker',
     colProps: { span: 8 },
     labelWidth: 150,
   },
   {
     field: 'createStartTime',
-    label: '订单开始时间',
+    label: '订单创建时间',
     component: 'DatePicker',
     colProps: { span: 8 },
     labelWidth: 150,
 <template>
   <div class="p-4">
     <BasicTable @register="registerTable">
+      <template #headerTop>
+        <a-alert type="info" show-icon>
+          <template #message>
+            <template v-if="checkedKeys.length > 0">
+              <span>已选中{{ checkedKeys.length }}条记录(可跨页)</span>
+              <a-button
+                :style="{ borderRadius: '5px 5px 5px 5px' }"
+                type="link"
+                @click="handleClearChoose"
+                size="small"
+                >清空</a-button
+              >
+            </template>
+            <template v-else>
+              <span>未选中任何订单</span>
+            </template>
+          </template>
+        </a-alert>
+      </template>
       <template #toolbar>
         <a-button
           type="primary"
@@ -330,7 +349,6 @@
  
   // 单选函数
   async function onSelect(record, selected: boolean) {
-    console.log(record, '5656565656record');
  
     if (selected) {
       checkedKeys.value = [...checkedKeys.value, record.id];
@@ -359,10 +377,6 @@
         checkIdKeys.value = checkIdKeys.value.filter((checkId) => checkId !== record.checkId);
       }
     }
-
-    console.log(checkedKeys.value, 565666666); // 输出当前的 checkedKeys 值
-    console.log(invoiceIdKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(checkIdKeys.value, 565666666); // 输出当前的 selectedProductionDepartment 值
   }
  
   // 全选函数
@@ -394,10 +408,12 @@
       // 仅当 checkId 不为 undefined 时，才删除
       checkIdKeys.value = checkIdKeys.value.filter((checkId) => checkIds.indexOf(checkId) === -1);
     }
+  }
  
-    console.log(checkedKeys.value, 565666666); // 输出当前的 checkedKeys 值
-    console.log(invoiceIdKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    console.log(checkIdKeys.value, 565666666); // 输出当前的 selectedProductionDepartment 值
+  function handleClearChoose() {
+    checkedKeys.value = [];
+    invoiceIdKeys.value = [];
+    checkIdKeys.value = [];
   }
  
   function handleFinanceEdit(record) {
@@ -418,15 +434,13 @@
     }, 50);
   }
   function handleDeleteInvoiceIds() {
-    // console.log(checkedKeys.value, '5656checkedKeys.value');
     deleteInvoice({ ids: invoiceIdKeys.value });
     setTimeout(() => {
       reloadTable();
     }, 50);
   }
   function handleDeleteCheckIds() {
-    // console.log(checkedKeys.value, '5656checkedKeys.value');
-    deleteInvoice({ ids: checkIdKeys.value });
+    checkDelete({ ids: checkIdKeys.value });
     setTimeout(() => {
       reloadTable();
     }, 50);
@@ -33,7 +33,6 @@
       dataIndex: 'productionDepartment',
       width: 150,
       customRender: (res) => {
-        // console.log(res, 56562);
         return res.record.exportVOS[0].productionDepartment;
       },
     },
@@ -42,7 +41,6 @@
       dataIndex: 'productionDepartmentTotalPrice',
       width: 150,
       customRender: (res) => {
-        // console.log(res, 56562);
         return res.record.productionDepartmentTotalPrice.toFixed(2);
       },
     },
@@ -51,7 +49,6 @@
       dataIndex: 'deductAmount',
       width: 160,
       customRender: (res) => {
-        // console.log(res, 56562);
         return res.record.deductAmount.toFixed(2);
       },
     },
@@ -68,7 +65,6 @@
       dataIndex: 'actualPayedAmount',
       width: 160,
       customRender: (res) => {
-        // console.log(res, 56562);
         return res.record.actualPayedAmount.toFixed(2);
       },
     },
@@ -77,7 +73,6 @@
       dataIndex: 'unPayedAmount',
       width: 150,
       customRender: (res) => {
-        // console.log(res, 56562);
         return res.record.unPayedAmount.toFixed(2);
       },
     },
@@ -98,7 +93,6 @@
       const res = await checkAnalysis({ ids: ids.value });
       const arrayRes = ref([]);
       arrayRes.value.push(res);
-      console.log(res, '5656payana');
       return res;
     },
     columns: columnsAnalysis,
@@ -245,9 +245,6 @@
         }
       }
     }
-    // console.log(checkedKeys.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    // console.log(selectedCustomCodes.value, 565666666); // 输出当前的 selectedCustomCodes 值
-    // console.log(selectedProductionDepartment.value, 565666666); // 输出当前的 selectedCustomCodes 值
   }
  
   // 全选函数
-import { FormSchema } from '/@/components/Form';
-import { BasicColumn } from '/@/components/Table';
-import { icon } from 'ant-design-vue';
-import { FilePptOutlined } from '@ant-design/icons-vue';
-import { size } from 'lodash-es';
-import { ref } from 'vue';
-import { view } from '@/utils/pdfShow';
-
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'invoiceNo',
-    label: 'Invoice编号',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'status',
-    label: '总经理审核',
-    component: 'Select',
-    colProps: { span: 6 },
-    componentProps: {
-      options: [
-        { label: '未提交审核', value: -1 },
-        { label: '待审核', value: 0 },
-        { label: '审核通过', value: 10 },
-        { label: '审核驳回', value: 20 },
-      ],
-    },
-  },
-  {
-    field: 'customerCode',
-    label: '客户编码',
-    component: 'Input',
-    colProps: {
-      span: 6,
-    },
-    // labelWidth: 140,
-  },
-];
-
-export const columns: BasicColumn[] = [
-  {
-    title: 'Invoice编号',
-    dataIndex: 'invoiceNo',
-    width: 180,
-  },
-  {
-    title: '报关单',
-    dataIndex: 'bgUrl',
-    width: 80,
-    customRender: (column) => {
-      const bgUrl = column.record.bgUrl;
-      if (bgUrl == undefined) {
-        return;
-      }
-      return <FilePptOutlined style="font-size:25px" onClick={() => view(bgUrl)} />;
-    },
-  },
-  {
-    title: '必须回款日期',
-    dataIndex: 'backRefundDate',
-    width: 120,
-  },
-  {
-    title: '发生扣款金额$',
-    dataIndex: 'deductAmount',
-    width: 120,
-    // customRender: (column) => {
-    //   return column.record.deductAmount?.toFixed(2);
-    // },
-  },
-  {
-    title: '上传扣款单',
-    dataIndex: 'deductUrl',
-    width: 80,
-    customRender: (column) => {
-      const deductUrl = column.record.deductUrl;
-      if (deductUrl == undefined) {
-        return;
-      }
-      // return <FilePptOutlined style="font-size:25px" onClick={() => window.open(deductUrl[0])} />;
-      return <FilePptOutlined style="font-size:25px" />;
-    },
-  },
-  {
-    title: '实际应收金额$',
-    dataIndex: 'actualReceivableAmount',
-    width: 120,
-    // customRender: (column) => {
-    //   return column.record.actualReceivableAmount?.toFixed(2);
-    // },
-  },
-  {
-    title: '实际收款金额1$',
-    dataIndex: 'actualPayedAmount1',
-    width: 120,
-    // customRender: (column) => {
-    //   return column.record.actualPayedAmount1?.toFixed(2);
-    // },
-  },
-  {
-    title: '实际收款金额2$',
-    dataIndex: 'actualPayedAmount2',
-    width: 120,
-    // customRender: (column) => {
-    //   return column.record.actualPayedAmount2?.toFixed(2);
-    // },
-  },
-  {
-    title: '实际收款金额3$',
-    dataIndex: 'actualPayedAmount3',
-    width: 120,
-    // customRender: (column) => {
-    //   return column.record.actualPayedAmount3?.toFixed(2);
-    // },
-  },
-  {
-    title: '其他费用$',
-    dataIndex: 'otherAmount',
-    width: 120,
-    customRender: (column) => {
-      return column.record.otherAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '总经理审核',
-    dataIndex: 'status',
-    width: 120,
-    customRender: (column) => {
-      if (column.record.status == -1) {
-        return '未提交审核';
-      } else if (column.record.status == 0) {
-        return '待审核';
-      } else if (column.record.status == 10) {
-        return '审核通过';
-      } else if (column.record.status == 20) {
-        return '审核驳回';
-      }
-    },
-  },
-  {
-    title: '操作1',
-    key: 'action', // 对应 #bodyCell 中的 column.key
-    width: 280,
-  },
-  {
-    title: '操作2',
-    key: 'action2', // 对应 #bodyCell 中的 column.key
-    width: 280,
-  },
-];
-
-export const columnsAnalysis: BasicColumn[] = [
-  {
-    title: '实际应付金额总计$',
-    dataIndex: 'actualPayedAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.actualPayedAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '实际应收金额总计$',
-    dataIndex: 'actualReceivableAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.actualReceivableAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '客户总价$',
-    dataIndex: 'customerTotalPrice',
-    width: 50,
-    customRender: (column) => {
-      return column.record.customerTotalPrice?.toFixed(2);
-    },
-  },
-  {
-    title: '发生扣款金额总计$',
-    dataIndex: 'deductAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.deductAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '实际应收金额总计$',
-    dataIndex: 'actualReceivableAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.actualReceivableAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '实际应收$',
-    dataIndex: 'otherAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.otherAmount?.toFixed(2);
-    },
-  },
-  {
-    title: '其他费用金额汇总$',
-    dataIndex: 'otherTotalAmount',
-    width: 50,
-    customRender: (column) => {
-      return column.record.otherTotalAmount?.toFixed(2);
-    },
-  },
-];