修改采购相关详情也展示

src/components/BasicDescriptions/src/index.scss

@@ -22,8 +22,9 @@
     background-color:#f5f7fa;
     text-align: right;
     padding-right: 5px;
-    min-width: 80px;
+    min-width: 100px;
     height: 100%;
+    font-size: 12px!important;
     display: flex;
     align-items: center;
     justify-content: flex-end;
@@ -32,6 +33,7 @@
   .col-value{
     flex:1;
     padding-left: 5px;
+    font-size: 12px !important;
     display: flex;
     align-items: center;
   }

src/components/ReconciliationForm/src/_details.ts

@@ -7,30 +7,50 @@ export const reconciliationColumns: DescriptionColumns = [
   {
     field: "payNo",
     label: "对账单号",
-    span: 12
+    span: 6
+  },
+  {
+    field: "status",
+    label: "对账状态",
+    render(status) {
+      return h(ElTag, null, {
+        default: () =>
+          statusOptions.find(s => s.value === String(status))?.label
+      });
+    }
+  },
+  {
+    field: "apply_name",
+    label: "申请人",
+    span: 6
+  },
+  {
+    field: "addtime",
+    label: "创建时间",
+    span: 6
   },
   {
     field: "supplierName",
-    label: "供应商",
+    label: "卖出方公司",
     span: 12,
     render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "供应商编号 : " + supplierNo, 270)
+      createTooltip(supplierName, "卖出方公司编号 : " + supplierNo, 270)
   },
   {
     field: "companyName",
-    label: "业务公司",
-    render: (companyName, { supplierNo }) =>
-      createTooltip(companyName, "业务公司编号 : " + supplierNo, 270)
-  },
-  {
-    field: "apply_name",
-    label: "申请人",
-    render: (apply_name, { apply_id }) =>
-      createTooltip(apply_name, "申请人ID : " + apply_id, 90)
+    label: "买入方公司",
+    span: 12,
+    render: (companyName, { companyNo }) =>
+      createTooltip(companyName, "买入方公司编号 : " + companyNo, 270)
   },
   {
-    field: "total_fee",
-    label: "对账总额"
+    field: "pay_status",
+    label: "付款状态",
+    render(status) {
+      return h(ElTag, null, {
+        default: () => pay_status.find(s => s.value === String(status))?.label
+      });
+    }
   },
   {
     field: "apay_fee",
@@ -44,18 +64,6 @@ export const reconciliationColumns: DescriptionColumns = [
     field: "wpay_fee",
     label: "未付款"
   },
-  {
-    field: "ainv_fee",
-    label: "已开票"
-  },
-  {
-    field: "inv_fee",
-    label: "开票中"
-  },
-  {
-    field: "winv_fee",
-    label: "未开票"
-  },
   {
     field: "inv_status",
     label: "开票状态",
@@ -65,36 +73,27 @@ export const reconciliationColumns: DescriptionColumns = [
       });
     }
   },
+
   {
-    field: "pay_status",
-    label: "付款状态",
-    render(status) {
-      return h(ElTag, null, {
-        default: () => pay_status.find(s => s.value === String(status))?.label
-      });
-    }
+    field: "ainv_fee",
+    label: "已开票"
   },
   {
-    field: "status",
-    label: "申核状态",
-    render(status) {
-      return h(ElTag, null, {
-        default: () =>
-          statusOptions.find(s => s.value === String(status))?.label
-      });
-    }
+    field: "inv_fee",
+    label: "开票中"
   },
   {
-    field: "addtime",
-    label: "对账时间"
+    field: "winv_fee",
+    label: "未开票"
   },
+
   {
-    field: "updatetime",
-    label: "更新时间"
+    field: "total_fee",
+    label: "对账总额"
   },
   {
     field: "remark",
-    span: 3,
+    span: 18,
     label: "备注"
   }
 ];
@@ -105,11 +104,11 @@ export const statusOptions = [
     value: "1"
   },
   {
-    label: "审核成功",
+    label: "对账成功",
     value: "2"
   },
   {
-    label: "驳回",
+    label: "对账驳回",
     value: "3"
   }
 ];

src/views/purchase/purchPay/config/_details.ts

@@ -6,33 +6,52 @@ import { createTooltip } from "/@/utils/tootip";
 
 export const purchpayColumns: DescriptionColumns = [
   {
-    field: "payNo",
-    span: 2,
-    label: "对账申请编号"
+    field: "dzNo",
+    span: 6,
+    label: "对账付款编号"
   },
   {
-    field: "dzNo",
-    span: 2,
-    label: "付款申请编号"
+    field: "status",
+    label: "状态",
+    span: 6,
+    render(status) {
+      return h(ElTag, null, {
+        default: () =>
+          statusOptions.find(s => String(status) === String(s.value))?.label ||
+          "--"
+      });
+    }
   },
+
+  {
+    field: "payNo",
+    span: 7,
+    label: "对账申请编号"
+  },
+
   {
     field: "apply_name",
-    span: 2,
-    label: "申请人",
-    render: (apply_name, { apply_id }) =>
-      createTooltip(apply_name, "申请人ID : " + apply_id, 90)
+    span: 5,
+    label: "申请人"
+    // render: (apply_name, { apply_id }) =>
+    //   createTooltip(apply_name, "申请人ID : " + apply_id, 90)
   },
+
   {
     field: "pay_fee",
-    label: "申请付款额度"
+    span: 6,
+    label: "付款额度"
   },
   {
-    field: "addtime",
-    label: "申请时间"
+    field: "return_time",
+    span: 6,
+    label: "回执时间"
   },
+
   {
     field: "return_img",
     label: "付款回执",
+    span: 12,
     render(return_img) {
       const chunks = return_img?.split(",");
       if (!chunks) return null;
@@ -48,25 +67,11 @@ export const purchpayColumns: DescriptionColumns = [
       });
     }
   },
-  {
-    field: "return_time",
-    label: "付款回执时间"
-  },
-  {
-    field: "status",
-    label: "状态",
-    span: 2,
-    render(status) {
-      return h(ElTag, null, {
-        default: () =>
-          statusOptions.find(s => String(status) === String(s.value))?.label ||
-          "--"
-      });
-    }
-  },
+
   {
     field: "remark",
-    label: "备注"
+    label: "备注",
+    span: 24
   }
 ];
 

src/views/purchase/purchPay/config/_options.ts

@@ -13,7 +13,7 @@ export const statusOptions = [
   },
   {
     value: "3",
-    label: "审核成功"
+    label: "付款成功"
   },
   {
     value: "4",

src/views/purchase/purchPay/config/content.config.ts

@@ -22,7 +22,7 @@ const columns = [
   // },
   {
     label: "对账付款编号",
-    prop: "DzNo",
+    prop: "dzNo",
     width: 160,
     align: "left"
   },
@@ -31,34 +31,6 @@ const columns = [
     prop: "payNo",
     width: 160
   },
-  // v
-  {
-    label: "卖方公司编号",
-    prop: "supplierNo",
-    minWidth: 180,
-    align: "left"
-  },
-  {
-    label: "买方公司名称",
-    prop: "companyName",
-    minWidth: 180
-  },
-  {
-    label: "买方公司编号",
-    prop: "companyNo",
-    minWidth: 180
-  },
-  {
-    label: "总额款",
-    prop: "total_fee",
-    minWidth: 110
-  },
-  {
-    label: "本次付款金额",
-    prop: "dpay_fee",
-    minWidth: 110,
-    align: "left"
-  },
   {
     label: "状态",
     prop: "dstatus",
@@ -77,6 +49,39 @@ const columns = [
         }
       )
   },
+  {
+    label: "对账总金额",
+    prop: "total_fee",
+    width: 110
+  },
+  {
+    label: "本次付款金额",
+    prop: "dpay_fee",
+    width: 110,
+    align: "left"
+  },
+  {
+    label: "卖方公司编号",
+    prop: "supplierNo",
+    width: 160,
+    align: "left"
+  },
+  {
+    label: "卖方公司名称",
+    prop: "supplierName",
+    minWidth: 180
+  },
+  {
+    label: "买方公司编号",
+    prop: "companyNo",
+    width: 160
+  },
+  {
+    label: "买方公司名称",
+    prop: "companyName",
+    minWidth: 180
+  },
+
   {
     label: "申请人",
     prop: "apply_name",
@@ -85,9 +90,8 @@ const columns = [
   },
   {
     label: "申请时间",
-    minWidth: 180,
-    prop: "addtime",
-    formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
+    width: 160,
+    prop: "addtime"
   },
   {
     label: "操作",

src/views/purchase/purchPay/config/search.config.ts

@@ -4,9 +4,9 @@ import { statusOptions } from "./_options";
 const searchFormConfig: FormConfig = {
   formItems: [
     {
-      field: "companyNo",
+      field: "dzNo",
       type: "input",
-      placeholder: "买方公司编号"
+      placeholder: "对账付款编号"
     },
     {
       field: "payNo",

src/views/purchase/purchPayRelive/config/_details.ts

@@ -71,46 +71,37 @@ export const purchpayColumns: DescriptionColumns = [
 export const purchpayReliveColumns: DescriptionColumns = [
   {
     field: "returnCode",
-
-    label: "退款编号"
+    label: "付款解除编号"
   },
   {
-    field: "payNo",
+    field: "status",
+    label: "状态",
 
-    label: "对账申请编号"
+    render(status) {
+      return h(ElTag, null, {
+        default: () =>
+          statusOptions.find(s => String(status) === String(s.value))?.label ||
+          "--"
+      });
+    }
   },
   {
     field: "apply_name",
-
-    label: "申请人",
-    render: (apply_name, { apply_id }) =>
-      createTooltip(apply_name, "申请人ID : " + apply_id, 90)
-  },
-  {
-    field: "supplierName",
-
-    label: "卖方公司",
-    render: (supplierName, { supplierNo }) =>
-      createTooltip(supplierName, "卖方公司编号 : " + supplierNo, 360)
-  },
-  {
-    field: "companyName",
-
-    label: "买方公司",
-    render: (companyName, { companyNo }) =>
-      createTooltip(companyName, "买方公司编号 : " + companyNo, 360)
-  },
-  {
-    field: "pay_fee",
-    label: "申请付款额度"
+    label: "申请人"
   },
   {
     field: "addtime",
     label: "申请时间"
   },
+  {
+    field: "apay_fee",
+    label: "解除额度"
+  },
+
   {
     field: "returnImg",
     label: "退款回执",
+    span: 18,
     render(return_img) {
       const chunks = return_img?.split(",");
       if (!chunks) return null;
@@ -126,20 +117,10 @@ export const purchpayReliveColumns: DescriptionColumns = [
       });
     }
   },
-  {
-    field: "status",
-    label: "状态",
 
-    render(status) {
-      return h(ElTag, null, {
-        default: () =>
-          statusOptions.find(s => String(status) === String(s.value))?.label ||
-          "--"
-      });
-    }
-  },
   {
     field: "remark",
+    span: 24,
     label: "备注"
   }
 ];

src/views/purchase/purchPayRelive/config/content.config.ts

@@ -7,50 +7,57 @@ import { ElTag } from "element-plus";
 import { statusOptions } from "./_options";
 
 const columns = [
+  // {
+  //   type: "selection",
+  //   minWidth: 55,
+  //   align: "left",
+  //   hide: ({ checkList }) => !checkList.includes("勾选列")
+  // },
+  // {
+  //   label: "序号",
+  //   type: "index",
+  //   minWidth: 60,
+  //   align: "left",
+  //   hide: ({ checkList }) => !checkList.includes("序号列")
+  // },
   {
-    type: "selection",
-    minWidth: 55,
-    align: "left",
-    hide: ({ checkList }) => !checkList.includes("勾选列")
-  },
-  {
-    label: "序号",
-    type: "index",
-    minWidth: 60,
-    align: "left",
-    hide: ({ checkList }) => !checkList.includes("序号列")
+    label: "付款解除编号",
+    prop: "returnCode",
+    width: 160,
+    align: "left"
   },
   {
-    label: "退款申请编号",
-    prop: "returnCode",
-    minWidth: 180,
+    label: "对账付款编号",
+    prop: "orderCode",
+    width: 160,
     align: "left"
   },
+
   {
     label: "对账编号",
     prop: "payNo",
-    minWidth: 180,
+    width: 160,
     align: "left"
   },
   {
     label: "卖方公司编号",
     prop: "supplierNo",
-    minWidth: 180,
+    width: 160,
     align: "left"
   },
   {
-    label: "买方公司名称",
-    prop: "companyName",
+    label: "卖方公司名称",
+    prop: "supplierName",
     minWidth: 180
   },
   {
     label: "买方公司编号",
     prop: "companyNo",
-    minWidth: 180
+    width: 160
   },
   {
     label: "买方公司名称",
-    prop: "companyNo",
+    prop: "companyName",
     minWidth: 180
   },
   {

src/views/purchase/purchPayRelive/config/search.config.ts

@@ -6,7 +6,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "returnCode",
       type: "input",
-      placeholder: "退款申请编号"
+      placeholder: "付款解除编号"
     },
     {
       field: "payNo",

src/views/purchase/ticketReturn/config/_details.ts

@@ -39,15 +39,34 @@ export const cgInvTypeOptions = [
 export const ticketReturnColumns: DescriptionColumns = [
   {
     field: "hpNo",
-    label: "回票申请编号"
+    label: "对账回票编号"
+  },
+  {
+    field: "status",
+    label: "状态",
+    render(data) {
+      return h(ElTag, null, {
+        default: () => statusOptions.find(s => s.value === String(data))?.label
+      });
+    }
   },
   {
     field: "apply_name",
-    label: "申请人名称"
+    label: "申请人"
+  },
+  {
+    field: "addtime",
+    label: "创建时间"
+  },
+
+  {
+    field: "inv_fee",
+    label: "回票金额"
   },
+
   {
     field: "invType",
-    label: "发票申请类型",
+    label: "发票上传方式",
     render(data) {
       return h(ElTag, null, {
         default: () => invTypeOptions.find(s => s.value === String(data))?.label
@@ -64,39 +83,10 @@ export const ticketReturnColumns: DescriptionColumns = [
       });
     }
   },
-  {
-    field: "invName",
-    label: "发票名称"
-  },
-  {
-    field: "inv_img",
-    label: "发票图片",
-    render(src) {
-      return h(ElImage, {
-        src,
-        previewSrcList: [src],
-        style: {
-          height: "20px"
-        }
-      });
-    }
-  },
-  {
-    field: "inv_fee",
-    label: "发票金额"
-  },
-  {
-    field: "status",
-    label: "状态",
-    render(data) {
-      return h(ElTag, null, {
-        default: () => statusOptions.find(s => s.value === String(data))?.label
-      });
-    }
-  },
+
   {
     field: "open_time",
-    label: "开票时间"
+    label: "发票日期"
   },
   {
     field: "invoiceNumber",
@@ -107,32 +97,36 @@ export const ticketReturnColumns: DescriptionColumns = [
     label: "发票代码"
   },
   {
-    field: "checkNumber",
-    label: "校验码"
-  },
-  {
-    field: "pay_apply_name",
-    label: "对账申请人"
+    field: "inv_subtotal_amount",
+    label: "税前总金额"
   },
   {
-    field: "supplierNo",
-    label: "供应商编号"
+    field: "inv_amount",
+    label: "税后总金额"
   },
   {
-    field: "supplierName",
-    label: "供应商名称"
-  },
-  {
-    field: "companyNo",
-    label: "业务企业编号"
+    field: "checkNumber",
+    span: 8,
+    label: "校验码"
   },
   {
-    field: "companyName",
-    label: "业务企业名称"
+    field: "inv_img",
+    label: "发票图片",
+    span: 4,
+    render(src) {
+      return h(ElImage, {
+        src,
+        previewSrcList: [src],
+        style: {
+          height: "20px"
+        }
+      });
+    }
   },
   {
-    field: "total_fee",
-    label: "对账申请总额"
+    field: "remark",
+    span: 12,
+    label: "审核备注"
   }
 ];
 

src/views/purchase/ticketReturnRelive/config/_details.ts

@@ -142,25 +142,7 @@ export const ticketReturnColumns: DescriptionColumns = [
 export const ticketReturnReliveColumns: DescriptionColumns = [
   {
     field: "returnCode",
-    label: "退票编号"
-  },
-  {
-    field: "apply_name",
-    label: "申请人名称"
-  },
-  {
-    field: "supplierName",
-    label: "卖方公司",
-    render(supplierName, { supplierNo }) {
-      return createTooltip(supplierName, "卖方公司编号 : " + supplierNo, 360);
-    }
-  },
-  {
-    field: "companyName",
-    label: "买方公司",
-    render(companyName, { companyNo }) {
-      return createTooltip(companyName, "买方公司编号 : " + companyNo, 360);
-    }
+    label: "回票解除编号"
   },
   {
     field: "status",
@@ -173,16 +155,21 @@ export const ticketReturnReliveColumns: DescriptionColumns = [
     }
   },
   {
-    field: "inv_fee",
-    label: "发票金额"
+    field: "apply_name",
+    label: "申请人名称"
   },
   {
-    field: "total_fee",
-    label: "对账申请总额"
+    field: "addtime",
+    label: "添加时间"
+  },
+  {
+    field: "inv_fee",
+    label: "解除金额"
   },
   {
     field: "returnImg",
     label: "回执图片",
+    span: 18,
     render(returnImg) {
       const chunks = returnImg?.split(",");
 
@@ -202,11 +189,14 @@ export const ticketReturnReliveColumns: DescriptionColumns = [
   },
   {
     field: "reason",
-    label: "退票原因"
+    label: "退票原因",
+    span: 24
   },
+
   {
     field: "remark",
-    label: "备注"
+    label: "备注",
+    span: 24
   }
 ];
 

src/views/purchase/ticketReturnRelive/config/content.config.ts

@@ -7,47 +7,37 @@ import { ElTag } from "element-plus";
 import { statusOptions } from "./_opitons";
 
 const columns = [
+  // {
+  //   type: "selection",
+  //   width: 55,
+  //   hide: ({ checkList }) => !checkList.includes("勾选列")
+  // },
+  // {
+  //   label: "序号",
+  //   type: "index",
+  //   width: 70,
+  //   hide: ({ checkList }) => !checkList.includes("序号列")
+  // },
   {
-    type: "selection",
-    width: 55,
-    hide: ({ checkList }) => !checkList.includes("勾选列")
-  },
-  {
-    label: "序号",
-    type: "index",
-    width: 70,
-    hide: ({ checkList }) => !checkList.includes("序号列")
+    label: "回票解除编号",
+    prop: "returnCode",
+    width: 160
   },
   {
-    label: "退票申请编号",
-    prop: "returnCode",
-    width: 180
+    label: "对账回票编号",
+    prop: "orderCode",
+    width: 160
   },
+
   {
     label: "对账编号",
     prop: "payNo",
-    width: 180
-  },
-  {
-    label: "卖方公司名称",
-    prop: "supplierName"
-  },
-  {
-    label: "卖方公司编号",
-    prop: "supplierNo"
-  },
-  {
-    label: "买方公司名称",
-    prop: "companyName"
-  },
-  {
-    label: "买方公司编号",
-    prop: "companyNo"
+    width: 160
   },
   {
     label: "状态",
     prop: "status",
-    width: 160,
+    width: 100,
     cellRenderer: ({ row, props }) =>
       h(
         ElTag,
@@ -60,6 +50,27 @@ const columns = [
         }
       )
   },
+  {
+    label: "卖方公司编号",
+    prop: "supplierNo",
+    width: 160
+  },
+  {
+    label: "卖方公司名称",
+    prop: "supplierName",
+    minWidth: 160
+  },
+  {
+    label: "买方公司编号",
+    prop: "companyNo",
+    width: 160
+  },
+  {
+    label: "买方公司名称",
+    prop: "companyName",
+    minWidth: 160
+  },
+
   {
     label: "退票理由",
     prop: "reason"
@@ -71,7 +82,7 @@ const columns = [
   {
     label: "创建时间",
     prop: "addtime",
-    width: 180,
+    width: 160,
     formatter: ({ addtime }) => dayjs(addtime).format("YYYY-MM-DD HH:mm:ss")
   },
   {

src/views/purchase/ticketReturnRelive/config/search.config.ts

@@ -12,7 +12,7 @@ const searchFormConfig: FormConfig = {
     {
       field: "returnCode",
       type: "input",
-      placeholder: "退票申请编号"
+      placeholder: "回票解除编号"
     },
     {
       field: "create_timer",