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

dist/assets/InvoiceTitle.77bebe.js

@@ -1 +1 @@
-import{_ as s,d as _,o as l,G as d,l as r,a as u}from"./index.js";import{B as v}from"./basic-descriptions.17783a41.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.94f3d065.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.17783a41.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.94f3d065.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.2f487ca5.js";import D from"./BaseForm.7c4831.js";import{P as g}from"./index.183c593f.js";import{a as h}from"./index.3e4a56da.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.17783a41.js";import"./index.08977e.js";import"./use-page-search.496e3eda.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.eaa2d03d.js";import"./tootip.c29898b9.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.8d3b4268.js";import D from"./BaseForm.7c4831.js";import{P as g}from"./index.2f46cc4b.js";import{a as h}from"./index.9f585a72.js";import"./status.0f771e9a.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.94f3d065.js";import"./index.08977e.js";import"./use-page-search.9e0a9497.js";import"./ChildGoodEditModal.7967d3.js";import"./columns.fbc3c96b.js";import"./tootip.ab44b2b2.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.4ee9f3b5.js

@@ -0,0 +1 @@
+import{aF as e,ab as a}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:c,VITE_PROXY_USER_REAL:i,VITE_WORKORDER_REAL:s}=a(),n=s,o=t=>e.request("post",`${n}/cxinv/FinancialManager/create`,{data:t}),u=t=>e.request("post",`${n}/cxinv/FinancialProducts/CheckBatch`,{data:t}),p=t=>e.request("post",`${n}/cxinv/FinancialManager/list`,{data:t}),h=t=>e.request("post",`${n}/cxinv/FinancialManager/info`,{data:t}),l=t=>e.request("post",`${n}/cxinv/adjust/info`,{data:t}),v=t=>e.request("post",`${n}/cxinv/FinancialManager/delete`,{data:t}),x=t=>e.request("post",`${n}/cxinv/adjust/status`,{data:t}),E=t=>e.request("post",`${n}/cxinv/FinancialManager/CheckSure`,{data:t});export{o as a,x as b,p as c,v as d,u as e,l as f,E as g,h};

dist/assets/index.ac9c33da.js

@@ -1 +0,0 @@
-import{aF as e,ab as a}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:r,VITE_PROXY_USER_REAL:i,VITE_WORKORDER_REAL:c}=a(),n=c,o=t=>e.request("post",`${n}/cxinv/FinancialManager/create`,{data:t}),u=t=>e.request("post",`${n}/cxinv/FinancialProducts/CheckBatch`,{data:t}),p=t=>e.request("post",`${n}/cxinv/FinancialManager/list`,{data:t}),h=t=>e.request("post",`${n}/cxinv/FinancialManager/info`,{data:t}),l=t=>e.request("post",`${n}/cxinv/FinancialManager/delete`,{data:t}),E=t=>e.request("post",`${n}/cxinv/FinancialManager/CheckSure`,{data:t}),R=t=>e.request("post",`${n}/cxinv/FinancialManager/CheckAccrue`,{data:t});export{o as a,E as b,p as c,l as d,u as e,R as f,h};

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.ab3cca28.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.ca6732aa.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/assets/shared.b2aeacac.js → dist/assets/shared.82b50daf.js

@@ -1 +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((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};
+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:"\u5BA1\u6838\u5B8C\u6210",type:"success"},{value:"3",label:"\u9A73\u56DE",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};

src/api/invoiceInOut/inOutManager/index.ts

@@ -29,16 +29,20 @@ export const httpDetail = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/info`, { data });
 };
 
+export const httpJTDetail = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/adjust/info`, { data });
+};
+
 export const httpDelete = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/delete`, { data });
 };
 
 export const httpStatus = (data: object): ResponseType => {
-    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckSure`, { data });
+    return http.request("post", `${newApi}/cxinv/adjust/status`, { data });
 };
 
 export const httpCheckAccrue = (data: object): ResponseType => {
-    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckAccrue`, { data });
+    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckSure`, { data });
 };
 
 export const httpCatist = (data: object): ResponseType => {

src/api/invoiceInOut/provisionOut/index.ts

@@ -21,6 +21,10 @@ export const httpList = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/list`, { data });
 };
 
+export const httpJTList = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/adjust/list`, { data });
+};
+
 export const httpDetail = (data: object): ResponseType => {
     return http.request("post", `${newApi}/cxinv/FinancialManager/info`, { data });
 };

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

@@ -85,7 +85,7 @@ const handleSubmit = async () => {
         unit: '0',
         tax: '0',
         inv_tax: '0',
-        inv_cat_code: '0'
+        inv_cat_code: '0',
       })
     })
 

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

@@ -83,7 +83,9 @@ const handleSubmit = async () => {
         channel: '3',
         source: '1',
         unit: '0',
-        tax: '0'
+        tax: '0',
+        inv_tax: '0',
+        inv_cat_code: '0',
       })
     })
 

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

@@ -77,7 +77,7 @@ const Uploadsuccess = ({ results, header }) => {
       // } else {
       // }
 
-      item[prop] = value.trim()
+      item[prop] = value ? String(value).trim() : value
     })
 
     result.push(item)

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

@@ -68,7 +68,7 @@ const Uploadsuccess = ({ results, header }) => {
         value = value.replace(')', '）')
       }
 
-      item[prop] = value.trim()
+      item[prop] = value ? String(value).trim() : value
     })
 
     result.push(item)
@@ -113,7 +113,11 @@ const handleSubmit = async () => {
         inv_total: Number(item.inv_tax_total).toFixed(8),
 
         platform_type: '1',
-        channel: '1'
+        channel: '1',
+        relaArr: [{
+          id: '0',
+          num: item.num
+        }]
       })
     })
 

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

@@ -76,7 +76,7 @@ const Uploadsuccess = ({ results, header }) => {
       // } else {
       // }
 
-      item[prop] = value
+      item[prop] = value ? String(value).trim() : value
     })
 
     result.push(item)

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

@@ -67,7 +67,8 @@ const Uploadsuccess = ({ results, header }) => {
         value = value.replace(')', '）')
       }
 
-      item[prop] = value
+
+      item[prop] = value ? String(value).trim() : value
     })
 
     result.push(item)
@@ -76,8 +77,6 @@ const Uploadsuccess = ({ results, header }) => {
   const license = getCurrentLicense()
   const inv_buyer_codes = [...new Set(result.map(({ inv_seller_code }) => inv_seller_code))]
 
-  console.log(inv_buyer_codes)
-
   
   if (inv_buyer_codes.length !== 1) {
     ElMessage.warning('导入数据的销售方公司必须一致')
@@ -116,7 +115,11 @@ const handleSubmit = async () => {
         inv_total: Number(item.inv_tax_total).toFixed(8),
 
         platform_type: '1',
-        channel: '1'
+        channel: '3',
+        relaArr: [{
+          id: '0',
+          num: item.num
+        }]
       })
     })
 

src/views/invoiceInOut/outManager/detail.vue

@@ -144,7 +144,6 @@ async function onSubmit() {
 
     const list = formData.value.goods.filter(item => !!item.num)
 
-
     if(list.length !== 0){
       ElMessage.warning('商品操作数量不能为空')
       return

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

@@ -11,6 +11,11 @@ const columns = [
     type: 'selection',
     fixed: 'left'
   },
+  {
+    label: "商品ID",
+    prop: "id",
+    width: 60
+  },
   {
     label: "商品编码",
     prop: "skuCode",
@@ -94,6 +99,7 @@ const columns = [
 
 const contentConfig: ContentConfig = {
   columns,
+  companyProp: 'buyer_code',
   apis: { 
     httpList: (parameter = {}) => httpList({ ...parameter, status: '1' })
   }

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

@@ -80,7 +80,7 @@ export const goodColumns = [
 
 export const orderGoodColumns = [
   {
-    field: 'invoiceCode',
+    field: 'manager__invoiceCode',
     label: '业务编号',
     span: 6
   },

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

@@ -1,20 +1,20 @@
 import { ContentConfig } from "/@/components/PageContent";
-import { httpList } from "/@/api/invoiceInOut/provisionOut";
+import { httpJTList } from "/@/api/invoiceInOut/provisionOut";
 import { renderIconLabelLeft } from "/@/utils/columnRenderHelper";
 import { statusOptions } from "./shared"
 import { ElTag } from "element-plus";
 import { h } from "vue";
 
 const columns = [
-  { label: "发票明细ID",  prop: "inv_item_id",  width: 90  },
-  { label: '业务编号', minWidth: 150,  prop: 'invoiceCode' },
-  { label: '购买方公司', width: 150,  ...renderIconLabelLeft('buyer_code', 'buyer_name', '销售方公司纳税号:')  },
-  { label: '销售方公司', prop: 'seller_code', width: 150,...renderIconLabelLeft('seller_code', 'seller_name', '销售方公司纳税号:') },
+  { label: "发票明细ID",  prop: "manager__inv_item_id",  width: 90  },
+  { label: '业务编号', minWidth: 150, prop: 'manager__invoiceCode' },
+  { label: '购买方公司', width: 150, ...renderIconLabelLeft('manager__buyer_code', 'manager__buyer_name', '购买方公司纳税号:')  },
+  { label: '销售方公司', prop: 'seller_code', width: 150, ...renderIconLabelLeft('manager__seller_code', 'manager__seller_name', '销售方公司纳税号:') },
   { 
     label: '商品名称',  
     prop: 'goodName',   
     minWidth: 140,
-    ...renderIconLabelLeft('goodNo', 'goodName', '商品编号:')
+    ...renderIconLabelLeft('manager__goodNo', 'manager__goodName', '商品编号:')
   },
   
   { 
@@ -25,26 +25,17 @@ const columns = [
   
   { 
     label: '税前单价', 
-    prop: 'inv_subprice', 
+    prop: 'manager__inv_subprice', 
     width: 120 
   },
 
   { 
     label: '税后单价', 
-    prop: 'inv_price', 
+    prop: 'manager__inv_price', 
     width: 120 
   },
-  {
-    label: '发票购买方公司',
-    width: 120,
-    ...renderIconLabelLeft('inv_buyer_code', 'inv_buyer_name', '购买方公司名称纳税号:')
-  },
-
-  {
-    label: '发票销售方公司',
-    width: 180,
-    ...renderIconLabelLeft('inv_seller_code', 'inv_seller_name', '发票销售方公司纳税号:')
-  },
+  { label: '发票购买方公司', width: 150, ...renderIconLabelLeft('manager__inv_buyer_code', 'manager__inv_buyer_name', '购买方公司纳税号:') },
+  { label: '发票销售方公司', prop: 'seller_code', width: 150, ...renderIconLabelLeft('manager__inv_seller_code', 'manager__inv_seller_name', '销售方公司纳税号:') },
   { 
     label: "状态", 
     width: 80,
@@ -79,9 +70,9 @@ const contentConfig: ContentConfig = {
   columns,
   title: "商品管理",
   permissions: ['007'],
-  companyProp: 'inv_seller_code',
+  companyProp: 'seller_code',
   apis: { 
-    httpList: (parameter = {}) => httpList({ ...parameter, status: '3' }),
+    httpList: (parameter = {}) => httpJTList({ ...parameter }),
     httpAdd: true
   }
 };

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

@@ -26,10 +26,12 @@ export const mapLabelToSource = sourceOptions.reduce((prev, current) => ({
 
 export const statusOptions = [
     { value: '1', label: '待处理', type: 'warning' },
-    { value: '2', label: '处理完成', type: 'success' }
+    { value: '2', label: '审核完成', type: 'success' },
+    { value: '3', label: '驳回', type: 'success' }
 ]
 
 
+
 export const managerStatusOptions = [
   { value: '1', label: '正常' },
   { value: '2', label: '计提' },

src/views/invoiceInOut/provisionOut/detail.vue

@@ -8,7 +8,7 @@ import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import ChooseGoodModal from "./components/ChooseGoodModal/index.vue"
 import ChildGoodEditModal from "./components/ChildGoodEditModal.vue";
 
-import { httpDetail, httpCheckAccrue } from "/@/api/invoiceInOut/inOutManager";
+import { httpJTDetail, httpCheckAccrue } from "/@/api/invoiceInOut/inOutManager";
 import { ElForm, ElFormItem, ElMessage, ElOption, ElSelect } from "element-plus";
 import { useTask } from "/@/hooks/core";
 
@@ -43,7 +43,7 @@ const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 const searchParameter = computed(() => {
   // 入库、入库红冲和出库红冲 只能选择真实成本的商品，出库类型可以选择预估成本商品
   if(!detailTask.data) return {}
-  return detailTask.data.type == '2' ? { basic_status: '1'  } : { basic_status: '2' }
+  return detailTask.data.type == '2' ? { basic_status: '1'  } : { basic_status: '1' }
 })
 
 const formData = ref({ 
@@ -108,7 +108,7 @@ function spanMethod({ row:_1, column:_2, rowIndex, columnIndex }: any){
 async function onSubmit(){
   try{
     await formRef.value.validate()
-    const relaArrCopy = formData.value.goods.map(({ id, goodNum }) => ({ id, num: goodNum }))
+    const relaArrCopy = formData.value.goods.map(({ id, goodNum, subunit_price }) => ({ id, num: goodNum, unit_price: subunit_price }))
 
     const relaArr = []
     const mapId = {}
@@ -123,17 +123,18 @@ async function onSubmit(){
     loading.value = true
     
     const { code, message } = await httpCheckAccrue({ 
-      relaArr, 
-      manager_id: id.value, 
+      status: '2', 
+      id: id.value, 
+      idArr: relaArr,
       checkFee: formData.value.checkFee, 
-      is_CheckOrder: formData.value.is_CheckOrder 
+      isAddCheck: formData.value.is_CheckOrder 
     })
     
     loading.value = false
 
     if (code == 0) {
       ElMessage.success('操作完成')
-      detailTask.run(httpDetail({ id: id.value }))
+      detailTask.run(httpJTDetail({ id: id.value }))
     } else {
       ElMessage.warning(message)
     }
@@ -177,7 +178,7 @@ function handleShowDetail(id, index) {
 }
 
 
-id.value && detailTask.run(httpDetail({ id: id.value }))
+id.value && detailTask.run(httpJTDetail({ id: id.value }))
 </script>
 
 <template>
@@ -188,17 +189,16 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
           <ElCollapseItem :title="title" name="1">
             <BasicDescriptions :columns="orderGoodColumns" :data="detailTask.data" v-if="detailTask.data" />
           </ElCollapseItem>
-
-          <ElCollapseItem :title="'订单详情'" name="2">
+          <!-- <ElCollapseItem :title="'订单详情'" name="2">
             <BasicDescriptions v-if="detailTask.data" :columns="importOrderGoodColumns" :data="detailTask.data" />
           </ElCollapseItem>
 
           <ElCollapseItem :title="'发票详情'" name="3">
             <BasicDescriptions v-if="detailTask.data" :columns="importInvoiceGoodColumns" :data="detailTask.data" />
-          </ElCollapseItem>
+          </ElCollapseItem> -->
 
           <ElCollapseItem title="商品信息" name="4" v-if="detailTask.data && detailTask.data.status != '1'">
-            <ElTable size="small" border :data="detailTask.data.ProductRela">
+            <ElTable size="small" border :data="detailTask.data.Manager">
               <ElTableColumn label="商品ID" prop="product_id" width="60px" show-overflow-tooltip />
               <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
               <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
@@ -221,6 +221,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
             <ElForm ref="formRef" :rules="rules" :model="formData" label-width="140px">
               <ElFormItem label="关联凭证" prop="goods">
                 <ElTable :span-method="spanMethod" border size="small" :data="formData.goods">
+                  <ElTableColumn label="商品ID" prop="id" width="60" show-overflow-tooltip />
                   <ElTableColumn label="商品编号" prop="skuCode" show-overflow-tooltip />
                   <ElTableColumn label="商品名称" prop="goodName" show-overflow-tooltip />
                   <ElTableColumn label="账面数量" prop="total_stock" show-overflow-tooltip />
@@ -284,7 +285,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
     <ElDialog center title="商品详情" v-model="productVisible" style="overflow: hidden">
       <div v-loading="productDetailTask.loading">
         <ProductDetail v-if="productDetailTask.data" :data="productDetailTask.data"
-          :num="detailTask.data.ProductRela[productIndex].num" />
+          :num="detailTask.data.Manager[productIndex].num" />
       </div>
     </ElDialog>
   </div>