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.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};
+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.7fc44f60.js";import{B as M}from"./basic-descriptions.0aeaa8ba.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.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};
+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.0aeaa8ba.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.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};
+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.0aeaa8ba.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.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};
+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.0aeaa8ba.js";import{u as I}from"./useDetail.36e52516.js";import{a as N}from"./index.60df50c7.js";import"./shared.80186348.js";import"./index.bb93f8.js";import"./use-page-search.65c95735.js";import"./status.d3ab78fb.js";import"./index.1b80ae42.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.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};
+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.0aeaa8ba.js";import{u as x}from"./useDetail.36e52516.js";import w from"./BaseForm.52e1af.js";import{g as y,a as I}from"./columns.7fc44f60.js";import{a as N}from"./index.60df50c7.js";import"./status.d3ab78fb.js";import"./InvoiceTitle.77bebe.js";import"./index.08977e.js";import"./use-page-search.65c95735.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.4fcbd024.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.0fe4b12d.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/index.html

@@ -11,7 +11,7 @@
     window.process = {};
   </script>
   <script type="module" crossorigin src="/assets/index.js"></script>
-  <link rel="stylesheet" href="/assets/index.c2778ed0.css">
+  <link rel="stylesheet" href="/assets/index.a06f63bb.css">
   <link rel="stylesheet" href="/assets/layout-theme-default.css" id="head">
 </head>
 

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

@@ -27,28 +27,28 @@ const columns = [
     required: true
   },
   {
-    label: '购买方纳税号',
+    label: '订单购买方纳税号',
     prop: 'buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司名称',
+    label: '订单购买方公司名称',
     prop: 'buyer_name',
-    minWidth: '130px',
+    minWidth: '150px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
     minWidth: '160px',
     defaultData: '',
@@ -82,7 +82,7 @@ const columns = [
     required: true
   },
   {
-    label: '单位',
+    label: '订单单位',
     prop: 'unit',
     minWidth: '80px',
     defaultData: '',
@@ -124,7 +124,7 @@ const columns = [
     required: true
   },
   {
-    label: '税率',
+    label: '订单税率',
     prop: 'tax',
     minWidth: '100px',
     defaultData: '',

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

@@ -61,18 +61,19 @@ const Uploadsuccess = ({ results, header }) => {
         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
-      }
+      // 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)
@@ -96,6 +97,13 @@ const handleSubmit = async () => {
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
+
+        inv_num: Number(item.inv_num).toFixed(8),
+        inv_subprice: Number(item.inv_subprice).toFixed(8),
+        inv_subtotal: Number(item.inv_subtotal).toFixed(8),
+        inv_price: Number(item.inv_price).toFixed(8),
+        inv_total: Number(item.inv_tax_total).toFixed(8),
+
         platform_type: "1",
         goodType: "1",
         channel: "2",

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

@@ -27,28 +27,28 @@ const columns = [
     required: true
   },
   {
-    label: '购买方纳税号',
+    label: '订单购买方纳税号',
     prop: 'buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司名称',
+    label: '订单购买方公司名称',
     prop: 'buyer_name',
-    minWidth: '130px',
+    minWidth: '150px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
     minWidth: '160px',
     defaultData: '',
@@ -82,7 +82,7 @@ const columns = [
     required: true
   },
   {
-    label: '单位',
+    label: '订单单位',
     prop: 'unit',
     minWidth: '80px',
     defaultData: '',
@@ -124,7 +124,7 @@ const columns = [
     required: true
   },
   {
-    label: '税率',
+    label: '订单税率',
     prop: 'tax',
     minWidth: '100px',
     defaultData: '',

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

@@ -66,20 +66,9 @@ const Uploadsuccess = ({ results, header }) => {
         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
-      }
-
+      item[prop] = value
     })
 
-    console.log(item)
     result.push(item)
   }
 
@@ -101,8 +90,13 @@ 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,
+        
+        inv_num: Number(item.inv_num).toFixed(8),
+        inv_subprice: Number(item.inv_subprice).toFixed(8),
+        inv_subtotal: Number(item.inv_subtotal).toFixed(8),
+        inv_price: Number(item.inv_price).toFixed(8),
+        inv_total: Number(item.inv_tax_total).toFixed(8),
+
         platform_type: '1',
         channel: '1',
         goodType: '1'

src/views/invoiceInOut/outManager/components/NotOrderImportModal/columns-config.ts

@@ -27,28 +27,28 @@ const columns = [
     required: true
   },
   {
-    label: '购买方纳税号',
+    label: '订单购买方纳税号',
     prop: 'buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司名称',
+    label: '订单购买方公司名称',
     prop: 'buyer_name',
-    minWidth: '130px',
+    minWidth: '150px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
     minWidth: '160px',
     defaultData: '',
@@ -82,7 +82,7 @@ const columns = [
     required: true
   },
   {
-    label: '单位',
+    label: '订单单位',
     prop: 'unit',
     minWidth: '80px',
     defaultData: '',
@@ -124,7 +124,7 @@ const columns = [
     required: true
   },
   {
-    label: '税率',
+    label: '订单税率',
     prop: 'tax',
     minWidth: '100px',
     defaultData: '',

src/views/invoiceInOut/outManager/components/NotOrderImportModal/index.vue

@@ -30,11 +30,12 @@ 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]) { 
+      if (si.label.trim() !== header[sii].trim()) { 
         headok = false; 
       }
     });
@@ -61,18 +62,18 @@ const Uploadsuccess = ({ results, header }) => {
         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
-      }
+      item[prop] = value
+      // 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 {
+      // }
     })
 
     result.push(item)
@@ -96,6 +97,14 @@ const handleSubmit = async () => {
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
+        
+        inv_num: Number(item.inv_num).toFixed(8),
+        inv_subprice: Number(item.inv_subprice).toFixed(8),
+        inv_subtotal: Number(item.inv_subtotal).toFixed(8),
+        inv_price: Number(item.inv_price).toFixed(8),
+        inv_total: Number(item.inv_tax_total).toFixed(8),
+
+
         platform_type: "1",
         goodType: "1",
         channel: "2",

src/views/invoiceInOut/outManager/components/OrderImportModal/columns-config.ts

@@ -27,28 +27,28 @@ const columns = [
     required: true
   },
   {
-    label: '购买方纳税号',
+    label: '订单购买方纳税号',
     prop: 'buyer_code',
     minWidth: '130px',
     defaultData: '',
     required: true
   },
   {
-    label: '购买方公司名称',
+    label: '订单购买方公司名称',
     prop: 'buyer_name',
-    minWidth: '130px',
+    minWidth: '150px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
     minWidth: '160px',
     defaultData: '',
     required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
     minWidth: '160px',
     defaultData: '',
@@ -82,7 +82,7 @@ const columns = [
     required: true
   },
   {
-    label: '单位',
+    label: '订单单位',
     prop: 'unit',
     minWidth: '80px',
     defaultData: '',
@@ -124,7 +124,7 @@ const columns = [
     required: true
   },
   {
-    label: '税率',
+    label: '订单税率',
     prop: 'tax',
     minWidth: '100px',
     defaultData: '',

src/views/invoiceInOut/outManager/components/OrderImportModal/index.vue

@@ -66,17 +66,16 @@ const Uploadsuccess = ({ results, header }) => {
         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
-      }
-
+      // 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)
@@ -101,8 +100,13 @@ 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,
+        
+        inv_num: Number(item.inv_num).toFixed(8),
+        inv_subprice: Number(item.inv_subprice).toFixed(8),
+        inv_subtotal: Number(item.inv_subtotal).toFixed(8),
+        inv_price: Number(item.inv_price).toFixed(8),
+        inv_total: Number(item.inv_tax_total).toFixed(8),
+
         platform_type: '1',
         channel: '1',
         goodType: '1'

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

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { cg_order_type_options, xs_inv_type_list, tax_list } from "/@/utils/status"
 import { ElButton, ElCol, ElForm, ElFormItem, ElMessage, ElOption, ElSelect, ElTooltip } from "element-plus"
 import { httpCompanies } from "/@/api/invoiceInOut/productManager"
@@ -24,8 +24,16 @@ 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' }]
+}))
+
 const router = useRouter()
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
@@ -59,6 +67,7 @@ async function submit(){
     await formRef.value?.validate()
     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){
@@ -121,13 +130,40 @@ function handleChildGoodEdit(index: number){
     state.companies = [...result.data.list]
     const item = state.companies.find(item => item.companyNo === current.value.companyNo)
     formData.value.buyer_code = item.company_license
+    setPurchaserInvoiceTitle(item)
   }
 })()
 
+
+function getRandomIntInclusive(min, max) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1)) + min; //含最大值，含最小值 
+}
+
+function generateNumber(){
+  let date = dayjs(new Date()).format('YY-MM-DD HH:mm:ss')
+  date = date.replace(/-/g, '')
+  date = date.replace(/:/g, '')
+  date = date.replace(/ /g, '')
+  let ms = String(dayjs().get('millisecond'))
+  if(ms.length === 2){ ms = '0' + ms }
+  if(ms.length === 1){ ms = '00' + ms }
+  
+  let prefix = formData.value.is_combind == '0' ? 'PKU' : 'PSU'
+  const randomSuffix = getRandomIntInclusive(10, 99)
+  const code = prefix + date + ms + randomSuffix
+  return code
+}
+
+
+function handleGoodSourceChange(value){
+  if(value == '2') formData.value.skuCode = ''
+}
 </script>
 
 <template>
-  <ElForm ref="formRef" :rules="rules" :model="formData" v-loading="createTask.loading">
+  <ElForm ref="formRef" :rules="rulesRef" :model="formData" v-loading="createTask.loading">
     <ElRow :gutter="10">
       <ElCol :span="12">
         <ElFormItem label="销售方公司" prop="seller_code">
@@ -142,13 +178,8 @@ function handleChildGoodEdit(index: number){
 
       <ElCol :span="12">
         <ElFormItem label="购买方公司" prop="buyer_code">
-          <ElSelect 
-            style="width: 100%" 
-            placeholder="购买方公司" 
-            v-model="formData.buyer_code"
-            @change="setPurchaserInvoiceTitle"
-            disabled
-          >
+          <ElSelect style="width: 100%" placeholder="购买方公司" v-model="formData.buyer_code"
+            @change="setPurchaserInvoiceTitle" disabled>
             <ElOption v-for="item in state.companies" :label="item.company_name" :value="item.company_license" />
           </ElSelect>
         </ElFormItem>
@@ -158,7 +189,7 @@ function handleChildGoodEdit(index: number){
 
       <ElCol :span="6">
         <ElFormItem label="商品来源" prop="good_source">
-          <ElSelect @change="formData.good_code = ''" v-model="formData.good_source" placeholder="商品来源"
+          <ElSelect @change="handleGoodSourceChange" v-model="formData.good_source" placeholder="商品来源"
             style="width: 100%">
             <ElOption label="采销商品" value="1" />
             <ElOption label="非采销商品" value="2" />
@@ -210,7 +241,7 @@ function handleChildGoodEdit(index: number){
 
       <ElCol :span="6">
         <ElFormItem label="商品编号" prop="skuCode">
-          <ElInput v-model="formData.skuCode" placeholder="商品编号" />
+          <ElInput placeholder="商品编号" v-model="formData.skuCode" :disabled="formData.good_source == '2'" />
         </ElFormItem>
       </ElCol>
 
@@ -230,14 +261,15 @@ function handleChildGoodEdit(index: number){
 
       <ElCol :span="6">
         <ElFormItem label="重量" prop="unit_weight">
-          <ElInput v-model="formData.unit_weight" placeholder="重量" />
+          <UnitInput unit="g" v-model="formData.unit_weight" placeholder="重量" />
         </ElFormItem>
       </ElCol>
 
       <ElCol :span="6">
         <ElFormItem label="发票类型" prop="inv_type">
           <ElSelect v-model="formData.inv_type" placeholder="发票类型" style="width: 100%">
-            <ElOption v-for="opt in xs_inv_type_list" :value="opt.value" :label="opt.label" />
+            <ElOption label="普票" value="0" />
+            <ElOption label="专票" value="1" />
           </ElSelect>
         </ElFormItem>
       </ElCol>