build

dist/assets/InvoiceTitle.250697.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.6c2dfac0.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:"",good_code:"",good_type:"",is_combind:"",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.d643872c.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:"",good_code:"",good_type:"",is_combind:"",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.456185fd.js";import{B as c}from"./basic-descriptions.6c2dfac0.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.456185fd.js";import{B as c}from"./basic-descriptions.d643872c.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.f3b08e.js → dist/assets/detail.8b0ced.js

@@ -1 +1 @@
-import{_ as E,d as b,aO as D,r as t,aj as g,H as B,l as e,o as i,c as T,j as o,C as s,a6 as h,G as d,a as p}from"./index.js";import{g as V,a as x}from"./ChildGoodEditModal.6d23b8.js";import{B as y}from"./basic-descriptions.6c2dfac0.js";import{u as j}from"./useDetail.345d5569.js";import w from"./BaseForm.4fc96e.js";import{a as I}from"./index.aa22c55a.js";import"./status.21dece30.js";import"./shared.456185fd.js";import"./index.bb93f8.js";import"./use-page-search.f27a7ddb.js";const N={class:"padding__container"},H=b({__name:"detail",setup(O){const a=D(),{title:n,isDetail:r,collapses:l,id:m}=j({baseName:"\u76D8\u70B9",collapseLen:2});return m.value&&a.run(I({id:m.value})),(P,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=g("loading");return B((i(),T("div",N,[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(y),{key:1,columns:e(a).data.is_combind=="1"?e(V):e(x),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 M=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{M as default};
+import{_ as E,d as b,aO as D,r as t,aj as g,H as B,l as e,o as i,c as T,j as o,C as s,a6 as h,G as d,a as p}from"./index.js";import{g as V,a as x}from"./ChildGoodEditModal.6d23b8.js";import{B as y}from"./basic-descriptions.d643872c.js";import{u as j}from"./useDetail.107d918b.js";import w from"./BaseForm.4fc96e.js";import{a as I}from"./index.0935e0b4.js";import"./status.21dece30.js";import"./shared.456185fd.js";import"./index.bb93f8.js";import"./use-page-search.89126f99.js";const N={class:"padding__container"},H=b({__name:"detail",setup(O){const a=D(),{id:n,title:r,isDetail:m,collapses:l}=j({baseName:"\u76D8\u70B9",collapseLen:2});return n.value&&a.run(I({id:n.value})),(P,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=g("loading");return B((i(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(r)},{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(r),name:"1"},{default:s(()=>[e(m)?p("v-if",!0):(i(),d(w,{key:0})),e(m)&&e(a).data?(i(),d(e(y),{key:1,columns:e(a).data.is_combind=="1"?e(V):e(x),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 M=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/inventoryCheck/detail.vue"]]);export{M as default};

dist/assets/detail.c73fd2.js

@@ -1 +1 @@
-import{_ as E,d as b,aO as g,r as t,aj as D,H as B,l as e,o as i,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{B as h}from"./basic-descriptions.6c2dfac0.js";import{u as x}from"./useDetail.345d5569.js";import j from"./BaseForm.dc901e.js";import{g as w,a as y}from"./ChildGoodEditModal.266623.js";import{a as I}from"./index.aa22c55a.js";import"./status.21dece30.js";import"./InvoiceTitle.250697.js";import"./index.91c8b9.js";import"./use-page-search.f27a7ddb.js";import"./query-category.7a496a.js";const N={class:"padding__container"},H=b({__name:"detail",setup(O){const a=g(),{title:n,isDetail:r,collapses:l,id:m}=x({baseName:"\u5546\u54C1",collapseLen:2});return m.value&&a.run(I({id:m.value})),(P,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return B((i(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(n)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(n),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(i(),d(j,{key:0})),e(r)&&e(a).data?(i(),d(e(h),{key:1,columns:e(a).data.is_combind=="1"?e(w):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 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,aO as g,r as t,aj as D,H as B,l as e,o as i,c as T,j as o,C as s,a6 as V,G as d,a as p}from"./index.js";import{B as h}from"./basic-descriptions.d643872c.js";import{u as x}from"./useDetail.107d918b.js";import j from"./BaseForm.dc901e.js";import{g as w,a as y}from"./ChildGoodEditModal.266623.js";import{a as I}from"./index.0935e0b4.js";import"./status.21dece30.js";import"./InvoiceTitle.250697.js";import"./index.91c8b9.js";import"./use-page-search.89126f99.js";import"./query-category.7a496a.js";const N={class:"padding__container"},H=b({__name:"detail",setup(O){const a=g(),{title:n,isDetail:r,collapses:l,id:m}=x({baseName:"\u5546\u54C1",collapseLen:2});return m.value&&a.run(I({id:m.value})),(P,c)=>{const u=t("ElCollapseItem"),_=t("ElCollapse"),f=t("ElTabPane"),v=t("ElTabs"),C=D("loading");return B((i(),T("div",N,[o(v,null,{default:s(()=>[o(f,{label:e(n)},{default:s(()=>[o(_,{modelValue:e(l),"onUpdate:modelValue":c[0]||(c[0]=k=>V(l)?l.value=k:null)},{default:s(()=>[o(u,{title:e(n),name:"1"},{default:s(()=>[e(r)?p("v-if",!0):(i(),d(j,{key:0})),e(r)&&e(a).data?(i(),d(e(h),{key:1,columns:e(a).data.is_combind=="1"?e(w):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 Q=E(H,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{Q as default};

dist/assets/index.aa22c55a.js → dist/assets/index.0935e0b4.js

@@ -1 +1 @@
-import{ax as s,a0 as a}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:i,VITE_PROXY_USER_REAL:o,VITE_WORKORDER_REAL:e}=a(),r=o+"/admin/",n=e,u=t=>s.request("post",`${n}/cxinv/FinancialProducts/create`,{data:t}),p=t=>s.request("post",`${n}/cxinv/FinancialProducts/list`,{data:t}),d=t=>s.request("post",`${n}/cxinv/FinancialProducts/info`,{data:t}),R=t=>s.request("post",`${n}/cxinv/FinancialProducts/status`,{data:t}),l=t=>s.request("post",`${r}companylist`,{data:{noRela:!0,...t}});export{d as a,l as b,R as c,u as d,p as h};
+import{ax as s,a0 as a}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:i,VITE_PROXY_USER_REAL:o,VITE_WORKORDER_REAL:e}=a(),r=o+"/admin/",n=e,u=t=>s.request("post",`${n}/cxinv/FinancialProducts/create`,{data:t}),p=t=>s.request("post",`${n}/cxinv/FinancialProducts/list`,{data:t}),d=t=>s.request("post",`${n}/cxinv/FinancialProducts/info`,{data:t}),R=t=>s.request("post",`${n}/cxinv/FinancialProducts/status`,{data:t}),l=t=>s.request("post",`${r}companylist`,{data:{noRela:!0,...t}});export{d as a,l as b,u as c,R as d,p as h};

dist/assets/index.480afa0e.js

@@ -1 +0,0 @@
-import{ax as a,a0 as s}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:i,VITE_PROXY_USER_REAL:o,VITE_WORKORDER_REAL:e}=s(),n=e,c=t=>a.request("post",`${n}/cxinv/FinancialManager/create`,{data:t}),p=t=>a.request("post",`${n}/cxinv/FinancialManager/list`,{data:t}),E=t=>a.request("post",`${n}/cxinv/FinancialManager/info`,{data:t});export{p as a,c as b,E as h};

dist/assets/index.c2b73126.js

@@ -0,0 +1 @@
+import{ax as a,a0 as e}from"./index.js";const{VITE_PROXY_DOMAIN_REAL:i,VITE_PROXY_USER_REAL:c,VITE_WORKORDER_REAL:s}=e(),n=s,o=t=>a.request("post",`${n}/cxinv/FinancialManager/create`,{data:t}),p=t=>a.request("post",`${n}/cxinv/FinancialManager/list`,{data:t}),u=t=>a.request("post",`${n}/cxinv/FinancialManager/info`,{data:t}),E=t=>a.request("post",`${n}/cxinv/FinancialManager/CheckSure`,{data:t});export{E as a,p as b,o as c,u as h};

dist/assets/qrCode.be32d8.js

@@ -1,4 +1,4 @@
-import{d as Ht,w as Ot,U as Lt,z as me,j as P,H as pe,aj as we,l as R,aw as be,F as Jt,y as Ce,bp as ve,bq as Dt,am as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,ak as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.a67d51ba.js";/*!
+import{d as Ht,w as Ot,U as Lt,z as me,j as P,H as pe,aj as we,l as R,aw as be,F as Jt,y as Ce,bp as ve,bq as Dt,am as Ee,_ as Te,r as jt,o as Be,c as Ae,C as W,h as Se,ak as Ne,M as Pe}from"./index.js";import{M as ht}from"./motion.3a393faf.js";/*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
  * Copyright (c) 2014-2017, Jon Schlinkert.

dist/assets/shared.6241f91b.js → dist/assets/shared.2f92e8a7.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:"\u7EBF\u4E0B\u8BA2\u5355",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:"\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};

src/api/invoiceInOut/inOutManager/index.ts

@@ -26,7 +26,7 @@ export const httpDetail = (data: object): ResponseType => {
 };
 
 export const httpStatus = (data: object): ResponseType => {
-    return http.request("post", `${newApi}/cxinv/FinancialProducts/status`, { data });
+    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckSure`, { data });
 };
 
 export const httpCatist = (data: object): ResponseType => {

src/api/invoiceInOut/inventoryCheck/index.ts

@@ -0,0 +1,44 @@
+import { http } from "/@/utils/http";
+import { loadEnv } from "@build/index";
+const { VITE_PROXY_DOMAIN_REAL, VITE_PROXY_USER_REAL, VITE_WORKORDER_REAL } = loadEnv();
+const userAPi = VITE_PROXY_DOMAIN_REAL;
+const yewuApi = VITE_PROXY_USER_REAL + "/admin/";
+
+const newApi = VITE_WORKORDER_REAL
+
+
+interface ResponseType extends Promise<any> {
+    data?: object; code?: number; msg?: string;
+}
+
+// 添加
+export const httpAdd = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/create`, { data });
+};
+
+// 列表
+export const httpList = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckList`, { data });
+};
+
+export const httpDetail = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/info`, { data });
+};
+
+export const httpStatus = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/cxinv/FinancialManager/CheckSure`, { data });
+};
+
+export const httpCatist = (data: object): ResponseType => {
+    return http.request("post", `${newApi}/user/TaxCategory/list`, { data });
+};
+
+
+export const httpInvList = (data: object): ResponseType => {
+    return http.request("post", `${yewuApi}orderinvlist`, { data });
+};
+
+
+export const httpCompanies = (data: object): any => {
+    return http.request("post", `${yewuApi}companylist`, { data: { noRela: true, ...data } });
+};

src/views/invoiceInOut/inOutManager/components/ChooseGoodModal/index.vue

@@ -43,8 +43,6 @@ function handleSubmit(){
       }
    })
 
-   console.log(result, '~~🚀~~')
-
    visible.value = false
    emit('submit', result)
 }

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

@@ -210,14 +210,14 @@ const columns = [
   },
   {
     label: '税前单价',
-    prop: 'inv_price',
+    prop: 'inv_subprice',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
     label: '税前总价',
-    prop: 'inv_subprice',
+    prop: 'inv_subtotal',
     minWidth: '100px',
     defaultData: '',
     required: true
@@ -265,7 +265,7 @@ const columns = [
     required: true
   },
   {
-    label: '关联商品编号',
+    label: '关联商品ID',
     prop: 'relaGoodNo',
     minWidth: '120px',
     defaultData: '',
@@ -294,21 +294,10 @@ const columns = [
   }
 ]
 
-const notOrderTemplate = [columns.slice(1).reduce((prev, current) => {
-  return { ...prev, [current.label]: current.defaultData ? current.defaultData : '' }
-}, {})]
-
-
-export const mapLabelToProp = columns.reduce((prev, current) => ({
-  ...prev,
-  [current.label]: current.prop
-}), {})
-
+const notOrderTemplate = [columns.slice(1).reduce((prev, current) => ({ ...prev, [current.label]: current.defaultData ? current.defaultData : '' }), {})]
 
-export const mapPropertyToLabel = columns.reduce((prev, current) => ({
-  ...prev,
-  [current.prop]: current.label
-}), {})
+export const mapLabelToProp = columns.reduce((prev, current) => ({  ...prev, [current.label]: current.prop }), {})
+export const mapPropertyToLabel = columns.reduce((prev, current) => ({ ...prev, [current.prop]: current.label }), {})
 
 export const requiredProps = columns.filter(column => !!column.required).map(item => item.prop)
 

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

@@ -1,16 +1,15 @@
 <script setup lang="ts">
-import { ref, h } from "vue";
+import { ref } from "vue";
 import { ElButton, ElDialog, ElMessage } from "element-plus";
 import { execlUpload } from "/@/components/execlUpload";
 import { useResponseHandle } from "/@/hooks";
 import { useVModel } from "@vueuse/core";
 
-import { columns, mapLabelToProp } from "./columns-config";
-import { isImportDataValid } from "./validator";
-import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
 import { mapLabelToSource, mapLabelToType } from "../../config/shared";
+import { httpAdd } from "/@/api/invoiceInOut/inOutManager";
+import { columns, mapLabelToProp } from "./columns-config";
 import { mapLabelToInvtype } from "/@/utils/status";
-
+import { isImportDataValid } from "./validator";
 
 
 const loading = ref(false);
@@ -76,21 +75,25 @@ const handleSubmit = async () => {
 
     tableData.value.forEach(item => {
       list.push({ 
-        ...item, 
+        ...item,
         inv_type: mapLabelToInvtype[item.inv_type],
         source: mapLabelToSource[item.source], 
         type: mapLabelToType[item.type],
         buyer_name: item.inv_buyer_name,
         buyer_code: item.inv_buyer_code,
-        platform_type: '1',
-        channel: '2',
-        goodType: '1',
-        relaArr: [
-
-        ]
+        platform_type: "1",
+        goodType: "1",
+        channel: "2",
+        relaArr: [{  
+          id: item.relaGoodNo, 
+          num: item.relaGoodNum 
+        }]
       })
     })
 
+    // console.log(list)
+    // return
+
     const { code, message,data: _d } = await httpAdd({ list });
 
     loading.value = false;
@@ -118,7 +121,7 @@ const cancel = () => {
   <ElDialog
     v-model="visible"
     :close-on-click-modal="false"
-    title="订单商品导入"
+    title="非订单商品导入"
     width="1040px"
     top="8vh"
     center

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

@@ -210,14 +210,14 @@ const columns = [
   },
   {
     label: '税前单价',
-    prop: 'inv_price',
+    prop: 'inv_subprice',
     minWidth: '100px',
     defaultData: '',
     required: true
   },
   {
     label: '税前总价',
-    prop: 'inv_subprice',
+    prop: 'inv_subtotal',
     minWidth: '100px',
     defaultData: '',
     required: true

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

@@ -13,8 +13,8 @@ import { mapLabelToInvtype } from "/@/utils/status";
 
 
 
-const loading = ref(false);
 const tableData = ref([]);
+const loading = ref(false);
 
 const emit = defineEmits(["refresh"]);
 const props = defineProps<{ visible: boolean }>()

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

@@ -1,7 +1,7 @@
 import { ElTag } from "element-plus"
-import { cg_order_type_options } from "/@/utils/status"
+import { cg_order_type_options, xs_inv_type_list } from "/@/utils/status"
 import { h } from "vue"
-import { sourceOptions, statusOptions, typeOptions } from "./shared"
+import { managerStatusOptions, sourceOptions, statusOptions, typeOptions } from "./shared"
 import { createTooltip } from "/@/utils/tootip"
 
 export const goodColumns = [
@@ -105,7 +105,7 @@ export const orderGoodColumns = [
     label: '状态',
     span: 6,
     render(_, row) {
-      return h(ElTag, { type: 'primary', size: 'small' }, {
+      return h(ElTag, { type: statusOptions.find(item => item.value == row.status)?.type, size: 'small' }, {
         default: () => statusOptions.find(item => item.value == row.status)?.label
       })
     }
@@ -118,7 +118,172 @@ export const orderGoodColumns = [
     label: '销售方公司',
     span: 12,
     render(_, row){
-      return createTooltip(row.seller_name, "销售方公司纳税识别号 : " + row.seller_code, 300)
+      return createTooltip(row.seller_name, "销售方公司纳税识别号 : " + row.seller_code, 340)
+    }
+  },
+  {
+    label: '订单编号',
+    field: 'orderCode',
+    span: 6
+  },
+  {
+    label: '订单主编号',
+    field: 'cxCode',
+    span: 6
+  },
+  {
+    label: '商品名称',
+    span: 12,
+    render(_, row){
+      return createTooltip(row.goodName, "商品编号 : " + row.goodNo, 340)
+    }
+  },
+  {
+    label: '单位',
+    field: 'unit',
+    span: 6
+  },
+  {
+    label: '商品数量',
+    field: 'num',
+    span: 6
+  },
+  {
+    label: '商品单价',
+    field: 'goodPrice',
+    span: 6
+  },
+  {
+    label: '订单总金额',
+    field: 'totalPrice',
+    span: 6
+  },
+  {
+    label: '税目',
+    field: 'cat_code',
+    span: 6
+  },
+  {
+    label: '税率',
+    span: 6,
+    render(_, row){
+      return (Number(row.tax) * 100) + '%'
+    }
+  },
+  {
+    label: '购买方公司',
+    span: 12,
+    render(_, row){
+      return createTooltip(row.buyer_name, "购买方公司纳税识别号 : " + row.buyer_code, 340)
+    }
+  },
+  {
+    label: '关联金额',
+    field: 'inv_fee',
+    span: 6
+  },
+  {
+    label: '发票号码',
+    field: 'inv_number',
+    span: 6
+  },
+  {
+    label: '发票销售方公司',
+    span: 12,
+    render(_, row){
+      return createTooltip(row.inv_seller_name, "发票销售方公司编号 : " + row.inv_seller_code, 340)
+    }
+  },
+  {
+    label: '发票明细ID',
+    span: 6,
+    field: 'inv_item_id'
+  },
+  {
+    label: '发票类型',
+    span: 6,
+    render(_, row){
+      return xs_inv_type_list.find(item => item.value == row.inv_type)?.label
+    }
+  },
+  {
+    label: '货物或应税劳务、服务名称',
+    span: 12,
+    field: 'inv_good_name'
+  },
+  {
+    label: '规格型号',
+    span: 6,
+    field: 'inv_spec'
+  },
+  {
+    label: '发票商品单位',
+    span: 6,
+    field: 'inv_unit'
+  },
+  {
+    label: '发票商品数量',
+    span: 6,
+    field: 'inv_num'
+  },
+  {
+    label: '税前单价',
+    span: 6,
+    field: 'inv_subprice'
+  },
+  {
+    label: '税前总价',
+    span: 6,
+    field: 'inv_subtotal'
+  },
+  {
+    label: '发票税率',
+    field: 'inv_tax',
+    span: 6
+  },
+  {
+    label: '发票税额',
+    field: 'inv_tax_total',
+    span: 6
+  },
+  {
+    label: '税后单价',
+    field: 'inv_price',
+    span: 6
+  },
+  {
+    label: '税后单价',
+    field: 'inv_total',
+    span: 6
+  },
+  {
+    label: '类目编号状态',
+    span: 6,
+    render(_, row){
+      return h(ElTag, { size: 'small', type: row.cat_diff == '0' ? 'danger' : 'success' }, {
+        default: () => row.cat_diff == '0' ? '不一致' : '一致'
+      })
     }
+  },
+  {
+    label: '税率状态',
+    span: 6,
+    render(_, row) {
+      return h(ElTag, { size: 'small', type: row.tax_diff == '0' ? 'danger' : 'success' }, {
+        default: () => row.tax_diff == '0' ? '不一致' : '一致'
+      })
+    }
+  },
+  {
+    label: '业务类型',
+    span: 6,
+    render(_, row) {
+      return managerStatusOptions.find((item) => item.value == row.manager_status)?.label
+    }
+  },
+  {
+    label: '备注',
+    span: 12,
+    field: 'remark'
   }
 ]

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

@@ -35,7 +35,7 @@ const columns = [
 
   { 
     label: "状态", 
-    width: 80,
+    width: 90,
     cellRenderer({ row }) {
       return h(
         ElTag, 
@@ -185,7 +185,11 @@ const columns = [
     width: 100 
   },
   
-  { label: '规格型号', prop: 'inv_spec', width: 80 },
+  { 
+    label: '规格型号', 
+    prop: 'inv_spec', 
+    width: 80 
+  },
   
   { 
     label: '发票商品单位', 
@@ -250,9 +254,11 @@ const columns = [
     prop: 'TODO', 
     width: 100,
     cellRenderer({ row }) {
-      return h(ElTag, { size: 'small', type: row.tax_diff == '0' ? 'danger' : 'success' }, {
-        default: () => row.tax_diff == '0' ? '不一致' : '一致'
-      })
+      return h(
+        ElTag, 
+        { size: 'small', type: row.tax_diff == '0' ? 'danger' : 'success' }, 
+        { default: () => row.tax_diff == '0' ? '不一致' : '一致' }
+      )
     }
   },
   
@@ -269,23 +275,38 @@ const columns = [
       return managerStatusOptions.find((item) => item.value == row.manager_status)?.label
     }
   },
-  
   { 
-    label: '商品编号', 
+    label: '关联商品ID', 
     prop: 'goodNo', 
-    width: 100 
+    width: 80,
+    cellRenderer({ row }){
+      if (row.ProductRela.length === 0){
+        return null
+      }
+      return row.ProductRela[0].id
+    }
   },
-  
   { 
-    label: '商品名称', 
+    label: '关联商品名称', 
     prop: 'goodName', 
-    width: 100 
+    width: 100,
+    cellRenderer({ row }) {
+      if (row.ProductRela.length === 0) {
+        return null
+      }
+      return row.ProductRela[0].goodName
+    }
   },
   
   // { label: '税前单价', prop: 'TODO', width: 100 },
   // { label: '单价', prop: 'goodPrice', width: 100 },
   // { label: '数量', prop: 'TODO', width: 100 },
-  { label: "操作", fixed: "right", width: 75, slot: "operation" }
+  { 
+    label: "操作", 
+    fixed: "right", 
+    width: 50, 
+    slot: "operation" 
+  }
 ];
 
 const contentConfig: ContentConfig = {

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

@@ -26,7 +26,7 @@ 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' }
 ]
 
 

src/views/invoiceInOut/inOutManager/detail.vue

@@ -1,17 +1,18 @@
 <script setup lang="ts">
 import { reactive, ref } from "vue";
 
-import { goodColumns, orderGoodColumns } from "./config/columns"
+import { orderGoodColumns } from "./config/columns"
 import { useDetail } from "/@/hooks/core/useDetail";
 import BasicDescriptions from "/@/components/BasicDescriptions";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import ChooseGoodModal from "./components/ChooseGoodModal/index.vue"
 import ChildGoodEditModal from "./components/ChildGoodEditModal.vue";
 
-import { httpDetail } from "/@/api/invoiceInOut/inOutManager";
+import { httpDetail, httpStatus } from "/@/api/invoiceInOut/inOutManager";
 
-import { ElForm } from "element-plus";
+import { ElForm, ElMessage } from "element-plus";
 import { useTask } from "/@/hooks/core";
+import router from "/@/router";
 
 
 const { title, collapses, id } = useDetail({ baseName: '出入库', collapseLen: 2 });
@@ -27,6 +28,7 @@ const state = reactive({
   data: {}
 })
 
+const loading = ref(false)
 const formRef = ref<InstanceType<typeof ElForm> | null>(null)
 
 const formData = ref({
@@ -83,21 +85,57 @@ function getSpanNumber(data, prop) {
   }
 }
 
-function spanMethod({ row:_1, column:_2, rowIndex, columnIndex }: any, data: any[]){
-    if(Number(columnIndex) === 2){
-      let nameSpan = getSpanNumber(formData.value.goods, "skuCode");
-      return { rowspan: nameSpan[rowIndex],colspan: 1};
+function spanMethod({ row:_1, column:_2, rowIndex, columnIndex }: any){
+  if ([0, 1, 2, 7].includes(Number(columnIndex))){
+      let nameSpan = getSpanNumber(formData.value.goods, "id");
+      return { rowspan: nameSpan[rowIndex], colspan: 1 };
     }
 }
 
 async function onSubmit(){
   try{
     await formRef.value.validate()
+    const relaArrCopy = formData.value.goods.map(({ id, goodNum }) => ({ id, num: goodNum }))
+
+    const relaArr = []
+    const mapId = {}
+    
+    for(const item of relaArrCopy){
+      if (!mapId[item.id]){
+        relaArr.push(item)
+        mapId[item.id] = true
+      } 
+    }
+
+    console.log(relaArr)
+
+    loading.value = true
+    const { code, message } = await httpStatus({ relaArr, manager_id: id.value })
+    loading.value = false
+
+    if (code == 0) {
+      ElMessage.success('操作完成')
+      detailTask.run(httpDetail({ id: id.value }))
+    } else {
+      ElMessage.warning(message)
+    }
+  
   }catch(err){
     console.log(err)
   }
 }
 
+function handleEditGood(index, data){
+  const { id } = formData.value.goods[index]
+  formData.value.goods.forEach((item, index) => {
+    if(item.id === id){
+      formData.value.goods[index].goodNum = data.goodNum
+
+      if(formData.value.goods[index].childNum){ formData.value.goods[index].childActionNum = formData.value.goods[index].childNum * data.goodNum }
+    }
+  })
+}
+
 id.value && detailTask.run(httpDetail({ id: id.value }))
 </script>
 
@@ -108,16 +146,21 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
         <ElCollapse v-model="collapses">
           <ElCollapseItem :title="title" name="1">
             <BasicDescriptions
-              v-if="detailTask.data"
               :columns="orderGoodColumns" 
               :data="detailTask.data" 
+              v-if="detailTask.data"
             />
           </ElCollapseItem>
 
-          <ElCollapseItem title="出入库信息确认" name="2">
-            <ElForm ref="formRef" :rules="rules" :model="formData" :span-method="spanMethod">
+          <ElCollapseItem 
+            title="出入库信息确认" 
+            name="2" 
+            v-if="detailTask.data && detailTask.data.status == '1' && detailTask.data.type == '1'"
+          >
+            <ElForm ref="formRef" :rules="rules" :model="formData">
               <ElFormItem label="操作商品" prop="goods">
                 <ElTable
+                :span-method="spanMethod"
                   border 
                   size="small" 
                   :data="formData.goods"
@@ -199,7 +242,7 @@ id.value && detailTask.run(httpDetail({ id: id.value }))
       :data="state.data"
       :index="state.index"
       v-model:visible="state.editVisible"
-      @submit="(index, data) => formData.goods[index] = { ...data }"
+      @submit="handleEditGood"
     />
   </div>
 </template>

src/views/invoiceInOut/inOutManager/index.vue

@@ -80,8 +80,7 @@ function onDownload(type = 'notOrder'){
           </template>
         </ElDropdown>
       </template>
-
-      <template #content_action>
+      <!-- <template #content_action>
         <ElTooltip content="取消操作" placement="top">
           <ElButton 
             :icon="useRenderIcon('delete')"
@@ -89,8 +88,7 @@ function onDownload(type = 'notOrder'){
             link
           />
         </ElTooltip>
-      </template>
-
+      </template> -->
     </PageContainer>
 
     <OrderImportModal 

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

@@ -1,54 +1,55 @@
 import { ContentConfig } from "/@/components/PageContent";
-import { httpList, httpStatus } from "/@/api/invoiceInOut/productManager";
-
-import { cg_order_type_options, statusList } from "/@/utils/status";
-import { ElTag } from "element-plus";
-import { h } from "vue";
+import { httpList, httpStatus } from "/@/api/invoiceInOut/inventoryCheck";
 
 const columns = [
   {
     label: "盘点编号",
-    prop: "TODO",
-    width: 150
-  },
-  {
-    label: "供应商纳税号",
-    prop: "TODO",
-    width: 160
+    prop: "checkCode",
+    width: 170
   },
+  // {
+  //   label: "供应商纳税号",
+  //   prop: "TODO",
+  //   width: 160
+  // },
+  // {
+  //   label: "销售方名称",
+  //   prop: "TODO",
+  //   width: 160
+  // },
   {
-    label: "销售方名称",
-    prop: "TODO",
+    label: '购买方公司纳税号',
+    prop: 'company_code',
     width: 160
   },
   {
-    label: '购买方纳税号',
-    prop: 'TODO',
+    label: '购买方公司名称',
+    prop: 'company_name',
     width: 160
   },
   {
     label: '商品编号',
-    prop: 'TODO',
+    prop: 'goodNo',
     width: 160
   },
   {
     label: "商品名称",
-    prop: "TODO",
+    prop: "goodName",
     width: 160
   },
   {
     label: "规格",
-    prop: "TODO",
+    prop: "spec",
     width: 80
   },
   {
     label: "单位",
-    prop: "TODO",
+    prop: "unit",
     width: 80
   },
   {
     label: '单价',
-    prop: 'TODO',
+    prop: 'price',
     width: 80
   },
   {
@@ -68,7 +69,7 @@ const columns = [
   },
   {
     label: '操作人',
-    prop: 'TODO',
+    prop: 'check_uname',
     width: 80
   },
   {

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

@@ -16,12 +16,12 @@ const searchFormConfig: FormConfig = {
         endPlaceholder: "结束时间"
       }
     },
-    {
-      field: 'TODO',
-      type: 'business-query',
-      options: goodTypeOptions,
-      placeholder: '业务公司'
-    },
+    // {
+    //   field: 'TODO',
+    //   type: 'business-query',
+    //   options: goodTypeOptions,
+    //   placeholder: '业务公司'
+    // },
     {
       field: 'skuCode',
       type: 'input',

src/views/invoiceInOut/inventoryCheck/detail.vue

@@ -7,10 +7,14 @@ import BaseForm from "./components/BaseForm.vue"
 import { httpDetail } from "/@/api/invoiceInOut/productManager";
 import { useTask } from "/@/hooks/core"
 
-
 const detailTask = useTask()
-const { title, isDetail, collapses, id } = useDetail({ baseName: '盘点', collapseLen: 2 });
 
+const {
+  id,
+  title, 
+  isDetail, 
+  collapses, 
+} = useDetail({ baseName: '盘点', collapseLen: 2 });
 
 id.value && detailTask.run(httpDetail({ id: id.value }))
 </script>