chore:更改列表样式

src/utils/columnRenderHelper.ts

@@ -1,5 +1,6 @@
 import { h } from "vue";
-import { ElTag } from "element-plus";
+import { ElButton, ElPopover, ElTag } from "element-plus";
+import { useRenderIcon } from "../components/ReIcon/src/hooks";
 
 export function renderProp(options: any[], prop = "status") {
   return {
@@ -17,3 +18,35 @@ export function renderProp(options: any[], prop = "status") {
     }
   };
 }
+
+export function renderIconLabelLeft(leftProp, rightProp, label = "", okProp = "") {
+  
+    return {
+      cellRenderer({ row }) {
+        console.log(row[okProp])
+        if (okProp && !row[okProp]) { 
+          return null
+        }
+        
+        return [
+            h(
+              ElPopover,
+              {
+                content: label + row[leftProp],
+                placement:'left',
+                width: 300,
+              },
+              {
+                reference: () =>
+                  h(ElButton, {
+                    link: true,
+                    size:'large',
+                    icon: useRenderIcon("information-line")
+                  })
+              }
+            ),
+            h("text", null, row[rightProp] || '--')
+          ]
+    }
+  };
+}

src/views/InvoiceSaleSettings/commodityCost/config/content.config.ts

@@ -5,6 +5,7 @@ import { h } from "vue";
 import dayjs from "dayjs";
 import { ElImage, ElTag } from "element-plus";
 import { good_type } from "./configs";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 function renderGoodImage(imgSrc: string) {
   const imgs = imgSrc.split(",");
@@ -31,25 +32,27 @@ const columns = [
     prop: "spuCode",
     width: 150
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    width: 175
+    width: 175,
+    ...renderIconLabelLeft('supplierNo', 'supplierName', '卖出方公司编码:')
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "买方公司名称",
+    label: "买入方公司",
     prop: "companyName",
-    width: 195
+    width: 195,
+    ...renderIconLabelLeft('companyNo', 'companyName', '买入方公司编码:')
   },
   {
     label: "商品名称",

src/views/InvoiceSaleSettings/consultingCost/config/content.config.ts

@@ -5,6 +5,7 @@ import { h } from "vue";
 import dayjs from "dayjs";
 import { ElImage, ElTag } from "element-plus";
 import { good_type } from "./configs";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 function renderGoodImage(imgSrc: string) {
   const imgs = imgSrc.split(",");
@@ -30,25 +31,27 @@ const columns = [
     prop: "spuCode",
     width: 150
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    width: 175
+    width: 175,
+    ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司编码:')
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "买方公司名称",
+    label: "买入方公司",
     prop: "companyName",
-    width: 195
+    width: 195,
+    ...renderIconLabelLeft('companyNo','companyName','买入方公司编码:')
   },
   {
     label: "商品名称",

src/views/InvoiceSales/invoiceApply/config/content.config.ts

@@ -11,6 +11,7 @@ import {
 } from "/@/utils/status";
 
 import { ElTag } from "element-plus";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const open_type_list = [
   { value: "1", label: "金税开票金税验票" },
@@ -30,9 +31,10 @@ const columns = [
     width: 150
   },
   {
-    label: "业务企业编码",
+    label: "业务企业公司",
     prop: "inv_out",
-    width: 150
+    width: 180,
+    ...renderIconLabelLeft('inv_out','inv_company','业务企业公司编码:')
   },
   {
     label: "客户公司名称",

src/views/InvoiceSales/invoicePool/config/content.config.ts

@@ -5,6 +5,7 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { ElTag } from "element-plus";
 import { invoiceTypeList, useTypeOptions } from "/@/utils/status";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   // {
@@ -24,15 +25,16 @@ const columns = [
     prop: "invNo",
     width: 150
   },
+  // {
+  //   label: "业务企业编码",
+  //   prop: "inv_out",
+  //   width: 150
+  // },
   {
-    label: "业务企业编码",
-    prop: "inv_out",
-    width: 150
-  },
-  {
-    label: "业务公司名称",
+    label: "业务公司",
     prop: "inv_company",
-    minWidth: 160
+    minWidth: 160,
+    ...renderIconLabelLeft('inv_out','inv_company','业务公司编码:')
   },
   {
     prop: "buyer_title",

src/views/InvoiceSales/refund/config/content.config.ts

@@ -9,6 +9,7 @@ import {
   xs_order_source_options,
   xs_order_type_options
 } from "/@/utils/status";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   // {
@@ -111,15 +112,18 @@ const columns = [
     width: "100px"
   },
 
-  {
-    label: "客户编码",
-    width: "150px",
-    prop: "companyNo"
-  },
+  // {
+  //   label: "客户编码",
+  //   width: "150px",
+  //   prop: "companyNo",
+  //   _slot_:''
+  // },
   {
     label: "客户名称",
     width: "180px",
-    prop: "customerName"
+    prop: "customerName",
+    // _slot_:'customer'
+    ...renderIconLabelLeft('companyNo','customerName','客户编码:')
   },
 
   {

src/views/InvoiceSales/returnTicket/config/content.config.ts

@@ -5,6 +5,7 @@ import { ElTag } from "element-plus";
 import { h } from "vue";
 import { RETURN_STATUS, RETURN_TYPE } from "/@/utils/details/inv-return";
 import { invoiceTypeList } from "/@/utils/status";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   // {
@@ -70,15 +71,16 @@ const columns = [
       });
     }
   },
+  // {
+  //   label: "业务公司编码",
+  //   prop: "inv_out",
+  //   width: 150
+  // },
   {
-    label: "业务公司编码",
-    prop: "inv_out",
-    width: 150
-  },
-  {
-    label: "业务公司名称",
+    label: "业务公司",
     prop: "companyName",
-    minWidth: 180
+    minWidth: 180,
+    ...renderIconLabelLeft('inv_out','companyName','业务公司编码:')
   },
   {
     label: "申请人",

src/views/InvoiceSales/sheetOrderPool/config/content.config.ts

@@ -11,6 +11,7 @@ import {
 } from "/@/utils/status";
 
 import { inv_open_status, retrun_status } from "./search.config";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -44,25 +45,27 @@ const columns = [
           useTypeOptions.find(s => s.value === row.platform_type)?.label || "--"
       })
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "卖方公司编码",
-    prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "companyName",
-    minWidth: 160
-  },
-  {
-    label: "客户编码",
-    prop: "customerNo",
-    width: 150
+    minWidth: 160,
+    ...renderIconLabelLeft('companyNo','companyName','卖出方公司编码:')
   },
+  // {
+  //   label: "客户编码",
+  //   prop: "customerNo",
+  //   width: 150
+  // },
   {
-    label: "客户名称",
+    label: "客户公司",
     prop: "customerName",
-    minWidth: 160
+    minWidth: 160,
+     ...renderIconLabelLeft('customerNo','customerName','客户公司编码:')
   },
   {
     label: "平台名称",

src/views/interest/accountQuery/config/content.config.ts

@@ -9,6 +9,7 @@ import { h } from "vue";
 import dayjs from "dayjs";
 import { ContentConfig } from "/@/components/PageContent";
 import { ElTag } from "element-plus";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -58,17 +59,18 @@ const columns = [
     align: "left"
   },
 
-  {
-    label: "公司编码",
-    prop: "companyCode",
-    width: 150,
-    align: "left"
-  },
+  // {
+  //   label: "公司编码",
+  //   prop: "companyCode",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
     label: "公司名称",
     prop: "companyName",
     minWidth: 180,
-    align: "left"
+    align: "left",
+    ...renderIconLabelLeft('companyCode','companyName','公司编码:')
   },
   {
     label: "创建时间",

src/views/netOrderEnter/netOrderEntry/config/content.config.ts

@@ -1,5 +1,6 @@
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/netOrderEnter/netOrderEntry";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -31,25 +32,27 @@ const columns = [
     label: "业务员",
     width: "70px"
   },
-  {
-    prop: "khNo",
-    label: "企业客户编码",
-    width: "150px"
-  },
+  // {
+  //   prop: "khNo",
+  //   label: "企业客户编码",
+  //   width: "150px"
+  // },
   {
     prop: "khName",
     label: "企业客户",
-    "min-width": "190px"
-  },
-  {
-    prop: "companyNo",
-    label: "销售公司编码",
-    width: "150px"
+    "min-width": "190px",
+    ...renderIconLabelLeft('khNo','khName','企业客户编码:')
   },
+  // {
+  //   prop: "companyNo",
+  //   label: "销售公司编码",
+  //   width: "150px"
+  // },
   {
     prop: "companyName",
-    label: "销售公司",
-    "min-width": "190px"
+    label: "销售方公司",
+    "min-width": "190px",
+    ...renderIconLabelLeft('companyNo','companyName','销售方公司编码:')
   },
 
   {
@@ -57,15 +60,16 @@ const columns = [
     label: "采购单号",
     width: "165px"
   },
-  {
-    prop: "supplierNo",
-    label: "供应商编码",
-    width: "150px"
-  },
+  // {
+  //   prop: "supplierNo",
+  //   label: "供应商编码",
+  //   width: "150px"
+  // },
   {
     prop: "supplierName",
-    label: "供应商",
-    "min-width": "190px"
+    label: "供应商公司",
+    "min-width": "190px",
+    ...renderIconLabelLeft('supplierNo','supplierName','供应商公司编码:')
   },
   {
     prop: "ordertime",

src/views/parameter/clients/config/content.config.ts

@@ -2,6 +2,7 @@ import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/parameter/clients";
 
 import dayjs from "dayjs";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -16,14 +17,15 @@ const columns = [
     width: 70,
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
+  // {
+  //   label: "客户编码",
+  //   width: 150,
+  //   prop: "companyNo"
+  // },
   {
-    label: "客户编码",
-    width: 150,
-    prop: "companyNo"
-  },
-  {
-    label: "客户名称",
-    prop: "companyName"
+    label: "客户公司",
+    prop: "companyName",
+    ...renderIconLabelLeft('companyNo', 'companyName', '客户公司编号:')
   },
   {
     label: "归属集团",

src/views/parameter/finance/config/content.config.ts

@@ -7,6 +7,7 @@ import { httpList, httpUpdate, httpStatus } from "/@/api/parameter/finance";
 import dayjs from "dayjs";
 import { h } from "vue";
 import { ElTag } from "element-plus";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 // const status = [
 //   {
@@ -43,7 +44,7 @@ const columns = [
   {
     label: "业务企业编码",
     prop: "companyNo",
-    width: 150
+    width: 150,
   },
   {
     label: "业务企业名称",

src/views/parameter/tagManage/config/content.config.ts

@@ -12,6 +12,7 @@ import { h } from "vue";
 import dayjs from "dayjs";
 import { ElTag } from "element-plus";
 import { tag_type } from "./_options";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -26,15 +27,16 @@ const columns = [
     width: 70,
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
+  // {
+  //   label: "业务公司编码",
+  //   prop: "companyNo",
+  //   width: "150px"
+  // },
   {
-    label: "业务公司编码",
-    prop: "companyNo",
-    width: "150px"
-  },
-  {
-    label: "业务公司名称",
+    label: "业务公司",
     prop: "companyName",
-    width: "160px"
+    width: "160px",
+    ...renderIconLabelLeft('companyNo','companyName','业务公司编码:','companyNo')
   },
   {
     label: "标签类型",

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

@@ -2,7 +2,7 @@ import { httpList, httpDel } from "/@/api/purchase/orderRecord";
 
 import { statusOptions } from "./_options";
 import { ContentConfig } from "/@/components/PageContent";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 import { hasAccountOptions } from "/@/utils/status";
 
 const columns = [
@@ -45,29 +45,31 @@ const columns = [
     width: 80,
     ...renderProp(hasAccountOptions, "has_account")
   },
+  // {
+  //   label: "卖出方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150,
+  //   align: "left",
+  // },
   {
-    label: "卖出方公司编码",
-    prop: "supplierNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "卖出方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
     minWidth: 160,
-    align: "left"
-  },
-  {
-    label: "买入方公司编码",
-    prop: "companyNo",
-    width: 150,
-    align: "left"
+    align: "left",
+    ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司:')
   },
+  // {
+  //   label: "买入方公司编码",
+  //   prop: "companyNo",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
-    label: "买入方公司名称",
+    label: "买入方公司",
     prop: "companyName",
     minWidth: 180,
-    align: "left"
+    align: "left",
+      ...renderIconLabelLeft('companyNo','companyName','买入方公司:')
   },
 
   {

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

@@ -1,6 +1,6 @@
 import { httpList } from "/@/api/purchase/porder";
 import { ContentConfig } from "/@/components/PageContent";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 
 import {
   cgdStatusOptions,
@@ -73,22 +73,22 @@ const columns = [
     prop: "goodName",
     width: "180px"
   },
-
   {
-    label: "卖出方公司编码",
-    prop: "supplierNo",
-    width: "150px"
+    label: "商品数量",
+    prop: "goodNum",
+    width: "80px"
   },
   {
-    label: "卖出方公司名称",
-    prop: "supplierName",
-    width: "175px"
+    label: "商品总价",
+    prop: "totalPrice",
+    width: "80px"
+  },
+  {
+    label: "卖出方公司编码",
+    prop: "supplierNo",
+    width: "150px",
+    ...renderIconLabelLeft('supplierNo', 'supplierName', '卖出公司编码:')
   },
-  // {
-  //   label: "销售订单编码",
-  //   prop: "qrdCode",
-  //   width: "150px"
-  // },
   {
     label: "备库单编码",
     prop: "bkCode",
@@ -101,15 +101,16 @@ const columns = [
   },
 
   {
-    label: "买入方公司名称",
+    label: "买入方公司",
     prop: "companyName",
-    width: "160px"
-  },
-  {
-    label: "买入方公司编码",
-    prop: "companyNo",
-    width: "150px"
+    width: "160px",
+    ...renderIconLabelLeft('companyNo', 'companyName', '买入公司编码:')
   },
+  // {
+  //   label: "买入方公司编码",
+  //   prop: "companyNo",
+  //   width: "150px"
+  // },
   {
     label: "创建时间",
     prop: "addtime",

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

@@ -4,7 +4,7 @@ import { httpList, httpDelete } from "/@/api/purchase/orderPay";
 import { h } from "vue";
 import { ElTag } from "element-plus";
 import { hasAccountOptions, purchPayStatusOptions } from "/@/utils/status";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -52,26 +52,28 @@ const columns = [
     width: 110,
     align: "left"
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    minWidth: 180
-  },
-  {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
+    minWidth: 180,
+    ...renderIconLabelLeft("supplierNo", "supplierName", "卖出方公司编码:")
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "买方公司名称",
+    label: "买入方公司名称",
     prop: "companyName",
-    minWidth: 180
+    minWidth: 180,
+     ...renderIconLabelLeft("companyNo", "companyName", "买入方公司编码:")
   },
 
   {

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

@@ -8,7 +8,7 @@ import {
   hasAccountOptions,
   purchPayReliveStatusOptions
 } from "/@/utils/status";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 // import { statusOptions } from "./_options";
 
 const columns = [
@@ -68,26 +68,28 @@ const columns = [
     width: 80,
     ...renderProp(hasAccountOptions, "has_account")
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    minWidth: 180
-  },
-  {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
+    minWidth: 180,
+    ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司编码:')
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
     label: "买方公司名称",
     prop: "companyName",
-    minWidth: 180
+    minWidth: 180,
+    ...renderIconLabelLeft('companyNo','companyName','方公司编码:')
   },
 
   {

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

@@ -12,7 +12,7 @@ import {
   checkTypeOptions,
   hasAccountOptions
 } from "/@/utils/status";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -41,15 +41,16 @@ const columns = [
     label: "申请人",
     prop: "apply_name"
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    width: 145
+    width: 145,
+    ...renderIconLabelLeft("supplierNo","supplierName","卖出方公司编码:")
   },
   {
     label: "发票税前金额",
@@ -174,15 +175,16 @@ const columns = [
       });
     }
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "买方公司名称",
+    label: "买入方公司",
     prop: "companyName",
-    width: 145
+    width: 145,
+    ...renderIconLabelLeft('companyNo','companyName','买入方公司编码:')
   },
   {
     label: "创建时间",

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

@@ -8,7 +8,7 @@ import {
   hasAccountOptions,
   ticketReturnReliveStatusOptions
 } from "/@/utils/status";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 
 const columns = [
   // {
@@ -63,26 +63,28 @@ const columns = [
         }
       )
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    minWidth: 160
+    width: 160,
+    ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司编码:')
   },
   {
-    label: "买方公司编码",
+    label: "买入方公司",
     prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "买方公司名称",
-    prop: "companyName",
-    minWidth: 160
+    width: 160,
+    ...renderIconLabelLeft('companyNo','companyName','买入方公司编码:')
   },
+  // {
+  //   label: "买方公司名称",
+  //   prop: "companyName",
+  //   minWidth: 160
+  // },
 
   {
     label: "退票理由",

src/views/reportForm/reportApply/config/content.config.ts

@@ -4,6 +4,7 @@ import { httpList, httpAdd, httpStatus } from "/@/api/reportForm/reportApply";
 import { h } from "vue";
 import dayjs from "dayjs";
 import { ElTag } from "element-plus";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 const columns = [
   {
     type: "selection",
@@ -37,14 +38,16 @@ const columns = [
         }
       )
   },
+  // {
+  //   label: "业务公司编码",
+  //   prop: "companyNo",
+  //   width: "150px"
+  // },
   {
-    label: "业务公司编码",
-    prop: "companyNo",
-    width: "150px"
-  },
-  {
-    label: "业务公司名称",
-    prop: "companyName"
+    label: "业务公司",
+    prop: "companyName",
+    minWidth: '180px',
+    ...renderIconLabelLeft('companyNo','companyName','业务公司编码')
   },
 
   {

src/views/reportForm/reportRecord/config/content.config.ts

@@ -6,6 +6,7 @@ import { h } from "vue";
 import dayjs from "dayjs";
 import { ElTag } from "element-plus";
 import { type_options, tag_type } from "./_options";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -73,14 +74,15 @@ const columns = [
     width: "140px",
     formatter: ({ end }) => dayjs(end).format("YYYY-MM-DD HH:mm:ss")
   },
+  // {
+  //   label: "业务公司编码",
+  //   prop: "companyNo",
+  //   width: "150px"
+  // },
   {
-    label: "业务公司编码",
-    prop: "companyNo",
-    width: "150px"
-  },
-  {
-    label: "业务公司名称",
-    prop: "companyName"
+    label: "业务公司",
+    prop: "companyName",
+    ...renderIconLabelLeft('companyNo','companyName','业务公司编码:')
   },
 
   {

src/views/supplierManage/supplierAccoutQuery/config/content.config.ts

@@ -10,6 +10,7 @@ import {
 import dayjs from "dayjs";
 import { ContentConfig } from "/@/components/PageContent";
 import { ElTag } from "element-plus";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -58,18 +59,18 @@ const columns = [
     minWidth: 150,
     align: "left"
   },
-
-  {
-    label: "公司编码",
-    prop: "companyCode",
-    width: 150,
-    align: "left"
-  },
+  // {
+  //   label: "公司编码",
+  //   prop: "companyCode",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
     label: "公司名称",
     prop: "companyName",
     minWidth: 180,
-    align: "left"
+    align: "left",
+    ...renderIconLabelLeft('companyCode','companyName','公司编码:')
   },
   {
     label: "创建时间",

src/views/supply/orderRecord/config/content.config.ts

@@ -2,7 +2,7 @@ import { httpList, httpDel } from "/@/api/purchase/orderRecord";
 
 import dayjs from "dayjs";
 import { ContentConfig } from "/@/components/PageContent";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 import { orderRecordStatusOptions } from "/@/utils/status";
 
 const columns = [
@@ -15,7 +15,7 @@ const columns = [
     label: "序号",
     type: "index",
     minWidth: 60,
-    align: "left",
+    align: "left", 
     hide: ({ checkList }) => !checkList.includes("序号列")
   },
   {
@@ -36,31 +36,32 @@ const columns = [
     width: 140,
     ...renderProp(orderRecordStatusOptions)
   },
-
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
     minWidth: 180,
-    align: "left"
+    align: "left",
+    ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司编码:')
   },
   {
-    label: "买方公司编码",
+    label: "买入方公司",
     prop: "companyNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "买方公司名称",
-    prop: "companyName",
     minWidth: 180,
-    align: "left"
+    align: "left",
+      ...renderIconLabelLeft('companyNo','companyName','买入方公司:')
   },
+  // {
+  //   label: "买方公司名称",
+  //   prop: "companyName",
+  //   minWidth: 180,
+  //   align: "left"
+  // },
   {
     label: "申请人",
     prop: "apply_name",

src/views/supply/porder/config/content.config.ts

@@ -1,6 +1,6 @@
 import { httpList } from "/@/api/purchase/porder";
 import { ContentConfig } from "/@/components/PageContent";
-import { renderProp } from "/@/utils/columnRenderHelper";
+import { renderIconLabelLeft, renderProp } from "/@/utils/columnRenderHelper";
 
 import {
   cgdStatusOptions,
@@ -79,25 +79,37 @@ const columns = [
     width: "180px"
   },
   {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: "150px"
+    label: "商品数量",
+    prop: "goodNum",
+    width: "80px"
   },
   {
-    label: "买方公司名称",
-    prop: "companyName",
-    width: "120px"
+    label: "商品总价",
+    prop: "totalPrice",
+    width: "80px"
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: "150px"
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: "150px"
+    label: "买入方公司",
+    prop: "companyName",
+    width: "150px",
+    ...renderIconLabelLeft('companyNo','companyName','买入方公司编码:')
   },
   {
-    label: "卖方公司名称",
-    prop: "supplierName",
-    width: "175px"
-  },
+    label: "卖出方公司",
+    prop: "supplierNo",
+    width: "150px",
+    ...renderIconLabelLeft('supplierNo','supplierName','买厨房公司编码:')
+  },
+  // {
+  //   label: "卖方公司名称",
+  //   prop: "supplierName",
+  //   width: "175px"
+  // },
   {
     label: "备库单",
     prop: "bkCode",

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

@@ -5,6 +5,7 @@ import dayjs from "dayjs";
 import { h } from "vue";
 import { ElTag } from "element-plus";
 import { purchPayStatusOptions } from "/@/utils/status";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -60,26 +61,28 @@ const columns = [
     prop: "total_fee",
     width: 110
   },
+  // {
+  //   label: "卖方公司编码",
+  //   prop: "supplierNo",
+  //   width: 150,
+  //   align: "left"
+  // },
   {
-    label: "卖方公司编码",
-    prop: "supplierNo",
-    width: 150,
-    align: "left"
-  },
-  {
-    label: "卖方公司名称",
+    label: "卖出方公司",
     prop: "supplierName",
-    minWidth: 180
-  },
-  {
-    label: "买方公司编码",
-    prop: "companyNo",
-    width: 150
+    minWidth: 180,
+    ...renderIconLabelLeft('supplierNo', 'supplierName','卖出方公司编码:')
   },
+  // {
+  //   label: "买方公司编码",
+  //   prop: "companyNo",
+  //   width: 150
+  // },
   {
-    label: "买方公司名称",
+    label: "买入方公司名称",
     prop: "companyName",
-    minWidth: 180
+    minWidth: 180,
+    ...renderIconLabelLeft('companyNo', 'companyName','买入方公司编码:')
   },
   {
     label: "申请人",

src/views/supply/ticketReturn/config/content.config.ts

@@ -13,6 +13,7 @@ import {
   checkTypeOptions,
   ticketReturnStatusOptions
 } from "/@/utils/status";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -42,15 +43,16 @@ const columns = [
     prop: "apply_name"
   },
   {
-    label: "买方公司编码",
+    label: "买入方公司",
     prop: "companyNo",
-    width: 150
-  },
-  {
-    label: "买方公司名称",
-    prop: "companyName",
-    width: 145
+    width: 150,
+    ...renderIconLabelLeft('companyNo','companyName','买入方公司编码:')
   },
+  // {
+  //   label: "买方公司名称",
+  //   prop: "companyName",
+  //   width: 145
+  // },
   {
     label: "发票税前金额",
     width: "110px",
@@ -169,15 +171,16 @@ const columns = [
     }
   },
   {
-    label: "卖方公司编码",
+    label: "卖出方公司",
     prop: "supplierNo",
-    width: 150
-  },
-  {
-    label: "卖方公司名称",
-    prop: "supplierName",
-    width: 145
+    width: 150,
+     ...renderIconLabelLeft('supplierNo','supplierName','卖出方公司编码:')
   },
+  // {
+  //   label: "卖方公司名称",
+  //   prop: "supplierName",
+  //   width: 145
+  // },
   {
     label: "创建时间",
     prop: "addtime",