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.9015eb7f.js";import{B as M}from"./basic-descriptions.c177a719.js";import"./status.d3ab78fb.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 O=B(G,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{O as default};
+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.522309b8.js";import{B as M}from"./basic-descriptions.a5554ee3.js";import"./status.d3ab78fb.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 O=B(G,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/ChildGoodEditModal.vue"]]);export{O 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.c177a719.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.a5554ee3.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.c177a719.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.a5554ee3.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.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.c177a719.js";import{u as I}from"./useDetail.6221ae7f.js";import{a as N}from"./index.bf71d936.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.6e957a2f.js";import"./status.d3ab78fb.js";import"./index.142fb588.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,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.a5554ee3.js";import{u as I}from"./useDetail.4c5d0191.js";import{a as N}from"./index.e21d1189.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.c081b015.js";import"./status.d3ab78fb.js";import"./index.deae3706.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 +1 @@
-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 d,a as p}from"./index.js";import{B as V}from"./basic-descriptions.c177a719.js";import{u as x}from"./useDetail.6221ae7f.js";import w from"./BaseForm.ebf3a1.js";import{g as y,a as I}from"./columns.9015eb7f.js";import{a as N}from"./index.bf71d936.js";import"./status.d3ab78fb.js";import"./InvoiceTitle.77bebe.js";import"./index.08977e.js";import"./use-page-search.6e957a2f.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.7a496a.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)?p("v-if",!0):(i(),d(w,{key:0})),e(r)&&e(a).data?(i(),d(e(V),{key:1,columns:e(a).data.is_combind=="1"?e(y):e(I),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 Q=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{Q as default};
+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 d,a as p}from"./index.js";import{B as V}from"./basic-descriptions.a5554ee3.js";import{u as x}from"./useDetail.4c5d0191.js";import w from"./BaseForm.ebf3a1.js";import{g as y,a as I}from"./columns.522309b8.js";import{a as N}from"./index.e21d1189.js";import"./status.d3ab78fb.js";import"./InvoiceTitle.77bebe.js";import"./index.08977e.js";import"./use-page-search.c081b015.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.7a496a.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)?p("v-if",!0):(i(),d(w,{key:0})),e(r)&&e(a).data?(i(),d(e(V),{key:1,columns:e(a).data.is_combind=="1"?e(y):e(I),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 Q=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{Q 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,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.b0c13321.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.4fcbd024.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/assets/shared.12fbb01c.js

@@ -0,0 +1 @@
+const e=[{value:"1",label:"\u5165\u5E93"},{value:"3",label:"\u5165\u5E93\u7EA2\u51B2"}],s=e.reduce((a,u)=>({...a,[u.label]:u.value}),{}),l=[{value:"1",label:"\u91C7\u9500\u7ED3\u7B97"},{value:"2",label:"\u7EBF\u4E0B\u8BA2\u5355"}],t=l.reduce((a,u)=>({...a,[u.label]:u.value}),{}),o=[{value:"1",label:"\u5F85\u5904\u7406",type:"warning"},{value:"2",label:"\u5904\u7406\u5B8C\u6210",type:"success"}],b=[{value:"1",label:"\u6B63\u5E38"},{value:"2",label:"\u8BA1\u63D0"},{value:"3",label:"\u5F02\u5E38"}];export{o as a,s as b,t as c,b as m,l as s,e as t};

dist/assets/shared.2f92e8a7.js

@@ -1 +0,0 @@
-const l=[{value:"1",label:"\u5165\u5E93"},{value:"2",label:"\u51FA\u5E93"},{value:"3",label:"\u5165\u5E93\u7EA2\u51B2"},{value:"4",label:"\u51FA\u5E93\u7EA2\u51B2"}],s=l.reduce((a,u)=>({...a,[u.label]:u.value}),{}),e=[{value:"1",label:"\u91C7\u9500\u7ED3\u7B97"},{value:"2",label:"\u7EBF\u4E0B\u8BA2\u5355"}],t=e.reduce((a,u)=>({...a,[u.label]:u.value}),{}),b=[{value:"1",label:"\u5F85\u5904\u7406",type:"warning"},{value:"2",label:"\u5904\u7406\u5B8C\u6210",type:"success"}],o=[{value:"1",label:"\u6B63\u5E38"},{value:"2",label:"\u8BA1\u63D0"},{value:"3",label:"\u5F02\u5E38"}];export{b as a,s as b,t as c,o as m,e as s,l as t};

dist/assets/shared.e1a395e7.js

@@ -0,0 +1 @@
+const e=[{value:"2",label:"\u51FA\u5E93"},{value:"4",label:"\u51FA\u5E93\u7EA2\u51B2"}],s=e.reduce((a,u)=>({...a,[u.label]:u.value}),{}),l=[{value:"1",label:"\u91C7\u9500\u7ED3\u7B97"},{value:"2",label:"\u7EBF\u4E0B\u8BA2\u5355"}],t=l.reduce((a,u)=>({...a,[u.label]:u.value}),{}),o=[{value:"1",label:"\u5F85\u5904\u7406",type:"warning"},{value:"2",label:"\u5904\u7406\u5B8C\u6210",type:"success"}],b=[{value:"1",label:"\u6B63\u5E38"},{value:"2",label:"\u8BA1\u63D0"},{value:"3",label:"\u5F02\u5E38"}];export{o as a,s as b,t as c,b as m,l as s,e as t};

src/store/modules/user.ts

@@ -268,7 +268,8 @@ export const useUserStore = defineStore({
           code: 0,
           data: [
             createMenu('商品管理', 'productManager', 'invoiceInOut/productManager'),
-            createMenu('出入库管理', 'inOutManager', 'invoiceInOut/inOutManager'),
+            createMenu('出库管理', 'outManager', 'invoiceInOut/outManager'),
+            createMenu('入库管理', 'inManager', 'invoiceInOut/inManager'),
             createMenu('盘点', 'inventoryCheck', 'invoiceInOut/inventoryCheck'),
             createMenu('计提出库明细处理', 'provisionOut', 'invoiceInOut/provisionOut'),
             createMenu('调整单', 'adjustOrder', 'invoiceInOut/adjustOrder'),

src/views/invoiceInOut/inOutManager/components/NotOrderImportModal/columns-config.ts → src/views/invoiceInOut/inManager/components/NotOrderImportModal/columns-config.ts

@@ -20,23 +20,37 @@ const columns = [
     required: true
   },
   {
-    label:'订单来源',
+    label: '订单来源',
     prop: 'source',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税识别号',
+    label: '购买方纳税号',
+    prop: 'buyer_code',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '购买方公司名称',
+    prop: 'buyer_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司',
+    label: '销售方公司名称',
     prop: 'seller_name',
-    minWidth: '100px',
+    minWidth: '160px',
     defaultData: '',
     required: true
   },
@@ -52,7 +66,6 @@ const columns = [
     prop: 'cxCode',
     minWidth: '120px',
     defaultData: '',
-    required: true
   },
   {
     label: '商品编号',
@@ -83,7 +96,7 @@ const columns = [
     required: true
   },
   {
-    label:'商品单价',
+    label: '商品单价',
     prop: 'goodPrice',
     minWidth: '110px',
     defaultData: '',
@@ -125,15 +138,15 @@ const columns = [
     required: true
   },
   {
-    label: '购买方公司名称',
-    prop: 'inv_buyer_name',
+    label: '购买方纳税号',
+    prop: 'inv_buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司纳税识别号',
-    prop: 'inv_buyer_code',
+    label: '购买方名称',
+    prop: 'inv_buyer_name',
     minWidth: '170px',
     defaultData: '',
     required: true
@@ -146,46 +159,39 @@ const columns = [
     required: true
   },
   {
-    label: '发票类型',
-    prop: 'inv_type',
+    label: '开票日期',
+    prop: 'inv_open_date',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票购买方公司',
-    prop: 'inv_buyer_name',
-    minWidth: '130px',
+    label: '发票类型',
+    prop: 'inv_type',
+    minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票购买方公司纳税号',
-    prop: 'inv_buyer_code',
+    label: '销售方公司纳税号',
+    mapLabel: '发票销售方公司纳税号',
+    prop: 'inv_seller_code',
     minWidth: '170px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票销售方公司',
+    label: '销售方公司',
     prop: 'inv_seller_name',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
-  {
-    label: '发票销售方公司纳税号',
-    prop: 'inv_seller_code',
-    minWidth: '170px',
-    defaultData: '',
-    required: true
-  },
   {
     label: '发票明细ID',
     prop: 'inv_item_id',
     minWidth: '110px',
     defaultData: '',
-    required: true
   },
   {
     label: '货物或应税劳务、服务名称',
@@ -206,21 +212,19 @@ const columns = [
     prop: 'inv_spec',
     minWidth: '110px',
     defaultData: '',
-    required: true
   },
   {
-    label: '发票商品单位',
+    label: '单位',
+    mapLabel: '发票商品单位',
     prop: 'inv_unit',
     minWidth: '100px',
     defaultData: '',
-    required: true
   },
   {
-    label: '发票商品数量',
+    label: '数量',
     prop: 'inv_num',
     minWidth: '100px',
     defaultData: '',
-    required: true
   },
   {
     label: '税前单价',
@@ -237,12 +241,19 @@ const columns = [
     required: true
   },
   {
-    label: '发票税率',
+    label: '税率',
     prop: 'inv_tax',
     minWidth: '80px',
     defaultData: '',
     required: true
   },
+  {
+    label: '税额',
+    prop: 'inv_tax_total',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
+  },
   {
     label: '税后单价',
     prop: 'inv_price',
@@ -262,21 +273,20 @@ const columns = [
     prop: 'TODO34',
     minWidth: '100px',
     defaultData: '',
-    required: false
+    required: true
   },
   {
     label: '税率状态',
     prop: 'TODO35',
     minWidth: '100px',
     defaultData: '',
-    required: false
+    required: true
   },
   {
     label: '备注',
     prop: 'remark',
     minWidth: '80px',
     defaultData: '',
-    required: true
   },
   {
     label: '关联商品ID',

src/views/invoiceInOut/inOutManager/components/NotOrderImportModal/index.vue → src/views/invoiceInOut/inManager/components/NotOrderImportModal/index.vue

@@ -30,14 +30,11 @@ const Uploadsuccess = ({ results, header }) => {
   }
 
   let headok = true;
-
   if (header.length !== columns.length - 1) {
     headok = false;
   } else {
     columns.slice(1).forEach((si, sii) => {
       if (si.label !== header[sii]) { 
-
-        console.log(si.label, header[sii])
         headok = false; 
       }
     });
@@ -57,7 +54,25 @@ const Uploadsuccess = ({ results, header }) => {
     const item = {}
     Object.keys(tableItem).forEach(label => {
       const prop = mapLabelToProp[label]
-      item[prop] = tableItem[label]
+      let value = tableItem[label]
+
+      if (label === '发票类型') {
+        value = value.replace('(', '（')
+        value = value.replace(')', '）')
+      }
+
+      const labels = ['税率', '销售方公司纳税号', '购买方纳税号', '单位']
+      if (labels.includes(label.replace('_1', ''))) {
+
+        if ((prop || "").includes('inv_')) {
+          item[prop.replace('inv_', '')] = value
+        } else {
+          const prop = mapLabelToProp[label.replace('_1', '')]
+          item[prop] = value
+        }
+      } else {
+        item[prop] = value
+      }
     })
 
     result.push(item)
@@ -81,8 +96,6 @@ const handleSubmit = async () => {
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
-        buyer_name: item.inv_buyer_name,
-        buyer_code: item.inv_buyer_code,
         platform_type: "1",
         goodType: "1",
         channel: "2",
@@ -127,6 +140,7 @@ const cancel = () => {
     width="1040px"
     top="8vh"
     center
+    @close="tableData = []"
   >
     <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
 

src/views/invoiceInOut/inOutManager/components/OrderImportModal/columns-config.ts → src/views/invoiceInOut/inManager/components/OrderImportModal/columns-config.ts

@@ -20,23 +20,37 @@ const columns = [
     required: true
   },
   {
-    label:'订单来源',
+    label: '订单来源',
     prop: 'source',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税识别号',
+    label: '购买方纳税号',
+    prop: 'buyer_code',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '购买方公司名称',
+    prop: 'buyer_name',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司',
+    label: '销售方公司名称',
     prop: 'seller_name',
-    minWidth: '100px',
+    minWidth: '160px',
     defaultData: '',
     required: true
   },
@@ -52,7 +66,6 @@ const columns = [
     prop: 'cxCode',
     minWidth: '120px',
     defaultData: '',
-    required: true
   },
   {
     label: '商品编号',
@@ -83,7 +96,7 @@ const columns = [
     required: true
   },
   {
-    label:'商品单价',
+    label: '商品单价',
     prop: 'goodPrice',
     minWidth: '110px',
     defaultData: '',
@@ -125,15 +138,15 @@ const columns = [
     required: true
   },
   {
-    label: '购买方公司名称',
-    prop: 'inv_buyer_name',
+    label: '购买方纳税号',
+    prop: 'inv_buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司纳税识别号',
-    prop: 'inv_buyer_code',
+    label: '购买方名称',
+    prop: 'inv_buyer_name',
     minWidth: '170px',
     defaultData: '',
     required: true
@@ -146,46 +159,39 @@ const columns = [
     required: true
   },
   {
-    label: '发票类型',
-    prop: 'inv_type',
+    label: '开票日期',
+    prop: 'inv_open_date',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票购买方公司',
-    prop: 'inv_buyer_name',
-    minWidth: '130px',
+    label: '发票类型',
+    prop: 'inv_type',
+    minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票购买方公司纳税号',
-    prop: 'inv_buyer_code',
+    label: '销售方公司纳税号',
+    mapLabel: '发票销售方公司纳税号',
+    prop: 'inv_seller_code',
     minWidth: '170px',
     defaultData: '',
     required: true
   },
   {
-    label: '发票销售方公司',
+    label: '销售方公司',
     prop: 'inv_seller_name',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
-  {
-    label: '发票销售方公司纳税号',
-    prop: 'inv_seller_code',
-    minWidth: '170px',
-    defaultData: '',
-    required: true
-  },
   {
     label: '发票明细ID',
     prop: 'inv_item_id',
     minWidth: '110px',
     defaultData: '',
-    required: true
   },
   {
     label: '货物或应税劳务、服务名称',
@@ -206,21 +212,19 @@ const columns = [
     prop: 'inv_spec',
     minWidth: '110px',
     defaultData: '',
-    required: true
   },
   {
-    label: '发票商品单位',
+    label: '单位',
+    mapLabel: '发票商品单位',
     prop: 'inv_unit',
     minWidth: '100px',
     defaultData: '',
-    required: true
   },
   {
-    label: '发票商品数量',
+    label: '数量',
     prop: 'inv_num',
     minWidth: '100px',
     defaultData: '',
-    required: true
   },
   {
     label: '税前单价',
@@ -237,12 +241,19 @@ const columns = [
     required: true
   },
   {
-    label: '发票税率',
+    label: '税率',
     prop: 'inv_tax',
     minWidth: '80px',
     defaultData: '',
     required: true
   },
+  {
+    label: '税额',
+    prop: 'inv_tax_total',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
+  },
   {
     label: '税后单价',
     prop: 'inv_price',
@@ -262,29 +273,28 @@ const columns = [
     prop: 'TODO34',
     minWidth: '100px',
     defaultData: '',
-    required: false
+    required: true
   },
   {
     label: '税率状态',
     prop: 'TODO35',
     minWidth: '100px',
     defaultData: '',
-    required: false
+    required: true
   },
   {
     label: '备注',
     prop: 'remark',
     minWidth: '80px',
     defaultData: '',
-    required: true
-  },
-  {
-    label: '入账月份',
-    prop: 'TODO37',
-    minWidth: '80px',
-    defaultData: '',
-    required: true
   }
+  // {
+  //   label: '入账月份',
+  //   prop: 'TODO37',
+  //   minWidth: '80px',
+  //   defaultData: '',
+  //   required: true
+  // }
 ]
 
 const orderTemplate = [columns.slice(1).reduce((prev, current) => {

src/views/invoiceInOut/inOutManager/components/OrderImportModal/index.vue → src/views/invoiceInOut/inManager/components/OrderImportModal/index.vue

@@ -32,15 +32,13 @@ const Uploadsuccess = ({ results, header }) => {
 
   let headok = true;
 
-  console.log(header.length, columns.length - 1)
-
   if (header.length !== columns.length - 1) {
     headok = false;
   } else {
     columns.slice(1).forEach((si, sii) => {
       if (si.label !== header[sii]) { 
 
-        console.log(si.label, header[sii])
+        console.log(si.label, header[sii], sii)
         headok = false; 
       }
     });
@@ -54,15 +52,34 @@ const Uploadsuccess = ({ results, header }) => {
 
   tableData.value = [];
 
+  console.log(results)
+
   const result = []
   for(const tableItem of results){
 
     const item = {}
-    Object.keys(tableItem).forEach(label => {
-      const prop = mapLabelToProp[label]
-      item[prop] = tableItem[label]
+    Object.keys(tableItem).forEach((label, index) => {
+      const prop = mapLabelToProp[label.replace('_1', '')]
+      let value = tableItem[label]
+      if(label === '发票类型'){
+        value = value.replace('(', '（')
+        value = value.replace(')', '）')
+      }
+
+      const labels = ['税率', '销售方公司纳税号', '购买方纳税号','单位']
+      if (labels.includes(label.replace('_1', '')) && label.indexOf('_1') === -1){
+        if(prop.includes('inv_')){
+          item[prop.replace('inv_', '')] = value
+        } else {
+          item[prop] = value
+        }
+      } else {
+        item[prop] = value
+      }
+
     })
 
+    console.log(item)
     result.push(item)
   }
 
@@ -123,6 +140,7 @@ const cancel = () => {
     width="1040px"
     top="8vh"
     center
+    @close="tableData = []"
   >
     <execlUpload style="margin-bottom: 10px" @on-success="Uploadsuccess" v-if="tableData.length === 0" />
 

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

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

src/views/invoiceInOut/inOutManager/config/shared.ts → src/views/invoiceInOut/inManager/config/shared.ts

@@ -1,8 +1,8 @@
 export const typeOptions = [
     { value: '1', label: '入库' },
-    { value: '2', label: '出库' },
+    // { value: '2', label: '出库' },
     { value: '3', label: '入库红冲' },
-    { value: '4', label: '出库红冲' },
+    // { value: '4', label: '出库红冲' },
 ]
 
 export const mapLabelToType = typeOptions.reduce((prev, current) => ({

src/views/invoiceInOut/inOutManager/detail.vue → src/views/invoiceInOut/inManager/detail.vue

@@ -15,7 +15,7 @@ import { useTask } from "/@/hooks/core";
 import SealMonthPicker from "/@/components/SealMonthPicker/index.vue"
 
 
-const { title, collapses, id } = useDetail({ baseName: '出入库', collapseLen: 2 });
+const { title, collapses, id } = useDetail({ baseName: '入库', collapseLen: 2 });
 
 const visible = ref(false)
 

src/views/invoiceInOut/inOutManager/index.vue → src/views/invoiceInOut/inManager/index.vue

@@ -22,8 +22,8 @@ const pageContentRef = ref(null)
 
 const events: PageEvents = {
   content: {
-    create: () => router.push('/invoiceInOut/productManagerDetail'),
-    preview: ({ id }) => router.push("/invoiceInOut/inOutManagerDetail?id=" + id)
+    create: () => router.push('/invoiceInOut/inManagerDetail'),
+    preview: ({ id }) => router.push("/invoiceInOut/inManagerDetail?id=" + id)
   }
 };
 

src/views/invoiceInOut/outManager/components/ChildGoodEditModal.vue

@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { useVModel } from '@vueuse/core';
+import { ElDialog } from 'element-plus';
+import { goodColumns } from '../config/columns';
+import BasicDescriptions from "/@/components/BasicDescriptions";
+
+import { NumberInput } from "/@/components/Input"
+import { ref, watch} from 'vue';
+
+const props = defineProps<{ 
+    visible: boolean;
+    index: any; 
+    data: any; 
+}>()
+
+const emit = defineEmits(['submit'])
+const visible = useVModel(props, 'visible')
+
+const child_num = ref(0)
+
+
+watch(() => visible.value, () => {
+    if(!visible.value){  return }
+    child_num.value = props.data.goodNum
+})
+
+function handleSubmit(){
+    emit('submit', props.index, { ...props.data, goodNum: child_num.value })    
+    visible.value = false
+}
+</script>
+
+<template>
+    <ElDialog
+       v-model="visible"
+       title="编辑商品" 
+       center
+    >
+        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns" />
+
+        <div class="flex justify-between mt-[10px]">
+            <div class="flex items-center">
+                <p style="width: 110px">操作数量:</p>
+                <NumberInput v-model="child_num" placeholder="操作数量" />
+            </div>
+
+            <ElButton type="primary" @click="handleSubmit">保存</ElButton>
+        </div>
+    </ElDialog>
+</template>

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

@@ -0,0 +1,76 @@
+import { render } from "nprogress";
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { h } from "vue";
+import { ElTag } from "element-plus";
+
+export const goodColumns = [
+  {
+    span: 12,
+    field: 'seller_name',
+    label: '销售方公司'
+  },
+  {
+    span: 12,
+    field: 'buyer_name',
+    label: '购买方公司'
+  },
+  {
+    span: 12,
+    field: 'goodName',
+    label: '订单商品名称'
+  },
+  {
+    span: 12,
+    field: 'inv_good_name',
+    label: '发票商品名称'
+  },
+  {
+    span: 6,
+    label: '商品类型',
+    render(_, { good_type }){
+      return h(ElTag, { size: 'small' }, {
+        default: () => cg_order_type_options.find(item => item.value == good_type)?.label || '--'
+      })
+    }
+  },
+  {
+    span: 6,
+    field: 'good_code',
+    label: '商品代码'
+  },
+  {
+    span: 6,
+    field: 'spec',
+    label: '规格'
+  },
+  {
+    span: 6,
+    field: 'unit',
+    label: '单位'
+  },
+  {
+    span: 6,
+    field: 'unit_price',
+    label: '税前单价'
+  },
+  {
+    span: 6,
+    field: 'subunit_price',
+    label: '税后单价'
+  },
+  {
+    span: 6,
+    field: 'unit_weight',
+    label: '重量'
+  },
+  {
+    span: 6,
+    field: 'spectral',
+    label: '分光'
+  },
+  {
+    field: 'cat_name',
+    label: '进项类目',
+    span: 24
+  }
+]

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

@@ -0,0 +1,102 @@
+import { ContentConfig } from "/@/components/PageContent";
+import { httpList } from "/@/api/invoiceInOut/productManager";
+
+import { cg_order_type_options, statusList } from "/@/utils/status";
+import { ElTag } from "element-plus";
+import { h } from "vue";
+
+const columns = [
+  {
+    width: 40,
+    type: 'selection',
+    fixed: 'left'
+  },
+  {
+    label: "商品编码",
+    prop: "skuCode",
+    width: 150
+  },
+  {
+    label: "销售方公司",
+    prop: "seller_name",
+    width: 160
+  },
+  {
+    label: "购买方公司",
+    prop: "buyer_name",
+    width: 160
+  },
+  {
+    label: '商品类型',
+    width: 100,
+    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",
+    width: 80
+  },
+  {
+    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: '税前单价',
+    prop: 'subunit_price',
+    width: 100
+  },
+  {
+    label: '税后单价',
+    prop: 'unit_price',
+    width: 100
+  },
+  {
+    label: '重量',
+    prop: 'unit_weight',
+    width: 80
+  },
+  {
+    label: '分光',
+    prop: 'spectral',
+    width: 80
+  },
+  {
+    label: '创建人',
+    prop: 'apply_name',
+    width: 80
+  },
+  {
+    label:'创建时间',
+    prop: 'create_time',
+    width: 140
+  }
+];
+
+const contentConfig: ContentConfig = {
+  columns,
+  apis: { 
+    httpList: (parameter = {}) => httpList({ ...parameter, status: '1' })
+  }
+};
+
+export default contentConfig;