xiaodai2017 před 2 roky
rodič
revize
a6fcb9f8d6

+ 79 - 26
src/utils/details/inv-open.ts

@@ -5,8 +5,11 @@ import { h } from "vue";
 import { ElTable, ElTableColumn, ElTag } from "element-plus";
 import { DescriptionColumns } from "/@/components/BasicDescriptions";
 import { createTooltip } from "../tootip";
-import { invoiceTypeList } from "../status";
-
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "../status";
 export const INV_TYPE = [
   { value: "1", label: "纸质专用发票", type: "primary" },
   { value: "2", label: "纸质普通发票", type: "success" },
@@ -37,19 +40,44 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
     label: "发票编号",
     labelWidth: "100px"
   },
+
   {
-    field: "seller_title",
-    label: "开票业务公司",
-    render: (seller_title, { inv_out }) =>
-      createTooltip(seller_title, "业务公司编号 : " + inv_out, 300)
+    field: "inv_value",
+    label: "发票金额"
   },
   {
-    field: "inv_in",
-    label: "客户公司"
+    label: "购买方抬头状态",
+    field: "seller_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: seller_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            seller_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
   },
   {
-    field: "inv_value",
-    label: "发票金额"
+    label: "销售方抬头状态",
+    field: "buyer_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: buyer_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            buyer_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
   },
   {
     field: "apply_name",
@@ -127,49 +155,73 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
     field: "post_fee",
     label: "快递费"
   },
+  {
+    field: "seller_title",
+    label: "买方抬头",
+    span: 12,
+    render: (seller_title, { inv_out }) =>
+      createTooltip(seller_title, "业务公司编号 : " + inv_out, 300)
+  },
+
   {
     field: "buyer_title",
-    label: "买方抬头"
+    label: "买方抬头",
+    span: 12
   },
+  // {
+  //   field: "inv_in",
+  //   label: "客户公司",
+  //   span: 12
+  // },
   {
     field: "buyer_code",
-    label: "买方纳税识别号"
+    label: "买方纳税识别号",
+    span: 12
   },
   {
     field: "buyer_addr",
-    label: "买方注册地址"
+    label: "买方注册地址",
+    span: 12
   },
   {
     field: "buyer_mobile",
-    label: "买方联系方式"
+    label: "买方联系方式",
+    span: 12
   },
   {
     field: "buyer_bank",
-    label: "买方银行"
+    label: "买方银行",
+    span: 12
   },
   {
     field: "seller_title",
-    label: "销售方抬头"
+    label: "销售方抬头",
+    span: 12
   },
   {
     field: "seller_code",
-    label: "销售方纳税识别号"
+    label: "销售方纳税识别号",
+    span: 12
   },
   {
     field: "seller_addr",
-    label: "销售方地址"
+    label: "销售方地址",
+    span: 12
   },
   {
     field: "seller_mobile",
-    label: "销售方联系方式"
+    label: "销售方联系方式",
+    span: 12
   },
   {
     field: "seller_bank",
-    label: "销售方银行"
+    label: "销售方银行",
+    span: 12
   },
   {
     field: "seller_bankNo",
-    label: "销售方账户"
+    label: "销售方账户",
+    span: 12
   },
   {
     field: "voider",
@@ -195,7 +247,7 @@ export const INV_OPEN_COLUMNS: DescriptionColumns = [
   {
     field: "remark",
     label: "发票备注",
-    span: 6
+    span: 24
   },
   {
     field: "cancel_fee",
@@ -284,10 +336,10 @@ export const ORDER_COLUMNS = [
     render: (buyer_title, { inv_out }) =>
       createTooltip(buyer_title, "开票公司编号 : " + inv_out, 360)
   },
-  {
-    field: "buyer_title",
-    label: "客户公司"
-  },
+  // {
+  //   field: "buyer_title",
+  //   label: "客户公司"
+  // },
   {
     field: "apply_name",
     label: "申请人"
@@ -343,6 +395,7 @@ export const ORDER_COLUMNS = [
   },
   {
     field: "exam_remark",
+    // span: 12,
     label: "审核备注"
   },
   {

+ 13 - 2
src/utils/status.ts

@@ -259,7 +259,16 @@ const cgd_send_type = [
   { value: "1", label: "公司自提" },
   { value: "2", label: "供应商包邮" }
 ];
-
+const seller_check_type = [
+  { value: "0", type: "info", label: "待验证" },
+  { value: "1", type: "success", label: "业务与发票一致" },
+  { value: "2", type: "error", label: "业务与发票不一致" }
+];
+const buyer_check_type = [
+  { value: "0", type: "info", label: "待验证" },
+  { value: "1", type: "success", label: "业务与发票一致" },
+  { value: "2", type: "error", label: "业务与发票不一致" }
+];
 export {
   statusList,
   menuTypeList,
@@ -274,5 +283,7 @@ export {
   inv_status_list,
   pay_status_list,
   cgd_type_list,
-  cgd_send_type
+  cgd_send_type,
+  seller_check_type,
+  buyer_check_type
 };

+ 30 - 1
src/views/InvoiceSales/invoiceApply/config/content.config.ts

@@ -2,7 +2,11 @@ import { h } from "vue";
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/InvoiceSales/invoiceApply";
 import { INV_OPEN_STATUS } from "/@/utils/details/inv-open";
-import { invoiceTypeList } from "/@/utils/status";
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "/@/utils/status";
 import { ElTag } from "element-plus";
 import dayjs from "dayjs";
 
@@ -64,6 +68,31 @@ const columns = [
     prop: "inv_code",
     width: 100
   },
+  {
+    label: "购买方抬头状态",
+    prop: "seller_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          seller_check_type.find(item => item.value == row.seller_check + "")
+            ?.label || "--"
+      });
+    }
+  },
+  {
+    label: "销售方抬头状态",
+    prop: "buyer_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          buyer_check_type.find(item => item.value == row.buyer_check + "")
+            ?.label || "--"
+      });
+    }
+  },
+
   {
     label: "申请人",
     prop: "apply_name",

+ 39 - 1
src/views/purchase/ticketReturn/config/_details.ts

@@ -7,7 +7,11 @@ import { h } from "vue";
 import { createTooltip } from "/@/utils/tootip";
 import { DescriptionColumns } from "/@/components/BasicDescriptions";
 import { invTypeOptions, statusOptions } from "./_opitons";
-import { invoiceTypeList } from "/@/utils/status";
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "/@/utils/status";
 
 export const cgInvTypeOptions = [
   {
@@ -127,6 +131,40 @@ export const ticketReturnColumns: DescriptionColumns = [
     field: "remark",
     span: 12,
     label: "审核备注"
+  },
+  {
+    label: "购买方抬头状态",
+    field: "seller_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: seller_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            seller_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
+  },
+  {
+    label: "销售方抬头状态",
+    field: "buyer_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: buyer_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            buyer_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
   }
 ];
 

+ 29 - 1
src/views/purchase/ticketReturn/config/content.config.ts

@@ -5,7 +5,11 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { ElImage, ElTag } from "element-plus";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
-import { invoiceTypeList } from "/@/utils/status";
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "/@/utils/status";
 
 const columns = [
   {
@@ -102,6 +106,30 @@ const columns = [
     width: "110px",
     prop: "total"
   },
+  {
+    label: "购买方抬头状态",
+    prop: "seller_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          seller_check_type.find(item => item.value == row.seller_check + "")
+            ?.label || "--"
+      });
+    }
+  },
+  {
+    label: "销售方抬头状态",
+    prop: "buyer_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          buyer_check_type.find(item => item.value == row.buyer_check + "")
+            ?.label || "--"
+      });
+    }
+  },
   {
     label: "发票号码",
     width: 110,

+ 82 - 74
src/views/supply/ticketReturn/config/_details.ts

@@ -7,7 +7,11 @@ import { h } from "vue";
 import { createTooltip } from "/@/utils/tootip";
 import { DescriptionColumns } from "/@/components/BasicDescriptions";
 import { invTypeOptions, statusOptions } from "./_opitons";
-import { invoiceTypeList } from "/@/utils/status";
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "/@/utils/status";
 
 export const cgInvTypeOptions = [
   {
@@ -37,72 +41,56 @@ export const cgInvTypeOptions = [
 ];
 
 export const ticketReturnColumns: DescriptionColumns = [
-  // {
-  //   field: "payNo",
-  //   label: "对账编号"
-  // },
   {
     field: "hpNo",
-    label: "回票申请编号"
-  },
-  {
-    field: "apply_name",
-    label: "申请人名称"
+    label: "对账回票编号"
   },
   {
-    field: "invType",
-    label: "发票申请类型",
+    field: "status",
+    label: "状态",
     render(data) {
       return h(ElTag, null, {
-        default: () =>
-          invTypeOptions.find(s => String(s.value) === String(data))?.label
+        default: () => statusOptions.find(s => s.value === String(data))?.label
       });
     }
   },
   {
-    field: "invoiceType",
-    label: "发票类型",
-    render(data) {
-      return h(ElTag, null, {
-        default: () =>
-          invoiceTypeList.find(s => String(s.value) === String(data))?.label ||
-          "--"
-      });
-    }
+    field: "apply_name",
+    label: "申请人"
   },
   {
-    field: "invName",
-    label: "发票名称"
+    field: "addtime",
+    label: "创建时间"
   },
+
   {
-    field: "inv_img",
-    label: "发票图片",
-    render(src) {
-      return h(ElImage, {
-        src,
-        previewSrcList: [src],
-        style: {
-          height: "20px"
-        }
-      });
-    }
+    field: "inv_fee",
+    label: "回票金额"
   },
+
   {
-    field: "inv_fee",
-    label: "发票金额"
+    field: "invType",
+    label: "发票上传方式",
+    render(data) {
+      return h(ElTag, null, {
+        default: () => invTypeOptions.find(s => s.value === String(data))?.label
+      });
+    }
   },
   {
-    field: "status",
-    label: "状态",
+    field: "invoiceType",
+    label: "发票类型",
     render(data) {
       return h(ElTag, null, {
-        default: () => statusOptions.find(s => s.value === String(data))?.label
+        default: () =>
+          invoiceTypeList.find(s => s.value === String(data))?.label || "--"
       });
     }
   },
+
   {
     field: "open_time",
-    label: "开票时间"
+    label: "发票日期"
   },
   {
     field: "invoiceNumber",
@@ -113,32 +101,70 @@ export const ticketReturnColumns: DescriptionColumns = [
     label: "发票代码"
   },
   {
-    field: "checkNumber",
-    label: "校验码"
+    field: "inv_subtotal_amount",
+    label: "税前总金额"
   },
   {
-    field: "pay_apply_name",
-    label: "对账申请人"
+    field: "inv_amount",
+    label: "税后总金额"
   },
   {
-    field: "supplierNo",
-    label: "供应商编号"
+    field: "checkNumber",
+    span: 8,
+    label: "校验码"
   },
   {
-    field: "supplierName",
-    label: "供应商名称"
+    field: "inv_img",
+    label: "发票图片",
+    span: 4,
+    render(src) {
+      return h(ElImage, {
+        src,
+        previewSrcList: [src],
+        style: {
+          height: "20px"
+        }
+      });
+    }
   },
   {
-    field: "companyNo",
-    label: "业务企业编号"
+    field: "remark",
+    span: 12,
+    label: "审核备注"
   },
   {
-    field: "companyName",
-    label: "业务企业名称"
+    label: "购买方抬头状态",
+    field: "seller_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: seller_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            seller_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
   },
   {
-    field: "total_fee",
-    label: "对账申请总额"
+    label: "销售方抬头状态",
+    field: "buyer_check",
+    render(data) {
+      return h(
+        ElTag,
+        {
+          type: buyer_check_type.find(s => s.value === String(data))
+            ?.type as any
+        },
+        {
+          default: () =>
+            buyer_check_type.find(s => s.value === String(data))?.label || "--"
+        }
+      );
+    }
   }
 ];
 
@@ -321,23 +347,5 @@ export const ticketFormItems = {
       label: "发票图片",
       prop: "inv_img"
     }
-  ],
-  electronics: [
-    {
-      label: "发票类型",
-      prop: "invoiceType"
-    },
-    {
-      label: "发票号码",
-      prop: "invNumber"
-    },
-    {
-      label: "税前金额",
-      prop: "subtotal_amount"
-    },
-    {
-      label: "开票日期",
-      prop: "open_time"
-    }
   ]
 };

+ 29 - 1
src/views/supply/ticketReturn/config/content.config.ts

@@ -5,7 +5,11 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { ElImage, ElTag } from "element-plus";
 import { checkTypeOptions, invTypeOptions, statusOptions } from "./_opitons";
-import { invoiceTypeList } from "/@/utils/status";
+import {
+  invoiceTypeList,
+  seller_check_type,
+  buyer_check_type
+} from "/@/utils/status";
 
 const columns = [
   {
@@ -100,6 +104,30 @@ const columns = [
     width: "110px",
     prop: "total"
   },
+  {
+    label: "购买方抬头状态",
+    prop: "seller_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          seller_check_type.find(item => item.value == row.seller_check + "")
+            ?.label || "--"
+      });
+    }
+  },
+  {
+    label: "销售方抬头状态",
+    prop: "buyer_check",
+    width: 130,
+    cellRenderer: ({ row }) => {
+      return h(ElTag, null, {
+        default: () =>
+          buyer_check_type.find(item => item.value == row.buyer_check + "")
+            ?.label || "--"
+      });
+    }
+  },
   {
     label: "发票号码",
     width: 110,