build

dist/assets/ChildGoodEditModal.7967d3.js

@@ -1 +1 @@
-import{_ as B,d as _,a_ as C,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as h,h as s,j as r,aO as b,M as w,ah as D,a$ as k}from"./index.js";import{a as E}from"./columns.7ac13b32.js";import{B as M}from"./basic-descriptions.878e0c53.js";import"./status.b7512d56.js";import"./tootip.58d28ae6.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 C,a$ as _,w as x,z as V,r as y,o as i,G as d,C as n,l as a,a as b,h as s,j as r,aO as h,M as w,ah as D,b0 as k}from"./index.js";import{a as E}from"./columns.855bd170.js";import{B as M}from"./basic-descriptions.950e4788.js";import"./status.b7512d56.js";import"./tootip.56b3986d.js";const F={class:"flex justify-between mt-[10px]"},N={class:"flex items-center"},G=C({__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=_(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"])):b("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(h),{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/ChildGoodEditModal.d0c9e8.js

@@ -0,0 +1 @@
+import{_ as C,d as _,a$ as x,w as V,z as y,r as b,o as i,G as d,C as n,l as a,a as B,h as u,j as r,aO as h,M as w,ah as D,b0 as F}from"./index.js";import{g as N}from"./columns.1742b3ca.js";import{B as k}from"./basic-descriptions.950e4788.js";import"./status.b7512d56.js";import"./shared.6e58c020.js";import"./tootip.56b3986d.js";const E={class:"flex justify-between mt-[10px]"},g={class:"flex items-center"},M=_({__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=x(t,"visible"),l=V(0);y(()=>o.value,()=>{!o.value||(l.value=t.data.goodNum)});function f(){c("submit",t.index,{...t.data,goodNum:l.value}),o.value=!1}return(G,e)=>{const v=b("ElButton");return i(),d(a(F),{modelValue:a(o),"onUpdate:modelValue":e[1]||(e[1]=s=>D(o)?o.value=s:null),title:"\u7F16\u8F91\u5546\u54C1",center:""},{default:n(()=>[t.data?(i(),d(a(k),{key:0,style:{overflow:"hidden"},data:t.data,columns:a(N)},null,8,["data","columns"])):B("v-if",!0),u("div",E,[u("div",g,[e[2]||(e[2]=u("p",{style:{width:"110px"}},"\u64CD\u4F5C\u6570\u91CF:",-1)),r(a(h),{modelValue:l.value,"onUpdate:modelValue":e[0]||(e[0]=s=>l.value=s),placeholder:"\u64CD\u4F5C\u6570\u91CF"},null,8,["modelValue"])]),r(v,{type:"primary",onClick:f},{default:n(()=>e[3]||(e[3]=[w("\u4FDD\u5B58")])),_:1})])]),_:1},8,["modelValue"])}}});var R=C(M,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/clientC/components/ChildGoodEditModal.vue"]]);export{R 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.878e0c53.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.950e4788.js";const y=o=>{const{company_address:e,mobile:i,registercode:n,bank_name:c,bankNo:t,name:a}=o;return{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}},g=o=>{const{invoice_addr:e,invoice_mobile:i,invoice_code:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},B=o=>{const{invoice_addr:e,invoice_mobile:i,company_license:n,invoice_bank:c,invoice_bankNo:t,invoice_title:a}=o;return{invoice_code:n,invoice_title:a,addrAndmobile:e+" "+i,bankAndBankNo:c+" "+t}},b=[{label:"\u62AC\u5934",span:24,field:"invoice_title"},{label:"\u7EB3\u7A0E\u4EBA\u8BC6\u522B\u53F7",span:24,field:"invoice_code"}],I=()=>({buyer_code:"",buyer_name:"",seller_code:"",seller_name:"",good_source:"1",good_code:"",good_type:"",is_combind:"0",inv_good_name:"",subunit_price:"",basic_status:"",unit_price:"",goodName:"",skuCode:"",cat_code:"",inv_type:"",cat_tax:"",spec:"",unit:"",unit_weight:"",spectral:"",childArr:[]}),m=_({__name:"InvoiceTitle",props:{detail:{type:Object,required:!0}},setup(o){return(e,i)=>Object.keys(e.detail).length!==0?(l(),d(r(v),{key:0,"px-8":"","pb-5":"",data:e.detail,columns:r(b),"col-number":1,"label-width":"130"},null,8,["data","columns"])):u("v-if",!0)}});var p=s(m,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/components/InvoiceTitle.vue"]]),A=Object.freeze(Object.defineProperty({__proto__:null,default:p},Symbol.toStringTag,{value:"Module"}));export{p as I,g as a,B as b,I as c,y as d,A as e};

dist/assets/InvoiceTitle.7eecae.js

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

dist/assets/detail.48dab8.js

@@ -1 +1 @@
-import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.0a18b4e3.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.0b4b0b9f.js";import{a as h}from"./index.04da8ffc.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.878e0c53.js";import"./index.ba4b19.js";import"./use-page-search.363fff1e.js";import"./columns.7ac13b32.js";import"./tootip.58d28ae6.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};
+import{_ as p,d as n,aY as m,at as d,H as _,l as e,o as a,c as u,h as f,L as v,G as o,a as i}from"./index.js";import{u as k}from"./useDetail.9120eecf.js";import D from"./BaseForm.46b546.js";import{P as g}from"./index.29adb7f9.js";import{a as h}from"./index.857d6b08.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.950e4788.js";import"./index.ba4b19.js";import"./use-page-search.e639bf40.js";import"./columns.855bd170.js";import"./tootip.56b3986d.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=n({__name:"detail",setup(C){const t=m(),{title:r,isDetail:c,collapses:N,id:s}=k({baseName:"\u5546\u54C1",collapseLen:2});return s.value&&t.run(h({id:s.value})),(w,L)=>{const l=d("loading");return _((a(),u("div",y,[f("p",x,v(e(r)),1),e(c)?i("v-if",!0):(a(),o(D,{key:0})),e(t).data?(a(),o(g,{key:1,data:e(t).data},null,8,["data"])):i("v-if",!0)])),[[l,e(t).loading]])}}});var U=p(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{U as default};

dist/assets/index.fd585e9e.js → dist/assets/index.8ebdc997.js

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

dist/assets/shared.6e58c020.js

@@ -0,0 +1 @@
+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((e,u)=>({...e,[u.label]:u.value}),{}),a=[{value:"1",label:"\u91C7\u9500\u7ED3\u7B97"},{value:"2",label:"\u7EBF\u4E0B\u8BA2\u5355"}],b=a.reduce((e,u)=>({...e,[u.label]:u.value}),{}),t=[{value:"1",label:"\u5F85\u5904\u7406",type:"warning"},{value:"2",label:"\u6B63\u5E38",type:"success"},{value:"3",label:"\u8BA1\u63D0",type:"success"},{value:"4",label:"\u5F02\u5E38",type:"danger"}];export{t as a,b,s as m,a as s,l as t};

dist/assets/shared.98a4b50b.js

@@ -1 +0,0 @@
-const e=[{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=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}),{}),b=[{value:"1",label:"\u5F85\u5904\u7406",type:"warning"},{value:"2",label:"\u6B63\u5E38",type:"success"},{value:"3",label:"\u8BA1\u63D0",type:"success"},{value:"4",label:"\u5F02\u5E38",type:"danger"}],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,l as s,e as t};

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.d76d56cf.css">
+  <link rel="stylesheet" href="/assets/index.ecfe13da.css">
   <link rel="stylesheet" href="/assets/layout-theme-default.css" id="head">
 </head>
 

src/components/productDetail/columns.ts

@@ -113,8 +113,10 @@ export const goodColumns = [
     {
         span: 6,
         label: '发票类型',
-        render(_, { inv_type }) {
-            return inv_type.includes('special') ? '专票' : '普票'
+        render(_, row) {
+            console.log(row, '~~🚀~~')
+            
+            return String(row.inv_type).includes('special') ? '专票' : '普票'
         }
     },
     {
@@ -264,8 +266,8 @@ export const goodHasChildColumns = [
     {
         span: 6,
         label: '发票类型',
-        render(_, { inv_type }) {
-            return inv_type.includes('special') ? '专票' : '普票'
+        render(_, row) {            
+            return String(row.inv_type).includes('special') ? '专票' : '普票'
         }
     },
     {

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

@@ -13,6 +13,7 @@ import { useTask } from '/@/hooks/core';
 
 import { httpAdd } from "/@/api/invoiceInOut/clientC"
 import { useRouter } from 'vue-router';
+import { addition } from '/@/utils/calc';
 
 const state = reactive({ 
     orderVisible: false, 
@@ -32,6 +33,13 @@ const createTask = useTask({ success(){
 
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
+const numSet = computed(() => {
+    return {
+        order: formData.value.orders.reduce((prev, { balance_num }) => addition(prev, balance_num), 0),
+        good: formData.value.goods.reduce((prev, { goodNum }) => addition(prev, goodNum), 0),
+    }
+})
+
 function getSpanNumber(data, prop) {
     let length = Array.isArray(data) ? data.length : 0;
     if (length > 0) {
@@ -93,21 +101,22 @@ function handleGoodComfirm(values: any[]) {
     formData.value.goods = [...list, ...formData.value.goods]
 }
 
-function handleEditGood(index: number, data: any) {
-    const { id } = formData.value.goods[index];
-    formData.value.goods = formData.value.goods.map(item => {
+function handleEditGood(index, data) {
+    const { id } = formData.value.goods[index]
+    formData.value.goods.forEach((item, index) => {
         if (item.id === id) {
-            const goodNum = data.goodNum;
-            const childActionNum = item.childNum
-                ? Number(item.childNum) * Number(goodNum)
-                : undefined;
-
-            return { ...item, goodNum, childActionNum };
+            formData.value.goods[index].goodNum = data.goodNum
+            const { goodNum, residue_stock } = data
+            formData.value.goods[index].isJT = goodNum > residue_stock
+            if (formData.value.goods[index].childNum) {
+                formData.value.goods[index].isJT = goodNum > residue_stock
+                formData.value.goods[index].childActionNum = formData.value.goods[index].childNum * data.goodNum
+            }
         }
-        return item;
-    });
+    })
 }
 
+
 async function submitForm(){
     try{
         await formRef.value?.validate()
@@ -154,7 +163,7 @@ const hasJT = computed(() => {
 
 
 const rules = {
-    orders: [{ required: true, message: '请选择toC订单信息', trigger: 'change' }],
+    orders:[{ required: true, message: '请选择toC订单信息', trigger: 'change' }],
     goods: [{ required: true, message: '请选择操作商品', trigger: 'change' }],
     month: [{ required: true, message: '请选择入账月份', trigger: 'change' }]
 }
@@ -197,7 +206,7 @@ const rules = {
                 <ElTableColumn label="客户公司" prop="buyer_name" show-overflow-tooltip />
                 <ElTableColumn label="商品编码" prop="goodNo" width="160px" show-overflow-tooltip />
                 <ElTableColumn label="商品名称" prop="goodName" width="160px" show-overflow-tooltip />
-                <ElTableColumn label="下单数量" prop="num" show-overflow-tooltip />
+                <ElTableColumn label="下单数量" prop="balance_num" show-overflow-tooltip />
                 <ElTableColumn label="销售单价" prop="goodPrice" show-overflow-tooltip />
                 <ElTableColumn label="销售合计" prop="totalPrice" show-overflow-tooltip />
                 <ElTableColumn label="出库时间" porp="fz_date" show-overflow-tooltip />
@@ -223,6 +232,8 @@ const rules = {
         </ElFormItem>
 
         <ElFormItem label="操作商品" prop="goods">
+            待处理数量: {{ Number(numSet.order) }} / {{ Number(numSet.good) }}, 未处理数量: {{ Number(numSet.order) -
+            Number(numSet.good) }}
             <ElTable :span-method="spanMethod" border size="small" :data="formData.goods">
                 <ElTableColumn label="商品ID" prop="id" width="60px" show-overflow-tooltip />
                 <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />

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

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useVModel } from '@vueuse/core';
 import { ElDialog } from 'element-plus';
-import { goodColumns } from '../config/columns';
+import { goodColumns_1 } from '../config/columns';
 import BasicDescriptions from "/@/components/BasicDescriptions";
 
 import { NumberInput } from "/@/components/Input"
@@ -36,7 +36,7 @@ function handleSubmit(){
        title="编辑商品" 
        center
     >
-        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns" />
+        <BasicDescriptions style="overflow: hidden;" v-if="props.data" :data="props.data" :columns="goodColumns_1" />
 
         <div class="flex justify-between mt-[10px]">
             <div class="flex items-center">

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

@@ -83,8 +83,8 @@ const columns = [
   },
 
   {
-    label: '下单数量',
-    prop: 'num',
+    label: '数量',
+    prop: 'balance_num',
     width: 100
   },
 

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

@@ -6,108 +6,121 @@ const columns = [
     width: "50"
   },
   {
-    label: '确认单编号',
-    prop: 'orderCode',
+    label: '类型',
+    prop: 'type',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售主单号',
-    prop: 'cxCode',
+    label: '订单来源',
+    prop: 'source',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label:'业务类型',
-    prop: 'type',
-    minWidth: '100px',
-    required: true,
-    defaultData: ''
+    label: '订单购买方纳税号',
+    prop: 'buyer_code',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '平台订单号',
-    prop: 'poCode',
-    minWidth: '120px',
-    required: true,
-    defaultData: ''
+    label: '订单购买方公司名称',
+    prop: 'buyer_name',
+    minWidth: '150px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
-    minWidth: '130px',
-    required: true,
-    defaultData: ''
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
-    minWidth: '130px',
-    required: true,
-    defaultData: ''
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '购买方公司编号',
-    prop: 'buyer_code',
+    label: '订单编号',
+    prop: 'orderCode',
     minWidth: '120px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '购买方公司名称',
-    prop: 'buyer_name',
+    label: '订单主单号',
+    prop: 'cxCode',
     minWidth: '120px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
   },
+  // {
+  //   label: '订单主单号',
+  //   prop: 'cxCode',
+  //   minWidth: '120px',
+  //   defaultData: '',
+  // },
   {
     label: '商品类型',
     prop: 'goodType',
-    minWidth: '100px',
-    required: true,
-    defaultData: ''
+    minWidth: '120px',
+    defaultData: '',
+    required: true
   },
   {
     label: '商品编号',
     prop: 'goodNo',
     minWidth: '100px',
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
     label: '商品名称',
     prop: 'goodName',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '订单单位',
+    prop: 'unit',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '下单数量',
+    label: '商品数量',
     prop: 'num',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label:'销售单价',
+    label: '商品单价',
     prop: 'goodPrice',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售合计',
+    label: '订单总金额',
     prop: 'totalPrice',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '出库月份',
+    label: '出库时间',
     prop: 'fz_date',
     minWidth: '80px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
     label: '关联商品ID',

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

@@ -103,7 +103,7 @@ const handleSubmit = async () => {
         cat_name: '0',
         channel: '3',
         source: '1',
-        unit: '0',
+        // unit: '0',
         tax: '0',
         inv_tax: '0',
         inv_cat_code: '0',
@@ -137,7 +137,7 @@ const cancel = () => {
   <ElDialog
     v-model="visible"
     :close-on-click-modal="false"
-    title="C端无发票非订单出库"
+    title="非订单商品(C端无发票出库)"
     width="1040px"
     top="8vh"
     center

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

@@ -6,109 +6,121 @@ const columns = [
     width: "50"
   },
   {
-    label: '确认单编号',
-    prop: 'orderCode',
+    label: '类型',
+    prop: 'type',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售主单号',
-    prop: 'cxCode',
+    label: '订单来源',
+    prop: 'source',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label:'业务类型',
-    prop: 'type',
-    minWidth: '100px',
-    required: true,
-    defaultData: ''
+    label: '订单购买方纳税号',
+    prop: 'buyer_code',
+    minWidth: '130px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '平台订单号',
-    prop: 'poCode',
-    minWidth: '120px',
-    required: true,
-    defaultData: ''
+    label: '订单购买方公司名称',
+    prop: 'buyer_name',
+    minWidth: '150px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司纳税号',
+    label: '订单销售方公司纳税号',
     prop: 'seller_code',
-    minWidth: '130px',
-    required: true,
-    defaultData: ''
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售方公司名称',
+    label: '订单销售方公司名称',
     prop: 'seller_name',
-    minWidth: '130px',
-    required: true,
-    defaultData: ''
+    minWidth: '160px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '购买方公司编号',
-    prop: 'buyer_code',
+    label: '订单编号',
+    prop: 'orderCode',
     minWidth: '120px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '购买方公司名称',
-    prop: 'buyer_name',
+    label: '订单主单号',
+    prop: 'cxCode',
     minWidth: '120px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
   },
+  // {
+  //   label: '订单主单号',
+  //   prop: 'cxCode',
+  //   minWidth: '120px',
+  //   defaultData: '',
+  // },
   {
     label: '商品类型',
     prop: 'goodType',
-    minWidth: '100px',
-    required: true,
-    defaultData: ''
+    minWidth: '120px',
+    defaultData: '',
+    required: true
   },
   {
     label: '商品编号',
     prop: 'goodNo',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
     label: '商品名称',
     prop: 'goodName',
     minWidth: '100px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
+  },
+  {
+    label: '订单单位',
+    prop: 'unit',
+    minWidth: '80px',
+    defaultData: '',
+    required: true
   },
   {
-    label: '下单数量',
+    label: '商品数量',
     prop: 'num',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label:'销售单价',
+    label: '商品单价',
     prop: 'goodPrice',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '销售合计',
+    label: '订单总金额',
     prop: 'totalPrice',
     minWidth: '110px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   },
   {
-    label: '出库月份',
+    label: '出库时间',
     prop: 'fz_date',
     minWidth: '80px',
-    required: true,
-    defaultData: ''
+    defaultData: '',
+    required: true
   }
 ]
 

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

@@ -30,11 +30,13 @@ 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; 
       }
     });
@@ -99,7 +101,7 @@ const handleSubmit = async () => {
         cat_name: '0',
         channel: '3',
         source: '1',
-        unit: '0',
+        // unit: '0',
         tax: '0',
         inv_tax: '0',
         inv_cat_code: '0',
@@ -133,7 +135,7 @@ const cancel = () => {
   <ElDialog
     v-model="visible"
     :close-on-click-modal="false"
-    title="C端无发票订单出库"
+    title="订单商品(C端无发票出库)"
     width="1040px"
     top="8vh"
     center

src/views/invoiceInOut/clientC/config/columns.ts

@@ -1,8 +1,82 @@
-import { ElTag } from "element-plus"
-import { cg_order_type_options, useTypeOptions, xs_inv_type_list } from "/@/utils/status"
+import { ElButton, ElTable, ElTableColumn, ElTag, ElTooltip } from "element-plus"
+import { cg_order_type_options, goodTypeOptions, useTypeOptions, xs_inv_type_list } from "/@/utils/status"
 import { h } from "vue"
 import { managerStatusOptions, sourceOptions, statusOptions, typeOptions } from "./shared"
 import { createTooltip } from "/@/utils/tootip"
+import { useRenderIcon } from "/@/components/ReIcon/src/hooks"
+
+export const goodColumns_1 = [
+  {
+    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
+  }
+]
+
 
 export const goodColumns = [
   {
@@ -82,17 +156,7 @@ export const goodColumns = [
 ]
 
 
-export const orderGoodColumns = [
-  {
-    span: 6,
-    field: 'orderCode',
-    label: '确认单编号'
-  },
-  {
-    span: 6,
-    field: 'cxCode',
-    label: '销售主单号'
-  },
+export const orderGoodColumns = (handleShowDetail: any, isShowChild = true) => ([
   {
     label: '类型',
     span: 6,
@@ -103,7 +167,7 @@ export const orderGoodColumns = [
     }
   },
   {
-    label: '数据来源',
+    label: '订单来源',
     span: 6,
     render(_, row) {
       return h(ElTag, { type: 'primary', size: 'small' }, {
@@ -111,46 +175,87 @@ export const orderGoodColumns = [
       })
     }
   },
+  {
+    label: '创建人',
+    span: 6,
+    field: 'apply_name'
+  },
+  {
+    label: '创建人',
+    span: 6,
+    field: 'create_time'
+  },
   {
     span: 12,
-    label: '销售方公司',
+    label: '订单购买方公司',
     render(_, row) {
-      return createTooltip(row.seller_name, '销售方公司纳税号:' + row.seller_code)
+      return createTooltip(row.buyer_name, '购买方公司编号:' + row.buyer_code)
     }
   },
   {
     span: 12,
-    label: '购买方公司',
+    label: '订单销售方公司',
     render(_, row) {
-      return createTooltip(row.buyer_name, '购买方公司编号:' + row.buyer_code)
+      return createTooltip(row.seller_name, '销售方公司纳税号:' + row.seller_code)
     }
   },
   {
     span: 6,
-    label: '业务类型',
+    field: 'orderCode',
+    label: '订单编号'
+  },
+  {
+    span: 6,
+    field: 'cxCode',
+    label: '订单主单号'
+  },
+
+  {
+    label: '商品类型',
+    span: 6,
     render(_, row) {
-      return managerStatusOptions.find((item) => item.value == row.manager_status)?.label
+      return h(ElTag, { type: 'primary', size: 'small' }, {
+        default: () => goodTypeOptions.find(item => item.value == row.goodType)?.label
+      })
     }
   },
   {
+    label: '商品名称',
     span: 6,
-    label: '平台类型',
     render(_, row) {
-      return h(ElTag, { size: 'small' }, {
-        default: () => useTypeOptions.find(item => item.value == row.platform_type)?.label || '--'
-      })
+      return createTooltip(row.goodName, '商品编号:' + row.goodNo, 300)
     }
   },
   {
-    label: '出库时间',
     span: 6,
-    field: 'fz_date'
+    label: '订单单位',
+    field: 'unit'
   },
   {
     span: 6,
-    label: '平台订单号',
-    field: 'poCode'
+    label: '商品数量',
+    field: 'num'
   },
+  {
+    span: 6,
+    label: '商品单价',
+    field: 'goodPrice'
+  },
+  {
+    span: 6,
+    label: '订单总金额',
+    field: 'totalPrice'
+  },
+  {
+    label: '出库时间',
+    span: 6,
+    field: 'fz_date'
+  },
+  // {
+  //   span: 6,
+  //   label: '平台订单号',
+  //   field: 'poCode'
+  // },
   {
     label: '状态',
     span: 6,
@@ -163,6 +268,30 @@ export const orderGoodColumns = [
 
   {
     label: '异常原因',
-    span: 18,
-  }
-]
+    span: 12,
+  },
+  ...(isShowChild ? [{
+    label: '出库商品',
+    span: 24,
+    render(_, { ProductRela }) {
+      return h(ElTable, { size: 'small', border: true, style: { width: '100 %' }, data: ProductRela }, [
+        h(ElTableColumn, { prop: 'product_id', label: 'ID', width: '60px', showOverflowTooltip: true }),
+        h(ElTableColumn, { prop: 'skuCode', label: '商品编号', showOverflowTooltip: true }, null),
+        h(ElTableColumn, { prop: 'goodName', label: '商品名称', showOverflowTooltip: true }, null),
+        h(ElTableColumn, { prop: 'num', label: '操作数量', showOverflowTooltip: true }),
+        h(ElTableColumn, { prop: 'create_time', label: '创建时间', showOverflowTooltip: true }),
+        h(ElTableColumn, { label: '操作', showOverflowTooltip: true }, {
+          default: ({ row, $index }) => h(ElTooltip, { content: '查看详情', placement: 'top' }, {
+            default: () => h(ElButton, {
+              onClick: () => handleShowDetail(row.product_id, $index),
+              icon: useRenderIcon('eye-view'),
+              type: 'primary',
+              size: 'small',
+              link: true,
+            })
+          })
+        }),
+      ])
+    }
+  }] : [])
+])