build

dist/assets/ChildGoodEditModal.7967d3.js

@@ -1 +1 @@
-import{_ as B,d as _,aZ 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.f01d8bd1.js";import{B as M}from"./basic-descriptions.fb5b2628.js";import"./status.4e0ebdbc.js";import"./tootip.b8a37fe7.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{g as E}from"./columns.57fd1333.js";import{B as M}from"./basic-descriptions.898fa2c0.js";import"./status.0f771e9a.js";import"./tootip.f8ec1491.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.fb5b2628.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.898fa2c0.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.80186348.js";import{B as c}from"./basic-descriptions.fb5b2628.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.80186348.js";import{B as c}from"./basic-descriptions.898fa2c0.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/columnRenderHelper.c9666c60.js

@@ -0,0 +1 @@
+import{ac as n,aR as i,J as u,aX as c}from"./index.js";function o(r,l,a="",t=""){return{cellRenderer({row:e}){return t&&!e[t]?null:[n(c,{content:a+e[r],placement:"left",width:300},{reference:()=>n(i,{link:!0,size:"large",icon:u("information-line")})}),n("text",null,e[l]||"--")]}}}function s(r,l,a="",t=""){return{cellRenderer({row:e}){return t&&!e[t]?null:[n(c,{content:a+r(e),placement:"left",width:300},{reference:()=>n(i,{link:!0,size:"large",icon:u("information-line")})}),n("text",null,l(e)||"--")]}}}export{s as a,o as r};

dist/assets/columnRenderHelper.e53c11ea.js

@@ -1 +0,0 @@
-import{ac as n,aR as a,J as u,b0 as c}from"./index.js";function o(r,l,i="",t=""){return{cellRenderer({row:e}){return t&&!e[t]?null:[n(c,{content:i+e[r],placement:"left",width:300},{reference:()=>n(a,{link:!0,size:"large",icon:u("information-line")})}),n("text",null,e[l]||"--")]}}}function s(r,l,i="",t=""){return{cellRenderer({row:e}){return t&&!e[t]?null:[n(c,{content:i+r(e),placement:"left",width:300},{reference:()=>n(a,{link:!0,size:"large",icon:u("information-line")})}),n("text",null,l(e)||"--")]}}}export{s as a,o as r};

dist/assets/detail.8b0ced.js

@@ -1 +1 @@
-import{_ as E,d as b,aX as B,r as t,at as D,H as g,l as e,o as i,c as h,j as o,C as s,ah as T,G as d,a as p}from"./index.js";import{B as V,g as x,a as y}from"./BaseForm.0d14fd.js";import{B as w}from"./basic-descriptions.fb5b2628.js";import{u as I}from"./useDetail.6122bd7e.js";import{a as N}from"./index.01c9e0ad.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.0088a7fd.js";import"./status.4e0ebdbc.js";import"./index.4344e637.js";const j={class:"padding__container"},H=b({__name:"detail",setup(P){const a=B(),{id:n,title:r,isDetail:m,collapses:l}=I({baseName:"\u76D8\u70B9",collapseLen:2});return n.value&&a.run(N({id:n.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return g((i(),h("div",j,[o(v,null,{default:s(()=>[o(f,{label:e(r)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>T(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(r),name:"1"},{default:s(()=>[e(m)?p("v-if",!0):(i(),d(V,{key:0})),e(m)&&e(a).data?(i(),d(e(w),{key:1,columns:e(a).data.is_combind=="1"?e(x):e(y),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var K=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{K as default};
+import{_ as E,d as b,aY as B,r as t,at as D,H as g,l as e,o as i,c as h,j as o,C as s,ah as T,G as d,a as p}from"./index.js";import{B as V,g as x,a as y}from"./BaseForm.0d14fd.js";import{B as w}from"./basic-descriptions.898fa2c0.js";import{u as I}from"./useDetail.de731874.js";import{a as N}from"./index.0e8d4646.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.c6a73876.js";import"./status.0f771e9a.js";import"./index.d1f322f8.js";const j={class:"padding__container"},H=b({__name:"detail",setup(P){const a=B(),{id:n,title:r,isDetail:m,collapses:l}=I({baseName:"\u76D8\u70B9",collapseLen:2});return n.value&&a.run(N({id:n.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return g((i(),h("div",j,[o(v,null,{default:s(()=>[o(f,{label:e(r)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>T(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(r),name:"1"},{default:s(()=>[e(m)?p("v-if",!0):(i(),d(V,{key:0})),e(m)&&e(a).data?(i(),d(e(w),{key:1,columns:e(a).data.is_combind=="1"?e(x):e(y),data:e(a).data},null,8,["columns","data"])):p("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var K=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{K as default};

dist/assets/detail.c73fd2.js

@@ -1 +0,0 @@
-import{_ as E,d as b,aX as g,r as t,at as D,H as B,l as e,o as i,c as T,j as o,C as s,ah as h,G as p,a as d}from"./index.js";import{B as V}from"./basic-descriptions.fb5b2628.js";import{u as x}from"./useDetail.6122bd7e.js";import w from"./BaseForm.52e1af.js";import{g as y,a as I}from"./columns.f01d8bd1.js";import{a as N}from"./index.01c9e0ad.js";import"./status.4e0ebdbc.js";import"./InvoiceTitle.77bebe.js";import"./index.08977e.js";import"./use-page-search.0088a7fd.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";import"./tootip.b8a37fe7.js";const j={class:"padding__container"},H=b({__name:"detail",setup(P){const a=g(),{title:n,isDetail:r,collapses:l,id:m}=x({baseName:"\u5546\u54C1",collapseLen:2});return m.value&&a.run(N({id:m.value})),(U,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return B((i(),T("div",j,[o(v,null,{default:s(()=>[o(f,{label:e(n)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>h(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(n),name:"1"},{default:s(()=>[e(r)?d("v-if",!0):(i(),p(w,{key:0})),e(r)&&e(a).data?(i(),p(e(V),{key:1,columns:e(a).data.is_combind=="1"?e(y):e(I),data:e(a).data},null,8,["columns","data"])):d("v-if",!0)]),_:1},8,["title"])]),_:1},8,["modelValue"])]),_:1},8,["label"])]),_:1})])),[[C,e(a).loading]])}}});var S=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{S as default};

dist/assets/index.2e8788c0.js → dist/assets/index.0270321a.js

@@ -1 +1 @@
-import{aF as d,ab as i,d as p,w as m,aZ as _,aX as f,z as y,o as v,G as E,l as r,ah as R,b1 as V,_ as Y,aW as k}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:x,VITE_PROXY_USER_REAL:A,VITE_WORKORDER_REAL:M}=i(),h=M,D=t=>d.request("post",`${h}/cxinv/FinancialSeal/getQuery`,{data:t}),S=p({__name:"index",props:{company_code:{type:String,required:!1},modelValue:{type:String,required:!0}},setup(t){const s=t,n=m([]),o=_(s,"modelValue"),c=f({success(a){n.value=a.map(({fz_date:e})=>e)}});y(()=>s.company_code,()=>{!s.company_code||c.run(D({company_code:s.company_code,status:0}))},{immediate:!0});function l(a){const e=k(a).format("YYYY-MM");return!n.value.includes(e)}return(a,e)=>(v(),E(r(V),{type:"month",modelValue:r(o),"onUpdate:modelValue":e[0]||(e[0]=u=>R(o)?o.value=u:null),"value-format":"YYYY-MM",disabledDate:a.company_code?l:void 0},null,8,["modelValue","disabledDate"]))}});var O=Y(S,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/components/SealMonthPicker/index.vue"]]);export{O as S};
+import{aF as d,ab as i,d as p,w as m,a_ as _,aY as f,z as y,o as Y,G as v,l as r,ah as E,b1 as R,_ as V,aW as k}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:x,VITE_PROXY_USER_REAL:A,VITE_WORKORDER_REAL:M}=i(),h=M,D=t=>d.request("post",`${h}/cxinv/FinancialSeal/getQuery`,{data:t}),S=p({__name:"index",props:{company_code:{type:String,required:!1},modelValue:{type:String,required:!0}},setup(t){const s=t,n=m([]),o=_(s,"modelValue"),c=f({success(a){n.value=a.map(({fz_date:e})=>e)}});y(()=>s.company_code,()=>{!s.company_code||c.run(D({company_code:s.company_code,status:0}))},{immediate:!0});function l(a){const e=k(a).format("YYYY-MM");return!n.value.includes(e)}return(a,e)=>(Y(),v(r(R),{type:"month",modelValue:r(o),"onUpdate:modelValue":e[0]||(e[0]=u=>E(o)?o.value=u:null),"value-format":"YYYY-MM",disabledDate:a.company_code?l:void 0},null,8,["modelValue","disabledDate"]))}});var O=V(S,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/components/SealMonthPicker/index.vue"]]);export{O as S};

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,bu as ve,bv 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.921bd967.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,bu as ve,bv 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.de78445b.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/assets/tootip.b8a37fe7.js → dist/assets/tootip.f8ec1491.js

@@ -1 +1 @@
-import{ac as e,b0 as a,aR as l,J as r}from"./index.js";function s(n,t,o=200){return e("div",{style:{display:"flex",justifyContent:"space-between"}},{default:()=>[e(a,{placement:"top",content:t,width:o},{reference:()=>e(l,{link:!0,icon:r("information-line")})}),e("span",null,n)]})}export{s as c};
+import{ac as e,aX as a,aR as l,J as r}from"./index.js";function s(n,t,o=200){return e("div",{style:{display:"flex",justifyContent:"space-between"}},{default:()=>[e(a,{placement:"top",content:t,width:o},{reference:()=>e(l,{link:!0,icon:r("information-line")})}),e("span",null,n)]})}export{s as c};

src/components/BasicForm/src/basic-form.vue

@@ -162,13 +162,13 @@ defineExpose({
 
             <template v-if="item.type === 'inv-in-query'">
               <InvInQuery v-model="formData[item.field]" :placeholder="item.placeholder || '发票购买方公司'"
-                @change="handleChange(item, true)" />
+                @change="handleChange(item, false)" />
             </template>
 
 
             <template v-if="item.type === 'inv-out-query'">
               <InvOutQuery v-model="formData[item.field]" :placeholder="item.placeholder || '发票销售方公司'"
-                @change="handleChange(item, true)" />
+                @change="handleChange(item, false)" />
             </template>
 
             <template v-if="item.type === 'brand-query'">

src/components/Input/src/unit.vue

@@ -19,12 +19,15 @@ const props = withDefaults(defineProps<IUnitInputProps>(), {
 const modelValue = useVModel(props, "modelValue");
 
 function limitNumTool(value, figure) {
+  console.log(props.KeepDecimals);
+  
   let str =
     ("" + value)
       .replace(/[^\d^\.]+/g, "")
       .replace(/^0+(\d)/, "$1")
       .replace(/^\./, "0.") //
-      .match(/^\d*(\.?\d{0,2})/g)[0] || "";
+      .match(new RegExp(`^\\d*(\\.?\\d{0,${props.KeepDecimals}})`, 'g'))[0] || "";
+      
   if (str.indexOf(".") > -1) {
     str = str.slice(0, Number(figure) + 3);
   } else {

src/components/productDetail/columns.ts

@@ -28,6 +28,14 @@ export const goodColumns = [
         span: 6,
         field: 'create_time',
         label: '创建时间'
+    },
+        {
+        span: 12,
+        field: 'buyer_name',
+        label: '购买方公司',
+        render(_, { buyer_code, buyer_name }) {
+            return createTooltip(buyer_name, '购买方公司编号:' + buyer_code, 300)
+        }
     },
     {
         span: 12,
@@ -37,14 +45,6 @@ export const goodColumns = [
             return createTooltip(seller_name, '销售方公司编号:' + seller_code, 300)
         }
     },
-    {
-        span: 12,
-        field: 'buyer_name',
-        label: '购买方公司',
-        render(_, { buyer_code, buyer_name }) {
-            return createTooltip(buyer_name, '购买方公司编号:' + buyer_code, 300)
-        }
-    },
     {
         span: 6,
         label: '商品来源',

src/utils/status.ts

@@ -162,10 +162,15 @@ export const mapLabelToInvtype = xs_inv_type_list.reduce((prev, current) => ({
 }), {})
 
 export const tax_list = [
-  { label: "0%", value: "0%",},
+  { label: "0%", value: "0%" },
+  { label: "1%", value: "1%" },
+  { label: "3%", value: "3%" },
+  { label: "5%", value: "5%" },
   { label: "6%", value: "6%" },
   { label: "9%", value: "9%" },
+  { label: "10%", value: "10%" },
   { label: "13%", value: "13%" },
+  { label: "16%", value: "16%" }
 ];
 
 const send_status_list = [

src/views/invoiceInOut/adjustOrder/config/content.config.ts

@@ -1,5 +1,6 @@
 import { ContentConfig } from "/@/components/PageContent";
 import { httpList } from "/@/api/invoiceInOut/adjustOrder";
+import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 
 const columns = [
   {
@@ -29,6 +30,11 @@ const columns = [
     width: 140,
     showOverflowTooltip: true
   },
+  {
+    label: '购买方公司',
+    width: 150,
+    ...renderIconLabelLeft('company_code', 'company_name', '购买方公司纳税号:')
+  },
   {
     label: "规格",
     prop: "spec",
@@ -74,6 +80,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "调整单管理",
   permissions: ["007"],
+  companyProp: 'company_code',
   apis: { httpList, httpAdd: true }
 };
 

src/views/invoiceInOut/clientC/components/BaseForm/index.vue

@@ -22,14 +22,8 @@ const state = reactive({
     index: -1
 })
 
-const formData = ref({
-    orders: [],
-    goods: [],
-    month: ''
-})
-
-
 const router = useRouter()
+const formData = ref({ orders: [], goods: [], month: '' })
 
 const createTask = useTask({ success(){
     ElMessage.success('创建成功') 

src/views/invoiceInOut/clientC/detail.vue

@@ -64,7 +64,10 @@ id.value && detailTask.run(httpDetail({ id: id.value }));
 
     <ChooseGoodModal v-model:visible="visible" @submit="handleGoodComfirm" />
 
-    <ChildGoodEditModal :data="state.data" :index="state.index" v-model:visible="state.editVisible"
+    <ChildGoodEditModal
+       v-model:visible="state.editVisible"
+      :data="state.data" 
+      :index="state.index" 
       @submit="handleEditGood" />
   </div>
 </template>

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

@@ -309,7 +309,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
-  companyProp: 'buyer_code',
+  companyProp: 'inv_buyer_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, channel: [1, 2], type: [1, 3] }),
     httpAdd: true

src/views/invoiceInOut/inManager/config/search.config.ts

@@ -7,11 +7,11 @@ const searchFormConfig: FormConfig = {
       type: 'inv-out-query',
       placeholder: '发票销售方公司'
     },
-    {
-      field: 'inv_buyer_code',
-      type:'inv-in-query',
-      placeholder:'发票购买方公司'
-    },
+    // {
+    //   field: 'inv_buyer_code',
+    //   type:'inv-in-query',
+    //   placeholder:'发票购买方公司'
+    // },
   ]
 };
 

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

@@ -304,7 +304,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
-  companyProp: 'seller_code',
+  companyProp: 'inv_seller_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, channel: [1, 2], type: [2, 4] }),
     httpAdd: true

src/views/invoiceInOut/outManager/config/search.config.ts

@@ -2,11 +2,11 @@ import { FormConfig } from "/@/components/PageSearch";
 
 const searchFormConfig: FormConfig = {
   formItems: [
-    {
-      field: 'inv_seller_code',
-      type: 'inv-out-query',
-      placeholder: '发票销售方公司'
-    },
+    // {
+    //   field: 'inv_seller_code',
+    //   type: 'inv-out-query',
+    //   placeholder: '发票销售方公司'
+    // },
     {
       field: 'inv_buyer_code',
       type:'inv-in-query',

src/views/invoiceInOut/productManager/components/BaseForm.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { computed, onMounted, reactive, ref } from "vue";
-import { cg_order_type_options, xs_inv_type_list, tax_list } from "/@/utils/status"
+import { computed, reactive, ref } from "vue";
+import { cg_order_type_options, tax_list } from "/@/utils/status"
 import { ElButton, ElCol, ElForm, ElFormItem, ElMessage, ElOption, ElSelect, ElTooltip } from "element-plus"
 import { httpCompanies } from "/@/api/invoiceInOut/productManager"
 import RemoteSelect from "/@/components/RemoteSelect";
@@ -19,19 +19,23 @@ import ChildGoodEditModal from "./ChildGoodEditModal.vue";
 
 
 import { httpInvoiceList } from "/@/api/InvoiceSales/invoiceApply";
-import { httpAdd, httpCatist } from "/@/api/invoiceInOut/productManager";
+import { httpAdd } from "/@/api/invoiceInOut/productManager";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import QueryCategory from "./query-category.vue";
 
-
 import dayjs from "dayjs";
 
-
 const { current } = useCurrentCompany()
 
 const rulesRef = computed(() => ({
   ...rules,
-  skuCode: [{ required: formData.value.good_source == '1', message: '请输入商品编号', trigger: 'change' }]
+  skuCode: [
+    {
+      required: formData.value.good_source == "1",
+      message: "请输入商品编号",
+      trigger: "change"
+    }
+  ]
 }))
 
 const router = useRouter()
@@ -65,11 +69,12 @@ async function submit(){
 
   try{
     await formRef.value?.validate()
-    createTask.run(httpAdd({
+    createTask.run( httpAdd({
       ...formData.value,
       skuCode: formData.value.good_source == '1' ? formData.value.skuCode : generateNumber(),
       childArr: formData.value.childArr.map(({ child_id, child_num }) => ({ child_id, child_num }))
     }))
+
   }catch(err){
     console.log(err)
   }
@@ -79,13 +84,6 @@ function handleInvoiceTitle(_isSeller: boolean, invoiceTitle: Record<string, str
   if (!_isSeller) {
     invoiceTitle = state.companies.find(item => item.company_license === formData.value.buyer_code)
     formData.value.buyer_name = invoiceTitle.company_name
-    // formData.value.seller_code = invoiceTitle.company_name
-    //支持的开票方式
-    // const { invoiceType, denomination: _denomination } = invoiceTitle;
-    // const chunks = invoiceType.split(",");
-    // ruleForm.value.invtype = "";
-    // invoiceTypes.value = xs_inv_type_list.filter(({ value }) => chunks.includes(value));
-    // formData.value.seller_name = 
   } else{
     formData.value.seller_name = invoiceTitle.name
   }
@@ -165,16 +163,6 @@ function handleGoodSourceChange(value){
 <template>
   <ElForm ref="formRef" :rules="rulesRef" :model="formData" v-loading="createTask.loading">
     <ElRow :gutter="10">
-      <ElCol :span="12">
-        <ElFormItem label="销售方公司" prop="seller_code">
-          <RemoteSelect style="width: 100%" request-prop="name" :api="httpInvoiceList" response-val-prop="registercode"
-            placeholder="销售方公司抬头" v-model:value="formData.seller_code" response-label-prop="name"
-            @item-change="setSellerInvoiceTitle" />
-        </ElFormItem>
-        <InvoiceTitle :detail="sellerInvoiceTitle" />
-      </ElCol>
-
-
       <ElCol :span="12">
         <ElFormItem label="购买方公司" prop="buyer_code">
           <ElSelect style="width: 100%" placeholder="购买方公司" v-model="formData.buyer_code"
@@ -184,6 +172,15 @@ function handleGoodSourceChange(value){
         </ElFormItem>
         <InvoiceTitle :detail="purchaserInvoiceTitle" />
       </ElCol>
+      
+      <ElCol :span="12">
+        <ElFormItem label="销售方公司" prop="seller_code">
+          <RemoteSelect style="width: 100%" request-prop="name" :api="httpInvoiceList" response-val-prop="registercode"
+            placeholder="销售方公司抬头" v-model:value="formData.seller_code" response-label-prop="name"
+            @item-change="setSellerInvoiceTitle" />
+        </ElFormItem>
+        <InvoiceTitle :detail="sellerInvoiceTitle" />
+      </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="商品来源" prop="good_source">
@@ -259,7 +256,7 @@ function handleGoodSourceChange(value){
 
       <ElCol :span="6">
         <ElFormItem label="重量" prop="unit_weight">
-          <UnitInput unit="g" v-model="formData.unit_weight" placeholder="重量" />
+          <UnitInput unit="g" v-model="formData.unit_weight" placeholder="重量" :KeepDecimals="3" />
         </ElFormItem>
       </ElCol>
 
@@ -273,14 +270,24 @@ function handleGoodSourceChange(value){
       </ElCol>
 
       <ElCol :span="6">
-        <ElFormItem label="成本税前单价" prop=" subunit_price">
-          <UnitInput unit="元" v-model="formData.subunit_price" placeholder="成本税前单价" />
+        <ElFormItem label="成本税前单价" prop="subunit_price">
+          <UnitInput 
+            unit="元" 
+            v-model="formData.subunit_price"
+            placeholder="成本税前单价"
+            :KeepDecimals="8" 
+          />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="成本税后单价" prop="unit_price">
-          <UnitInput unit="元" v-model="formData.unit_price" placeholder="成本税后单价" />
+          <UnitInput
+            unit="元" 
+            v-model="formData.unit_price"
+            placeholder="成本税后单价"
+            :KeepDecimals="8"
+          />
         </ElFormItem>
       </ElCol>
 

src/views/invoiceInOut/productManager/components/rules.ts

@@ -7,10 +7,10 @@ export const rules = {
     is_combind: [{ required: true, message: '请选择组合类型', trigger: 'change' }],
     goodName: [{ required: true, message: '请输入订单商品名称', trigger: 'change' }],
     inv_good_name: [{ required: true, message: '请输入发票商品名称', trigger: 'change' }],
-    unit_price: [{ required: true, message: '请输入成本税前单价', trigger: 'change' }],
+    unit_price: [{ required: true, message: '请输入成本税后单价', trigger: 'change' }],
     unit: [{ required: true, message: '请选择单位', trigger: 'change' }],
     unit_weight: [{ required: true, message: '请选择重量', trigger: 'change' }],
-    subunit_price: [{ required: true, message: '请输入成本税后单价', trigger: 'change' }],
+    subunit_price: [{ required: true, message: '请输入成本税前单价', trigger: 'change' }],
     cat_code: [{ required: true, message: '请选择进项类目', trigger: 'change' }],
     inv_type: [{ required: true, message: '请选择发票类型', trigger: 'change' }],
     cat_tax: [{ required: true, message: '请选择进项税率', trigger: 'change' }],

src/views/invoiceInOut/productManager/detail.vue

@@ -1,9 +1,8 @@
 <script setup lang="ts">
-import BasicDescriptions from "/@/components/BasicDescriptions";
 import { useDetail } from "/@/hooks/core/useDetail"
 import BaseForm from "./components/BaseForm.vue"
-import { goodColumns, goodHasChildColumns } from "./config/columns"
 
+import ProductDetail from "/@/components/productDetail/index.vue"
 import { httpDetail } from "/@/api/invoiceInOut/productManager";
 import { useTask } from "/@/hooks/core"
 
@@ -20,11 +19,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
             <BaseForm v-if="!isDetail" />
-            <BasicDescriptions 
-              v-if="isDetail && detailTask.data" 
-              :columns="detailTask.data.is_combind == '1' ? goodHasChildColumns : goodColumns" 
-              :data="detailTask.data" 
-            />
+            <ProductDetail v-if="detailTask.data" :data="detailTask.data" />
           </ElCollapseItem>
         </ElCollapse>
       </ElTabPane>

src/views/invoiceInOut/provisionOut/config/content.config.ts

@@ -6,21 +6,11 @@ import { ElTag } from "element-plus";
 import { h } from "vue";
 
 const columns = [
-  { 
-    label: "发票明细ID", 
-    prop: "inv_item_id", 
-    width: 90 
-  },
-  
-  { 
-    label: '业务编号', 
-    minWidth: 150,
-    prop: 'invoiceCode' 
-  },
-  { 
-    label: '商品名称', 
-    prop: 'goodName', 
-    minWidth: 140,
+  { label: "发票明细ID",  prop: "inv_item_id",  width: 90  },
+  { label: '业务编号', minWidth: 150,  prop: 'invoiceCode' },
+  { label: '购买方公司', width: 150,  ...renderIconLabelLeft('buyer_code', 'buyer_name', '销售方公司纳税号:')  },
+  { label: '销售方公司', prop: 'seller_code', width: 150,...renderIconLabelLeft('seller_code', 'seller_name', '销售方公司纳税号:') },
+  { label: '商品名称',  prop: 'goodName',   minWidth: 140,
     ...renderIconLabelLeft('goodNo', 'goodName', '商品编号:')
   },
   
@@ -41,7 +31,17 @@ const columns = [
     prop: 'inv_price', 
     width: 120 
   },
+  {
+    label: '发票购买方公司',
+    width: 120,
+    ...renderIconLabelLeft('inv_buyer_code', 'inv_buyer_name', '购买方公司名称纳税号:')
+  },
 
+  {
+    label: '发票销售方公司',
+    width: 180,
+    ...renderIconLabelLeft('inv_seller_code', 'inv_seller_name', '发票销售方公司纳税号:')
+  },
   { 
     label: "状态", 
     width: 80,
@@ -76,6 +76,7 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
+  companyProp: 'inv_seller_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, manager_status: '2' }),
     httpAdd: true

src/views/invoiceInOut/summary/detail.vue

@@ -91,9 +91,7 @@ const formData = ref({
                 </ElCol>
 
                 <ElCol :span="24">
-                  <ElTable
-                    size="small" 
-                    :data="listTask.data?.list" border stripe>
+                  <ElTable size="small" :data="listTask.data?.list" border stripe>
                     <ElTableColumn label="存货" align="center">
                       <ElTableColumn prop="skuCode" label="编码" width="120" show-overflow-tooltip />
                       <ElTableColumn prop="goodName" label="名称" width="150" show-overflow-tooltip />
@@ -107,35 +105,58 @@ const formData = ref({
                           {{ row.Porduct.unit_weight }}
                         </template>
                       </ElTableColumn>
-
-                      <ElTableColumn prop="light" label="分光" width="80" show-overflow-tooltip>
+                      <!-- <ElTableColumn prop="light" label="分光" width="80" show-overflow-tooltip>
                         <template #="{ row }">
                           {{ row.Porduct.spectral }}
                         </template>
-                      </ElTableColumn>
+                      </ElTableColumn> -->
                     </ElTableColumn>
 
                     <ElTableColumn label="期初" align="center">
                       <ElTableColumn prop="begin_num" label="数量" show-overflow-tooltip />
-                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip />
+
+                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
+                        <template #="{ row }">
+                          {{ row.Porduct?.subunit_price }}
+                        </template>
+                      </ElTableColumn>
+
                       <ElTableColumn prop="begin_total_price" label="金额" show-overflow-tooltip />
                     </ElTableColumn>
 
                     <ElTableColumn label="收入" align="center">
                       <ElTableColumn prop="in_num" label="数量" show-overflow-tooltip />
-                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip />
+
+                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
+                        <template #="{ row }">
+                          {{ row.Porduct?.subunit_price }}
+                        </template>
+                      </ElTableColumn>
+
                       <ElTableColumn prop="in_total_price" label="金额" show-overflow-tooltip />
                     </ElTableColumn>
 
                     <ElTableColumn label="发出" align="center">
                       <ElTableColumn prop="out_num" label="数量" show-overflow-tooltip />
-                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip />
+                      
+                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
+                        <template #="{ row }">
+                          {{ row.Porduct?.subunit_price }}
+                        </template>
+                      </ElTableColumn>
+
                       <ElTableColumn prop="out_total_price" label="金额" show-overflow-tooltip />
                     </ElTableColumn>
 
                     <ElTableColumn label="结存" align="center">
                       <ElTableColumn prop="balance_num" label="数量" show-overflow-tooltip />
-                      <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip />
+                      
+                        <ElTableColumn prop="unit_price" label="单价" show-overflow-tooltip>
+                        <template #="{ row }">
+                          {{ row.Porduct?.subunit_price }}
+                        </template>
+                      </ElTableColumn>
+
                       <ElTableColumn prop="balance_total_price" label="金额" show-overflow-tooltip />
                     </ElTableColumn>
                   </ElTable>