snow 6 ماه پیش
والد
کامیت
dab4599028
100فایلهای تغییر یافته به همراه22 افزوده شده و 190 حذف شده
  1. 10 9
      .env.development
  2. 1 0
      .env.v3_sit
  3. BIN
      dist-zip/build.zip
  4. 0 4
      dist/assets/Bar.abed6d.js
  5. 0 1
      dist/assets/Infinite.0286d4.js
  6. 0 4
      dist/assets/Line.1461d1.js
  7. 0 4
      dist/assets/Pie.a53dbe.js
  8. 1 5
      dist/assets/_inv-dialog.61297b.js
  9. 0 1
      dist/assets/action-table.9ef6ef.js
  10. 0 1
      dist/assets/add-edit-form.38cac2.js
  11. 0 1
      dist/assets/add-edit-form.485549.js
  12. 0 1
      dist/assets/add-edit-form.6e60ef.js
  13. 0 1
      dist/assets/add-edit-form.c30472.js
  14. 0 1
      dist/assets/addEdit.5a2986.js
  15. 0 1
      dist/assets/addEdit.67954a.js
  16. 0 1
      dist/assets/addEdit.6c2191.js
  17. 0 1
      dist/assets/addEdit.80b781.js
  18. 0 1
      dist/assets/addEdit.96a5e5.js
  19. 0 1
      dist/assets/addEdit.9c9811.js
  20. 0 4
      dist/assets/anchor.f2e092.js
  21. 0 1
      dist/assets/approval-modal.7f0117.js
  22. 0 1
      dist/assets/approval-pending.1bac4d.js
  23. 0 1
      dist/assets/approval-pending.6fb893.js
  24. 0 1
      dist/assets/approval-pending.962f75.js
  25. 0 1
      dist/assets/approval-pending.b2da74.js
  26. 0 4
      dist/assets/approval-pending.de24cb.js
  27. 0 1
      dist/assets/back-modal.65d106.js
  28. 0 1
      dist/assets/basic-descriptions.e3d0a03f.js
  29. 0 1
      dist/assets/basic-descriptions.f09bf70b.css
  30. 0 0
      dist/assets/basic-settings.3b21a5.js
  31. 0 0
      dist/assets/basic-settings.66dfc7.js
  32. 0 1
      dist/assets/basic-settings.bed4a8.js
  33. 0 0
      dist/assets/basic-settings.ff03e0.js
  34. 1 2
      dist/assets/batch.db09b3.js
  35. 0 1
      dist/assets/batchImportSendOrder.57678a.js
  36. 0 1
      dist/assets/batchImportSendOrder.e1d77d.js
  37. 0 1
      dist/assets/calc.850c7422.js
  38. 1 5
      dist/assets/capital-modal.336c9e.js
  39. 0 1
      dist/assets/capital-modal.38d648.js
  40. 0 1
      dist/assets/capital-modal.54011e.js
  41. 0 1
      dist/assets/capital-modal.79e9d5.js
  42. 0 1
      dist/assets/capital-modal.956795.js
  43. 0 4
      dist/assets/category.08866b.js
  44. 1 2
      dist/assets/cg.60c481.js
  45. 1 2
      dist/assets/cg.6b034f.js
  46. 0 1
      dist/assets/choose-form.028f8c.js
  47. 0 3
      dist/assets/choose-form.2e5c02.js
  48. 0 3
      dist/assets/choose-form.598e00.js
  49. 1 9
      dist/assets/choose-form.5a1521.js
  50. 0 1
      dist/assets/choose-form.621180.js
  51. 0 1
      dist/assets/choose-form.62b615.js
  52. 1 9
      dist/assets/choose-form.99f4c6.js
  53. 1 5
      dist/assets/choose-form.d0293d.js
  54. 0 1
      dist/assets/choose-form.e0abf5.js
  55. 0 1
      dist/assets/choose-form.e81208.js
  56. 1 5
      dist/assets/choose-form.ef9901.js
  57. 0 3
      dist/assets/choose-form.fea1e1.js
  58. 0 1
      dist/assets/choose-modal.01dd1a.js
  59. 0 1
      dist/assets/choose-modal.27bc28.js
  60. 0 1
      dist/assets/choose-modal.2c681d.js
  61. 0 1
      dist/assets/choose-modal.337b8f.js
  62. 0 1
      dist/assets/choose-modal.4a2280.js
  63. 0 1
      dist/assets/choose-modal.4b621b.js
  64. 0 1
      dist/assets/choose-modal.5bc1b1.js
  65. 0 1
      dist/assets/choose-modal.5d6dff.js
  66. 0 1
      dist/assets/choose-modal.6edbce.js
  67. 0 1
      dist/assets/choose-modal.6f81f8.js
  68. 0 1
      dist/assets/choose-modal.7bed6f.js
  69. 0 1
      dist/assets/choose-modal.8cf4f1.js
  70. 0 1
      dist/assets/choose-modal.b3e4d7.js
  71. 0 1
      dist/assets/choose-modal.b88fac.js
  72. 0 1
      dist/assets/choose-modal.c20ad1.js
  73. 0 1
      dist/assets/choose-modal.c90b8a.js
  74. 0 1
      dist/assets/choose-modal.cab700.js
  75. 0 1
      dist/assets/choose-modal.d0cd3b.js
  76. 0 1
      dist/assets/choose-modal.ddbce7.js
  77. 0 1
      dist/assets/choose-modal.e17140.js
  78. 0 1
      dist/assets/choose-modal.e2b61d.js
  79. 0 1
      dist/assets/choose-modal.e43751.js
  80. 0 1
      dist/assets/choose-modal.e800d4.js
  81. 0 1
      dist/assets/choose-modal.f78191.js
  82. 1 5
      dist/assets/claim.97cd74.js
  83. 0 1
      dist/assets/columnRenderHelper.744e85f5.js
  84. 0 0
      dist/assets/columnRenderHelper.a9b8ca6f.js
  85. 0 4
      dist/assets/columns.172b29.js
  86. 0 1
      dist/assets/columns.17ba95.js
  87. 0 1
      dist/assets/columns.36e379.js
  88. 0 4
      dist/assets/columns.40f83e.js
  89. 0 4
      dist/assets/columns.45398b.js
  90. 0 4
      dist/assets/columns.70d8b7.js
  91. 0 1
      dist/assets/columns.88d730.js
  92. 0 4
      dist/assets/columns.bcdd2e.js
  93. 0 4
      dist/assets/columns.bcdd2e2.js
  94. 0 4
      dist/assets/columns.bcdd2e3.js
  95. 0 1
      dist/assets/columns.d95d09.js
  96. 0 1
      dist/assets/columns.d95d092.js
  97. 0 1
      dist/assets/company-modal.539dcc.js
  98. 0 1
      dist/assets/company-modal.6d484d.js
  99. 0 1
      dist/assets/company-modal.a613df.js
  100. 1 5
      dist/assets/company-select.7e2f8b.js

+ 10 - 9
.env.development

@@ -16,25 +16,26 @@ VITE_APP_ID = "ww6076e6fd4268ee31"
 # 微信开发环境基础重定向url
 REDIRECT_BASE_URL = "http://cxinv.api.caixiao365.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL1 = "http://user.api.caixiao365.com"
+VITE_PROXY_USER_REAL1 = "http://user.test241.wanyuhengtong.com"
 # 开发环境后端用户地址
-VITE_PROXY_USER_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_USER_REAL = "http://stockinv.test241.wanyuhengtong.com"
 # 开发环境后端业务地址
-VITE_PROXY_DOMAIN_REAL = "http://cxinv.api.caixiao365.com"
+VITE_PROXY_DOMAIN_REAL = "http://stockinv.test241.wanyuhengtong.com"
 
-
-VITE_WORKORDER_REAL = "http://work.api.caixiao365.com"
+VITE_WORKORDER_REAL = "http://project.test241.wanyuhengtong.com"
 
 VITE_IS_PROD = true
 
-# 跳转采销地址
-VITE_PURCHASE_URL = 'http://pin.caixiao365.com/'
-# 跳转工单地址
-VITE_GD_URL = 'http://bug.caixiao365.com/'
+# 跳转结算地址
+VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
 
 # 报表地址
 VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
 
+
 # token密钥
 VITE_SECRET_KEY = 'key123'
 
+
+# 跳转工单地址
+VITE_GD_URL = 'http//bugweb.test241.wanyuhengtong.com/'

+ 1 - 0
.env.v3_sit

@@ -32,6 +32,7 @@ VITE_PURCHASE_URL = 'http://webstock3.test241.wanyuhengtong.com/'
 # 报表地址
 VITE_DASHBOARD_URL = 'http://web.report.caixiao365.com/'
 
+
 # token密钥
 VITE_SECRET_KEY = 'key123'
 

BIN
dist-zip/build.zip


+ 0 - 4
dist/assets/Bar.abed6d.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as s,d as r,w as o,a$ as i,o as n,c}from"./index.js";const l=r({__name:"Bar",setup(p){const e=o(null),{setOptions:t}=i(e);return t({tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},grid:{bottom:"20%",height:"68%",containLabel:!0},xAxis:[{type:"category",axisTick:{alignWithLabel:!0},axisLabel:{interval:0},data:["open_issues","forks","watchers","star"]}],yAxis:[{type:"value"}],series:[{name:"GitHub\u4FE1\u606F",type:"bar",data:[3,204,1079,1079]}]},{name:"click",callback:a=>{}}),(a,u)=>(n(),c("div",{ref_key:"barChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var f=s(l,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Bar.vue"]]);export{f as default};
-=======
-import{_ as s,d as r,w as o,b1 as i,o as n,c}from"./index.js";const l=r({__name:"Bar",setup(p){const e=o(null),{setOptions:t}=i(e);return t({tooltip:{trigger:"axis",axisPointer:{type:"shadow"}},grid:{bottom:"20%",height:"68%",containLabel:!0},xAxis:[{type:"category",axisTick:{alignWithLabel:!0},axisLabel:{interval:0},data:["open_issues","forks","watchers","star"]}],yAxis:[{type:"value"}],series:[{name:"GitHub\u4FE1\u606F",type:"bar",data:[3,204,1079,1079]}]},{name:"click",callback:a=>{}}),(a,u)=>(n(),c("div",{ref_key:"barChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var f=s(l,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Bar.vue"]]);export{f as default};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/Infinite.0286d4.js


+ 0 - 4
dist/assets/Line.1461d1.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as a,d as r,w as i,a$ as n,o,c as l}from"./index.js";const c=r({__name:"Line",setup(p){const e=i(null),{setOptions:t}=n(e);return t({grid:{bottom:"20%",height:"68%",containLabel:!0},tooltip:{trigger:"item"},xAxis:{type:"category",axisLabel:{interval:0},data:["open_issues","forks","watchers","star"]},yAxis:{type:"value"},series:[{data:[3,204,1079,1079],type:"line",areaStyle:{}}]},{name:"click",callback:s=>{}}),(s,_)=>(o(),l("div",{ref_key:"lineChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var m=a(c,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Line.vue"]]);export{m as default};
-=======
-import{_ as a,d as r,w as i,b1 as n,o,c as l}from"./index.js";const c=r({__name:"Line",setup(p){const e=i(null),{setOptions:t}=n(e);return t({grid:{bottom:"20%",height:"68%",containLabel:!0},tooltip:{trigger:"item"},xAxis:{type:"category",axisLabel:{interval:0},data:["open_issues","forks","watchers","star"]},yAxis:{type:"value"},series:[{data:[3,204,1079,1079],type:"line",areaStyle:{}}]},{name:"click",callback:s=>{}}),(s,_)=>(o(),l("div",{ref_key:"lineChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var m=a(c,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Line.vue"]]);export{m as default};
->>>>>>> v3.0

+ 0 - 4
dist/assets/Pie.a53dbe.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as s,d as r,w as o,a$ as i,o as n,c as l}from"./index.js";const c=r({__name:"Pie",setup(p){const e=o(null),{setOptions:t}=i(e);return t({tooltip:{trigger:"item"},legend:{orient:"vertical",right:!0},series:[{name:"Github\u4FE1\u606F",type:"pie",radius:"60%",center:["40%","50%"],data:[{value:1079,name:"watchers"},{value:1079,name:"star"},{value:204,name:"forks"},{value:3,name:"open_issues"}],emphasis:{itemStyle:{shadowBlur:10,shadowOffsetX:0,shadowColor:"rgba(0, 0, 0, 0.5)"}}}]},{name:"click",callback:a=>{}},{type:"zrender",name:"click",callback:a=>{}}),(a,m)=>(n(),l("div",{ref_key:"pieChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var _=s(c,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Pie.vue"]]);export{_ as default};
-=======
-import{_ as s,d as r,w as o,b1 as i,o as n,c as l}from"./index.js";const c=r({__name:"Pie",setup(p){const e=o(null),{setOptions:t}=i(e);return t({tooltip:{trigger:"item"},legend:{orient:"vertical",right:!0},series:[{name:"Github\u4FE1\u606F",type:"pie",radius:"60%",center:["40%","50%"],data:[{value:1079,name:"watchers"},{value:1079,name:"star"},{value:204,name:"forks"},{value:3,name:"open_issues"}],emphasis:{itemStyle:{shadowBlur:10,shadowOffsetX:0,shadowColor:"rgba(0, 0, 0, 0.5)"}}}]},{name:"click",callback:a=>{}},{type:"zrender",name:"click",callback:a=>{}}),(a,m)=>(n(),l("div",{ref_key:"pieChartRef",ref:e,style:{width:"100%",height:"35vh"}},null,512))}});var _=s(c,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/welcome/components/Pie.vue"]]);export{_ as default};
->>>>>>> v3.0

+ 1 - 5
dist/assets/_inv-dialog.61297b.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_ as i,d as u,w as s,r as p,o as v,G as c,C as m,j as _,l as d}from"./index.js";import{I as f}from"./index.a08cbd18.js";import"./status.1f2aea58.js";const g=u({__name:"_inv-dialog",setup(k,{expose:n}){const e=s(!1),o=s("");return n({onDisplay({YFPHM:a}){o.value=a,e.value=!0}}),(a,l)=>{const t=p("el-dialog");return v(),c(t,{modelValue:e.value,"onUpdate:modelValue":l[0]||(l[0]=r=>e.value=r),width:"1040px","close-on-click-modal":!1},{default:m(()=>[_(d(f),{"inv-number":o.value,type:"sale"},null,8,["inv-number"])]),_:1},8,["modelValue"])}}});var w=i(g,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/redInk/components/_inv-dialog.vue"]]);export{w as default};
-=======
-import{_ as i,d as u,w as s,r as p,o as m,G as v,C as c,j as _,l as d}from"./index.js";import{I as f}from"./index.11b5f34a.js";import"./invoice.3ef950c2.js";import"./status.642bba24.js";const g=u({__name:"_inv-dialog",setup(k,{expose:n}){const e=s(!1),o=s("");return n({onDisplay({YFPHM:a}){o.value=a,e.value=!0}}),(a,l)=>{const t=p("el-dialog");return m(),v(t,{modelValue:e.value,"onUpdate:modelValue":l[0]||(l[0]=r=>e.value=r),width:"1040px","close-on-click-modal":!1},{default:c(()=>[_(d(f),{"inv-number":o.value,type:"sale"},null,8,["inv-number"])]),_:1},8,["modelValue"])}}});var I=i(g,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/redInk/components/_inv-dialog.vue"]]);export{I as default};
->>>>>>> v3.0
+import{_ as i,d as u,w as s,r as p,o as v,G as c,C as m,j as _,l as d}from"./index.js";import{I as f}from"./index.753a81c0.js";import"./status.1f2aea58.js";const g=u({__name:"_inv-dialog",setup(k,{expose:n}){const e=s(!1),o=s("");return n({onDisplay({YFPHM:a}){o.value=a,e.value=!0}}),(a,l)=>{const t=p("el-dialog");return v(),c(t,{modelValue:e.value,"onUpdate:modelValue":l[0]||(l[0]=r=>e.value=r),width:"1040px","close-on-click-modal":!1},{default:m(()=>[_(d(f),{"inv-number":o.value,type:"sale"},null,8,["inv-number"])]),_:1},8,["modelValue"])}}});var w=i(g,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/redInk/components/_inv-dialog.vue"]]);export{w as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/action-table.9ef6ef.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/add-edit-form.38cac2.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/add-edit-form.485549.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/add-edit-form.6e60ef.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/add-edit-form.c30472.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.5a2986.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.67954a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.6c2191.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.80b781.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.96a5e5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/addEdit.9c9811.js


+ 0 - 4
dist/assets/anchor.f2e092.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as x,d as g,w as k,cS as y,x as b,o as l,c as u,F as C,D as B,B as T,L as D}from"./index.js";const E={fixed:"","p-5":"","text-sm":"","font-bold":""},w=["onClick"],N=g({__name:"anchor",props:{map:{type:Map,required:!0}},setup(i){const r=i,n=k(null),{y:o}=y(n);b(()=>{n.value=document.getElementsByClassName("el-scrollbar__wrap")[1]});function d(s){const{top:e}=r.map.get(s);n.value.scrollTo({top:Number(e)})}function m(s){let e=0,t=0;const a=[...r.map.entries()],{top:v,index:c}=r.map.get(s);return a.forEach(([S,{index:p,top:_}])=>{const f=c+1===p,h=c-1===p;f&&(e=_),h&&(t=_)}),c===0?o.value>=0&&o.value<e:o.value>t&&o.value<e&&o.value>=v}return(s,e)=>(l(),u("ul",E,[(l(!0),u(C,null,B(i.map.entries(),([t],a)=>(l(),u("li",{class:T(["hover:text-blue hover:bg-#f7f7f7 cursor-pointer duration-200ms p-1.5 m-1 rounded",{"is-active":m(t)}]),onClick:()=>d(t),key:a},D(t),11,w))),128))]))}});var F=x(N,[["__scopeId","data-v-5d3b9dd1"],["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/search/standBook/components/anchor.vue"]]);export{F as default};
-=======
-import{_ as x,d as g,w as k,cF as y,x as b,o as l,c as u,F as C,D as B,B as T,L as D}from"./index.js";const E={fixed:"","p-5":"","text-sm":"","font-bold":""},w=["onClick"],F=g({__name:"anchor",props:{map:{type:Map,required:!0}},setup(i){const r=i,n=k(null),{y:o}=y(n);b(()=>{n.value=document.getElementsByClassName("el-scrollbar__wrap")[1]});function d(s){const{top:e}=r.map.get(s);n.value.scrollTo({top:Number(e)})}function m(s){let e=0,t=0;const a=[...r.map.entries()],{top:v,index:c}=r.map.get(s);return a.forEach(([N,{index:p,top:_}])=>{const f=c+1===p,h=c-1===p;f&&(e=_),h&&(t=_)}),c===0?o.value>=0&&o.value<e:o.value>t&&o.value<e&&o.value>=v}return(s,e)=>(l(),u("ul",E,[(l(!0),u(C,null,B(i.map.entries(),([t],a)=>(l(),u("li",{class:T(["hover:text-blue hover:bg-#f7f7f7 cursor-pointer duration-200ms p-1.5 m-1 rounded",{"is-active":m(t)}]),onClick:()=>d(t),key:a},D(t),11,w))),128))]))}});var I=x(F,[["__scopeId","data-v-5d3b9dd1"],["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/search/standBook/components/anchor.vue"]]);export{I as default};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/approval-modal.7f0117.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/approval-pending.1bac4d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/approval-pending.6fb893.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/approval-pending.962f75.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/approval-pending.b2da74.js


+ 0 - 4
dist/assets/approval-pending.de24cb.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as B,d as E,Z as d,ag as V,w as b,a0 as F,r as o,o as i,G as _,C as a,j as e,l as c,a as D,M as h,aQ as q}from"./index.js";import A from"./img-upload.30ca1d.js";const U=E({__name:"approval-pending",props:{returnType:{type:String,required:!0}},emits:["changeStatus"],setup(f,{emit:g}){const v=f,t=d({return_img:"",status:"",remark:""}),n=d({return_img:[{required:!0,trigger:"change",message:"\u8BF7\u4E0A\u4F20\u9000\u6B3E\u56DE\u6267"}],status:[{required:!0,trigger:"change",message:"\u9009\u62E9\u5BA1\u6838\u72B6\u6001"}],remark:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u5907\u6CE8"}]}),x=V(()=>v.returnType!=="2"),s=b(null),k=()=>{s.value.validate(p=>p&&g("changeStatus",t))};return F(()=>{n.remark[0].required=t.status==="2"}),(p,r)=>{const m=o("el-option"),y=o("el-select"),l=o("el-form-item"),C=o("el-input"),w=o("el-button");return i(),_(c(q),{ref_key:"formRef",ref:s,"label-width":"100px",size:"small",model:t,rules:n},{default:a(()=>[e(l,{label:"\u5BA1\u6279\u72B6\u6001",prop:"status","w-400px":""},{default:a(()=>[e(y,{"w-400px":"",modelValue:t.status,"onUpdate:modelValue":r[0]||(r[0]=u=>t.status=u)},{default:a(()=>[e(m,{label:"\u901A\u8FC7",value:"1"}),e(m,{label:"\u4E0D\u901A\u8FC7",value:"2"})]),_:1},8,["modelValue"])]),_:1}),c(x)?(i(),_(l,{key:0,label:"\u9000\u6B3E\u56DE\u6267",prop:"return_img","w-480px":""},{default:a(()=>[e(A,{onChange:r[1]||(r[1]=u=>t.return_img=u)})]),_:1})):D("v-if",!0),e(l,{label:"\u5907\u6CE8",prop:"remark","w-400px":""},{default:a(()=>[e(C,{type:"textarea",modelValue:t.remark,"onUpdate:modelValue":r[2]||(r[2]=u=>t.remark=u)},null,8,["modelValue"])]),_:1}),e(l,{"w-full":"",flex:"","justify-end":""},{default:a(()=>[e(w,{type:"primary",onClick:k},{default:a(()=>[h("\u4FDD\u5B58")]),_:1})]),_:1})]),_:1},8,["model","rules"])}}});var I=B(U,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/refund/components/approval-process/approval-pending.vue"]]);export{I as default};
-=======
-import{_ as B,d as E,Z as d,ag as V,w as b,a0 as F,r as o,o as i,G as _,C as a,j as e,l as c,a as D,M as h,aR as q}from"./index.js";import A from"./img-upload.30ca1d.js";const U=E({__name:"approval-pending",props:{returnType:{type:String,required:!0}},emits:["changeStatus"],setup(f,{emit:g}){const v=f,t=d({return_img:"",status:"",remark:""}),n=d({return_img:[{required:!0,trigger:"change",message:"\u8BF7\u4E0A\u4F20\u9000\u6B3E\u56DE\u6267"}],status:[{required:!0,trigger:"change",message:"\u9009\u62E9\u5BA1\u6838\u72B6\u6001"}],remark:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u5907\u6CE8"}]}),x=V(()=>v.returnType!=="2"),s=b(null),k=()=>{s.value.validate(p=>p&&g("changeStatus",t))};return F(()=>{n.remark[0].required=t.status==="2"}),(p,r)=>{const m=o("el-option"),y=o("el-select"),l=o("el-form-item"),C=o("el-input"),w=o("el-button");return i(),_(c(q),{ref_key:"formRef",ref:s,"label-width":"100px",size:"small",model:t,rules:n},{default:a(()=>[e(l,{label:"\u5BA1\u6279\u72B6\u6001",prop:"status","w-400px":""},{default:a(()=>[e(y,{"w-400px":"",modelValue:t.status,"onUpdate:modelValue":r[0]||(r[0]=u=>t.status=u)},{default:a(()=>[e(m,{label:"\u901A\u8FC7",value:"1"}),e(m,{label:"\u4E0D\u901A\u8FC7",value:"2"})]),_:1},8,["modelValue"])]),_:1}),c(x)?(i(),_(l,{key:0,label:"\u9000\u6B3E\u56DE\u6267",prop:"return_img","w-480px":""},{default:a(()=>[e(A,{onChange:r[1]||(r[1]=u=>t.return_img=u)})]),_:1})):D("v-if",!0),e(l,{label:"\u5907\u6CE8",prop:"remark","w-400px":""},{default:a(()=>[e(C,{type:"textarea",modelValue:t.remark,"onUpdate:modelValue":r[2]||(r[2]=u=>t.remark=u)},null,8,["modelValue"])]),_:1}),e(l,{"w-full":"",flex:"","justify-end":""},{default:a(()=>[e(w,{type:"primary",onClick:k},{default:a(()=>[h("\u4FDD\u5B58")]),_:1})]),_:1})]),_:1},8,["model","rules"])}}});var j=B(U,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/refund/components/approval-process/approval-pending.vue"]]);export{j as default};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/back-modal.65d106.js


+ 0 - 1
dist/assets/basic-descriptions.e3d0a03f.js

@@ -1 +0,0 @@
-import{d,j as t,aO as p,aP as c,r as m,J as b,M as f}from"./index.js";const y={title:{type:String},colNumber:{type:Number,default:24},columns:{type:Array},data:{type:Object},labelWidth:{type:String},show:{type:Boolean,default:!0}};const h=d({name:"BasicDescriptions",props:y,setup(l,{slots:s}){return()=>{const{title:n,colNumber:r,columns:i,data:a,labelWidth:o,show:u}=l;return u?t(c,{title:n,border:!0,column:r,size:"small"},{default:()=>[i.map(e=>t(p,{label:e.label,key:e.field,span:e.span?e.span:6},{default:()=>[t("div",{class:"col-item"},[t("p",{class:"col-label",style:{width:o+"px"}},[e.label]),t("p",{class:"col-value"},[e.render?e.render(a[e.field],a):a[e.field]])])]})),s.custom&&s.custom(l.data)]}):t("div",{style:{display:"flex",width:"100%",justifyContent:"center",flexDirection:"column",alignItems:"center"}},[t(m("el-button"),{text:!0,size:"large",icon:b("warning-filled"),disabled:!0},null),t("span",null,[f("\u6682\u65E0\u6570\u636E")])])}}});export{h as B};

+ 0 - 1
dist/assets/basic-descriptions.f09bf70b.css

@@ -1 +0,0 @@
-.description-label{white-space:nowrap}.col-item{display:flex;align-items:center;justify-content:center;height:100%}.col-item p{border:1px solid #ebeef5;min-height:32px;margin-bottom:-1px;margin-left:-1px;height:100%;font-size:14px!important}.col-item .col-label{background-color:#f5f7fa;text-align:right;padding-right:5px;min-width:100px;height:100%;font-size:12px!important;display:flex;align-items:center;justify-content:flex-end}.col-item .col-value{flex:1;padding-left:5px;font-size:12px!important;display:flex;align-items:center;overflow:hidden}

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/assets/basic-settings.3b21a5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/assets/basic-settings.66dfc7.js


+ 0 - 1
dist/assets/basic-settings.bed4a8.js

@@ -1 +0,0 @@
-import{_ as b,d as y,aN as B,w as k,r as c,aC as E,o as n,c as d,h as N,L as S,G as m,l as r,aO as _,H as D,M as x,j as f,C as g,a as q}from"./index.js";import V from"./procure-setting.2cb5d0.js";import"./configs.134ff9c2.js";import"./verification.611d3025.js";import"./index.b15e7ea0.js";import"./query-category.31b321.js";const w={class:"settings__content","bg-white":""},I={"mb-2":"","font-bold":""},F={key:1,"h-100px":""},P=y({__name:"basic-settings",props:{columns:{type:Array,required:!0},canChange:{type:Boolean,required:!1},backRoute:{type:String,required:!0},title:{type:String,required:!0},name:{type:String,required:!1},detail:{type:null,required:!0},pageName:{type:String,required:!0}},emits:["refresh"],setup(e,{emit:p}){const o=e,{hasPermissionWithCode:v}=B(o.pageName),l=k(["1","2"]),C=computed(()=>{let{spuCode:t=""}=o.detail||{};t=t.slice(3);const a=t.slice(0,2),s=t.slice(2,4),i=t.slice(4,6);return Number(a)<24||Number(s)<8||Number(s)===8&&Number(i)<16});return(t,a)=>{const s=c("ElCollapseItem"),i=c("ElCollapse"),h=E("loading");return n(),d("div",w,[N("h1",I,S(e.title),1),e.detail?(n(),m(r(_),{key:0,data:e.detail,columns:e.columns,"label-width":"130px","col-number":2},null,8,["data","columns"])):D((n(),d("div",F,[x("\u8BE6\u60C5\u52A0\u8F7D\u4E2D...")])),[[h,!0]]),f(i,{modelValue:l.value,"onUpdate:modelValue":a[1]||(a[1]=u=>l.value=u)},{default:g(()=>[e.detail&&(e.detail.status==="0"||e.detail.status==="1")&&r(v)("043")&&r(C)?(n(),m(s,{key:0,title:"\u5F85\u91C7\u8D2D\u8BBE\u7F6E\u7C7B\u76EE",name:"1"},{default:g(()=>[f(V,{name:e.name,detail:e.detail,columns:e.columns,"back-route":e.backRoute,"can-change":e.canChange,onRefresh:a[0]||(a[0]=u=>p("refresh"))},null,8,["name","detail","columns","back-route","can-change"])]),_:1})):q("v-if",!0)]),_:1},8,["modelValue"])])}}});var L=b(P,[["__scopeId","data-v-6a036583"],["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/supplyInvoiceSaleSettings/basic-settings.vue"]]);export{L as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/assets/basic-settings.ff03e0.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 2
dist/assets/batch.db09b3.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/batchImportSendOrder.57678a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/batchImportSendOrder.e1d77d.js


+ 0 - 1
dist/assets/calc.850c7422.js

@@ -1 +0,0 @@
-function h(t,c){let e,r,n;try{e=t.toString().split(".")[1].length}catch{e=0}try{r=c.toString().split(".")[1].length}catch{r=0}return n=Math.pow(10,Math.max(e,r)),(t*n+c*n)/n}function s(t,c){let e=0,r=0,n,i;try{e=t.toString().split(".")[1].length}catch{}try{r=c.toString().split(".")[1].length}catch{}return n=Number(t.toString().replace(".","")),i=Number(c.toString().replace(".","")),a(n/i,Math.pow(10,r-e))}function a(t,c){let e=0,r=t.toString(),n=c.toString();try{e+=r.split(".")[1].length}catch{}try{e+=n.split(".")[1].length}catch{}return Number(r.replace(".",""))*Number(n.replace(".",""))/Math.pow(10,e)}function l(t,c){let e,r,n,i;try{e=t.toString().split(".")[1].length}catch{e=0}try{r=c.toString().split(".")[1].length}catch{r=0}return n=Math.pow(10,Math.max(e,r)),i=e>=r?e:r,((t*n-c*n)/n).toFixed(i)}function u(t){return t==="NaN"||Number(t)===0?"0":t<1e3&&t>0||t<0&&t>-1e3?t:s(t,1e4).toFixed(2)+"W"}function p(t){const c=Object.keys(t[0]);return t.reduce((e,r)=>c.reduce((n,i)=>({...n,[i]:h(e[i]||0,r[i])}),{}),{})}function m(t){return t?Number(t).toFixed(2):0}export{h as a,p as c,s as d,m as f,a as m,l as s,u};

+ 1 - 5
dist/assets/capital-modal.336c9e.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_,d as f,w as v,bD as C,r as D,aC as w,o as O,G as h,C as g,H as s,j as i,l as a,aO as n}from"./index.js";import{h as x}from"./index.f4e7922b.js";import{C as y}from"./tragelog.f1c3f825.js";import{O as U,G as k}from"./sale.74fa8025.js";import"./status.1f2aea58.js";const B=f({__name:"capital-modal",setup(L,{expose:d}){const o=v(!1),{data:e,run:u,loading:t}=C({initalData:{}});return d({onDisplay(r){o.value=!0,u(x({logNo:r}))}}),(r,c)=>{const m=D("el-dialog"),l=w("loading");return O(),h(m,{modelValue:o.value,"onUpdate:modelValue":c[0]||(c[0]=p=>o.value=p),center:"",title:"\u8D44\u91D1\u8BE6\u60C5",width:"1040px","close-on-click-modal":!1},{default:g(()=>[s(i(a(n),{style:{width:"100%"},columns:a(y),data:a(e)},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(U),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(k),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]])]),_:1},8,["modelValue"])}}});var G=_(B,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalPool/components/capital-modal.vue"]]);export{G as default};
-=======
-import{_,d as f,w as v,bw as C,r as D,aC as w,o as h,G as O,C as g,H as s,j as i,l as a}from"./index.js";import{h as x}from"./index.f4976335.js";import{B as n}from"./basic-descriptions.e3d0a03f.js";import{C as y}from"./tragelog.a7949113.js";import{O as B,G as U}from"./sale.df8b0987.js";import"./tootip.ff59d76f.js";import"./status.642bba24.js";const k=f({__name:"capital-modal",setup(L,{expose:d}){const o=v(!1),{data:e,run:m,loading:t}=C({initalData:{}});return d({onDisplay(r){o.value=!0,m(x({logNo:r}))}}),(r,c)=>{const u=D("el-dialog"),l=w("loading");return h(),O(u,{modelValue:o.value,"onUpdate:modelValue":c[0]||(c[0]=p=>o.value=p),center:"",title:"\u8D44\u91D1\u8BE6\u60C5",width:"1040px","close-on-click-modal":!1},{default:g(()=>[s(i(a(n),{style:{width:"100%"},columns:a(y),data:a(e)},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(B),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(U),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]])]),_:1},8,["modelValue"])}}});var j=_(k,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalPool/components/capital-modal.vue"]]);export{j as default};
->>>>>>> v3.0
+import{_,d as f,w as v,bD as C,r as D,aC as w,o as O,G as h,C as g,H as s,j as i,l as a,aO as n}from"./index.js";import{h as x}from"./index.227f1c2c.js";import{C as y}from"./tragelog.11586760.js";import{O as U,G as k}from"./sale.ea514d9d.js";import"./status.1f2aea58.js";const B=f({__name:"capital-modal",setup(L,{expose:d}){const o=v(!1),{data:e,run:u,loading:t}=C({initalData:{}});return d({onDisplay(r){o.value=!0,u(x({logNo:r}))}}),(r,c)=>{const m=D("el-dialog"),l=w("loading");return O(),h(m,{modelValue:o.value,"onUpdate:modelValue":c[0]||(c[0]=p=>o.value=p),center:"",title:"\u8D44\u91D1\u8BE6\u60C5",width:"1040px","close-on-click-modal":!1},{default:g(()=>[s(i(a(n),{style:{width:"100%"},columns:a(y),data:a(e)},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(U),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]]),s(i(a(n),{style:{width:"100%"},columns:a(k),data:a(e)&&a(e).orderinfo?a(e).orderinfo:{}},null,8,["columns","data"]),[[l,a(t)]])]),_:1},8,["modelValue"])}}});var G=_(B,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalPool/components/capital-modal.vue"]]);export{G as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/capital-modal.38d648.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/capital-modal.54011e.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/capital-modal.79e9d5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/capital-modal.956795.js


+ 0 - 4
dist/assets/category.08866b.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{_ as n,d as u,aV as c,w as i,o as d,G as f,l as r,aq as v,cF as y,bT as _}from"./index.js";const m=u({__name:"category",props:{modelValue:{type:String,required:!0}},setup(o,{expose:l}){const e=c(o,"modelValue"),t=i(null);return l({initalData:a=>t.value.initalData(a)}),(a,s)=>(d(),f(r(_),{ref_key:"CategoryRef",ref:t,value:r(e),"onUpdate:value":s[0]||(s[0]=p=>v(e)?e.value=p:null),"is-root":"",api:r(y),style:{width:"95%"},placeholder:"\u5546\u54C1\u5206\u7C7B","request-prop":"search","response-label-prop":"search","response-val-prop":"id"},null,8,["value","api"]))}});var h=n(m,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/netOrderEnter/netOrderEntry/components/category.vue"]]);export{h as default};
-=======
-import{_ as n,d as u,aV as c,w as i,o as d,G as f,l as t,aq as v,ct as y,bM as _}from"./index.js";const m=u({__name:"category",props:{modelValue:{type:String,required:!0}},setup(o,{expose:l}){const e=c(o,"modelValue"),r=i(null);return l({initalData:a=>r.value.initalData(a)}),(a,s)=>(d(),f(t(_),{ref_key:"CategoryRef",ref:r,value:t(e),"onUpdate:value":s[0]||(s[0]=p=>v(e)?e.value=p:null),"is-root":"",api:t(y),style:{width:"95%"},placeholder:"\u5546\u54C1\u5206\u7C7B","request-prop":"search","response-label-prop":"search","response-val-prop":"id"},null,8,["value","api"]))}});var h=n(m,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/netOrderEnter/netOrderEntry/components/category.vue"]]);export{h as default};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 2
dist/assets/cg.60c481.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 1 - 2
dist/assets/cg.6b034f.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-form.028f8c.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 3
dist/assets/choose-form.2e5c02.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 3
dist/assets/choose-form.598e00.js


+ 1 - 9
dist/assets/choose-form.5a1521.js

@@ -1,15 +1,7 @@
-<<<<<<< HEAD
-import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as r,a as N,h as C,M as F,l as p,aQ as g,aZ as R}from"./index.js";import k from"./index.f6ed20.js";import V from"./choose-modal.6edbce.js";import"./orderRecord.60394497.js";import"./index.c0daa950.js";import"./index.83e81a60.js";import"./status.1f2aea58.js";import"./date-range.78e4354c.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const c=t(null),f=t(null),m=t(null),e=t({payNo:"",pay_fee:""}),d=()=>f.value.onDisplay();function _(){const{detail:u}=m.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return R.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");c.value.validate(a=>a&&i("create",p(e)))}return(u,a)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(g),{ref_key:"formRef",ref:c,model:e.value,rules:p(w)},{default:r(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:r(()=>[N(` <ReconciliationForm\r
-=======
-import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as a,a as N,h as C,M as F,l as p,aR as R,a$ as g}from"./index.js";import k from"./index.f6ed20.js";import V from"./choose-modal.6edbce.js";import"./basic-descriptions.e3d0a03f.js";import"./tootip.ff59d76f.js";import"./orderRecord.f4878a2e.js";import"./calc.850c7422.js";import"./index.2d64d02c.js";import"./index.2150e818.js";import"./status.642bba24.js";import"./date-range.298eb922.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const m=t(null),c=t(null),f=t(null),e=t({payNo:"",pay_fee:""}),d=()=>c.value.onDisplay();function _(){const{detail:u}=f.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return g.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");m.value.validate(r=>r&&i("create",p(e)))}return(u,r)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(R),{ref_key:"formRef",ref:m,model:e.value,rules:p(w)},{default:a(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:a(()=>[N(` <ReconciliationForm\r
->>>>>>> v3.0
+import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as r,a as N,h as C,M as F,l as p,aQ as g,aZ as R}from"./index.js";import k from"./index.f6ed20.js";import V from"./choose-modal.6edbce.js";import"./orderRecord.2f635960.js";import"./index.41e1c427.js";import"./index.51cd2e2b.js";import"./status.1f2aea58.js";import"./date-range.21390715.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const c=t(null),f=t(null),m=t(null),e=t({payNo:"",pay_fee:""}),d=()=>f.value.onDisplay();function _(){const{detail:u}=m.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return R.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");c.value.validate(a=>a&&i("create",p(e)))}return(u,a)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(g),{ref_key:"formRef",ref:c,model:e.value,rules:p(w)},{default:r(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:r(()=>[N(` <ReconciliationForm\r
           ref="reconciliationRef"\r
           isPurchPay\r
           :id="formData.payNo"\r
           :readonly="!!formData.payNo"\r
           @choose="handleChoose"\r
-<<<<<<< HEAD
         /> `),o(k,{ref_key:"reconciliationRef",ref:m,isPurchPay:"",payNo:e.value.payNo,readonly:!!e.value.payNo,request:"",onChoose:d},null,8,["payNo","readonly"])]),_:1}),o(l,{label:"\u4ED8\u6B3E\u91D1\u989D",prop:"pay_fee"},{default:r(()=>[o(y,{modelValue:e.value.pay_fee,"onUpdate:modelValue":a[0]||(a[0]=n=>e.value.pay_fee=n),placeholder:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"},null,8,["modelValue"])]),_:1}),o(l,null,{default:r(()=>[C("div",M,[o(D,{type:"primary",onClick:_},{default:r(()=>[F("\u4FDD\u5B58")]),_:1})])]),_:1})]),_:1},8,["model","rules"]),o(V,{ref_key:"chooseModalRef",ref:f,onChoose:a[1]||(a[1]=n=>e.value.payNo=n)},null,512)])}}});var T=E(P,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/postSupplierOrder/sendOrderPay/component/choose-form.vue"]]);export{T as default};
-=======
-        /> `),o(k,{ref_key:"reconciliationRef",ref:f,isPurchPay:"",payNo:e.value.payNo,readonly:!!e.value.payNo,request:"",onChoose:d},null,8,["payNo","readonly"])]),_:1}),o(l,{label:"\u4ED8\u6B3E\u91D1\u989D",prop:"pay_fee"},{default:a(()=>[o(y,{modelValue:e.value.pay_fee,"onUpdate:modelValue":r[0]||(r[0]=n=>e.value.pay_fee=n),placeholder:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"},null,8,["modelValue"])]),_:1}),o(l,null,{default:a(()=>[C("div",M,[o(D,{type:"primary",onClick:_},{default:a(()=>[F("\u4FDD\u5B58")]),_:1})])]),_:1})]),_:1},8,["model","rules"]),o(V,{ref_key:"chooseModalRef",ref:c,onChoose:r[1]||(r[1]=n=>e.value.payNo=n)},null,512)])}}});var H=E(P,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/postSupplierOrder/sendOrderPay/component/choose-form.vue"]]);export{H as default};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-form.621180.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-form.62b615.js


+ 1 - 9
dist/assets/choose-form.99f4c6.js

@@ -1,15 +1,7 @@
-<<<<<<< HEAD
-import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as r,a as N,h as C,M as F,l as p,aQ as g,aZ as R}from"./index.js";import k from"./index.b9ab74.js";import V from"./choose-modal.27bc28.js";import"./orderRecord.60394497.js";import"./index.c0daa950.js";import"./index.83e81a60.js";import"./status.1f2aea58.js";import"./date-range.78e4354c.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const c=t(null),f=t(null),m=t(null),e=t({payNo:"",pay_fee:""}),d=()=>f.value.onDisplay();function _(){const{detail:u}=m.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return R.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");c.value.validate(a=>a&&i("create",p(e)))}return(u,a)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(g),{ref_key:"formRef",ref:c,model:e.value,rules:p(w)},{default:r(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:r(()=>[N(` <ReconciliationForm\r
-=======
-import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as a,a as N,h as C,M as F,l as p,aR as R,a$ as g}from"./index.js";import k from"./index.b9ab74.js";import V from"./choose-modal.27bc28.js";import"./basic-descriptions.e3d0a03f.js";import"./tootip.ff59d76f.js";import"./orderRecord.f4878a2e.js";import"./calc.850c7422.js";import"./index.2d64d02c.js";import"./index.2150e818.js";import"./status.642bba24.js";import"./date-range.298eb922.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const c=t(null),m=t(null),f=t(null),e=t({payNo:"",pay_fee:""}),d=()=>m.value.onDisplay();function _(){const{detail:u}=f.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return g.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");c.value.validate(r=>r&&i("create",p(e)))}return(u,r)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(R),{ref_key:"formRef",ref:c,model:e.value,rules:p(w)},{default:a(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:a(()=>[N(` <ReconciliationForm\r
->>>>>>> v3.0
+import{_ as E,d as h,w as t,r as s,o as v,c as B,j as o,C as r,a as N,h as C,M as F,l as p,aQ as g,aZ as R}from"./index.js";import k from"./index.b9ab74.js";import V from"./choose-modal.27bc28.js";import"./orderRecord.2f635960.js";import"./index.41e1c427.js";import"./index.51cd2e2b.js";import"./status.1f2aea58.js";import"./date-range.21390715.js";const w={pay_fee:[{required:!0,trigger:"change",message:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"}],payNo:[{required:!0,trigger:"change",message:"\u8BF7\u9009\u62E9\u4ED8\u6B3E\u8BA2\u5355"}]},x={"w-full":""},M={class:"flex w-full justify-end"},P=h({__name:"choose-form",emits:["create"],setup(b,{emit:i}){const c=t(null),f=t(null),m=t(null),e=t({payNo:"",pay_fee:""}),d=()=>f.value.onDisplay();function _(){const{detail:u}=m.value;if(Number(e.value.pay_fee)>Number(u==null?void 0:u.wpay_fee))return R.error("\u4ED8\u6B3E\u91D1\u989D\u4E0D\u80FD\u8D85\u8FC7\u672A\u4ED8\u6B3E\u91D1\u989D");c.value.validate(a=>a&&i("create",p(e)))}return(u,a)=>{const l=s("ElFormItem"),y=s("ElInput"),D=s("ElButton");return v(),B("div",x,[o(p(g),{ref_key:"formRef",ref:c,model:e.value,rules:p(w)},{default:r(()=>[o(l,{label:"\u8BA2\u5355\u5BF9\u8D26",prop:"payNo"},{default:r(()=>[N(` <ReconciliationForm\r
           ref="reconciliationRef"\r
           isPurchPay\r
           :id="formData.payNo"\r
           :readonly="!!formData.payNo"\r
           @choose="handleChoose"\r
-<<<<<<< HEAD
         /> `),o(k,{ref_key:"reconciliationRef",ref:m,isPurchPay:"",payNo:e.value.payNo,readonly:!!e.value.payNo,request:"",choose:"",onChoose:d},null,8,["payNo","readonly"])]),_:1}),o(l,{label:"\u4ED8\u6B3E\u91D1\u989D",prop:"pay_fee"},{default:r(()=>[o(y,{modelValue:e.value.pay_fee,"onUpdate:modelValue":a[0]||(a[0]=n=>e.value.pay_fee=n),placeholder:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"},null,8,["modelValue"])]),_:1}),o(l,null,{default:r(()=>[C("div",M,[o(D,{type:"primary",onClick:_},{default:r(()=>[F("\u4FDD\u5B58")]),_:1})])]),_:1})]),_:1},8,["model","rules"]),o(V,{ref_key:"chooseModalRef",ref:f,onChoose:a[1]||(a[1]=n=>e.value.payNo=n)},null,512)])}}});var Z=E(P,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/supplierOrder/sendOrderPay/component/choose-form.vue"]]);export{Z as default};
-=======
-        /> `),o(k,{ref_key:"reconciliationRef",ref:f,isPurchPay:"",payNo:e.value.payNo,readonly:!!e.value.payNo,request:"",choose:"",onChoose:d},null,8,["payNo","readonly"])]),_:1}),o(l,{label:"\u4ED8\u6B3E\u91D1\u989D",prop:"pay_fee"},{default:a(()=>[o(y,{modelValue:e.value.pay_fee,"onUpdate:modelValue":r[0]||(r[0]=n=>e.value.pay_fee=n),placeholder:"\u8BF7\u8F93\u5165\u4ED8\u6B3E\u91D1\u989D"},null,8,["modelValue"])]),_:1}),o(l,null,{default:a(()=>[C("div",M,[o(D,{type:"primary",onClick:_},{default:a(()=>[F("\u4FDD\u5B58")]),_:1})])]),_:1})]),_:1},8,["model","rules"]),o(V,{ref_key:"chooseModalRef",ref:m,onChoose:r[1]||(r[1]=n=>e.value.payNo=n)},null,512)])}}});var J=E(P,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/supplierOrder/sendOrderPay/component/choose-form.vue"]]);export{J as default};
->>>>>>> v3.0

+ 1 - 5
dist/assets/choose-form.d0293d.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_ as d,d as h,W as C,aF as N,w as r,z as I,aD as R,o as T,c as w,j as u,l as c}from"./index.js";import{R as _}from"./index.d9d56667.js";import k from"./choose-modal.c90b8a.js";import"./index.83e81a60.js";import"./orderRecord.60394497.js";import"./porder.cb46c196.js";import"./status.1f2aea58.js";import"./date-range.78e4354c.js";const g={"w-full":""},D=h({__name:"choose-form",props:{platformType:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:s}){const{currentCompany:p}=C(),l=N(""),i=r(null),m=r(null),a=r({payNo:""}),y=()=>{var e;return(e=i.value)==null?void 0:e.onDisplay()},v=e=>s("getBuyer",e);return I(()=>p.value,async()=>{var t;const{data:e}=await R({name:(t=p.value)==null?void 0:t.companyName}),o=e.list[0]||{};l.value=o.code||""},{immediate:!0}),f({getOpenInvInfo:()=>{var e;return((e=m.value)==null?void 0:e.getOpenInvInfo())||{}}}),(e,o)=>(T(),w("div",g,[u(c(_),{ref_key:"reconciliationRef",ref:m,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:a.value.payNo,readonly:!!a.value.payNo,onGetRecord:v,onChoose:y,onClear:o[0]||(o[0]=t=>a.value.payNo=""),onOpenInv:o[1]||(o[1]=t=>s("openInv",t))},null,8,["platformType","id","readonly"]),u(k,{ref_key:"chooseModalRef",ref:i,supplierNo:c(l),platformType:n.platformType,onChoose:o[2]||(o[2]=t=>a.value.payNo=t)},null,8,["supplierNo","platformType"])]))}});var q=d(D,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/form-copy/chooseForm/choose-form.vue"]]);export{q as default};
-=======
-import{_ as d,d as h,W as C,aF as N,w as a,z as I,aD as R,o as T,c as w,j as u,l as c}from"./index.js";import{R as _}from"./index.5923e52f.js";import k from"./choose-modal.c90b8a.js";import"./index.2150e818.js";import"./basic-descriptions.e3d0a03f.js";import"./orderRecord.f4878a2e.js";import"./tootip.ff59d76f.js";import"./porder.39a71c13.js";import"./status.642bba24.js";import"./calc.850c7422.js";import"./date-range.298eb922.js";const g={"w-full":""},D=h({__name:"choose-form",props:{platformType:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:p}){const{currentCompany:s}=C(),l=N(""),i=a(null),m=a(null),r=a({payNo:""}),y=()=>{var e;return(e=i.value)==null?void 0:e.onDisplay()},v=e=>p("getBuyer",e);return I(()=>s.value,async()=>{var t;const{data:e}=await R({name:(t=s.value)==null?void 0:t.companyName}),o=e.list[0]||{};l.value=o.code||""},{immediate:!0}),f({getOpenInvInfo:()=>{var e;return((e=m.value)==null?void 0:e.getOpenInvInfo())||{}}}),(e,o)=>(T(),w("div",g,[u(c(_),{ref_key:"reconciliationRef",ref:m,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:r.value.payNo,readonly:!!r.value.payNo,onGetRecord:v,onChoose:y,onClear:o[0]||(o[0]=t=>r.value.payNo=""),onOpenInv:o[1]||(o[1]=t=>p("openInv",t))},null,8,["platformType","id","readonly"]),u(k,{ref_key:"chooseModalRef",ref:i,supplierNo:c(l),platformType:n.platformType,onChoose:o[2]||(o[2]=t=>r.value.payNo=t)},null,8,["supplierNo","platformType"])]))}});var E=d(D,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/form-copy/chooseForm/choose-form.vue"]]);export{E as default};
->>>>>>> v3.0
+import{_ as d,d as h,W as C,aF as N,w as r,z as I,aD as R,o as T,c as w,j as u,l as c}from"./index.js";import{R as _}from"./index.223f383a.js";import k from"./choose-modal.c90b8a.js";import"./index.51cd2e2b.js";import"./orderRecord.2f635960.js";import"./porder.9da21d78.js";import"./status.1f2aea58.js";import"./date-range.21390715.js";const g={"w-full":""},D=h({__name:"choose-form",props:{platformType:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:s}){const{currentCompany:p}=C(),l=N(""),i=r(null),m=r(null),a=r({payNo:""}),y=()=>{var e;return(e=i.value)==null?void 0:e.onDisplay()},v=e=>s("getBuyer",e);return I(()=>p.value,async()=>{var t;const{data:e}=await R({name:(t=p.value)==null?void 0:t.companyName}),o=e.list[0]||{};l.value=o.code||""},{immediate:!0}),f({getOpenInvInfo:()=>{var e;return((e=m.value)==null?void 0:e.getOpenInvInfo())||{}}}),(e,o)=>(T(),w("div",g,[u(c(_),{ref_key:"reconciliationRef",ref:m,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:a.value.payNo,readonly:!!a.value.payNo,onGetRecord:v,onChoose:y,onClear:o[0]||(o[0]=t=>a.value.payNo=""),onOpenInv:o[1]||(o[1]=t=>s("openInv",t))},null,8,["platformType","id","readonly"]),u(k,{ref_key:"chooseModalRef",ref:i,supplierNo:c(l),platformType:n.platformType,onChoose:o[2]||(o[2]=t=>a.value.payNo=t)},null,8,["supplierNo","platformType"])]))}});var q=d(D,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/form-copy/chooseForm/choose-form.vue"]]);export{q as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-form.e0abf5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-form.e81208.js


+ 1 - 5
dist/assets/choose-form.ef9901.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_ as v,d as h,W as N,aF as C,w as a,z as T,ch as w,o as I,c as R,j as c,l as m}from"./index.js";import{R as g}from"./index.d9d56667.js";import k from"./choose-modal.6f81f8.js";import"./index.83e81a60.js";import"./orderRecord.60394497.js";import"./porder.cb46c196.js";import"./status.1f2aea58.js";import"./date-range.78e4354c.js";const _={"w-full":""},B=h({__name:"choose-form",props:{platformType:{type:String,required:!0},customerNo:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:s}){const{currentCompany:l}=N(),p=C(""),i=a(null),u=a(null),r=a({payNo:""}),y=()=>{var e;return(e=i.value)==null?void 0:e.onDisplay()},d=e=>s("getBuyer",e);return T(()=>l.value,async()=>{var o;const{data:e}=await w({code:(o=l.value)==null?void 0:o.companyNo});p.value=(e[0]||{}).relation_code},{immediate:!0}),f({getOpenInvInfo:()=>{var e;return((e=u.value)==null?void 0:e.getOpenInvInfo())||{}}}),(e,o)=>(I(),R("div",_,[c(m(g),{ref_key:"reconciliationRef",ref:u,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:r.value.payNo,readonly:!!r.value.payNo,onGetRecord:d,onChoose:y,onClear:o[0]||(o[0]=t=>r.value.payNo=""),onOpenInv:o[1]||(o[1]=t=>s("openInv",t))},null,8,["platformType","id","readonly"]),c(k,{ref_key:"chooseModalRef",ref:i,supplierNo:m(p),customerNo:n.customerNo,platformType:n.platformType,onChoose:o[2]||(o[2]=t=>r.value.payNo=t)},null,8,["supplierNo","customerNo","platformType"])]))}});var P=v(B,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/chooseForm/choose-form.vue"]]);export{P as default};
-=======
-import{_ as v,d as N,W as h,aF as C,w as a,z as T,c6 as w,o as I,c as R,j as u,l as c}from"./index.js";import{R as g}from"./index.5923e52f.js";import k from"./choose-modal.6f81f8.js";import"./index.2150e818.js";import"./basic-descriptions.e3d0a03f.js";import"./orderRecord.f4878a2e.js";import"./tootip.ff59d76f.js";import"./porder.39a71c13.js";import"./status.642bba24.js";import"./calc.850c7422.js";import"./date-range.298eb922.js";const _={"w-full":""},B=N({__name:"choose-form",props:{platformType:{type:String,required:!0},customerNo:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:s}){const{currentCompany:p}=h(),l=C(""),i=a(null),m=a(null),r=a({payNo:""}),y=()=>{var o;return(o=i.value)==null?void 0:o.onDisplay()},d=o=>s("getBuyer",o);return T(()=>p.value,async()=>{var e;const{data:o}=await w({code:(e=p.value)==null?void 0:e.companyNo});l.value=(o[0]||{}).relation_code},{immediate:!0}),f({getOpenInvInfo:()=>{var o;return((o=m.value)==null?void 0:o.getOpenInvInfo())||{}}}),(o,e)=>(I(),R("div",_,[u(c(g),{ref_key:"reconciliationRef",ref:m,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:r.value.payNo,readonly:!!r.value.payNo,onGetRecord:d,onChoose:y,onClear:e[0]||(e[0]=t=>r.value.payNo=""),onOpenInv:e[1]||(e[1]=t=>s("openInv",t))},null,8,["platformType","id","readonly"]),u(k,{ref_key:"chooseModalRef",ref:i,supplierNo:c(l),customerNo:n.customerNo,platformType:n.platformType,onChoose:e[2]||(e[2]=t=>r.value.payNo=t)},null,8,["supplierNo","customerNo","platformType"])]))}});var E=v(B,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/chooseForm/choose-form.vue"]]);export{E as default};
->>>>>>> v3.0
+import{_ as v,d as h,W as N,aF as C,w as a,z as T,ch as w,o as I,c as R,j as c,l as m}from"./index.js";import{R as g}from"./index.223f383a.js";import k from"./choose-modal.6f81f8.js";import"./index.51cd2e2b.js";import"./orderRecord.2f635960.js";import"./porder.9da21d78.js";import"./status.1f2aea58.js";import"./date-range.21390715.js";const _={"w-full":""},B=h({__name:"choose-form",props:{platformType:{type:String,required:!0},customerNo:{type:String,required:!0}},emits:["create","openInv","getBuyer"],setup(n,{expose:f,emit:s}){const{currentCompany:l}=N(),p=C(""),i=a(null),u=a(null),r=a({payNo:""}),y=()=>{var e;return(e=i.value)==null?void 0:e.onDisplay()},d=e=>s("getBuyer",e);return T(()=>l.value,async()=>{var o;const{data:e}=await w({code:(o=l.value)==null?void 0:o.companyNo});p.value=(e[0]||{}).relation_code},{immediate:!0}),f({getOpenInvInfo:()=>{var e;return((e=u.value)==null?void 0:e.getOpenInvInfo())||{}}}),(e,o)=>(I(),R("div",_,[c(m(g),{ref_key:"reconciliationRef",ref:u,showTicketColumn:!0,cover:!0,isPurchPay:"",edit:!0,platformType:n.platformType,id:r.value.payNo,readonly:!!r.value.payNo,onGetRecord:d,onChoose:y,onClear:o[0]||(o[0]=t=>r.value.payNo=""),onOpenInv:o[1]||(o[1]=t=>s("openInv",t))},null,8,["platformType","id","readonly"]),c(k,{ref_key:"chooseModalRef",ref:i,supplierNo:m(p),customerNo:n.customerNo,platformType:n.platformType,onChoose:o[2]||(o[2]=t=>r.value.payNo=t)},null,8,["supplierNo","customerNo","platformType"])]))}});var P=v(B,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/invoiceApply/components/currentcy-form-wanyu/chooseForm/choose-form.vue"]]);export{P as default};

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 3
dist/assets/choose-form.fea1e1.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.01dd1a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.27bc28.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.2c681d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.337b8f.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.4a2280.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.4b621b.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.5bc1b1.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.5d6dff.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.6edbce.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.6f81f8.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.7bed6f.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.8cf4f1.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.b3e4d7.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.b88fac.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.c20ad1.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.c90b8a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.cab700.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.d0cd3b.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.ddbce7.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.e17140.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.e2b61d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.e43751.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.e800d4.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/choose-modal.f78191.js


+ 1 - 5
dist/assets/claim.97cd74.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_ as e,d as t,o,c as i,j as a}from"./index.js";import r from"./index.e1ac32.js";import"./related-order.9ad17b.js";import"./configs.9fedcea5.js";import"./global.9ad647c8.js";import"./sales-modal.754424.js";import"./index.fdf8fd5e.js";import"./status.1f2aea58.js";import"./date-range.78e4354c.js";import"./receipt-payment.c44f78.js";const s={class:"invoice__content","bg-white":""},_=t({__name:"claim",setup(c){return(m,p)=>(o(),i("div",s,[a(r)]))}});var g=e(_,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalClaim/claim.vue"]]);export{g as default};
-=======
-import{_ as e,d as t,o,c as i,j as r}from"./index.js";import a from"./index.e1ac32.js";import"./related-order.9ad17b.js";import"./configs.8856ed67.js";import"./global.9ad647c8.js";import"./sales-modal.754424.js";import"./index.2b5a32b9.js";import"./status.642bba24.js";import"./date-range.298eb922.js";import"./receipt-payment.c44f78.js";import"./basic-descriptions.e3d0a03f.js";const s={class:"invoice__content","bg-white":""},_=t({__name:"claim",setup(c){return(m,p)=>(o(),i("div",s,[r(a)]))}});var j=e(_,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalClaim/claim.vue"]]);export{j as default};
->>>>>>> v3.0
+import{_ as e,d as t,o,c as i,j as a}from"./index.js";import r from"./index.e1ac32.js";import"./related-order.9ad17b.js";import"./configs.21b13d13.js";import"./global.9ad647c8.js";import"./sales-modal.754424.js";import"./index.81fc8841.js";import"./status.1f2aea58.js";import"./date-range.21390715.js";import"./receipt-payment.c44f78.js";const s={class:"invoice__content","bg-white":""},_=t({__name:"claim",setup(c){return(m,p)=>(o(),i("div",s,[a(r)]))}});var g=e(_,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/InvoiceSales/capitalClaim/claim.vue"]]);export{g as default};

+ 0 - 1
dist/assets/columnRenderHelper.744e85f5.js

@@ -1 +0,0 @@
-import{al as r,aS as u,aY as i,J as o,aX as s}from"./index.js";function f(t,l="status"){return{cellRenderer({row:a}){const e=t.find(n=>n.value===String(a[l]));return r(u,{type:e&&e.type?e.type:""},{default:()=>(e==null?void 0:e.label)||"--"})}}}function d(t,l,a="",e=""){return{cellRenderer({row:n}){return e&&!n[e]?null:[r(s,{content:a+n[t],placement:"left",width:300},{reference:()=>r(i,{link:!0,size:"large",icon:o("information-line")})}),r("text",null,n[l]||"--")]}}}export{f as a,d as r};

+ 0 - 0
dist/assets/columnRenderHelper.7511a6a4.js → dist/assets/columnRenderHelper.a9b8ca6f.js


+ 0 - 4
dist/assets/columns.172b29.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as o,j as a,r as s,ae as r}from"./index.js";import{l as i,a as n}from"./status.1f2aea58.js";function u(){return{columns:o([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u89D2\u8272\u540D\u79F0",prop:"role_name"},{label:"\u4E1A\u52A1\u516C\u53F8",prop:"companyName"},{label:"\u7B49\u7EA7",prop:"level",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(i.find(l=>l.value==e.level+"")||{}).type||"info",effect:"plain"},{default:()=>[(i.find(l=>l.value==e.level+"")||{}).label||"--"]})},{label:"\u72B6\u6001",prop:"status",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(n.find(l=>l.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(n.find(l=>l.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",prop:"createTime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as o,j as a,r as s,ae as r}from"./index.js";import{l as i,a as n}from"./status.642bba24.js";function u(){return{columns:o([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u89D2\u8272\u540D\u79F0",prop:"role_name"},{label:"\u4E1A\u52A1\u516C\u53F8",prop:"companyName"},{label:"\u7B49\u7EA7",prop:"level",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(i.find(l=>l.value==e.level+"")||{}).type||"info",effect:"plain"},{default:()=>[(i.find(l=>l.value==e.level+"")||{}).label||"--"]})},{label:"\u72B6\u6001",prop:"status",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(n.find(l=>l.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(n.find(l=>l.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",prop:"createTime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/columns.17ba95.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/columns.36e379.js


+ 0 - 4
dist/assets/columns.40f83e.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{j as e,r as l,b2 as n,M as u}from"./index.js";function r(){const t=[{type:"",label:"\u5584\u826F"},{type:"success",label:"\u597D\u5B66"},{type:"info",label:"\u5E7D\u9ED8"},{type:"danger",label:"\u65C5\u6E38"},{type:"warning",label:"\u8FFD\u5267"}];return{columnsA:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"user"},null)]}),u("\u7528\u6237\u540D")]),value:"xiaoxian"},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"iphone"},null)]}),u("\u624B\u673A\u53F7")]),value:"123456789"},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"location"},null)]}),u("\u5C45\u4F4F\u5730")]),value:"\u4E0A\u6D77"}],columnsB:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"tickets"},null)]}),u("\u6807\u7B7E")]),cellRenderer:()=>t.map(c=>e(l("el-tag"),{class:"mr-10px",type:c.type,size:"small",effect:"dark"},{default:()=>[c.label]}))},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"office-building"},null)]}),u("\u8054\u7CFB\u5730\u5740")]),value:"\u4E0A\u6D77\u5E02\u5F90\u6C47\u533A"}],columnsC:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"notebook"},null)]}),u("\u597D\u597D\u5B66\u4E60\uFF0C\u5929\u5929\u5411\u4E0A")]),value:"\u4E0A\u6D77\u5E02\u5F90\u6C47\u533A"}]}}export{r as useColumns};
-=======
-import{j as e,r as l,b4 as n,M as u}from"./index.js";function r(){const t=[{type:"",label:"\u5584\u826F"},{type:"success",label:"\u597D\u5B66"},{type:"info",label:"\u5E7D\u9ED8"},{type:"danger",label:"\u65C5\u6E38"},{type:"warning",label:"\u8FFD\u5267"}];return{columnsA:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"user"},null)]}),u("\u7528\u6237\u540D")]),value:"xiaoxian"},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"iphone"},null)]}),u("\u624B\u673A\u53F7")]),value:"123456789"},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"location"},null)]}),u("\u5C45\u4F4F\u5730")]),value:"\u4E0A\u6D77"}],columnsB:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"tickets"},null)]}),u("\u6807\u7B7E")]),cellRenderer:()=>t.map(c=>e(l("el-tag"),{class:"mr-10px",type:c.type,size:"small",effect:"dark"},{default:()=>[c.label]}))},{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"office-building"},null)]}),u("\u8054\u7CFB\u5730\u5740")]),value:"\u4E0A\u6D77\u5E02\u5F90\u6C47\u533A"}],columnsC:[{labelRenderer:()=>e("div",{class:"flex items-center"},[e(l("el-icon"),null,{default:()=>[e(n,{icon:"notebook"},null)]}),u("\u597D\u597D\u5B66\u4E60\uFF0C\u5929\u5929\u5411\u4E0A")]),value:"\u4E0A\u6D77\u5E02\u5F90\u6C47\u533A"}]}}export{r as useColumns};
->>>>>>> v3.0

+ 0 - 4
dist/assets/columns.45398b.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as o,j as a,r as s,ae as r}from"./index.js";import{l as i,a as n}from"./status.1f2aea58.js";function u(){return{columns:o([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u89D2\u8272\u540D\u79F0",prop:"role_name"},{label:"\u7B49\u7EA7",prop:"level",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(i.find(l=>l.value==e.level+"")||{}).type||"info",effect:"plain"},{default:()=>[(i.find(l=>l.value==e.level+"")||{}).label||"--"]})},{label:"\u72B6\u6001",prop:"status",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(n.find(l=>l.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(n.find(l=>l.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",prop:"createTime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as o,j as a,r as s,ae as r}from"./index.js";import{l as i,a as n}from"./status.642bba24.js";function u(){return{columns:o([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u89D2\u8272\u540D\u79F0",prop:"role_name"},{label:"\u7B49\u7EA7",prop:"level",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(i.find(l=>l.value==e.level+"")||{}).type||"info",effect:"plain"},{default:()=>[(i.find(l=>l.value==e.level+"")||{}).label||"--"]})},{label:"\u72B6\u6001",prop:"status",cellRenderer:({row:e,props:t})=>a(s("el-tag"),{size:t.size,type:(n.find(l=>l.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(n.find(l=>l.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",prop:"createTime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

+ 0 - 4
dist/assets/columns.70d8b7.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as l,j as s,r as o,ae as r}from"./index.js";import{a as t}from"./status.1f2aea58.js";function u(){return{columns:l([{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u89D2\u8272",prop:"role_name"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",minWidth:80,cellRenderer:({row:e,props:p})=>s(o("el-tag"),{size:"small",type:(t.find(a=>a.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(t.find(a=>a.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:160,prop:"addtime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as l,j as s,r as o,ae as r}from"./index.js";import{a as t}from"./status.642bba24.js";function u(){return{columns:l([{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u89D2\u8272",prop:"role_name"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",minWidth:80,cellRenderer:({row:e,props:p})=>s(o("el-tag"),{size:"small",type:(t.find(a=>a.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(t.find(a=>a.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:160,prop:"addtime",formatter:({addtime:e})=>r(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/columns.88d730.js


+ 0 - 4
dist/assets/columns.bcdd2e.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.1f2aea58.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.642bba24.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

+ 0 - 4
dist/assets/columns.bcdd2e2.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.1f2aea58.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.642bba24.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

+ 0 - 4
dist/assets/columns.bcdd2e3.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
 import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.1f2aea58.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
-=======
-import{w as s,j as i,r as n,ae as o}from"./index.js";import{a}from"./status.642bba24.js";function u(){return{columns:s([{type:"selection",width:40,align:"center",hide:({checkList:e})=>!e.includes("\u52FE\u9009\u5217")},{label:"\u5E8F\u53F7",type:"index",width:70,hide:({checkList:e})=>!e.includes("\u5E8F\u53F7\u5217")},{label:"\u771F\u5B9E\u59D3\u540D",prop:"nickname"},{label:"\u7528\u6237\u540D\u79F0",prop:"username"},{label:"\u72B6\u6001",prop:"status",width:80,cellRenderer:({row:e,props:l})=>i(n("el-tag"),{size:l.size,type:(a.find(t=>t.value==e.status+"")||{}).type||"info",effect:"plain"},{default:()=>[(a.find(t=>t.value==e.status+"")||{}).label||"--"]})},{label:"\u521B\u5EFA\u65F6\u95F4",width:305,prop:"addtime",formatter:({addtime:e})=>o(e).format("YYYY-MM-DD HH:mm:ss")},{label:"\u64CD\u4F5C",fixed:"right",width:145,slot:"operation"}])}}export{u as useColumns};
->>>>>>> v3.0

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/columns.d95d09.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/columns.d95d092.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/company-modal.539dcc.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/company-modal.6d484d.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 1
dist/assets/company-modal.a613df.js


+ 1 - 5
dist/assets/company-select.7e2f8b.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-import{_ as t,d as r,aV as l,o as u,G as n,l as o,aq as m,bT as c}from"./index.js";import{h as i}from"./index.cc9e82c9.js";const d=r({__name:"company-select",props:{modelValue:{type:String,required:!0}},setup(s){const e=l(s,"modelValue");return(_,a)=>(u(),n(o(c),{value:o(e),"onUpdate:value":a[0]||(a[0]=p=>m(e)?e.value=p:null),api:o(i),style:{width:"95%"},placeholder:"\u8BF7\u9009\u62E9\u5356\u65B9\u516C\u53F8","request-prop":"companyName","response-label-prop":"company_name","response-val-prop":"companyNo"},null,8,["value","api"]))}});var B=t(d,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/parameter/commission/company-select.vue"]]);export{B as default};
-=======
-import{_ as t,d as r,aV as l,o as u,G as n,l as o,aq as m,bM as c}from"./index.js";import{h as i}from"./index.4e56d83a.js";const d=r({__name:"company-select",props:{modelValue:{type:String,required:!0}},setup(s){const e=l(s,"modelValue");return(_,a)=>(u(),n(o(c),{value:o(e),"onUpdate:value":a[0]||(a[0]=p=>m(e)?e.value=p:null),api:o(i),style:{width:"95%"},placeholder:"\u8BF7\u9009\u62E9\u5356\u65B9\u516C\u53F8","request-prop":"companyName","response-label-prop":"company_name","response-val-prop":"companyNo"},null,8,["value","api"]))}});var B=t(d,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/parameter/commission/company-select.vue"]]);export{B as default};
->>>>>>> v3.0
+import{_ as t,d as r,aV as l,o as u,G as n,l as o,aq as m,bT as c}from"./index.js";import{h as i}from"./index.7393a816.js";const d=r({__name:"company-select",props:{modelValue:{type:String,required:!0}},setup(s){const e=l(s,"modelValue");return(_,a)=>(u(),n(o(c),{value:o(e),"onUpdate:value":a[0]||(a[0]=p=>m(e)?e.value=p:null),api:o(i),style:{width:"95%"},placeholder:"\u8BF7\u9009\u62E9\u5356\u65B9\u516C\u53F8","request-prop":"companyName","response-label-prop":"company_name","response-val-prop":"companyNo"},null,8,["value","api"]))}});var B=t(d,[["__file","C:/Users/63107/Desktop/projects/settle-vue3/src/views/parameter/commission/company-select.vue"]]);export{B as default};

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است