Selaa lähdekoodia

修改标签问题处理部分样式

yangg 11 kuukautta sitten
vanhempi
sitoutus
8af485bff2
68 muutettua tiedostoa jossa 112 lisäystä ja 177 poistoa
  1. 1 1
      .env
  2. 1 1
      dist/assets/Notify-JoMQAEcN.js
  3. 0 0
      dist/assets/SKUList-Cyah1WY_.js
  4. 0 0
      dist/assets/accountTemplate-DIt0WMx4.js
  5. 0 0
      dist/assets/addInventory-Cc4qyoCa.js
  6. 0 0
      dist/assets/addOutbound-B0dJOEDo.js
  7. 0 0
      dist/assets/administratorManage-D0Ki5-51.js
  8. 1 1
      dist/assets/basicSetting-C4MsdBLE.js
  9. 0 0
      dist/assets/boxed-lockscreen-DrBEa3XI.js
  10. 0 0
      dist/assets/boxed-signin-BYEVaWdU.js
  11. 0 0
      dist/assets/boxed-signup-B--QBt2Y.js
  12. 0 0
      dist/assets/branch-BN6THRnQ.js
  13. 1 1
      dist/assets/companyInfo-DuUnX-HO.js
  14. 0 0
      dist/assets/companyList-CUAMHGeZ.js
  15. 0 0
      dist/assets/configMsg-DbaiCWkn.js
  16. 0 0
      dist/assets/dicData-DOrSQlLb.js
  17. 0 0
      dist/assets/emailtemplate-B88DQgN9.js
  18. 1 1
      dist/assets/express-Bs-z8qbu.js
  19. 0 0
      dist/assets/express-DNeTOXV8.js
  20. 1 1
      dist/assets/goods-BFtI2D7x.js
  21. 1 1
      dist/assets/goodsExchange-B_B0QMhj.js
  22. 0 0
      dist/assets/goodsInventory-CRm70yj2.js
  23. 1 1
      dist/assets/goodsInventory-CzzJFY1z.js
  24. 0 0
      dist/assets/goodsInventoryAdd-QqPg8UTm.js
  25. 0 0
      dist/assets/goodsInventoryLoss-CDW3Vmub.js
  26. 1 1
      dist/assets/goodsInventoryLoss-Cxem_PkF.js
  27. 0 0
      dist/assets/goodsInventoryLossAdd-DFbLqQf0.js
  28. 1 1
      dist/assets/goodsLend-CcqvxrmJ.js
  29. 0 0
      dist/assets/goodsLend-DpfFt1Z4.js
  30. 1 1
      dist/assets/goodsTransfer-CvKhwuwg.js
  31. 0 0
      dist/assets/goodsTransfer-DNJ50MJ9.js
  32. 0 0
      dist/assets/goodsUnderstock-NtyjTnfp.js
  33. 0 0
      dist/assets/goodsUnderstockAdd-D17IzrV9.js
  34. 1 1
      dist/assets/index-D0tw8n1D.js
  35. 0 0
      dist/assets/index-Dhk0YbwP.css
  36. 0 0
      dist/assets/index-htML_UHV.js
  37. 0 0
      dist/assets/menuManage-B3ZyQqQv.js
  38. 1 1
      dist/assets/menus-shMhw8ZU.js
  39. 0 0
      dist/assets/orderList-CBDR_mFU.js
  40. 0 0
      dist/assets/orderList-CeCuWBQi.js
  41. 0 0
      dist/assets/outbound-D12zBEVz.js
  42. 0 0
      dist/assets/overseasList-DXciOyvN.js
  43. 0 0
      dist/assets/overseasWarehouseAuth-DfaVFtFI.js
  44. 1 1
      dist/assets/package-h5ke33cc.js
  45. 0 0
      dist/assets/packageAdd-nDrfr7ky.js
  46. 0 0
      dist/assets/packageList-COXQntVI.js
  47. 0 0
      dist/assets/packagePermissions-B6Tv8WZp.js
  48. 0 0
      dist/assets/platformLogin-CyycKyOj.js
  49. 0 0
      dist/assets/print-CiWqBKd7.js
  50. 0 0
      dist/assets/roleManage-cm9PS36E.js
  51. 0 0
      dist/assets/roleManageAdd-Cjka1Swa.js
  52. 1 1
      dist/assets/setting-BD2OoeWh.js
  53. 0 0
      dist/assets/smsTemplate-C8McgxTb.js
  54. 0 0
      dist/assets/systemLog-C_JcZ7tH.js
  55. 0 0
      dist/assets/systemMessage-ub9ZjzlO.js
  56. 1 1
      dist/assets/templateManage-B5-rXpvV.js
  57. 0 0
      dist/assets/warehouseList-CB2lXPgR.js
  58. 0 0
      dist/assets/warehouseLocation-BcBKCwBR.js
  59. 0 0
      dist/assets/warehousing-C5A234Qb.js
  60. 0 0
      dist/assets/warehousing-PMqDdN7_.js
  61. 2 2
      dist/index.html
  62. 52 29
      src/components/TableSearch/index.vue
  63. 4 85
      src/components/layout/Header.vue
  64. 24 39
      src/layouts/app-layout.vue
  65. 5 0
      src/locales/en.json
  66. 3 0
      src/locales/zh.json
  67. 2 2
      src/views/order/orderList.vue
  68. 4 4
      src/views/stock/warehousing.vue

+ 1 - 1
.env

@@ -1,5 +1,5 @@
 VITE_API_URL=https://api.raycos.net
 #线下地址
-#http://192.168.8.110:9998
+#http://192.168.1.178:9998
 #线上地址
 #https://api.raycos.net

+ 1 - 1
dist/assets/Notify-BUI5BOyx.js → dist/assets/Notify-JoMQAEcN.js

@@ -1 +1 @@
-import{d as x,r as y,o as S,f as t,i as c,w as u,j as g,H as M,aB as B,p as b,v as l,h as d,F as _,x as m,y as p}from"./index-D8mj5zgo.js";const N={class:"bg-white p-2"},V=["onClick"],w=["onClick"],z=["onClick"],E=["onClick"],T=x({__name:"Notify",setup(F){let s=y("SYSTEM");const a=y({}),r=o=>{},C=(o,f)=>{s.value=o.props.name,v()},v=()=>{B(s.value).then(o=>{a.value=o})};return S(()=>{v()}),(o,f)=>{const i=b("el-tab-pane"),h=b("el-tabs");return l(),t("div",N,[c(h,{modelValue:g(s),"onUpdate:modelValue":f[0]||(f[0]=e=>M(s)?s.value=e:s=e),type:"card",class:"demo-tabs",onTabClick:C},{default:u(()=>[c(i,{label:"系统消息",name:"SYSTEM"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,V))),128))])]),_:1}),c(i,{label:"短息消息",name:"SMS"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,w))),128))])]),_:1}),c(i,{label:"邮件消息",name:"MAIL"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,z))),128))])]),_:1}),c(i,{label:"公众号消息",name:"OFFICIAL"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,E))),128))])]),_:1})]),_:1},8,["modelValue"])])}}});export{T as default};
+import{d as x,r as y,o as S,f as t,i as c,w as u,j as g,H as M,aB as B,p as b,v as l,h as d,F as _,x as m,y as p}from"./index-htML_UHV.js";const N={class:"bg-white p-2"},V=["onClick"],w=["onClick"],z=["onClick"],E=["onClick"],T=x({__name:"Notify",setup(F){let s=y("SYSTEM");const a=y({}),r=o=>{},C=(o,f)=>{s.value=o.props.name,v()},v=()=>{B(s.value).then(o=>{a.value=o})};return S(()=>{v()}),(o,f)=>{const i=b("el-tab-pane"),h=b("el-tabs");return l(),t("div",N,[c(h,{modelValue:g(s),"onUpdate:modelValue":f[0]||(f[0]=e=>M(s)?s.value=e:s=e),type:"card",class:"demo-tabs",onTabClick:C},{default:u(()=>[c(i,{label:"系统消息",name:"SYSTEM"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,V))),128))])]),_:1}),c(i,{label:"短息消息",name:"SMS"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,w))),128))])]),_:1}),c(i,{label:"邮件消息",name:"MAIL"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,z))),128))])]),_:1}),c(i,{label:"公众号消息",name:"OFFICIAL"},{default:u(()=>[d("ul",null,[(l(!0),t(_,null,m(a.value.records,(e,n)=>(l(),t("li",{key:n,onClick:k=>r(e),class:"mt-1 mb-1",style:{"font-size":"16px"}},p(e.content),9,E))),128))])]),_:1})]),_:1},8,["modelValue"])])}}});export{T as default};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/SKUList-Cyah1WY_.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/accountTemplate-DIt0WMx4.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/addInventory-Cc4qyoCa.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/addOutbound-B0dJOEDo.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/administratorManage-D0Ki5-51.js


+ 1 - 1
dist/assets/basicSetting-Cr-rSt8o.js → dist/assets/basicSetting-C4MsdBLE.js

@@ -1 +1 @@
-import{a5 as a}from"./index-D8mj5zgo.js";function n(e,t){return a({url:`admin/erp/warehouse/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:t})}function s(e){return a({url:"admin/erp/warehouse",method:"post",headers:{"Content-Type":"application/json"},data:e})}function o(){return a({url:"admin/erp/warehouse/list-all",method:"get",loading:!1})}function u(e){return a({url:"admin/erp/warehouse",method:"get",loading:!1,params:e})}function i(e){return a({url:"/admin/systems/manager/admin-users/getUserByDept",method:"get",loading:!1,params:e})}export{s as a,i as b,n as e,o as g,u as w};
+import{a5 as a}from"./index-htML_UHV.js";function n(e,t){return a({url:`admin/erp/warehouse/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:t})}function s(e){return a({url:"admin/erp/warehouse",method:"post",headers:{"Content-Type":"application/json"},data:e})}function o(){return a({url:"admin/erp/warehouse/list-all",method:"get",loading:!1})}function u(e){return a({url:"admin/erp/warehouse",method:"get",loading:!1,params:e})}function i(e){return a({url:"/admin/systems/manager/admin-users/getUserByDept",method:"get",loading:!1,params:e})}export{s as a,i as b,n as e,o as g,u as w};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/boxed-lockscreen-DrBEa3XI.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/boxed-signin-BYEVaWdU.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/boxed-signup-B--QBt2Y.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/branch-BN6THRnQ.js


+ 1 - 1
dist/assets/companyInfo-DfQcYse9.js → dist/assets/companyInfo-DuUnX-HO.js

@@ -1,4 +1,4 @@
-import{d as x,V as G,r as y,at as ue,o as de,u as be,f as q,i as s,w as d,t as Ee,au as Ce,av as we,aw as Me,p as P,v as Q,F as Re,x as ye,m as U,y as F,h as Z,k as ee,E as z,ax as Ae,ay as Ne,al as Pe,I as Se,_ as Ie}from"./index-D8mj5zgo.js";import{p as ke}from"./package-DjVvrY0h.js";import{s as ze}from"./element-china-area-data-DyMRb5Dq.js";/*!
+import{d as x,V as G,r as y,at as ue,o as de,u as be,f as q,i as s,w as d,t as Ee,au as Ce,av as we,aw as Me,p as P,v as Q,F as Re,x as ye,m as U,y as F,h as Z,k as ee,E as z,ax as Ae,ay as Ne,al as Pe,I as Se,_ as Ie}from"./index-htML_UHV.js";import{p as ke}from"./package-h5ke33cc.js";import{s as ze}from"./element-china-area-data-DyMRb5Dq.js";/*!
  * qrcode.vue v3.4.1
  * A Vue.js component to generate QRCode.
  * © 2017-2023 @scopewu(https://github.com/scopewu)

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/companyList-CUAMHGeZ.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/configMsg-DbaiCWkn.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/dicData-DOrSQlLb.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/emailtemplate-B88DQgN9.js


+ 1 - 1
dist/assets/express-BcsIkWK8.js → dist/assets/express-Bs-z8qbu.js

@@ -1 +1 @@
-import{a5 as s,an as n}from"./index-D8mj5zgo.js";function r(e){return s({url:"admin/systems/logi-companies",method:"get",loading:!1,params:e})}function a(e){let t=e.formItems;return delete e.formItems,s({url:`admin/systems/logi-companies?${n.stringify(e)}`,method:"post",headers:{"Content-Type":"application/json"},data:t})}function m(e){return s({url:`admin/systems/logi-companies/${e}`,method:"delete"})}function d(e,t){let o=t.formItems;return delete t.formItems,s({url:`admin/systems/logi-companies/${e}?${n.stringify(t)}`,method:"put",headers:{"Content-Type":"application/json"},data:o})}function l(e,t){return s({url:`admin/systems/logi-companies/${e}`,method:"post",data:{disabled:t}})}export{a,m as d,d as e,r as g,l as o};
+import{a5 as s,an as n}from"./index-htML_UHV.js";function r(e){return s({url:"admin/systems/logi-companies",method:"get",loading:!1,params:e})}function a(e){let t=e.formItems;return delete e.formItems,s({url:`admin/systems/logi-companies?${n.stringify(e)}`,method:"post",headers:{"Content-Type":"application/json"},data:t})}function m(e){return s({url:`admin/systems/logi-companies/${e}`,method:"delete"})}function d(e,t){let o=t.formItems;return delete t.formItems,s({url:`admin/systems/logi-companies/${e}?${n.stringify(t)}`,method:"put",headers:{"Content-Type":"application/json"},data:o})}function l(e,t){return s({url:`admin/systems/logi-companies/${e}`,method:"post",data:{disabled:t}})}export{a,m as d,d as e,r as g,l as o};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/express-DNeTOXV8.js


+ 1 - 1
dist/assets/goods-BR5JqFqC.js → dist/assets/goods-BFtI2D7x.js

@@ -1 +1 @@
-import{a5 as e}from"./index-D8mj5zgo.js";function r(t){return e({url:"/admin/erp/product/addProduct",method:"post",headers:{"Content-Type":"application/json"},data:t})}function n(t,d){return e({url:`/admin/erp/product/updateProduct/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:d})}function a(t){return e({url:"/admin/erp/product",method:"get",params:t})}function p(t){return e({url:`/admin/erp/product/deletedProduct/${t}`,method:"post",headers:{"Content-Type":"application/json"}})}export{r as a,p as d,n as e,a as p};
+import{a5 as e}from"./index-htML_UHV.js";function r(t){return e({url:"/admin/erp/product/addProduct",method:"post",headers:{"Content-Type":"application/json"},data:t})}function n(t,d){return e({url:`/admin/erp/product/updateProduct/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:d})}function a(t){return e({url:"/admin/erp/product",method:"get",params:t})}function p(t){return e({url:`/admin/erp/product/deletedProduct/${t}`,method:"post",headers:{"Content-Type":"application/json"}})}export{r as a,p as d,n as e,a as p};

+ 1 - 1
dist/assets/goodsExchange-DMxwmP-A.js → dist/assets/goodsExchange-B_B0QMhj.js

@@ -1 +1 @@
-import{a5 as t}from"./index-D8mj5zgo.js";function r(e){return t({url:`/admin/erp/warehouseEntry/${e}`,method:"get",loaidng:!1})}function u(e){return t({url:`/admin/erp/warehouseOut/${e}`,method:"get",loaidng:!1})}function s(e){return t({url:"/admin/erp/warehouseEntry",method:"post",headers:{"Content-Type":"application/json"},data:e})}function d(e,n){return t({url:`/admin/erp/warehouseEntry/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:n})}function i(e){return t({url:"/admin/erp/warehouseOut",method:"post",headers:{"Content-Type":"application/json"},data:e})}function h(e,n,a){return t({url:`/admin/erp/warehouseOut/getGoodByWarehouse/${n}/${a}`,method:"get",loaidng:!1,params:e})}function l(e){return t({url:"/admin/erp/warehouseOut",method:"get",loaidng:!1,params:e})}function p(e){return t({url:"/admin/erp/warehouseEntry",method:"get",loaidng:!1,params:e})}function g(e){return t({url:"/admin/systems/admin-users/info",method:"get",loaidng:!1,params:e})}function m(e,n){return t({url:`/admin/erp/warehouseOut/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:n})}function c(e,n){return t({url:`/admin/erp/scancode/getProduct/${e}/${n}`,method:"get",loaidng:!1})}function f(e,n,a){return t({url:`/admin/erp/scancode/getsnCode/${e}/${n}/${a}`,method:"get",loaidng:!1})}function y(e){return t({url:`/admin/erp/order/getOneBySn/${e}`,method:"get",loaidng:!1})}function w(e){return t({url:"/admin/erp/scancode/skuRedis",method:"post",headers:{"Content-Type":"application/json"},data:e})}export{l as a,r as b,h as c,f as d,d as e,y as f,p as g,m as h,i,g as j,c as k,u as l,w as s,s as w};
+import{a5 as t}from"./index-htML_UHV.js";function r(e){return t({url:`/admin/erp/warehouseEntry/${e}`,method:"get",loaidng:!1})}function u(e){return t({url:`/admin/erp/warehouseOut/${e}`,method:"get",loaidng:!1})}function s(e){return t({url:"/admin/erp/warehouseEntry",method:"post",headers:{"Content-Type":"application/json"},data:e})}function d(e,n){return t({url:`/admin/erp/warehouseEntry/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:n})}function i(e){return t({url:"/admin/erp/warehouseOut",method:"post",headers:{"Content-Type":"application/json"},data:e})}function h(e,n,a){return t({url:`/admin/erp/warehouseOut/getGoodByWarehouse/${n}/${a}`,method:"get",loaidng:!1,params:e})}function l(e){return t({url:"/admin/erp/warehouseOut",method:"get",loaidng:!1,params:e})}function p(e){return t({url:"/admin/erp/warehouseEntry",method:"get",loaidng:!1,params:e})}function g(e){return t({url:"/admin/systems/admin-users/info",method:"get",loaidng:!1,params:e})}function m(e,n){return t({url:`/admin/erp/warehouseOut/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:n})}function c(e,n){return t({url:`/admin/erp/scancode/getProduct/${e}/${n}`,method:"get",loaidng:!1})}function f(e,n,a){return t({url:`/admin/erp/scancode/getsnCode/${e}/${n}/${a}`,method:"get",loaidng:!1})}function y(e){return t({url:`/admin/erp/order/getOneBySn/${e}`,method:"get",loaidng:!1})}function w(e){return t({url:"/admin/erp/scancode/skuRedis",method:"post",headers:{"Content-Type":"application/json"},data:e})}export{l as a,r as b,h as c,f as d,d as e,y as f,p as g,m as h,i,g as j,c as k,u as l,w as s,s as w};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsInventory-CRm70yj2.js


+ 1 - 1
dist/assets/goodsInventory-XE36YQjO.js → dist/assets/goodsInventory-CzzJFY1z.js

@@ -1 +1 @@
-import{a5 as t}from"./index-D8mj5zgo.js";function a(n,o){return t({url:`admin/stock/inventory/${n}`,method:"post",headers:{"Content-Type":"application/json"},data:o})}function r(n){return t({url:"admin/stock/inventory",method:"post",headers:{"Content-Type":"application/json"},data:n})}function s(n,o){return t({url:`admin/stock/inventory/audit/${n}`,method:"post",data:o})}function d(n){return t({url:`admin/stock/inventory/${n}`,method:"get",loaidng:!1})}function i(n){return t({url:"admin/stock/inventory",method:"get",loaidng:!1,params:n})}function u(n){return t({url:`/admin/stock/inventory/syncStock/${n}`,method:"get",loaidng:!1})}function m(){return t({url:"/admin/systems/manager/admin-users/getUserByCompany",method:"get",loaidng:!1})}export{u as a,d as b,m as c,r as d,a as e,s as f,i as g};
+import{a5 as t}from"./index-htML_UHV.js";function a(n,o){return t({url:`admin/stock/inventory/${n}`,method:"post",headers:{"Content-Type":"application/json"},data:o})}function r(n){return t({url:"admin/stock/inventory",method:"post",headers:{"Content-Type":"application/json"},data:n})}function s(n,o){return t({url:`admin/stock/inventory/audit/${n}`,method:"post",data:o})}function d(n){return t({url:`admin/stock/inventory/${n}`,method:"get",loaidng:!1})}function i(n){return t({url:"admin/stock/inventory",method:"get",loaidng:!1,params:n})}function u(n){return t({url:`/admin/stock/inventory/syncStock/${n}`,method:"get",loaidng:!1})}function m(){return t({url:"/admin/systems/manager/admin-users/getUserByCompany",method:"get",loaidng:!1})}export{u as a,d as b,m as c,r as d,a as e,s as f,i as g};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsInventoryAdd-QqPg8UTm.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsInventoryLoss-CDW3Vmub.js


+ 1 - 1
dist/assets/goodsInventoryLoss-XjhtSX9w.js → dist/assets/goodsInventoryLoss-Cxem_PkF.js

@@ -1 +1 @@
-import{a5 as o}from"./index-D8mj5zgo.js";function n(t,e){return o({url:`admin/stock/damage/report/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:e})}function s(t){return o({url:"admin/stock/damage/report",method:"post",headers:{"Content-Type":"application/json"},data:t})}function r(t,e){return o({url:`admin/stock/damage/report/audit/${t}`,method:"post",data:e})}function d(t){return o({url:`admin/stock/damage/report/${t}`,method:"get",loaidng:!1})}function i(t){return o({url:"admin/stock/damage/report",method:"get",loaidng:!1,params:t})}function u(t,e){return o({url:`/admin/stock/damage/report/submit/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:e})}export{s as a,d as b,r as c,n as e,i as g,u as s};
+import{a5 as o}from"./index-htML_UHV.js";function n(t,e){return o({url:`admin/stock/damage/report/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:e})}function s(t){return o({url:"admin/stock/damage/report",method:"post",headers:{"Content-Type":"application/json"},data:t})}function r(t,e){return o({url:`admin/stock/damage/report/audit/${t}`,method:"post",data:e})}function d(t){return o({url:`admin/stock/damage/report/${t}`,method:"get",loaidng:!1})}function i(t){return o({url:"admin/stock/damage/report",method:"get",loaidng:!1,params:t})}function u(t,e){return o({url:`/admin/stock/damage/report/submit/${t}`,method:"post",headers:{"Content-Type":"application/json"},data:e})}export{s as a,d as b,r as c,n as e,i as g,u as s};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsInventoryLossAdd-DFbLqQf0.js


+ 1 - 1
dist/assets/goodsLend-C5aodGW6.js → dist/assets/goodsLend-CcqvxrmJ.js

@@ -1 +1 @@
-import{a5 as a}from"./index-D8mj5zgo.js";function n(e){return a({url:"/admin/erp/warehouse/area/query",method:"get",params:e})}function o(e){return a({url:"/admin/erp/warehouse/area/create ",method:"post",headers:{"Content-Type":"application/json"},data:e})}function p(e){return a({url:"/admin/erp/warehouse/area/update ",method:"post",headers:{"Content-Type":"application/json"},data:e})}function u(e){return a({url:"/admin/erp/warehouse/area/delete",method:"delete",headers:{"Content-Type":"application/json"},data:e})}function d(e){return a({url:"/admin/erp/warehouse/area/listAreaType",method:"get",loaidng:!1,params:e})}function s(e){return a({url:"/admin/erp/warehouse/area/createAreaType",method:"post",headers:{"Content-Type":"application/json"},data:e})}function i(e,r){return a({url:`/admin/erp/warehouse/area/updateAreaType/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:r})}function h(e){return a({url:`/admin/erp/warehouse/area/removeAreaType/${e}`,method:"delete"})}export{s as a,o as c,u as d,i as e,d as g,n as q,h as r,p as u};
+import{a5 as a}from"./index-htML_UHV.js";function n(e){return a({url:"/admin/erp/warehouse/area/query",method:"get",params:e})}function o(e){return a({url:"/admin/erp/warehouse/area/create ",method:"post",headers:{"Content-Type":"application/json"},data:e})}function p(e){return a({url:"/admin/erp/warehouse/area/update ",method:"post",headers:{"Content-Type":"application/json"},data:e})}function u(e){return a({url:"/admin/erp/warehouse/area/delete",method:"delete",headers:{"Content-Type":"application/json"},data:e})}function d(e){return a({url:"/admin/erp/warehouse/area/listAreaType",method:"get",loaidng:!1,params:e})}function s(e){return a({url:"/admin/erp/warehouse/area/createAreaType",method:"post",headers:{"Content-Type":"application/json"},data:e})}function i(e,r){return a({url:`/admin/erp/warehouse/area/updateAreaType/${e}`,method:"put",headers:{"Content-Type":"application/json"},data:r})}function h(e){return a({url:`/admin/erp/warehouse/area/removeAreaType/${e}`,method:"delete"})}export{s as a,o as c,u as d,i as e,d as g,n as q,h as r,p as u};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsLend-DpfFt1Z4.js


+ 1 - 1
dist/assets/goodsTransfer-pxvFRKFN.js → dist/assets/goodsTransfer-CvKhwuwg.js

@@ -1 +1 @@
-import{a5 as e}from"./index-D8mj5zgo.js";function n(t){return e({url:`admin/erp/stockTransfer/${t}`,method:"get",loaidng:!1})}function o(t){return e({url:"admin/erp/stockTransfer",method:"post",headers:{"Content-Type":"application/json"},data:t})}function d(t,r){return e({url:`admin/erp/stockTransfer/${t}`,method:"put",headers:{"Content-Type":"application/json"},data:r})}function s(t){return e({url:"/admin/erp/productStock",method:"get",loaidng:!1,params:t})}function p(t){return e({url:"/admin/erp/product/updateWarnStock",method:"post",headers:{"Content-Type":"application/json"},data:t})}export{o as a,d as e,n as g,s as p,p as u};
+import{a5 as e}from"./index-htML_UHV.js";function n(t){return e({url:`admin/erp/stockTransfer/${t}`,method:"get",loaidng:!1})}function o(t){return e({url:"admin/erp/stockTransfer",method:"post",headers:{"Content-Type":"application/json"},data:t})}function d(t,r){return e({url:`admin/erp/stockTransfer/${t}`,method:"put",headers:{"Content-Type":"application/json"},data:r})}function s(t){return e({url:"/admin/erp/productStock",method:"get",loaidng:!1,params:t})}function p(t){return e({url:"/admin/erp/product/updateWarnStock",method:"post",headers:{"Content-Type":"application/json"},data:t})}export{o as a,d as e,n as g,s as p,p as u};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsTransfer-DNJ50MJ9.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsUnderstock-NtyjTnfp.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/goodsUnderstockAdd-D17IzrV9.js


+ 1 - 1
dist/assets/index-BpruhgGC.js → dist/assets/index-D0tw8n1D.js

@@ -1,4 +1,4 @@
-import{d as Te,r as Dt,P as hi,o as ci,Q as di,R as gi,T as ui,U as Gt,V as pi,W as fi,_ as ut,v as ht,f as ct,h as A,X as St,c as Zt,i as j,w as st,j as Xt,y as Le,m as J,p as oe,t as xi,Y as bi,J as Pe}from"./index-D8mj5zgo.js";const mi="/assets/images/profile-6.jpeg",vi="/assets/images/profile-7.jpeg",yi="/assets/images/profile-8.jpeg",wi="/assets/images/profile-9.jpeg",ki="/assets/images/profile-10.jpeg",Ai="/assets/images/product-headphones.jpg",Ci="/assets/images/product-shoes.jpg",ze="/assets/images/product-laptop.jpg",Si="/assets/images/product-camera.jpg",Li="/assets/images/profile-34.jpeg";function Pi(B){return B&&B.__esModule&&Object.prototype.hasOwnProperty.call(B,"default")?B.default:B}var le={exports:{}};/*!
+import{d as Te,r as Dt,P as hi,o as ci,Q as di,R as gi,T as ui,U as Gt,V as pi,W as fi,_ as ut,v as ht,f as ct,h as A,X as St,c as Zt,i as j,w as st,j as Xt,y as Le,m as J,p as oe,t as xi,Y as bi,J as Pe}from"./index-htML_UHV.js";const mi="/assets/images/profile-6.jpeg",vi="/assets/images/profile-7.jpeg",yi="/assets/images/profile-8.jpeg",wi="/assets/images/profile-9.jpeg",ki="/assets/images/profile-10.jpeg",Ai="/assets/images/product-headphones.jpg",Ci="/assets/images/product-shoes.jpg",ze="/assets/images/product-laptop.jpg",Si="/assets/images/product-camera.jpg",Li="/assets/images/profile-34.jpeg";function Pi(B){return B&&B.__esModule&&Object.prototype.hasOwnProperty.call(B,"default")?B.default:B}var le={exports:{}};/*!
  * ApexCharts v3.45.2
  * (c) 2018-2024 ApexCharts
  * Released under the MIT License.

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/index-Dhk0YbwP.css


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/index-htML_UHV.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/menuManage-B3ZyQqQv.js


+ 1 - 1
dist/assets/menus-BmfDTn31.js → dist/assets/menus-shMhw8ZU.js

@@ -1 +1 @@
-import{a5 as t}from"./index-D8mj5zgo.js";function u(){return t({url:"admin/systems/menus/children",method:"get"})}function d(e){return t({url:"admin/systems/menus",method:"post",data:e})}function m(e,n){return t({url:`admin/systems/menus/${e}`,method:"put",data:n})}function r(e){return t({url:`admin/systems/menus/${e}`,method:"delete"})}export{d as a,r as d,m as e,u as g};
+import{a5 as t}from"./index-htML_UHV.js";function u(){return t({url:"admin/systems/menus/children",method:"get"})}function d(e){return t({url:"admin/systems/menus",method:"post",data:e})}function m(e,n){return t({url:`admin/systems/menus/${e}`,method:"put",data:n})}function r(e){return t({url:`admin/systems/menus/${e}`,method:"delete"})}export{d as a,r as d,m as e,u as g};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/orderList-CBDR_mFU.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/orderList-CeCuWBQi.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/outbound-D12zBEVz.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/overseasList-DXciOyvN.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/overseasWarehouseAuth-DfaVFtFI.js


+ 1 - 1
dist/assets/package-DjVvrY0h.js → dist/assets/package-h5ke33cc.js

@@ -1 +1 @@
-import{a5 as e}from"./index-D8mj5zgo.js";function o(a){return e({url:"/admin/erp/companyPackage/createCompanyPackage",method:"post",headers:{"Content-Type":"application/json"},data:a})}function p(a,n){return e({url:`/admin/erp/companyPackage/updateCompanyPackage/${a}`,method:"post",headers:{"Content-Type":"application/json"},data:n})}function r(a){return e({url:"/admin/erp/companyPackage",method:"post",headers:{"Content-Type":"application/json"},data:a,needToken:!1})}function s(a){return e({url:`/admin/erp/companyPackage/disAbleUse/${a}`,method:"post",headers:{"Content-Type":"application/json"}})}export{o as a,p as e,r as p,s};
+import{a5 as e}from"./index-htML_UHV.js";function o(a){return e({url:"/admin/erp/companyPackage/createCompanyPackage",method:"post",headers:{"Content-Type":"application/json"},data:a})}function p(a,n){return e({url:`/admin/erp/companyPackage/updateCompanyPackage/${a}`,method:"post",headers:{"Content-Type":"application/json"},data:n})}function r(a){return e({url:"/admin/erp/companyPackage",method:"post",headers:{"Content-Type":"application/json"},data:a,needToken:!1})}function s(a){return e({url:`/admin/erp/companyPackage/disAbleUse/${a}`,method:"post",headers:{"Content-Type":"application/json"}})}export{o as a,p as e,r as p,s};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/packageAdd-nDrfr7ky.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/packageList-COXQntVI.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/packagePermissions-B6Tv8WZp.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/platformLogin-CyycKyOj.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/print-CiWqBKd7.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/roleManage-cm9PS36E.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/roleManageAdd-Cjka1Swa.js


+ 1 - 1
dist/assets/setting-C59QGWo-.js → dist/assets/setting-BD2OoeWh.js

@@ -1 +1 @@
-import{a5 as e}from"./index-D8mj5zgo.js";function n(t){return e({url:"admin/system-logs",method:"get",loaidng:!1,params:t})}function s(){return e({url:"admin/erp/post/list-all",method:"get",loaidng:!1})}function d(t){return e({url:"admin/systems/dept/list",method:"get",params:t})}function i(t){return e({url:"admin/systems/dept/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function o(t){return e({url:"admin/systems/dept/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function r(t){return e({url:"admin/systems/dept/delete",method:"delete",params:t})}function l(t){return e({url:"admin/systems/dict-type/page",method:"get",params:t})}function u(t){return e({url:"admin/systems/dict-type/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function m(t){return e({url:"admin/systems/dict-type/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function p(t){return e({url:"admin/systems/dict-type/delete",method:"delete",params:t})}function c(t){return e({url:"admin/systems/dict-data/list-all-simple",method:"get",loaidng:!1,params:{dict_type:t}})}function y(t){return e({url:"admin/systems/dict-data/page",method:"get",loaidng:!1,params:t})}function g(t){return e({url:"admin/systems/dict-data/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function f(t){return e({url:"admin/systems/dict-data/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function h(t){return e({url:"admin/systems/dict-data/delete",method:"delete",params:t})}function D(){return e({url:"/admin/erp/warehouse/list-all",method:"get",loaidng:!1})}function T(t){return e({url:"/admin/systems/dict-data/page",method:"get",loaidng:!1,params:t})}export{T as a,c as b,d as c,l as d,y as e,p as f,D as g,h,m as i,u as j,g as k,f as l,n as m,s as n,r as o,o as p,i as q};
+import{a5 as e}from"./index-htML_UHV.js";function n(t){return e({url:"admin/system-logs",method:"get",loaidng:!1,params:t})}function s(){return e({url:"admin/erp/post/list-all",method:"get",loaidng:!1})}function d(t){return e({url:"admin/systems/dept/list",method:"get",params:t})}function i(t){return e({url:"admin/systems/dept/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function o(t){return e({url:"admin/systems/dept/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function r(t){return e({url:"admin/systems/dept/delete",method:"delete",params:t})}function l(t){return e({url:"admin/systems/dict-type/page",method:"get",params:t})}function u(t){return e({url:"admin/systems/dict-type/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function m(t){return e({url:"admin/systems/dict-type/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function p(t){return e({url:"admin/systems/dict-type/delete",method:"delete",params:t})}function c(t){return e({url:"admin/systems/dict-data/list-all-simple",method:"get",loaidng:!1,params:{dict_type:t}})}function y(t){return e({url:"admin/systems/dict-data/page",method:"get",loaidng:!1,params:t})}function g(t){return e({url:"admin/systems/dict-data/update",method:"put",headers:{"Content-Type":"application/json"},data:t})}function f(t){return e({url:"admin/systems/dict-data/create",method:"post",headers:{"Content-Type":"application/json"},data:t})}function h(t){return e({url:"admin/systems/dict-data/delete",method:"delete",params:t})}function D(){return e({url:"/admin/erp/warehouse/list-all",method:"get",loaidng:!1})}function T(t){return e({url:"/admin/systems/dict-data/page",method:"get",loaidng:!1,params:t})}export{T as a,c as b,d as c,l as d,y as e,p as f,D as g,h,m as i,u as j,g as k,f as l,n as m,s as n,r as o,o as p,i as q};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/smsTemplate-C8McgxTb.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/systemLog-C_JcZ7tH.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/systemMessage-ub9ZjzlO.js


+ 1 - 1
dist/assets/templateManage-BxnqUQM0.js → dist/assets/templateManage-B5-rXpvV.js

@@ -1 +1 @@
-import{a5 as t}from"./index-D8mj5zgo.js";function p(e){return t({url:"/admin/erp/SmsMailTemplate",method:"get",loaidng:!1,params:e})}function i(e){return t({url:"/admin/erp/SmsMailTemplate/createTemplate",method:"post",headers:{"Content-Type":"application/json"},data:e})}function l(e,a){return t({url:`/admin/erp/SmsMailTemplate/updateTemplate/${e}`,method:"post",headers:{"Content-Type":"application/json"},data:a})}function o(e){return t({url:`/admin/erp/SmsMailTemplate/alterStatus/${e}`,method:"post",headers:{"Content-Type":"application/json"}})}function r(e,a){return t({url:`/admin/erp/SmsMailTemplate/delete/${e}`,method:"post",headers:{"Content-Type":"application/json"},data:a})}function s(e){return t({url:`/admin/erp/SmsMailTemplate/getSysNotBand/${e}`,method:"get",loaidng:!1})}export{s as a,i as b,o as c,r as d,l as e,p as g};
+import{a5 as t}from"./index-htML_UHV.js";function p(e){return t({url:"/admin/erp/SmsMailTemplate",method:"get",loaidng:!1,params:e})}function i(e){return t({url:"/admin/erp/SmsMailTemplate/createTemplate",method:"post",headers:{"Content-Type":"application/json"},data:e})}function l(e,a){return t({url:`/admin/erp/SmsMailTemplate/updateTemplate/${e}`,method:"post",headers:{"Content-Type":"application/json"},data:a})}function o(e){return t({url:`/admin/erp/SmsMailTemplate/alterStatus/${e}`,method:"post",headers:{"Content-Type":"application/json"}})}function r(e,a){return t({url:`/admin/erp/SmsMailTemplate/delete/${e}`,method:"post",headers:{"Content-Type":"application/json"},data:a})}function s(e){return t({url:`/admin/erp/SmsMailTemplate/getSysNotBand/${e}`,method:"get",loaidng:!1})}export{s as a,i as b,o as c,r as d,l as e,p as g};

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/warehouseList-CB2lXPgR.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/warehouseLocation-BcBKCwBR.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/warehousing-C5A234Qb.js


Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
dist/assets/warehousing-PMqDdN7_.js


+ 2 - 2
dist/index.html

@@ -8,8 +8,8 @@
         <link rel="preconnect" href="https://fonts.googleapis.com" />
         <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
         <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;500;600;700;800&display=swap" rel="stylesheet" />
-      <script type="module" crossorigin src="/assets/index-D8mj5zgo.js"></script>
-      <link rel="stylesheet" crossorigin href="/assets/index-C9nSEd0I.css">
+      <script type="module" crossorigin src="/assets/index-htML_UHV.js"></script>
+      <link rel="stylesheet" crossorigin href="/assets/index-Dhk0YbwP.css">
     </head>
 
     <body>

+ 52 - 29
src/components/TableSearch/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="en-search dark:!bg-[#060818]">
-    <div style="width: 330px ">
+    <div style="width: 330px">
       <el-input v-if="true" size="small" class="dark:!bg-[#060818]" clearable :placeholder="placeholder" v-model="keyword" @keyup.enter="search">
         <template #append>
           <el-button @click="search">
@@ -13,8 +13,8 @@
       </el-input>
     </div>
     <div v-if="advanced">
-      <el-popover ref="popover" placement="bottom-start" trigger="click" :width="advancedWidth" v-model="popoverVisible">
-        <slot name="advanced-content" @click.stop></slot>
+      <!--  <el-popover ref="popover" placement="bottom-start" trigger="click" :width="advancedWidth" v-model="popoverVisible">
+        <slot name="advanced-content"></slot>
         <div style="text-align: right; margin: 0">
           <el-popover placement="top" width="160"  v-model="visibleDelPopover">
             <p>确定要清空表单吗?</p>
@@ -32,6 +32,26 @@
         <template #reference>
           <el-button size="small" style="margin-left: 10px">高级搜索</el-button>
         </template>
+      </el-popover> -->
+      <el-popover ref="popover" placement="bottom-start" trigger="click" :width="advancedWidth" v-model:visible="popoverVisible">
+        <slot name="advanced-content"></slot>
+        <div style="text-align: right; margin: 0">
+          <el-popover placement="top" width="160" v-model:visible="visibleDelPopover">
+            <p>确定要清空表单吗?</p>
+            <div style="text-align: right; margin: 0">
+              <el-button size="small" link @click.stop="visibleDelPopover = false">取消</el-button>
+              <el-button type="primary" size="small" @click.stop="handleCleanForm">确定</el-button>
+            </div>
+            <template #reference>
+              <el-button size="small" link class="clean-form">清空</el-button>
+            </template>
+          </el-popover>
+          <el-button size="small" link @click.stop="popoverVisible = false">取消</el-button>
+          <el-button type="primary" size="small" @click.stop="advancedSearch">确定</el-button>
+        </div>
+        <template #reference>
+          <el-button size="small" style="margin-left: 10px">高级搜索</el-button>
+        </template>
       </el-popover>
     </div>
   </div>
@@ -62,6 +82,7 @@ const search = () => {
 };
 
 const advancedSearch = () => {
+  debugger
   visibleDelPopover.value = false;
   popoverVisible.value = false;
   emit('advancedSearch', keyword.value);
@@ -78,38 +99,40 @@ const handleCleanForm = (event: Event) => {
   const $parent = rootParent;
   const $form = $parent?.$refs['advancedForm'];
   const $forms = $parent?.$refs['advancedForms'];
-  const objs = JSON.parse(JSON.stringify($parent?.advancedForm || {}));
-  Object.keys(objs).forEach((key) => {
-    $parent.advancedForm[key] = '';
-  });
-  if ($forms) {
-    const objss = JSON.parse(JSON.stringify($parent?.advancedForms || {}));
-    Object.keys(objss).forEach((key) => {
-      $parent.advancedForms[key] = '';
+
+  // Check if $parent and $form are defined
+  if ($parent) {
+    const objs = JSON.parse(JSON.stringify($parent.advancedForm || {}));
+    Object.keys(objs).forEach((key) => {
+      $parent.advancedForm[key] = '';
+    });
+    if ($forms) {
+      const objss = JSON.parse(JSON.stringify($parent.advancedForms || {}));
+      Object.keys(objss).forEach((key) => {
+        $parent.advancedForms[key] = '';
+      });
+      findClearValue($forms);
+    }
+    findClearValue($form);
+    clearFuncs.value.forEach((func) => {
+      func(event);
     });
-    findClearValue($forms);
+    clearFuncs.value = [];
+    visibleDelPopover.value = false;
   }
-
-  findClearValue($form);
-  clearFuncs.value.forEach((func) => {
-    func(event);
-  });
-  clearFuncs.value = [];
-  visibleDelPopover.value = false;
 };
 
 const findClearValue = (component: any) => {
+  if (!component || !component.$children) return; // Check if component and $children exist
   const $ch = component.$children;
-  $ch &&
-    $ch.length &&
-    $ch.forEach((item: any) => {
-      const funs = clearFuncNames.value.filter((name) => typeof item[name] === 'function');
-      if (funs.length) {
-        clearFuncs.value.push(item[funs[0]]);
-      } else {
-        findClearValue(item);
-      }
-    });
+  $ch.forEach((item: any) => {
+    const funs = clearFuncNames.value.filter((name) => typeof item[name] === 'function');
+    if (funs.length) {
+      clearFuncs.value.push(item[funs[0]]);
+    } else {
+      findClearValue(item);
+    }
+  });
 };
 </script>
 

+ 4 - 85
src/components/layout/Header.vue

@@ -273,7 +273,7 @@
               <span class="px-2">{{ $t('warehouse') }}</span>
             </div>
             <div class="right_arrow">
-              <icon-caret-down />
+             <!--  <icon-caret-down /> -->
             </div>
           </a>
           <ul class="sub-menu">
@@ -314,55 +314,13 @@
               <span class="px-2">{{ $t('goods') }}</span>
             </div>
             <div class="right_arrow">
-              <icon-caret-down />
+              <!-- <icon-caret-down /> -->
             </div>
           </a>
           <ul class="sub-menu">
             <li>
               <router-link to="/goods/SKUlist">{{ $t('SKUList') }}</router-link>
             </li>
-            <!--  <li>
-              <router-link to="/apps/mailbox">{{ $t('mailbox') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/apps/todolist">{{ $t('todo_list') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/apps/notes">{{ $t('notes') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/apps/scrumboard">{{ $t('scrumboard') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/apps/contacts">{{ $t('contacts') }}</router-link>
-            </li>
-            <li class="relative">
-              <a href="javascript:;"
-                >{{ $t('invoice') }}
-                <div class="ltr:ml-auto rtl:mr-auto rtl:rotate-90 -rotate-90">
-                  <icon-caret-down />
-                </div>
-              </a>
-              <ul
-                class="rounded absolute top-0 ltr:left-[95%] rtl:right-[95%] min-w-[180px] bg-white z-[10] text-dark dark:text-white-dark dark:bg-[#1b2e4b] shadow p-0 py-2 hidden"
-              >
-                <li>
-                  <router-link to="/apps/invoice/list">{{ $t('list') }}</router-link>
-                </li>
-                <li>
-                  <router-link to="/apps/invoice/preview">{{ $t('preview') }}</router-link>
-                </li>
-                <li>
-                  <router-link to="/apps/invoice/add">{{ $t('add') }}</router-link>
-                </li>
-                <li>
-                  <router-link to="/apps/invoice/edit">{{ $t('edit') }}</router-link>
-                </li>
-              </ul>
-            </li>
-            <li>
-              <router-link to="/apps/calendar">{{ $t('calendar') }}</router-link>
-            </li> -->
           </ul>
         </li>
         <li class="menu nav-item relative">
@@ -373,25 +331,13 @@
               <span class="px-2">{{ $t('order') }}</span>
             </div>
             <div class="right_arrow">
-              <icon-caret-down />
+              <!-- <icon-caret-down /> -->
             </div>
           </a>
           <ul class="sub-menu">
             <li>
               <router-link to="/order/orderList">{{ $t('order') }}</router-link>
             </li>
-            <!-- <li>
-              <router-link to="/setting/roleManage">{{ $t('roleManage') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/companyMent/branch">{{ $t('branch') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/companyMent/configMsg">{{ $t('configMsg') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/setting/systemLog">{{ $t('systemLog') }}</router-link>
-            </li> -->
           </ul>
         </li>
         <li class="menu nav-item relative">
@@ -401,7 +347,7 @@
               <span class="px-2">{{ $t('companyMent') }}</span>
             </div>
             <div class="right_arrow">
-              <icon-caret-down />
+              <!-- <icon-caret-down /> -->
             </div>
           </a>
           <ul class="sub-menu">
@@ -420,33 +366,6 @@
             <li>
               <router-link to="/setting/systemLog">{{ $t('systemLog') }}</router-link>
             </li>
-            <!--   <li>
-              <router-link to="/components/countdown">{{ $t('countdown') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/counter">{{ $t('counter') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/sweetalert">{{ $t('sweet_alerts') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/timeline">{{ $t('timeline') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/notifications">{{ $t('notifications') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/media-object">{{ $t('media_object') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/list-group">{{ $t('list_group') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/pricing-table">{{ $t('pricing_tables') }}</router-link>
-            </li>
-            <li>
-              <router-link to="/components/lightbox">{{ $t('lightbox') }}</router-link>
-            </li> -->
           </ul>
         </li>
         <!-- <li class="menu nav-item relative">

+ 24 - 39
src/layouts/app-layout.vue

@@ -49,7 +49,7 @@
     </div>
 
     <!-- BEGIN APP SETTING LAUNCHER -->
-    <Setting />
+    <!--  <Setting /> -->
     <!-- END APP SETTING LAUNCHER -->
 
     <div class="main-container text-black dark:text-white-dark min-h-screen" :class="[store.state.navbar]">
@@ -294,10 +294,6 @@
             <!-- 第一种格式 -->
             <!-- tabs-box --><!-- :class="'active'" -->
             <scroll-pane class="tags-view-wrapper" ref="scrollPane">
-              <!-- <router-link ref="tag" class="tags-view-item" :class="'active'" to="/dashboard">
-                {{ '首页' }}
-                <span class="el-icon-close"></span>
-              </router-link> -->
               <router-link
                 ref="tag"
                 class="tags-view-item"
@@ -306,17 +302,15 @@
                 :to="item.path"
                 :class="item.path == toPath ? 'active' : ''"
               >
-                {{ t(item.name) }}
-                <!-- <span class="pt-1" v-if="item.path !== '/dashboard'" @click.stop="removeTag(index)">
-                  <el-icon>
-                    <Close />
-                  </el-icon>
-                </span> -->
+                <div :class="item.path !== '/dashboard' ? 'flex' : ''" class="justify-around">
+                  <span>{{ t(item.name) }}</span>
+                  <span class="ml-1 mt-0.5" v-if="item.path !== '/dashboard'" @click.prevent.stop="removeTag(index)">
+                    <el-icon>
+                      <Close />
+                    </el-icon>
+                  </span>
+                </div>
               </router-link>
-              <!--   <router-link ref="tag" class="tags-view-item" to="/stock/warehouseList">
-                {{ '仓库列表' }}
-                <span class="el-icon-close"></span>
-              </router-link> -->
             </scroll-pane>
             <!-- 第二种格式 -->
             <!--  <el-breadcrumb separator="/">
@@ -379,7 +373,7 @@ const toggleSidebars = () => {
   store.dispatch('toggleSidebar');
 };
 onMounted(() => {
-  toPathList.value.push({ name: '首页', path: '/dashboard' });
+  toPathList.value.push({ name: t('home'), path: '/dashboard' });
   window.onscroll = () => {
     if (document.body.scrollTop > 50 || document.documentElement.scrollTop > 50) {
       showTopButton.value = true;
@@ -430,28 +424,15 @@ const expand = () => {
 
 /* 监听 */
 const toPath = ref('');
-const toPathList = ref<{ name:any; path: string }[]>([]);
+const toPathList = ref<{ name: any; path: string }[]>([]);
 watch(route, (to) => {
   toPath.value = to.path;
   // Add path if it doesn't exist
   if (!toPathList.value.some((item) => item.path === to.path)) {
-    toPathList.value.push({ name: to.name|| null, path: to.path });
+    toPathList.value.push({ name: to.name || null, path: to.path });
     // Limit to last 10 entries
     if (toPathList.value.length > 10) toPathList.value.shift();
   }
-  /* toPath.value = to.path;
-  if (!toPathList.value.includes(to.path)) {
-    toPathList.value.push(to.path);
-  }
-
-  if (toPathList.value.length > 10) {
-    toPathList.value.shift(); 
-  } */
-  if (to.path == '/dashboard') {
-    /* sidebarShow.value = false; */
-  } else {
-    /* sidebarShow.value = true; */
-  }
 });
 
 /* 获取页面 */
@@ -463,18 +444,22 @@ const lastTenVisitedViews = computed(() => {
 });
 /* 删除标签 */
 const removeTag = (index: number) => {
-  if (toPathList.value.length > 1) { // Ensure there's at least one tag left
-    const tagToRemove = toPathList.value[index]; // Get the tag being removed
-    toPathList.value.splice(index, 1); // Remove the tag
+  if (toPathList.value.length > 1) {
+    const tagToRemove = toPathList.value[index]; // 获取要删除的标签
+    toPathList.value.splice(index, 1); // 删除标签
 
-    // Determine the previous tag to navigate to
-    const previousTag = toPathList.value[index] || toPathList.value[index - 1]; // Get the previous tag or stay on the current one
+    // 确定要导航到的上一个标签
+    const previousTag = toPathList.value[index] || toPathList.value[index - 1]; // 获取上一个标签或保持在当前标签
 
-    // Check if the current route is the same as the tag being removed
-    if (previousTag && route.path !== tagToRemove.path) {
-      router.push(previousTag.path); // Navigate to the previous tag
+    // 检查当前路由是否与要删除的标签相同
+    if (previousTag) {
+      router.push(previousTag.path); // 导航到上一个标签
     }
   }
+  // 保证最后一个标签为首页
+  if (toPathList.value.length === 1 && toPathList.value[0].path !== '/dashboard') {
+    toPathList.value.push({ name: '首页', path: '/dashboard' });
+  }
 };
 /* 历史标签 */
 </script>

+ 5 - 0
src/locales/en.json

@@ -11,6 +11,11 @@
   "goodsUnderstock": "Transfer List",
   "configMsg": "Message Configuration",
 
+
+  "overseasList": "Warehouse List",
+  "orderList": "Order List",
+  "Notify": "Notification",
+
   "selfBuilt": "Self-built Warehouse",
   "virtualWarehouse": "Virtual Warehouse",
   "overseasWarehouse": "Overseas Warehouse",

+ 3 - 0
src/locales/zh.json

@@ -13,6 +13,9 @@
 
     "selfBuilt":"自建仓",
     "virtualWarehouse":"虚拟仓",
+    "overseasList":"仓库列表",
+    "orderList":"订单列表",
+    "Notify":"通知",
 
     "overseasWarehouse":"海外仓",
     "overseasWarehouseAuth":"海外仓授权",

+ 2 - 2
src/views/order/orderList.vue

@@ -26,7 +26,7 @@
                 ></el-cascader>
               </el-form-item>
               <el-form-item label="状态">
-                <el-select @click.stop v-model="searchForm.status" clearable >
+                <el-select @click.stop v-model="searchForm.status" clearable :teleported="false">
                   <el-option key="NEW" label="新创建" value="NEW" />
                   <el-option key="CONFIRMED" label="已确认" value="CONFIRMED" />
                   <el-option key="RETURNED" label="已归还" value="RETURNED" />
@@ -441,7 +441,7 @@ const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
   return true;
 };
 /* 仓库列表 */
-const warehouseList=ref([])
+const warehouseList = ref([]);
 /* 搜索表单 */
 const searchForm = ref({
   dept_id: '',

+ 4 - 4
src/views/stock/warehousing.vue

@@ -4,7 +4,7 @@
     <div class="search bg-white pt-2 dark:!bg-[#060818]">
       <el-form ref="advancedFormRef" :model="advancedForm" ><!-- label-width="130px" -->
         <el-row :gutter="20">
-          <el-col :xs="24" :sm="24" :md="6" :lg="5" :xl="6" class="mb-4 mr-3">
+          <el-col :xs="24" :sm="24" :md="6" :lg="4" :xl="6" class="mb-4 mr-3">
             <el-form-item :label="$t('access_time')+':'">
               <el-date-picker
                 class="dark:!bg-[#060818] w-full mt-1"
@@ -19,12 +19,12 @@
           </el-col>
           <el-col :xs="24" :sm="24" :md="8" :lg="3" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('warechouse')+':'">
-              <el-select v-model="advancedForm.warehouse_id" clearable class="w-full dark:!bg-[#060818]">
+              <el-select v-model="advancedForm.warehouse_id" clearable class="dark:!bg-[#060818] min-w-20" >
                 <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :md="7" :lg="3" :xl="7" class="mb-4 mr-3">
+          <el-col :xs="24" :sm="24" :md="8" :lg="3" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('storage_type')+':'">
               <el-select v-model="advancedForm.type" clearable class="w-full dark:!bg-[#060818]">
                 <el-option v-for="item in entryList" :key="item.id" :label="item.label" :value="item.value" />
@@ -46,7 +46,7 @@
               <el-input v-model="advancedForm.customer_phone" class="w-full dark:!bg-[#060818]" clearable :placeholder="$t('change') + $t('phone')"></el-input>
             </el-form-item>
           </el-col> -->
-          <el-col :xs="24" :sm="24" :md="7" :lg="3" :xl="7" class="mb-4 mr-3">
+          <el-col :xs="24" :sm="24" :md="7" :lg="3" :xl="8" class="mb-4 mr-3">
             <el-form-item :label="$t('warehousing_state')+':'">
               <el-select v-model="advancedForm.has_submit" clearable class="w-full dark:!bg-[#060818]">
                 <!--  <el-option v-for="item in entryList" :key="item.id" :label="item.label" :value="item.value" /> -->

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä