snow 3 bulan lalu
induk
melakukan
2f13166238
94 mengubah file dengan 232 tambahan dan 102 penghapusan
  1. 0 0
      dist/assets/BaseForm.4b5981.js
  2. 0 0
      dist/assets/BaseForm.74360a.js
  3. 0 0
      dist/assets/ChildGoodEditModal.396f34.js
  4. 0 0
      dist/assets/ChildGoodEditModal.6c6e20.js
  5. 1 1
      dist/assets/ChildGoodEditModal.7967d3.js
  6. 0 0
      dist/assets/ChildGoodEditModal.b0de1a.js
  7. 1 1
      dist/assets/ChildGoodEditModal.d0c9e8.js
  8. 0 0
      dist/assets/Infinite.5f6983.js
  9. 1 1
      dist/assets/InvoiceTitle.77bebe.js
  10. 1 1
      dist/assets/InvoiceTitle.7eecae.js
  11. 0 0
      dist/assets/basic-descriptions.c3d4adde.js
  12. 0 0
      dist/assets/columnRenderHelper.71d8c898.js
  13. 0 0
      dist/assets/columns.43a3d339.js
  14. 0 0
      dist/assets/columns.a38bf541.js
  15. 0 0
      dist/assets/detail.3e1540.js
  16. 0 0
      dist/assets/detail.40f304.js
  17. 1 1
      dist/assets/detail.48dab8.js
  18. 0 0
      dist/assets/detail.81a26f.js
  19. 0 0
      dist/assets/detail.86fc1b.js
  20. 0 0
      dist/assets/detail.a9680f.js
  21. 0 0
      dist/assets/detail.a9d661.js
  22. 0 0
      dist/assets/detail.ab0da9.js
  23. 0 0
      dist/assets/execl-upload.5c303721.js
  24. 0 0
      dist/assets/index.04a7a9.js
  25. 0 0
      dist/assets/index.0975b0.js
  26. 0 0
      dist/assets/index.0c3c0c40.js
  27. 0 0
      dist/assets/index.0dbb49.js
  28. 0 0
      dist/assets/index.1c6699.js
  29. 0 0
      dist/assets/index.1ddafc.js
  30. 0 0
      dist/assets/index.23a090.js
  31. 0 0
      dist/assets/index.26a26c.js
  32. 0 0
      dist/assets/index.2c386425.js
  33. 0 0
      dist/assets/index.2ce247f3.js
  34. 0 0
      dist/assets/index.2d5352.js
  35. 0 0
      dist/assets/index.303734.js
  36. 0 0
      dist/assets/index.37707a.js
  37. 0 0
      dist/assets/index.4a3411bd.js
  38. 0 0
      dist/assets/index.4a55f9.js
  39. 0 0
      dist/assets/index.4cf9ee.js
  40. 0 0
      dist/assets/index.52bb3f.js
  41. 0 0
      dist/assets/index.603aa9.js
  42. 0 0
      dist/assets/index.674a5d.js
  43. 1 1
      dist/assets/index.732d6b80.js
  44. 0 0
      dist/assets/index.77e8d1.js
  45. 0 0
      dist/assets/index.796b49ae.js
  46. 0 0
      dist/assets/index.7b86ba.js
  47. 0 0
      dist/assets/index.86be5bcd.js
  48. 0 0
      dist/assets/index.8b31f1.js
  49. 0 0
      dist/assets/index.8d6107.js
  50. 0 0
      dist/assets/index.96ac3cd0.js
  51. 0 0
      dist/assets/index.9fb413.js
  52. 0 0
      dist/assets/index.9fd33b.js
  53. 0 0
      dist/assets/index.a3610b0b.js
  54. 0 0
      dist/assets/index.a5268686.js
  55. 0 0
      dist/assets/index.a9eb7f.js
  56. 0 0
      dist/assets/index.aff7a4.js
  57. 0 0
      dist/assets/index.bdcf42.js
  58. 0 0
      dist/assets/index.c1687a.js
  59. 0 0
      dist/assets/index.c2487c.js
  60. 0 0
      dist/assets/index.c48d03.js
  61. 0 0
      dist/assets/index.cca329.js
  62. 0 0
      dist/assets/index.d4a00f33.js
  63. 0 0
      dist/assets/index.d83ede.js
  64. 0 0
      dist/assets/index.d92aef.js
  65. 0 0
      dist/assets/index.ddd736.js
  66. 0 0
      dist/assets/index.df996f.js
  67. 0 0
      dist/assets/index.f3233fa5.js
  68. 0 0
      dist/assets/index.f9cde5.js
  69. 0 0
      dist/assets/index.fc1994.js
  70. 0 0
      dist/assets/index.fc8072.js
  71. 0 0
      dist/assets/index.fc8f2766.js
  72. 0 0
      dist/assets/index.ff51ce.js
  73. 0 0
      dist/assets/index.js
  74. 0 0
      dist/assets/motion.b6021c01.js
  75. 0 0
      dist/assets/phone.9e1123.js
  76. 1 1
      dist/assets/qrCode.be32d8.js
  77. 0 0
      dist/assets/query-category.fa03a8.js
  78. 0 0
      dist/assets/regist.bfca82.js
  79. 0 0
      dist/assets/rule.c03e6507.js
  80. 0 0
      dist/assets/tootip.968143c9.js
  81. 0 0
      dist/assets/update.2f876b.js
  82. 0 0
      dist/assets/use-page-search.3b730f1d.js
  83. 0 0
      dist/assets/useDetail.fe9160e3.js
  84. 0 0
      dist/assets/verifyCode.5cb978ed.js
  85. 20 21
      src/layout/components/company/index.vue
  86. 109 7
      src/store/modules/user.ts
  87. 4 3
      src/views/invoiceInOut/clientC/components/NotOrderImportModal/index.vue
  88. 5 3
      src/views/invoiceInOut/clientC/components/OrderImportModal/index.vue
  89. 5 4
      src/views/invoiceInOut/inManager/components/NotOrderImportModal/index.vue
  90. 4 3
      src/views/invoiceInOut/inManager/components/OrderImportModal/index.vue
  91. 4 3
      src/views/invoiceInOut/outManager/components/NotOrderImportModal/index.vue
  92. 8 10
      src/views/invoiceInOut/outManager/components/OrderImportModal/index.vue
  93. 5 0
      src/views/invoiceInOut/summary/config/content.config.ts
  94. 61 41
      src/views/invoiceInOut/summary/index.vue

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/BaseForm.4b5981.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/BaseForm.74360a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/ChildGoodEditModal.396f34.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/ChildGoodEditModal.6c6e20.js


+ 1 - 1
dist/assets/ChildGoodEditModal.7967d3.js

@@ -1 +1 @@
-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.e9825f30.js";import{B as M}from"./basic-descriptions.248297d4.js";import"./status.b7512d56.js";import"./tootip.6b238748.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};
+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.43a3d339.js";import{B as M}from"./basic-descriptions.c3d4adde.js";import"./status.b7512d56.js";import"./tootip.968143c9.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};

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/ChildGoodEditModal.b0de1a.js


+ 1 - 1
dist/assets/ChildGoodEditModal.d0c9e8.js

@@ -1 +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.106c229a.js";import{B as k}from"./basic-descriptions.248297d4.js";import"./status.b7512d56.js";import"./shared.a743a5f7.js";import"./tootip.6b238748.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};
+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.a38bf541.js";import{B as k}from"./basic-descriptions.c3d4adde.js";import"./status.b7512d56.js";import"./shared.a743a5f7.js";import"./tootip.968143c9.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};

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/Infinite.5f6983.js


+ 1 - 1
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.248297d4.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.c3d4adde.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};

+ 1 - 1
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.248297d4.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.c3d4adde.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};

+ 0 - 0
dist/assets/basic-descriptions.248297d4.js → dist/assets/basic-descriptions.c3d4adde.js


+ 0 - 0
dist/assets/columnRenderHelper.3532e359.js → dist/assets/columnRenderHelper.71d8c898.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/columns.43a3d339.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/columns.a38bf541.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.3e1540.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.40f304.js


+ 1 - 1
dist/assets/detail.48dab8.js

@@ -1 +1 @@
-import{_ as n,d as p,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.e0d3f419.js";import D from"./BaseForm.74360a.js";import{P as g}from"./index.3540ed96.js";import{a as h}from"./index.2b06bce7.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.248297d4.js";import"./use-page-search.e7489779.js";import"./columns.e9825f30.js";import"./tootip.6b238748.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=p({__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 S=n(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{S as default};
+import{_ as n,d as p,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.fe9160e3.js";import D from"./BaseForm.74360a.js";import{P as g}from"./index.fc8f2766.js";import{a as h}from"./index.a3610b0b.js";import"./status.b7512d56.js";import"./InvoiceTitle.77bebe.js";import"./basic-descriptions.c3d4adde.js";import"./use-page-search.3b730f1d.js";import"./columns.43a3d339.js";import"./tootip.968143c9.js";import"./ChildGoodEditModal.7967d3.js";import"./query-category.fa03a8.js";const y={class:"padding__container"},x={class:"my-[5px]",style:{"font-size":"14px"}},B=p({__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 S=n(B,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/views/invoiceInOut/productManager/detail.vue"]]);export{S as default};

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.81a26f.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.86fc1b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.a9680f.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.a9d661.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/detail.ab0da9.js


+ 0 - 0
dist/assets/execl-upload.87bb29d2.js → dist/assets/execl-upload.5c303721.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.04a7a9.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.0975b0.js


+ 0 - 0
dist/assets/index.5757d502.js → dist/assets/index.0c3c0c40.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.0dbb49.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.1c6699.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.1ddafc.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.23a090.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.26a26c.js


+ 0 - 0
dist/assets/index.499baa10.js → dist/assets/index.2c386425.js


+ 0 - 0
dist/assets/index.1333c3c7.js → dist/assets/index.2ce247f3.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.2d5352.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.303734.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.37707a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.4a3411bd.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.4a55f9.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.4cf9ee.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.52bb3f.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.603aa9.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.674a5d.js


+ 1 - 1
dist/assets/index.b0e01b2e.js → dist/assets/index.732d6b80.js

@@ -1 +1 @@
-import{d as E,w as c,aY as D,r as l,at as b,o as d,c as m,j as e,C as s,l as i,J as B,H as k,G as y,a as F,_ as P}from"./index.js";import{h as x}from"./index.1333c3c7.js";import{P as T}from"./index.23d4179f.js";const g={class:"w-full"},R=E({__name:"index",props:{ProductRela:{type:Array,required:!0}},setup(V){const p=c(!1),a=c(0),u=D();function _(t,n){p.value=!0,a.value=n,u.run(x({id:t}))}return(t,n)=>{const o=l("ElTableColumn"),v=l("ElButton"),f=l("ElTooltip"),w=l("ElTable"),C=l("ElDialog"),h=b("loading");return d(),m("div",g,[e(w,{size:"small",border:"",data:t.ProductRela},{default:s(()=>[e(o,{label:"\u5546\u54C1ID",prop:"product_id",width:"60px","show-overflow-tooltip":""}),e(o,{label:"\u5546\u54C1\u7F16\u53F7",prop:"skuCode","show-overflow-tooltip":""}),e(o,{label:"\u5546\u54C1\u540D\u79F0",prop:"goodName","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C\u6570\u91CF",prop:"num",width:"80px","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C\u4EBA",prop:"apply_name",width:"80px","show-overflow-tooltip":""}),e(o,{label:"\u521B\u5EFA\u65F6\u95F4",prop:"create_time","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C",width:"100px"},{default:s(r=>[e(f,{content:"\u67E5\u770B\u8BE6\u60C5"},{default:s(()=>[e(v,{type:"primary",link:"",icon:i(B)("eye-view"),onClick:A=>_(r.row.product_id,r.$index)},null,8,["icon","onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"]),e(C,{center:"",title:"\u5546\u54C1\u8BE6\u60C5",modelValue:p.value,"onUpdate:modelValue":n[0]||(n[0]=r=>p.value=r),style:{overflow:"hidden"}},{default:s(()=>[k((d(),m("div",null,[i(u).data?(d(),y(T,{key:0,data:i(u).data,num:t.ProductRela[a.value].num,time:t.ProductRela[a.value].create_time,name:t.ProductRela[a.value].apply_name},null,8,["data","num","time","name"])):F("v-if",!0)])),[[h,i(u).loading]])]),_:1},8,["modelValue"])])}}});var U=P(R,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/components/BasicProducts/index.vue"]]);export{U as B};
+import{d as E,w as c,aY as D,r as l,at as b,o as d,c as m,j as e,C as s,l as i,J as B,H as k,G as y,a as F,_ as P}from"./index.js";import{h as x}from"./index.2ce247f3.js";import{P as T}from"./index.4a3411bd.js";const g={class:"w-full"},R=E({__name:"index",props:{ProductRela:{type:Array,required:!0}},setup(V){const p=c(!1),a=c(0),u=D();function _(t,n){p.value=!0,a.value=n,u.run(x({id:t}))}return(t,n)=>{const o=l("ElTableColumn"),v=l("ElButton"),f=l("ElTooltip"),w=l("ElTable"),C=l("ElDialog"),h=b("loading");return d(),m("div",g,[e(w,{size:"small",border:"",data:t.ProductRela},{default:s(()=>[e(o,{label:"\u5546\u54C1ID",prop:"product_id",width:"60px","show-overflow-tooltip":""}),e(o,{label:"\u5546\u54C1\u7F16\u53F7",prop:"skuCode","show-overflow-tooltip":""}),e(o,{label:"\u5546\u54C1\u540D\u79F0",prop:"goodName","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C\u6570\u91CF",prop:"num",width:"80px","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C\u4EBA",prop:"apply_name",width:"80px","show-overflow-tooltip":""}),e(o,{label:"\u521B\u5EFA\u65F6\u95F4",prop:"create_time","show-overflow-tooltip":""}),e(o,{label:"\u64CD\u4F5C",width:"100px"},{default:s(r=>[e(f,{content:"\u67E5\u770B\u8BE6\u60C5"},{default:s(()=>[e(v,{type:"primary",link:"",icon:i(B)("eye-view"),onClick:A=>_(r.row.product_id,r.$index)},null,8,["icon","onClick"])]),_:2},1024)]),_:1})]),_:1},8,["data"]),e(C,{center:"",title:"\u5546\u54C1\u8BE6\u60C5",modelValue:p.value,"onUpdate:modelValue":n[0]||(n[0]=r=>p.value=r),style:{overflow:"hidden"}},{default:s(()=>[k((d(),m("div",null,[i(u).data?(d(),y(T,{key:0,data:i(u).data,num:t.ProductRela[a.value].num,time:t.ProductRela[a.value].create_time,name:t.ProductRela[a.value].apply_name},null,8,["data","num","time","name"])):F("v-if",!0)])),[[h,i(u).loading]])]),_:1},8,["modelValue"])])}}});var U=P(R,[["__file","C:/Users/89793/Desktop/projects/ticket-system/src/components/BasicProducts/index.vue"]]);export{U as B};

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.77e8d1.js


+ 0 - 0
dist/assets/index.339d07be.js → dist/assets/index.796b49ae.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.7b86ba.js


+ 0 - 0
dist/assets/index.3b2d9d33.js → dist/assets/index.86be5bcd.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.8b31f1.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.8d6107.js


+ 0 - 0
dist/assets/index.30f1c3ca.js → dist/assets/index.96ac3cd0.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.9fb413.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.9fd33b.js


+ 0 - 0
dist/assets/index.2b06bce7.js → dist/assets/index.a3610b0b.js


+ 0 - 0
dist/assets/index.2f397065.js → dist/assets/index.a5268686.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.a9eb7f.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.aff7a4.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.bdcf42.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.c1687a.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.c2487c.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.c48d03.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.cca329.js


+ 0 - 0
dist/assets/index.85a60ba0.js → dist/assets/index.d4a00f33.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.d83ede.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.d92aef.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.ddd736.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.df996f.js


+ 0 - 0
dist/assets/index.d54610b5.js → dist/assets/index.f3233fa5.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.f9cde5.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.fc1994.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.fc8072.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.fc8f2766.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.ff51ce.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/index.js


+ 0 - 0
dist/assets/motion.4aa224cf.js → dist/assets/motion.b6021c01.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/phone.9e1123.js


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

File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/query-category.fa03a8.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/regist.bfca82.js


+ 0 - 0
dist/assets/rule.79ba4372.js → dist/assets/rule.c03e6507.js


+ 0 - 0
dist/assets/tootip.6b238748.js → dist/assets/tootip.968143c9.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/update.2f876b.js


+ 0 - 0
dist/assets/use-page-search.e7489779.js → dist/assets/use-page-search.3b730f1d.js


+ 0 - 0
dist/assets/useDetail.e0d3f419.js → dist/assets/useDetail.fe9160e3.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/assets/verifyCode.5cb978ed.js


+ 20 - 21
src/layout/components/company/index.vue

@@ -54,15 +54,15 @@ async function requesetSupplierAll(name: string) {
   });
 }
 
-onMounted(() => {
-  setTimeout(() => {
-    const superItem = document.querySelector(".super-item");
-    if (!superItem) return;
-    scrollWrapper = superItem.parentElement?.parentElement as HTMLDivElement;
-    if (!scrollWrapper) return;
-    scrollWrapper.addEventListener("scroll", debouceScroll, false);
-  }, 1000);
-});
+// onMounted(() => {
+//   setTimeout(() => {
+//     const superItem = document.querySelector(".super-item");
+//     if (!superItem) return;
+//     scrollWrapper = superItem.parentElement?.parentElement as HTMLDivElement;
+//     if (!scrollWrapper) return;
+//     scrollWrapper.addEventListener("scroll", debouceScroll, false);
+//   }, 1000);
+// });
 
 async function handleScroll() {
   const height = scrollWrapper.clientHeight;
@@ -98,16 +98,16 @@ async function handleScroll() {
   }
 }
 
-onUnmounted(() => {
-  state.loading = false;
-  state.noMore = false;
-  state.name = "";
-  state.page = 1;
+// onUnmounted(() => {
+//   state.loading = false;
+//   state.noMore = false;
+//   state.name = "";
+//   state.page = 1;
 
-  if (scrollWrapper) {
-    scrollWrapper.removeEventListener("scroll", debouceScroll);
-  }
-});
+//   if (scrollWrapper) {
+//     scrollWrapper.removeEventListener("scroll", debouceScroll);
+//   }
+// });
 
 async function handleChange(value) {
   if (props.noSet) return;
@@ -131,8 +131,8 @@ async function handleChange(value) {
 }
 
 const getLabel = company => {
-  const { companyCode, companyName } = company;
-  return companyCode + " / " + companyName;
+  const { company_license, companyName } = company;
+  return company_license + " / " + companyName;
 };
 
 watchEffect(() => setCompanies(list.value));
@@ -145,7 +145,6 @@ requesetSupplierAll("");
     remote
     ref="selectRef"
     :model-value="currentCompany.companyCode"
-    :remote-method="requesetSupplierAll"
     style="width: 450px"
     @change="handleChange"
   >

+ 109 - 7
src/store/modules/user.ts

@@ -188,25 +188,127 @@ export const useUserStore = defineStore({
         
         /* 非超管用户获取公司 */
         if (!this.isSuperUser && this.companyList.length === 0) {
-          const result = await httpMyCompany({ size: 10000, type: '1' });
+          // const result = await httpMyCompany({ size: 10000, type: '1' });
 
-
-          
-          this.companyList = result.data.list.map(
+          this.companyList = (company_relaton || []).map(
             ({ companyCode, companyName, is_main }) => ({ companyCode, companyName, company_license: '' ,is_main })
           )
 
+
           if (!this.companyList || this.companyList.length === 0) { return; }
         }
 
 
         if (!this.licenseSet || this.licenseSet.length === 0){
-          const { code, data: companies } = await httpCompanies({ size: 10000 })
-          this.licenseSet = companies.list
+          // const { code, data: companies } = await httpCompanies({ size: 10000 })
+
+          // const list = companies.list.map(item => ({
+          //   companyNo: item.companyNo,
+          //   company_license: item.company_license,
+          //   company_name: item.company_name,
+          //   invoice_title: item.invoice_title
+          // }))
+
+          // console.log(list)
+
+          const companies = [
+            {
+              "companyNo": "GS2407291600490369",
+              "company_license": "9144030056854457XB",
+              "company_name": "深圳鸿逸科技发展有限公司",
+              "invoice_title": "深圳鸿逸科技发展有限公司"
+            },
+            {
+              "companyNo": "GS2404151642335170",
+              "company_license": "911100006337468570",
+              "company_name": "北京元隆雅图文化传播股份有限公司",
+              "invoice_title": "北京元隆雅图文化传播股份有限公司"
+            },
+            {
+              "companyNo": "GS2404151647395616",
+              "company_license": "911100006337468571",
+              "company_name": "结算单E企购",
+              "invoice_title": "结算单E企购"
+            },
+            {
+              "companyNo": "GS2402020907088731",
+              "company_license": "91110118MACDK2TY8J",
+              "company_name": "北京泰文创供应链管理有限公司",
+              "invoice_title": "北京泰文创供应链管理有限公司"
+            },
+            {
+              "companyNo": "GS2401181650538135",
+              "company_license": "91110113MA008E6E18",
+              "company_name": "北京知事文化产业发展有限公司",
+              "invoice_title": "北京知事文化产业发展有限公司"
+            },
+            {
+              "companyNo": "GS2302231122266720",
+              "company_license": "91420106MA4F28BX0T",
+              "company_name": "湖北泽仁文化发展有限公司",
+              "invoice_title": "湖北泽仁文化发展有限公司"
+            },
+            {
+              "companyNo": "GS2302231117413175",
+              "company_license": "91420111MA4K345W3D",
+              "company_name": "湖北德润仁合文化产业发展有限公司",
+              "invoice_title": "湖北德润仁合文化产业发展有限公司"
+            },
+            {
+              "companyNo": "GS2302231123305392",
+              "company_license": "91230184MA1CNL5D05",
+              "company_name": "五常市藏金壹柒肆伍农业科技有限公司",
+              "invoice_title": "五常市藏金壹柒肆伍农业科技有限公司"
+            },
+            {
+              "companyNo": "GS2302231114471122",
+              "company_license": "91110113MA01PAPQ33",
+              "company_name": "创世昌源 (北京)国际旅行社有限公司",
+              "invoice_title": "创世昌源 (北京)国际旅行社有限公司"
+            },
+            {
+              "companyNo": "GS2302231124114965",
+              "company_license": "91110113MA7LH3Y14H",
+              "company_name": "北京普润心堂商贸有限公司",
+              "invoice_title": "北京普润心堂商贸有限公司"
+            },
+            {
+              "companyNo": "GS2302231125079621",
+              "company_license": "91110113MA008J790J",
+              "company_name": "北京百辰荣达国际科贸有限公司",
+              "invoice_title": "北京百辰荣达国际科贸有限公司"
+            },
+            {
+              "companyNo": "GS2304031312553746",
+              "company_license": "91110118MACEA1R94G",
+              "company_name": "北京锦兴弘昌科技有限公司",
+              "invoice_title": "北京锦兴弘昌科技有限公司"
+            },
+            {
+              "companyNo": "GS2302231323386950",
+              "company_license": "91120222MA06KMPU67",
+              "company_name": "北京泓源广诚国际商贸有限公司",
+              "invoice_title": "北京泓源广诚国际商贸有限公司"
+            },
+            {
+              "companyNo": "GS2302231311448895",
+              "company_license": "91120116MA073LUY6M",
+              "company_name": "开乾国际商贸(天津)有限公司",
+              "invoice_title": "开乾国际商贸(天津)有限公司"
+            },
+            {
+              "companyNo": "GS2203161855277894",
+              "company_license": "91110113MA004JNJ28",
+              "company_name": "北京万宇恒通国际科贸有限公司",
+              "invoice_title": "北京万宇恒通国际科贸有限公司"
+            }
+          ]
+
+          this.licenseSet = companies
 
           if (code === 0) {
             this.companyList.forEach(item => {
-              const current = companies.list.find(({ companyNo }) => companyNo == item.companyCode)
+              const current = companies.find(({ companyNo }) => companyNo == item.companyCode)
               item.company_license = current?.company_license
             })
           }

+ 4 - 3
src/views/invoiceInOut/clientC/components/NotOrderImportModal/index.vue

@@ -21,7 +21,7 @@ const emit = defineEmits(["refresh"]);
 const tableData = ref([]);
 const loading = ref(false);
 
-const errorState = ref({ visible: false, list: [] })
+const errorState = ref({ visible: false, list: [], title: '' })
 const headerState = ref({ visible: false, importColumns: [], columns: [] })
 
 const visible = useVModel(props, 'visible')
@@ -122,9 +122,10 @@ const handleSubmit = async () => {
     const { code, message, data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
       errorState.value.list = _d
+      errorState.value.title = message
       return
     }
 
@@ -174,7 +175,7 @@ const cancel = () => {
     <ErrorDialog 
       v-model:visible="errorState.visible" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
+      :title="errorState.title" 
     />
 
     <ImportTableColumn 

+ 5 - 3
src/views/invoiceInOut/clientC/components/OrderImportModal/index.vue

@@ -25,7 +25,8 @@ const responseHandle = useResponseHandle();
 
 const errorState = ref({
   visible: false,
-  list: []
+  list: [],
+  title: ''
 })
 
 const Uploadsuccess = ({ results, header }) => {
@@ -121,9 +122,10 @@ const handleSubmit = async () => {
     const { code, message, data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
       errorState.value.list = _d
+      errorState.value.title = message
       return
     }
 
@@ -175,7 +177,7 @@ const cancel = () => {
     <ErrorDialog 
       v-model:visible="errorState.visible" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
+      :title="errorState.title" 
     />
     
     <ImportTableColumn 

+ 5 - 4
src/views/invoiceInOut/inManager/components/NotOrderImportModal/index.vue

@@ -24,7 +24,7 @@ const { getCurrentLicense } = useCompany()
 const visible = useVModel(props, 'visible')
 const responseHandle = useResponseHandle();
 
-const errorState = ref({ visible: false, list: [] })
+const errorState = ref({ visible: false, list: [], title: '' })
 const headerState = ref({ visible: false, importColumns: [], columns: [] })
 
 const Uploadsuccess = ({ results, header }) => {
@@ -143,8 +143,9 @@ const handleSubmit = async () => {
     const { code, message,data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
+      errorState.value.title = message
       errorState.value.list = _d
       return
     }
@@ -194,9 +195,9 @@ const cancel = () => {
     </div>
 
     <ErrorDialog 
-      v-model:visible="errorState.visible" 
+      v-model:visible="errorState.visible"
+      :title="errorState.title" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
     />
     
     <ImportTableColumn 

+ 4 - 3
src/views/invoiceInOut/inManager/components/OrderImportModal/index.vue

@@ -28,7 +28,7 @@ const props = defineProps<{ visible: boolean }>()
 const visible = useVModel(props, 'visible')
 const responseHandle = useResponseHandle();
 
-const errorState = ref({ visible: false, list: [] })
+const errorState = ref({ visible: false, list: [], title: '' })
 const headerState = ref({ visible: false, importColumns: [], columns: [] })
 
 const Uploadsuccess = ({ results, header }) => {
@@ -131,9 +131,10 @@ const handleSubmit = async () => {
     const { code, message,data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
       errorState.value.list = _d
+      errorState.value.title = message
       return
     }
 
@@ -184,7 +185,7 @@ const cancel = () => {
     <ErrorDialog 
       v-model:visible="errorState.visible" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
+      :title="errorState.title" 
     />
 
     <ImportTableColumn 

+ 4 - 3
src/views/invoiceInOut/outManager/components/NotOrderImportModal/index.vue

@@ -25,7 +25,7 @@ const { getCurrentLicense } = useCompany()
 const visible = useVModel(props, 'visible')
 const responseHandle = useResponseHandle();
 
-const errorState = ref({ visible: false, list: [] })
+const errorState = ref({ visible: false, list: [], title: '' })
 const headerState = ref({ visible: false, importColumns: [], columns: [] })
 
 const Uploadsuccess = ({ results, header }) => {
@@ -145,9 +145,10 @@ const handleSubmit = async () => {
     const { code, message,data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
       errorState.value.list = _d
+      errorState.value.title = message
       return
     }
 
@@ -198,7 +199,7 @@ const cancel = () => {
     <ErrorDialog 
       v-model:visible="errorState.visible" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
+      :title="errorState.title" 
     />
 
     <ImportTableColumn 

+ 8 - 10
src/views/invoiceInOut/outManager/components/OrderImportModal/index.vue

@@ -25,7 +25,7 @@ const { getCurrentLicense } = useCompany()
 const visible = useVModel(props, 'visible')
 const responseHandle = useResponseHandle();
 
-const errorState = ref({ visible: false, list: [] })
+const errorState = ref({ visible: false, list: [], title: '' })
 const headerState = ref({ visible: false, importColumns: [], columns: [] })
 
 
@@ -129,9 +129,10 @@ const handleSubmit = async () => {
     const { code, message,data: _d } = await httpAdd({ list });
     loading.value = false;
 
-    if (code == 1004 && !_d) {
+    if (code == 1004 && _d) {
       errorState.value.visible = true
       errorState.value.list = _d
+      errorState.value.title = message
       return
     }
 
@@ -181,15 +182,12 @@ const cancel = () => {
 
     <ErrorDialog 
       v-model:visible="errorState.visible" 
+      :title="errorState.title" 
       :list="errorState.list" 
-      :title="'数据校验不通过'" 
-    />
-
-    <ImportTableColumn 
-      v-model:visible="headerState.visible" 
-      :import-columns="headerState.importColumns"
-      :columns="headerState.columns" 
-    />
+      />
+
+    <ImportTableColumn v-model:visible="headerState.visible" :import-columns="headerState.importColumns"
+      :columns="headerState.columns" />
   </ElDialog>
 </template>
 

+ 5 - 0
src/views/invoiceInOut/summary/config/content.config.ts

@@ -34,6 +34,11 @@ const columns = [
       })
     }
   },
+  {
+    label: "备注",
+    width: 150,
+    prop: 'remark'
+  },
   {
     label: "封装操作人",
     prop: "apply_name",

+ 61 - 41
src/views/invoiceInOut/summary/index.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { usePageSearch, type PageHooks, type PageEvents } from "/@/hooks/page";
-import { ElButton, ElMessage, ElMessageBox, ElTooltip } from "element-plus";
+import { ElButton, ElDialog, ElInput, ElMessage, ElMessageBox, ElTooltip } from "element-plus";
 import { useRenderIcon } from "/@/components/ReIcon/src/hooks";
 import contentConfig from "./config/content.config";
 import searchConfig from "./config/search.config";
@@ -16,6 +16,10 @@ const contentRef = ref(null)
 
 const { isSuperUser } = useUserInfo()
 
+const remark = ref('')
+const visible = ref(false)
+const _id = ref('')
+
 // 使用页面搜索钩子
 const hooks: PageHooks = {
   pageSearchHook: () => usePageSearch(
@@ -42,6 +46,11 @@ async function handleStatusChange(id, status) {
       showCancelButton: true
     });
 
+    if(status == '3'){
+      visible.value = true
+      _id.value = id
+      return
+    }
 
     const result = await httpFZStatus({id, status})
 
@@ -52,6 +61,28 @@ async function handleStatusChange(id, status) {
     }
 
 
+  } catch (err) {
+    console.error("状态变更失败:", err);
+  }
+}
+
+async function handleStatusChangeNo() {
+  try {
+
+    if(remark.value.trim().length === 0){
+      ElMessage.warning('请输入驳回备注')
+      return
+    }
+
+    const result = await httpFZStatus({ id: _id.value, status:'3', remark: remark.value })
+    if (result.code == 0) {
+      contentRef.value?.onSearch()
+      visible.value = false
+    } else {
+      ElMessage.warning(result.message)
+    }
+
+
   } catch (err) {
     console.error("状态变更失败:", err);
   }
@@ -60,53 +91,42 @@ async function handleStatusChange(id, status) {
 
 <template>
   <PageAuth :pageName="PageName">
-    <PageContainer
-      :hooks="hooks"
-      :events="events"
-      :searchConfig="searchConfig"
-      :contentConfig="contentConfig"
-      :get-content-ref="ref => contentRef = ref"
-    >
+    <PageContainer :hooks="hooks" :events="events" :searchConfig="searchConfig" :contentConfig="contentConfig"
+      :get-content-ref="ref => contentRef = ref">
       <template #content_action="row">
-        <ElTooltip content="审批通过" placement="top"  v-if="row.status == '1' && !isSuperUser">
-          <ElButton
-            link
-            size="small"
-            type="primary"
-            @click="handleStatusChange(row.id, '2')"
-            :icon="useRenderIcon('checkbox-circle-line')"
-          />
-        </ElTooltip>
-        
-        <ElTooltip content="改为未封账" placement="top" v-if="row.status == '1' && !isSuperUser">
-          <ElButton
-            link
-            size="small"
-            type="primary"
-            @click="handleStatusChange(row.id, '0')"
-            :icon="useRenderIcon('close-circle-line')"
-          />
+        <ElTooltip content="审批通过" placement="top" v-if="row.status == '1' && !isSuperUser">
+          <ElButton link size="small" type="primary" @click="handleStatusChange(row.id, '2')"
+            :icon="useRenderIcon('checkbox-circle-line')" />
         </ElTooltip>
 
-        <ElTooltip content="解除封账" placement="top"  v-if="row.status == '2' && !isSuperUser">
-          <ElButton
-            link
-            size="small"
-            type="primary"
-            @click="handleStatusChange(row.id, '0')"
-            :icon="useRenderIcon('link')"
-          />
+        <ElTooltip content="改为未封账" placement="top" v-if="row.status == '2' && !isSuperUser">
+          <ElButton link size="small" type="primary" @click="handleStatusChange(row.id, '0')"
+            :icon="useRenderIcon('close-circle-line')" />
         </ElTooltip>
+
+        <!-- <ElTooltip content="解除封账" placement="top" v-if="row.status == '2' && !isSuperUser">
+          <ElButton link size="small" type="primary" @click="handleStatusChange(row.id, '0')"
+            :icon="useRenderIcon('link')" />
+        </ElTooltip> -->
+
         <ElTooltip content="改为待审批" placement="top" v-if="row.status == '0' && !isSuperUser">
-          <ElButton
-            link
-            size="small"
-            type="primary"
-            @click="handleStatusChange(row.id, '1')"
-            :icon="useRenderIcon('compass')"
-          />
+          <ElButton link size="small" type="primary" @click="handleStatusChange(row.id, '1')"
+            :icon="useRenderIcon('compass')" />
+        </ElTooltip>
+
+        <ElTooltip content="审核驳回" placement="top" v-if="row.status == '2' && !isSuperUser">
+          <ElButton link size="small" type="primary" @click="handleStatusChange(row.id, '3')"
+            :icon="useRenderIcon('close')" />
         </ElTooltip>
       </template>
     </PageContainer>
+
+    <ElDialog title="驳回备注" center  v-model="visible" @close="remark = '';_id = ''">
+      <ElInput type="textarea" v-model="remark" placeholder="驳回备注" />
+
+      <div class="w-full mt-[10px] flex justify-end">
+        <ElButton type="primary" @click="handleStatusChangeNo">保存</ElButton>
+      </div>
+    </ElDialog>
   </PageAuth>
 </template>

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini