build

dist/assets/ChildGoodEditModal.7967d3.js

@@ -1 +1 @@
-import{_ as B,d as _,a_ as C,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as h,h as s,j as r,aO as b,M as w,ah as D,a$ as k}from"./index.js";import{a as E}from"./columns.3129b278.js";import{B as M}from"./basic-descriptions.b613ec84.js";import"./status.b7512d56.js";import"./tootip.88cca741.js";const F={class:"flex justify-between mt-[10px]"},N={class:"flex items-center"},G=_({__name:"ChildGoodEditModal",props:{visible:{type:Boolean,required:!0},index:{type:null,required:!0},data:{type:null,required:!0}},emits:["submit"],setup(m,{emit:p}){const t=m,c=p,o=C(t,"visible"),l=x(0);V(()=>o.value,()=>{!o.value||(l.value=t.data.child_num)});function f(){c("submit",t.index,{...t.data,child_num:l.value}),o.value=!1}return(g,e)=>{const v=y("ElButton");return i(),d(a(k),{modelValue:a(o),"onUpdate:modelValue":e[1]||(e[1]=u=>D(o)?o.value=u:null),title:"\u7F16\u8F91\u5B50\u5546\u54C1",center:""},{default:n(()=>[t.data?(i(),d(a(M),{key:0,style:{overflow:"hidden"},data:t.data,columns:a(E)},null,8,["data","columns"])):h("v-if",!0),s("div",F,[s("div",N,[e[2]||(e[2]=s("p",{style:{width:"110px"}},"\u5B50\u5546\u54C1\u6BD4\u4F8B:",-1)),r(a(b),{modelValue:l.value,"onUpdate:modelValue":e[0]||(e[0]=u=>l.value=u),placeholder:"\u5B50\u5546\u54C1\u6BD4\u4F8B"},null,8,["modelValue"])]),r(v,{type:"primary",onClick:f},{default:n(()=>e[3]||(e[3]=[w("\u4FDD\u5B58")])),_:1})])]),_:1},8,["modelValue"])}}});var z=B(G,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{z as default};
+import{_ as B,d as _,a_ as C,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as h,h as s,j as r,aO as b,M as w,ah as D,a$ as k}from"./index.js";import{a as E}from"./columns.1fc57494.js";import{B as M}from"./basic-descriptions.d80c710b.js";import"./status.b7512d56.js";import"./tootip.19541d1c.js";const F={class:"flex justify-between mt-[10px]"},N={class:"flex items-center"},G=_({__name:"ChildGoodEditModal",props:{visible:{type:Boolean,required:!0},index:{type:null,required:!0},data:{type:null,required:!0}},emits:["submit"],setup(m,{emit:p}){const t=m,c=p,o=C(t,"visible"),l=x(0);V(()=>o.value,()=>{!o.value||(l.value=t.data.child_num)});function f(){c("submit",t.index,{...t.data,child_num:l.value}),o.value=!1}return(g,e)=>{const v=y("ElButton");return i(),d(a(k),{modelValue:a(o),"onUpdate:modelValue":e[1]||(e[1]=u=>D(o)?o.value=u:null),title:"\u7F16\u8F91\u5B50\u5546\u54C1",center:""},{default:n(()=>[t.data?(i(),d(a(M),{key:0,style:{overflow:"hidden"},data:t.data,columns:a(E)},null,8,["data","columns"])):h("v-if",!0),s("div",F,[s("div",N,[e[2]||(e[2]=s("p",{style:{width:"110px"}},"\u5B50\u5546\u54C1\u6BD4\u4F8B:",-1)),r(a(b),{modelValue:l.value,"onUpdate:modelValue":e[0]||(e[0]=u=>l.value=u),placeholder:"\u5B50\u5546\u54C1\u6BD4\u4F8B"},null,8,["modelValue"])]),r(v,{type:"primary",onClick:f},{default:n(()=>e[3]||(e[3]=[w("\u4FDD\u5B58")])),_:1})])]),_:1},8,["modelValue"])}}});var z=B(G,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{z as default};

dist/assets/InvoiceTitle.77bebe.js

@@ -1 +1 @@
-import{_ as s,d as _,o as l,G as d,l as r,a as u}from"./index.js";import{B as v}from"./basic-descriptions.b613ec84.js";const y=o=>{const{company_address:e,mobile:i,registercode:n,bank_name:c,bankNo:t,name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},B=o=>{const{invoice_addr:e,invoice_mobile:i,company_license:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},b=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],I=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"1",good_code:"",good_type:"",is_combind:"0",inv_good_name:"",subunit_price:"",basic_status:"",unit_price:"",goodName:"",skuCode:"",cat_code:"",inv_type:"",cat_tax:"",spec:"",unit:"",unit_weight:"",spectral:"",childArr:[]}),m=_({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(o){return(e,i)=>Object.keys(e.detail).length!==0?(l(),d(r(v),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:r(b),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var p=s(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),A=Object.freeze(Object.defineProperty({__proto__:null,default:p},Symbol.toStringTag,{value:"Module"}));export{p as I,g as a,B as b,I as c,y as d,A as e};
+import{_ as s,d as _,o as l,G as d,l as r,a as u}from"./index.js";import{B as v}from"./basic-descriptions.d80c710b.js";const y=o=>{const{company_address:e,mobile:i,registercode:n,bank_name:c,bankNo:t,name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},B=o=>{const{invoice_addr:e,invoice_mobile:i,company_license:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},b=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],I=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"1",good_code:"",good_type:"",is_combind:"0",inv_good_name:"",subunit_price:"",basic_status:"",unit_price:"",goodName:"",skuCode:"",cat_code:"",inv_type:"",cat_tax:"",spec:"",unit:"",unit_weight:"",spectral:"",childArr:[]}),m=_({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(o){return(e,i)=>Object.keys(e.detail).length!==0?(l(),d(r(v),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:r(b),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var p=s(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),A=Object.freeze(Object.defineProperty({__proto__:null,default:p},Symbol.toStringTag,{value:"Module"}));export{p as I,g as a,B as b,I as c,y as d,A as e};

dist/assets/InvoiceTitle.7eecae.js

@@ -1 +1 @@
-import{_ as o,d as s,o as i,G as n,l as t,a as r}from"./index.js";import{i as a}from"./shared.4f9e44f6.js";import{B as c}from"./basic-descriptions.b613ec84.js";const l=s({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(p){return(e,m)=>Object.keys(e.detail).length!==0?(i(),n(t(c),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:t(a),"col-number":1,"label-width":"130"},null,8,["data","columns"])):r("v-if",!0)}});var f=o(l,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/components/InvoiceTitle.vue"]]);export{f as default};
+import{_ as o,d as s,o as i,G as n,l as t,a as r}from"./index.js";import{i as a}from"./shared.4f9e44f6.js";import{B as c}from"./basic-descriptions.d80c710b.js";const l=s({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(p){return(e,m)=>Object.keys(e.detail).length!==0?(i(),n(t(c),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:t(a),"col-number":1,"label-width":"130"},null,8,["data","columns"])):r("v-if",!0)}});var f=o(l,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/components/InvoiceTitle.vue"]]);export{f as default};

dist/assets/detail.48dab8.js

@@ -1 +1 @@
-import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.caa33b7d.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.c64a331f.js";import{a as h}from"./index.1ba04f31.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.b613ec84.js";import"./index.ba4b19.js";import"./use-page-search.88230d59.js";import"./columns.3129b278.js";import"./tootip.88cca741.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};
+import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.a51485e8.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.704a489c.js";import{a as h}from"./index.3ff9d0ea.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.d80c710b.js";import"./index.ba4b19.js";import"./use-page-search.25684bb5.js";import"./columns.1fc57494.js";import"./tootip.19541d1c.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};

dist/assets/qrCode.be32d8.js

@@ -1,4 +1,4 @@
-import{d as Ht,w as Ot,a7 as Lt,z as me,j as P,H as pe,at as we,l as R,aE as be,F as Jt,y as Ce,bv as ve,bw as Dt,aw as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,au as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.20586e2d.js";/*!
+import{d as Ht,w as Ot,a7 as Lt,z as me,j as P,H as pe,at as we,l as R,aE as be,F as Jt,y as Ce,bv as ve,bw as Dt,aw as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,au as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.310598e4.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

src/views/invoiceInOut/clientC/components/ChooseGoodModal/config/content.config.ts

@@ -7,59 +7,67 @@ import { h } from "vue";
 
 const columns = [
   {
-    width: 40,
+    width: 30,
     type: 'selection',
     fixed: 'left'
   },
+  {
+    label: "ID",
+    prop: "id",
+    width: 80
+  },
   {
     label: "商品编码",
     prop: "skuCode",
     width: 150
   },
   {
-    label: "销售方公司",
-    prop: "seller_name",
-    width: 160
-  },
-  {
-    label: "购买方公司",
-    prop: "buyer_name",
-    width: 160
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
   },
   {
     label: '商品类型',
     width: 100,
-    cellRenderer({ row }){
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small' }, {
         default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
       })
     }
   },
   {
-    label: '商品名称',
-    prop: 'goodName',
-    width: 150
-  },
-  {
-    label: "规格",
-    prop: "spec",
-    width: 80
-  },
-  {
-    label: "单位",
-    prop: "unit",
+    label: '结存数',
+    prop: 'residue_stock',
     width: 80
   },
   {
     label: "状态",
     prop: "status",
-    width: 80,
-    cellRenderer({ row }){
+    width: 60,
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
         default: () => statusList.find(item => item.value == row.status)?.label || '--'
       })
     }
   },
+  {
+    label: '商品来源',
+    width: 95,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => goodSourceOptions.find(item => item.value == row.good_source)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '成本状态',
+    width: 75,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => basicStatusOptions.find(item => item.value == row.basic_status)?.label || '--'
+      })
+    }
+  },
   {
     label: '税前单价',
     prop: 'subunit_price',
@@ -70,15 +78,37 @@ const columns = [
     prop: 'unit_price',
     width: 100
   },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 42
+  },
+
+
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
   {
     label: '重量',
     prop: 'unit_weight',
     width: 80
   },
+  // {
+  //   label: '分光',
+  //   prop: 'spectral',
+  //   width: 80
+  // },
   {
-    label: '分光',
-    prop: 'spectral',
-    width: 80
+    label: "销售方公司",
+    width: 160,
+    ...renderIconLabelLeft('seller_code', 'seller_name', "销售方公司纳税号:")
+  },
+  {
+    label: "购买方公司",
+    width: 160,
+    ...renderIconLabelLeft('buyer_code', 'buyer_name', "购买方公司纳税号:")
   },
   {
     label: '创建人',
@@ -86,10 +116,10 @@ const columns = [
     width: 80
   },
   {
-    label:'创建时间',
+    label: '创建时间',
     prop: 'create_time',
     width: 140
-  }
+  },
 ];
 
 const contentConfig: ContentConfig = {

src/views/invoiceInOut/inManager/components/ChooseGoodModal/config/content.config.ts

@@ -4,62 +4,72 @@ import { httpList } from "/@/api/invoiceInOut/productManager";
 import { cg_order_type_options, statusList } from "/@/utils/status";
 import { ElTag } from "element-plus";
 import { h } from "vue";
+import { basicStatusOptions, goodSourceOptions } from "/@/views/invoiceInOut/productManager/config/columns";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
-    width: 40,
+    width: 30,
     type: 'selection',
     fixed: 'left'
   },
+  {
+    label: "ID",
+    prop: "id",
+    width: 80
+  },
   {
     label: "商品编码",
     prop: "skuCode",
     width: 150
   },
   {
-    label: "销售方公司",
-    prop: "seller_name",
-    width: 160
-  },
-  {
-    label: "购买方公司",
-    prop: "buyer_name",
-    width: 160
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
   },
   {
     label: '商品类型',
     width: 100,
-    cellRenderer({ row }){
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small' }, {
         default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
       })
     }
   },
   {
-    label: '商品名称',
-    prop: 'goodName',
-    width: 150
-  },
-  {
-    label: "规格",
-    prop: "spec",
-    width: 80
-  },
-  {
-    label: "单位",
-    prop: "unit",
+    label: '结存数',
+    prop: 'residue_stock',
     width: 80
   },
   {
     label: "状态",
     prop: "status",
-    width: 80,
-    cellRenderer({ row }){
+    width: 60,
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
         default: () => statusList.find(item => item.value == row.status)?.label || '--'
       })
     }
   },
+  {
+    label: '商品来源',
+    width: 95,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => goodSourceOptions.find(item => item.value == row.good_source)?.label || '--'
+      })
+    }
+  },
+  {
+    label: '成本状态',
+    width: 75,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => basicStatusOptions.find(item => item.value == row.basic_status)?.label || '--'
+      })
+    }
+  },
   {
     label: '税前单价',
     prop: 'subunit_price',
@@ -70,15 +80,37 @@ const columns = [
     prop: 'unit_price',
     width: 100
   },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 42
+  },
+
+
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
   {
     label: '重量',
     prop: 'unit_weight',
     width: 80
   },
+  // {
+  //   label: '分光',
+  //   prop: 'spectral',
+  //   width: 80
+  // },
   {
-    label: '分光',
-    prop: 'spectral',
-    width: 80
+    label: "销售方公司",
+    width: 160,
+    ...renderIconLabelLeft('seller_code', 'seller_name', "销售方公司纳税号:")
+  },
+  {
+    label: "购买方公司",
+    width: 160,
+    ...renderIconLabelLeft('buyer_code', 'buyer_name', "购买方公司纳税号:")
   },
   {
     label: '创建人',
@@ -86,10 +118,10 @@ const columns = [
     width: 80
   },
   {
-    label:'创建时间',
+    label: '创建时间',
     prop: 'create_time',
     width: 140
-  }
+  },
 ];
 
 const contentConfig: ContentConfig = {

src/views/invoiceInOut/inManager/detail.vue

@@ -47,7 +47,7 @@ const productDetail = computed(() => {
 const searchParameter = computed(() => {
   // 入库、入库红冲和出库红冲 只能选择真实成本的商品，出库类型可以选择预估成本商品
   if (!detailTask.data) return {}
-  return { basic_status: '1', good_type: detailTask.data?.goodType }
+  return { good_type: detailTask.data?.goodType }
 })
 
 

src/views/invoiceInOut/inventoryCheck/components/ChooseGoodModal/config/content.config.ts

@@ -5,7 +5,7 @@ import { cg_order_type_options, statusList } from "/@/utils/status";
 import { ElTag } from "element-plus";
 import { h } from "vue";
 import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
-import { basicStatusOptions } from "/@/views/invoiceInOut/productManager/config/columns";
+import { basicStatusOptions, goodSourceOptions } from "/@/views/invoiceInOut/productManager/config/columns";
 
 const columns = [
   {
@@ -52,6 +52,15 @@ const columns = [
       })
     }
   },
+  {
+    label: '商品来源',
+    width: 95,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => goodSourceOptions.find(item => item.value == row.good_source)?.label || '--'
+      })
+    }
+  },
   {
     label: '成本状态',
     width: 75,
@@ -61,9 +70,6 @@ const columns = [
       })
     }
   },
-
-
-
   {
     label: '税前单价',
     prop: 'subunit_price',

src/views/invoiceInOut/outManager/components/ChooseGoodModal/config/content.config.ts

@@ -4,17 +4,19 @@ import { httpList } from "/@/api/invoiceInOut/productManager";
 import { cg_order_type_options, statusList } from "/@/utils/status";
 import { ElTag } from "element-plus";
 import { h } from "vue";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
+import { basicStatusOptions, goodSourceOptions } from "/@/views/invoiceInOut/productManager/config/columns";
 
 const columns = [
   {
-    width: 40,
+    width: 30,
     type: 'selection',
     fixed: 'left'
   },
   {
-    label: '商品ID',
-    prop: 'id',
-    width: 60
+    label: "ID",
+    prop: "id",
+    width: 80
   },
   {
     label: "商品编码",
@@ -22,54 +24,50 @@ const columns = [
     width: 150
   },
   {
-    label: "销售方公司",
-    prop: "seller_name",
-    width: 160
-  },
-  {
-    label: "购买方公司",
-    prop: "buyer_name",
-    width: 160
+    label: '商品名称',
+    prop: 'goodName',
+    width: 150
   },
   {
     label: '商品类型',
     width: 100,
-    cellRenderer({ row }){
+    cellRenderer({ row }) {
       return h(ElTag, { size: 'small' }, {
         default: () => cg_order_type_options.find(item => item.value == row.good_type)?.label || '--'
       })
     }
   },
   {
-    label: '商品名称',
-    prop: 'goodName',
-    width: 150
-  },
-  {
-    label: "规格",
-    prop: "spec",
+    label: '结存数',
+    prop: 'residue_stock',
     width: 80
   },
   {
-    label: "单位",
-    prop: "unit",
-    width: 80
+    label: "状态",
+    prop: "status",
+    width: 60,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, {
+        default: () => statusList.find(item => item.value == row.status)?.label || '--'
+      })
+    }
   },
   {
-    label: '结存数',
-    prop: 'residue_stock',
-    width: 100
+    label: '商品来源',
+    width: 95,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => goodSourceOptions.find(item => item.value == row.good_source)?.label || '--'
+      })
+    }
   },
   {
-    label: "状态",
-    prop: "status",
-    width: 80,
-    cellRenderer({ row }){
-      return h(
-        ElTag, 
-        { size: 'small', type: statusList.find(item => item.value == row.status)?.type || 'warning' }, 
-        { default: () => statusList.find(item => item.value == row.status)?.label || '--' }
-    )
+    label: '成本状态',
+    width: 75,
+    cellRenderer({ row }) {
+      return h(ElTag, { size: 'small' }, {
+        default: () => basicStatusOptions.find(item => item.value == row.basic_status)?.label || '--'
+      })
     }
   },
   {
@@ -82,15 +80,37 @@ const columns = [
     prop: 'unit_price',
     width: 100
   },
+  {
+    label: "单位",
+    prop: "unit",
+    width: 42
+  },
+
+
+  {
+    label: "规格",
+    prop: "spec",
+    width: 80
+  },
   {
     label: '重量',
     prop: 'unit_weight',
     width: 80
   },
+  // {
+  //   label: '分光',
+  //   prop: 'spectral',
+  //   width: 80
+  // },
   {
-    label: '分光',
-    prop: 'spectral',
-    width: 80
+    label: "销售方公司",
+    width: 160,
+    ...renderIconLabelLeft('seller_code', 'seller_name', "销售方公司纳税号:")
+  },
+  {
+    label: "购买方公司",
+    width: 160,
+    ...renderIconLabelLeft('buyer_code', 'buyer_name', "购买方公司纳税号:")
   },
   {
     label: '创建人',
@@ -98,10 +118,10 @@ const columns = [
     width: 80
   },
   {
-    label:'创建时间',
+    label: '创建时间',
     prop: 'create_time',
     width: 140
-  }
+  },
 ];
 
 const contentConfig: ContentConfig = {