Bladeren bron

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/assets/ShoppingCartOutlined-3b334f03.js
#	dist/assets/base-b02b8c3b.js
#	dist/assets/detail-d6e74f46.js
#	dist/assets/dispatchAndReturnMxAgent-4ea85093.js
#	dist/assets/index-08ac3cc7.js
#	dist/assets/index-1fc091e3.js
#	dist/assets/index-25255183.css
#	dist/assets/index-387d22d5.js
#	dist/assets/index-3ebb7639.js
#	dist/assets/index-41fd6c1e.js
#	dist/assets/index-42f10928.js
#	dist/assets/index-5b890a28.js
#	dist/assets/index-6a3c1740.js
#	dist/assets/index-744e8d99.js
#	dist/assets/index-7c5328fc.js
#	dist/assets/index-8182400f.js
#	dist/assets/index-88f6ac8d.js
#	dist/assets/index-8c943a76.js
#	dist/assets/index-ae79c411.js
#	dist/assets/index-b5305ca2.js
#	dist/assets/index-b6471bb6.js
#	dist/assets/index-b8f85f82.js
#	dist/assets/index-bd0b307d.js
#	dist/assets/index-bdb88cc5.js
#	dist/assets/index-c5a6cc37.js
#	dist/assets/index-c651a18f.js
#	dist/assets/index-cc02937a.js
#	dist/assets/index-d90eaf89.js
#	dist/assets/index-da6e0cc9.js
#	dist/assets/index-f0277e90.js
#	dist/assets/index-f332d95f.js
#	dist/assets/index-f4364608.js
#	dist/assets/index-f7dcf718.js
#	dist/assets/md5-5743a3ce.js
#	dist/assets/payment-e4c4a1ab.js
#	dist/assets/tableTemp-59d6222b.js
#	dist/index2.html
qymljy 2 jaren geleden
bovenliggende
commit
7fb084e97b
72 gewijzigde bestanden met toevoegingen van 127 en 75 verwijderingen
  1. 1 0
      dist/assets/ShoppingCartOutlined-3b334f03.js
  2. 0 0
      dist/assets/base-b02b8c3b.js
  3. 0 0
      dist/assets/detail-d6e74f46.js
  4. 1 0
      dist/assets/dispatchAndReturnMxAgent-4ea85093.js
  5. 0 0
      dist/assets/index-08ac3cc7.js
  6. 1 0
      dist/assets/index-0ad56a87.css
  7. 0 0
      dist/assets/index-0e5bc22e.js
  8. 1 0
      dist/assets/index-1fc091e3.js
  9. 1 0
      dist/assets/index-25255183.css
  10. 0 0
      dist/assets/index-387d22d5.js
  11. 0 0
      dist/assets/index-3ebb7639.js
  12. 0 0
      dist/assets/index-41fd6c1e.js
  13. 1 0
      dist/assets/index-42f10928.js
  14. 0 0
      dist/assets/index-43e28f5e.js
  15. 1 0
      dist/assets/index-58a65365.css
  16. 0 0
      dist/assets/index-5b890a28.js
  17. 0 0
      dist/assets/index-6a3c1740.js
  18. 1 0
      dist/assets/index-744e8d99.js
  19. 1 0
      dist/assets/index-747d8c8f.css
  20. 1 0
      dist/assets/index-7c5328fc.js
  21. 0 0
      dist/assets/index-8182400f.js
  22. 1 0
      dist/assets/index-88f6ac8d.js
  23. 0 0
      dist/assets/index-8c943a76.js
  24. 0 0
      dist/assets/index-93f0a7d4.css
  25. 0 0
      dist/assets/index-ae79c411.js
  26. 0 0
      dist/assets/index-b5305ca2.js
  27. 1 0
      dist/assets/index-b6471bb6.js
  28. 1 0
      dist/assets/index-b8f85f82.js
  29. 0 0
      dist/assets/index-bd0b307d.js
  30. 0 0
      dist/assets/index-bdb88cc5.js
  31. 0 0
      dist/assets/index-bee5ed3e.js
  32. 0 0
      dist/assets/index-c5a6cc37.js
  33. 1 0
      dist/assets/index-c651a18f.js
  34. 0 0
      dist/assets/index-cc02937a.js
  35. 0 0
      dist/assets/index-d90eaf89.js
  36. 1 0
      dist/assets/index-da6e0cc9.js
  37. 0 0
      dist/assets/index-e40afa4e.js
  38. 1 0
      dist/assets/index-f0277e90.js
  39. 0 0
      dist/assets/index-f332d95f.js
  40. 1 0
      dist/assets/index-f4364608.js
  41. 0 0
      dist/assets/index-f7dcf718.js
  42. 1 0
      dist/assets/login-676d043d.css
  43. 0 0
      dist/assets/login-be799cf2.js
  44. 8 0
      dist/assets/md5-5743a3ce.js
  45. 1 0
      dist/assets/noAccess-f13dc699.js
  46. 1 0
      dist/assets/payment-3c6aa860.css
  47. 5 0
      dist/assets/payment-e4c4a1ab.js
  48. 1 0
      dist/assets/tableTemp-59d6222b.js
  49. 17 0
      dist/index2.html
  50. 2 2
      node_modules/.vite/deps/@ant-design_icons-vue.js
  51. 0 0
      node_modules/.vite/deps/@ant-design_icons-vue.js.map
  52. 28 28
      node_modules/.vite/deps/_metadata.json
  53. 5 5
      node_modules/.vite/deps/ant-design-vue.js
  54. 0 0
      node_modules/.vite/deps/ant-design-vue.js.map
  55. 2 2
      node_modules/.vite/deps/ant-design-vue_es_locale_zh_CN.js
  56. 0 0
      node_modules/.vite/deps/ant-design-vue_es_locale_zh_CN.js.map
  57. 0 0
      node_modules/.vite/deps/axios.js.map
  58. 0 0
      node_modules/.vite/deps/js-md5.js.map
  59. 2 2
      node_modules/.vite/deps/mathjs.js
  60. 0 0
      node_modules/.vite/deps/mathjs.js.map
  61. 1 1
      node_modules/.vite/deps/pinia-plugin-persist.js.map
  62. 2 2
      node_modules/.vite/deps/pinia.js
  63. 2 2
      node_modules/.vite/deps/vue-router.js
  64. 1 1
      node_modules/.vite/deps/vue.js
  65. 4 4
      src/DRP/SDrpManagement/productGroup/index.vue
  66. 2 2
      src/DRP/SDrpManagement/productGroup/modules/fieldAndClass.vue
  67. 3 2
      src/DRP/SDrpManagement/productGroup/modules/tree.vue
  68. 6 4
      src/DRP/SDrpManagement/shopCart/index.vue
  69. 10 13
      src/components/layout/aside.vue
  70. 1 2
      src/components/layout/header.vue
  71. 2 2
      src/components/webSocket/index.vue
  72. 3 1
      src/style.less

+ 1 - 0
dist/assets/ShoppingCartOutlined-3b334f03.js

@@ -0,0 +1 @@
+import{a as o}from"./index-c9978dc1.js";import{j as l}from"./vue-15ee4564.js";var p={icon:{tag:"svg",attrs:{viewBox:"0 0 1024 1024",focusable:"false"},children:[{tag:"path",attrs:{d:"M922.9 701.9H327.4l29.9-60.9 496.8-.9c16.8 0 31.2-12 34.2-28.6l68.8-385.1c1.8-10.1-.9-20.5-7.5-28.4a34.99 34.99 0 00-26.6-12.5l-632-2.1-5.4-25.4c-3.4-16.2-18-28-34.6-28H96.5a35.3 35.3 0 100 70.6h125.9L246 312.8l58.1 281.3-74.8 122.1a34.96 34.96 0 00-3 36.8c6 11.9 18.1 19.4 31.5 19.4h62.8a102.43 102.43 0 00-20.6 61.7c0 56.6 46 102.6 102.6 102.6s102.6-46 102.6-102.6c0-22.3-7.4-44-20.6-61.7h161.1a102.43 102.43 0 00-20.6 61.7c0 56.6 46 102.6 102.6 102.6s102.6-46 102.6-102.6c0-22.3-7.4-44-20.6-61.7H923c19.4 0 35.3-15.8 35.3-35.3a35.42 35.42 0 00-35.4-35.2zM305.7 253l575.8 1.9-56.4 315.8-452.3.8L305.7 253zm96.9 612.7c-17.4 0-31.6-14.2-31.6-31.6 0-17.4 14.2-31.6 31.6-31.6s31.6 14.2 31.6 31.6a31.6 31.6 0 01-31.6 31.6zm325.1 0c-17.4 0-31.6-14.2-31.6-31.6 0-17.4 14.2-31.6 31.6-31.6s31.6 14.2 31.6 31.6a31.6 31.6 0 01-31.6 31.6z"}}]},name:"shopping-cart",theme:"outlined"};const u=p;function i(r){for(var t=1;t<arguments.length;t++){var e=arguments[t]!=null?Object(arguments[t]):{},n=Object.keys(e);typeof Object.getOwnPropertySymbols=="function"&&(n=n.concat(Object.getOwnPropertySymbols(e).filter(function(a){return Object.getOwnPropertyDescriptor(e,a).enumerable}))),n.forEach(function(a){s(r,a,e[a])})}return r}function s(r,t,e){return t in r?Object.defineProperty(r,t,{value:e,enumerable:!0,configurable:!0,writable:!0}):r[t]=e,r}var c=function(t,e){var n=i({},t,e.attrs);return l(o,i({},n,{icon:u}),null)};c.displayName="ShoppingCartOutlined";c.inheritAttrs=!1;const h=c;export{h as S};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/base-b02b8c3b.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/detail-d6e74f46.js


+ 1 - 0
dist/assets/dispatchAndReturnMxAgent-4ea85093.js

@@ -0,0 +1 @@
+import{b as p}from"./index-c9978dc1.js";import{l as k}from"./index-349e8ca3.js";import{_ as b}from"./index-e8ae4702.js";import{u as h}from"./vue-router-0190217c.js";import{a,U as g,V as t,W as o,j as u,X as n,u as r,G as s,a4 as l,a5 as c,F as x,a3 as d}from"./vue-15ee4564.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const T={key:0},N={key:1},w={__name:"dispatchAndReturnMxAgent",setup(v){h();const _=a();let y=a([]);a([]);let f=a([{label:"类型",key:"type",type:"select",dataSource:[{remarks:"发货",value:"发货"},{remarks:"退货",value:"退货"}]},{label:"出库时间",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]},{label:"搜索",key:"condition",type:"input"}]),i=a({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230626104003});return(A,B)=>{const m=g("router-link");return t(),o("div",null,[u(k,{ref_key:"list",ref:_,columns:r(y),param:r(i),tableName:"dispatchMxTable",searchType:r(f)},{operation:n(()=>[s(" 发退货明细 "),u(b,{param:r(i)},null,8,["param"])]),tb_cell:n(({data:e})=>[e.column.dataIndex==="price"?(t(),o("span",T,l(r(p).formatAmount(e.record.price)),1)):c("",!0),e.column.dataIndex==="amount"?(t(),o("span",N,l(r(p).formatAmount(e.record.amount)),1)):c("",!0),e.column.dataIndex==="billno"?(t(),o(x,{key:2},[e.record.type=="发货"?(t(),d(m,{key:0,to:{path:"/dispatchdetail_agent",query:{id:e.record.id}}},{default:n(()=>[s(l(e.record.billno),1)]),_:2},1032,["to"])):(t(),d(m,{key:1,to:{path:"/aftersalesBillDetail",query:{id:e.record.id}}},{default:n(()=>[s(l(e.record.billno),1)]),_:2},1032,["to"]))],64)):c("",!0)]),_:1},8,["columns","param","searchType"])])}}};export{w as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-08ac3cc7.js


+ 1 - 0
dist/assets/index-0ad56a87.css

@@ -0,0 +1 @@
+.header .ant-menu-horizontal{border-bottom:none}.header[data-v-c5a62e84]{display:flex;align-items:center;position:sticky;top:0px;padding-right:60px;border-bottom:1px solid #f0f0f0;background:#fff;z-index:999}.dropdown-link[data-v-c5a62e84]{margin-top:-1px}.color-red[data-v-c5a62e84]{color:red}.flex[data-v-c5a62e84]{display:flex;align-items:center;justify-content:space-around}.asides[data-v-c5acd5b0]{position:relative;width:256px;background:#fff;box-shadow:2px 0 6px #a8adb159;transition:.1s ease-out all}.aside-item[data-v-c5acd5b0]{cursor:pointer;color:#333;margin:10px;border-radius:5px;transition:.2s linear;overflow:hidden}.logo-panel[data-v-c5acd5b0]{padding:10px;margin-bottom:10px;border-bottom:1px solid #f1f2f3;background:#fff}.logo-panel h4[data-v-c5acd5b0]{color:#333;margin:0 0 0 10px}.flex[data-v-c5acd5b0]{display:flex;align-items:center;justify-content:space-between}.menu-icon[data-v-c5acd5b0]{display:inline-block;height:40px;width:100%;font-size:14px;text-align:center;line-height:40px}.collapsed[data-v-c5acd5b0]{display:block;padding:10px 20px}.onSystem .uncollapsed[data-v-c5acd5b0]{color:#fff}.layout{background:url(./bg-4325a45f.png);background-size:cover}.site-layout-content{min-height:280px;padding:24px;background:#fff}#components-layout-demo-top .logo{float:left;width:120px;height:31px;margin:16px 24px 16px 0;background:rgba(255,255,255,.3)}.ant-row-rtl #components-layout-demo-top .logo{float:right;margin:16px 0 16px 24px}[data-theme=dark] .site-layout-content{background:#fff}.content-height{height:calc(100vh - 70px);padding:0 10px 10px;overflow-y:scroll}.flex{display:flex}.scale-enter-active,.scale-leave-active{transition:all .5s ease}.scale-enter-from,.scale-leave-to{opacity:0;transform:scale(.9)}

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-0e5bc22e.js


+ 1 - 0
dist/assets/index-1fc091e3.js

@@ -0,0 +1 @@
+import{l as n}from"./index-349e8ca3.js";import{u as c}from"./vue-router-0190217c.js";import{a as e,V as p,W as i,j as l,X as a,u as r,G as o,a4 as u}from"./vue-15ee4564.js";import"./index-c9978dc1.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const _={class:"y-container"},k={__name:"index",setup(d){c();let s=e([]);e([]);let m=e({content:{systemappid:0},id:20221213094401});return(f,x)=>(p(),i("div",_,[l(n,{columns:r(s),param:r(m),tableName:"reportcenterTable"},{operation:a(()=>[o(" 报表中心 ")]),tb_cell:a(({data:t})=>[o(u(t.record[t.column.dataIndex]),1)]),_:1},8,["columns","param"])]))}};export{k as default};

+ 1 - 0
dist/assets/index-25255183.css

@@ -0,0 +1 @@
+.card{display:flex;align-items:center;margin:15px 0 10px;width:100%;height:50px;padding:10px 0;background:#fff;border-radius:8px;-webkit-mask-image:radial-gradient(circle at 88px 4px,transparent 4px,red 4.5px),radial-gradient(closest-side circle at 50%,red 99%,transparent 100%);-webkit-mask-size:100%,2px 4px;-webkit-mask-repeat:repeat,repeat-y;-webkit-mask-position:0 -4px,87px;-webkit-mask-composite:source-out;mask-composite:subtract;background:linear-gradient(45deg,orange,red)}.card-left{width:88px;text-align:center;font-size:18px;color:#fff}.card-right{padding:16px 12px;display:flex;flex:1;flex-direction:column}.card-info{margin:0 0 10px;font-size:14px;line-height:20px;color:#fff}.card-time{font-size:12px;line-height:16px;font-weight:400;color:#fff;margin-top:0}.pay_border[data-v-b7e8f4ea]{background:#FFF9F2;height:30px;vertical-align:center;line-height:30px}.pay_font[data-v-b7e8f4ea]{color:#fa8c16;margin-left:10px;font-size:17px;font-weight:700}

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-387d22d5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-3ebb7639.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-41fd6c1e.js


+ 1 - 0
dist/assets/index-42f10928.js

@@ -0,0 +1 @@
+import{l as o}from"./index-349e8ca3.js";import{u as m}from"./vue-router-0190217c.js";import{a as e,V as n,W as i,j as p,u as a}from"./vue-15ee4564.js";import"./index-c9978dc1.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={__name:"index",setup(u){m();const t=e();let r=e([]);e([]);let l=e([{label:"状态",key:"status",type:"select",dataSource:[{remarks:"新建",value:"新建"},{remarks:"提交",value:"提交"},{remarks:"审核",value:"审核"},{remarks:"复核",value:"复核"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]},{label:"搜索",key:"condition",type:"input"}]),s=e({content:{pageNumber:1,pageSize:20,type:"退货单",where:{condition:"",tablefilter:{}}},id:20230105161503});return(c,d)=>(n(),i("div",null,[p(o,{ref_key:"list",ref:t,columns:a(r),param:a(s),tableName:"afterSalesMagTable",keyRouteName:"billno",searchType:a(l),detailPage:{name:"aftersalesBillDetail",idname:"sa_aftersalesmagid"}},null,8,["columns","param","searchType"])]))}};export{h as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-43e28f5e.js


+ 1 - 0
dist/assets/index-58a65365.css

@@ -0,0 +1 @@
+p[data-v-13ed7b82]{margin:0}.class-item[data-v-13ed7b82]{margin:0 15px;cursor:pointer;transition:.2s all linear;font-size:14px}.classIndex[data-v-13ed7b82]{margin-bottom:0!important}.classItem[data-v-13ed7b82]{flex:0 1 auto;width:100px;font-size:.875rem;cursor:pointer;text-align:left;color:#666;border-right:1px solid #ccc;margin-bottom:1.5em;padding:0 15px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.flex-start[data-v-13ed7b82]{display:flex;flex-wrap:nowrap;align-items:flex-start;position:relative;width:80px}.act[data-v-13ed7b82]{color:red;font-weight:700}.classPanel[data-v-ae15efa5]{padding:10px 10px 1px;background:#fff}ul[data-v-ae15efa5]{display:flex;list-style:none;padding:0;color:#666}ul li[data-v-ae15efa5]{width:150px;padding:0 15px;text-align:left;cursor:pointer}.on[data-v-ae15efa5]{color:red;font-weight:700}.card[data-v-809c2b2b]{width:100%;min-height:300px;transition:all .2s;border-radius:5px;padding:10px;cursor:pointer;background:#fff}.card-list[data-v-809c2b2b]{min-height:calc(100vh - 520px)}.card[data-v-809c2b2b]:hover{box-shadow:0 0 12px #0000001a}.title[data-v-809c2b2b]{max-width:217px;height:22px;font-weight:700;color:#34495e!important}.group-panel[data-v-809c2b2b]{padding:10px}.group-panel p[data-v-809c2b2b]{color:#666}.empty[data-v-809c2b2b]{display:flex;align-items:center;justify-content:space-around;height:calc(100vh - 440px)}.full-height[data-v-809c2b2b]{height:calc(100vh - 146px);overflow-y:scroll}.pd-10[data-v-809c2b2b]{padding:8px 16px}.descript[data-v-809c2b2b]{font-size:.75rem}

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-5b890a28.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-6a3c1740.js


+ 1 - 0
dist/assets/index-744e8d99.js

@@ -0,0 +1 @@
+import{A as r,b as n}from"./index-c9978dc1.js";import{U as p,V as c,W as i,j as m,X as _,G as l}from"./vue-15ee4564.js";const d={style:{float:"right"}},b={__name:"index",props:{param:Object},setup(e){const a=e,o=async()=>{a.param.content.isExport=!0;const t=await r.requested(a.param);n.message(t,"导出成功",()=>{window.open(t.data[0].url?t.data[0].url:t.data,"_self"),a.param.content.isExport=!1})};return(t,u)=>{const s=p("a-button");return c(),i("div",d,[m(s,{type:"primary",onClick:o},{default:_(()=>[l("导出")]),_:1})])}}};export{b as _};

+ 1 - 0
dist/assets/index-747d8c8f.css

@@ -0,0 +1 @@
+.submit-panel[data-v-bc26a293]{position:sticky;bottom:0;display:flex;align-items:center;border:1px solid #f1f2f3;overflow:hidden;background:#fff;z-index:999}.submit-panel p[data-v-bc26a293]{flex:1;margin:0;text-align:right;padding:0 10px}.submit-btn[data-v-bc26a293]{float:right;padding:15px 20px;background:red;color:#fff;width:150px;text-align:center;cursor:pointer;font-weight:700}.disabled-submit-btn[data-v-bc26a293]{background:#999}.color-red[data-v-bc26a293]{color:red}.sumAmount[data-v-bc26a293]{font-size:1.5em;margin-left:10px}.search-input[data-v-bc26a293]{width:300px;margin-bottom:20px}.image-panel[data-v-bc26a293]{display:flex;align-items:center;justify-content:space-around;height:50px;width:50px;border-radius:4px;background:#f1f2f3;overflow:hidden}

+ 1 - 0
dist/assets/index-7c5328fc.js

@@ -0,0 +1 @@
+import{l as o}from"./index-349e8ca3.js";import{u as m}from"./vue-router-0190217c.js";import{a as e,V as p,W as i,j as c,X as n,u as a,G as u,a4 as d}from"./vue-15ee4564.js";import"./index-c9978dc1.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const g={__name:"index",setup(k){m();let t=e([]);e([]);let l=e([{label:"状态",key:"status",type:"select",dataSource:[{remarks:"新建",value:"新建"},{remarks:"提交",value:"提交"},{remarks:"审核",value:"审核"},{remarks:"关闭",value:"关闭"}]},{label:"订单类型",key:"type",type:"select",dataSource:[{remarks:"标准订单",value:"标准订单"},{remarks:"促销订单",value:"促销订单"},{remarks:"特殊订单",value:"特殊订单"}]},{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),s=e({content:{isExport:0,pageNumber:1,pageSize:20,where:{condition:"",tablefilter:{}}},id:20230105143002});return(y,b)=>(p(),i("div",null,[c(o,{columns:a(t),param:a(s),tableName:"orderTable",searchType:a(l),detailPage:{name:"orderdetail",idname:"sa_orderid"}},{tb_cell:n(({data:r})=>[u(d(r.record[r.column.dataIndex]),1)]),_:1},8,["columns","param","searchType"])]))}};export{g as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-8182400f.js


+ 1 - 0
dist/assets/index-88f6ac8d.js

@@ -0,0 +1 @@
+import{A as f,b as u}from"./index-c9978dc1.js";import{l as b}from"./index-349e8ca3.js";import{_ as h}from"./index-e8ae4702.js";import{u as x}from"./vue-router-0190217c.js";import{a,o as v,V as r,W as o,j as p,X as i,u as t,G as g,a4 as s,a5 as n}from"./vue-15ee4564.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const T={key:0},N={key:1},S={key:2},C={__name:"index",setup(A){x();const d=a();let y=a([]);a([]);let l=a([]),c=a({content:{pageNumber:1,pageSize:20,sort:[{sortname:"默认",sorted:1,sortid:137,reversed:0}],where:{condition:""}},id:20230508111703});const k=async()=>{let m={label:"分类明细",key:"type",type:"select",dataSource:(await f.optionstype("specordermx")).data};l.value=[{label:"状态",key:"status",type:"select",dataSource:[{remarks:"审核",value:"审核"},{remarks:"关闭",value:"关闭"},{remarks:"手工关闭",value:"手工关闭"}]},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]},{label:"未发查询",key:"datetype",type:"select",dataSource:[{remarks:"7日未发",value:"7"},{remarks:"30日未发",value:"30"},{remarks:"90日未发",value:"90"},{remarks:"所有未发",value:""}],method:e=>{e.isuncheckout=1}},m,{label:"搜索",key:"condition",type:"input"}]};return v(()=>{k()}),(_,m)=>(r(),o("div",null,[p(b,{ref_key:"list",ref:d,columns:t(y),param:t(c),tableName:"orderMxTable",searchType:t(l)},{operation:i(()=>[g(" 订单明细 "),p(h,{param:t(c)},null,8,["param"])]),tb_cell:i(({data:e})=>[e.column.dataIndex==="price"?(r(),o("span",T,s(t(u).formatAmount(e.record.price)),1)):n("",!0),e.column.dataIndex==="amount"?(r(),o("span",N,s(t(u).formatAmount(e.record.amount)),1)):n("",!0),e.column.dataIndex==="undeliqty"?(r(),o("span",S,s(e.record.undeliqty+e.record.unsoldqty),1)):n("",!0)]),_:1},8,["columns","param","searchType"])]))}};export{C as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-8c943a76.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-93f0a7d4.css


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-ae79c411.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-b5305ca2.js


+ 1 - 0
dist/assets/index-b6471bb6.js

@@ -0,0 +1 @@
+import{u as V,s as q,A as p}from"./index-c9978dc1.js";import{u as w}from"./vue-router-0190217c.js";import{_ as z}from"./_plugin-vue_export-helper-c27b6911.js";import{a as u,o as A,U as l,V as s,W as t,F as B,a2 as j,j as n,a5 as F,X as g,G as y,a4 as r,$ as I}from"./vue-15ee4564.js";const P={class:"y-container"},R=["onClick"],T={key:1,class:"message-content"},U={key:0,class:"empty"},$={__name:"index",setup(D){const v=V();let{system:f,mods:h,act_mods:E}=q(v);const x=w(),o=u({classname:"system.message.Message",method:"queryMessage",content:{nocache:!0,pageNumber:1,pageSize:20,type:"应用",where:{}}}),d=u([]),_=u(0),i=async()=>{const a=await p.requested(o.value);d.value=a.data,_.value=a.total},b=(a,c)=>{o.value.content.pageNumber=a,o.value.content.pageSize=c,i()},k=async a=>{if(a.isread==1)return!1;await p.requested({classname:"system.message.Message",method:"readMessage",content:{nocache:!0,messageid:a.messageid}}),a.isread=1},C=()=>{sessionStorage.setItem("isPay",1),h.value=f.value[1].modules,x.push({name:"payOrders"})};return A(()=>{i()}),(a,c)=>{const m=l("a-tag"),N=l("a-divider"),M=l("a-empty"),S=l("a-pagination");return s(),t("div",P,[(s(!0),t(B,null,j(d.value,e=>(s(),t("div",{key:e.index,onClick:G=>k(e)},[n(m,{color:"#108ee9"},{default:g(()=>[y(r(e.title),1)]),_:2},1024),n(m,{color:e.isread==1?"#87d068":"#f50"},{default:g(()=>[y(r(e.isread==1?"已读":"未读"),1)]),_:2},1032,["color"]),I("small",null,r(e.createdate),1),e.objectname==="sys_payorder"?(s(),t("p",{key:0,class:"message-content",onClick:C},r(e.message),1)):(s(),t("p",T,r(e.message),1)),n(N)],8,R))),128)),d.value.length==0?(s(),t("div",U,[n(M,{description:"暂无消息"})])):F("",!0),n(S,{current:o.value.content.pageNumber,"onUpdate:current":c[0]||(c[0]=e=>o.value.content.pageNumber=e),size:"small",total:_.value,onChange:b},null,8,["current","total"])])}}},H=z($,[["__scopeId","data-v-fc0babe2"]]);export{H as default};

+ 1 - 0
dist/assets/index-b8f85f82.js

@@ -0,0 +1 @@
+import{A as m,b as d}from"./index-c9978dc1.js";import{l as u}from"./index-349e8ca3.js";import{u as y}from"./vue-router-0190217c.js";import{a as e,o as _,V as n,W as r,j as b,X as f,u as a,a4 as h,a5 as g}from"./vue-15ee4564.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const k={key:0},j={__name:"index",setup(T){y();const i=e();e([]);const t=e([]);let p=e([{label:"筛选",key:"status",type:"select",dataSource:t},{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]},{label:"搜索",key:"condition",type:"input"}]),c=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230320160203});const l=async()=>{const s=await m.optionstype("dealershippingorderscreening");t.value=s.data};return _(()=>{l()}),(s,x)=>(n(),r("div",null,[b(u,{ref_key:"list",ref:i,param:a(c),tableName:"dispatchTable",keyRouteName:"billno",searchType:a(p),detailPage:{name:"dispatchdetail_agent",idname:"sa_dispatchid"}},{tb_cell:f(({data:o})=>[o.column.dataIndex==="sumamount"?(n(),r("span",k,h(a(d).formatAmount(o.record.sumamount)),1)):g("",!0)]),_:1},8,["param","searchType"])]))}};export{j as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-bd0b307d.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-bdb88cc5.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-bee5ed3e.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-c5a6cc37.js


+ 1 - 0
dist/assets/index-c651a18f.js

@@ -0,0 +1 @@
+import{A as i,b as t}from"./index-c9978dc1.js";import{d as m}from"./index-7ce894d6.js";import{u as b}from"./vue-router-0190217c.js";import{a as r,o as v,V as p,W as d,j as f,X as _,u as o}from"./vue-15ee4564.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const w={__name:"index",setup(h){const s=b(),u=r([]),l=r({}),n=async()=>{const e=await i.requested({id:"20221009103003",content:{nocache:!0,sa_cashbillid:s.currentRoute.value.query.id}});l.value=e.data,c(e.data)},c=e=>{u.value=[{label:"单号",value:e.billno},{label:"状态",value:e.status,style:function(){let a={};switch(e.status){case"新建":a={color:"#000000"};break;case"审核":a={color:"#52C41A"};break}return a}},{label:"账户类型",value:e.accountname},{label:"经销商",value:e.enterprisename},{label:"金额",value:t.formatAmount(e.amount)},{label:"分类",value:e.class},{label:"分类明细",value:e.subclass},{label:"单据日期",value:e.createdate},{label:"凭证来源",value:e.sourse},{label:"凭证来源说明",value:e.sourcenote},{label:"备注",value:e.remarks},{label:"确认金额",value:e.status==="审核"?t.formatAmount(e.amount):"--"}]};return v(()=>{n()}),(e,a)=>(p(),d("div",null,[f(m,{headData:u.value,title:"凭证号:"+l.value.billno,tabs:[],delParam:{id:"20221009103203",content:{sa_cashbillids:[o(s).currentRoute.value.query.id]}},disable:o(t).isDisabled(l.value.status,["审核"])},{tab0:_(()=>[]),_:1},8,["headData","title","delParam","disable"])]))}};export{w as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-cc02937a.js


File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-d90eaf89.js


+ 1 - 0
dist/assets/index-da6e0cc9.js

@@ -0,0 +1 @@
+import{A as D,d as I}from"./index-c9978dc1.js";import{u as S}from"./vue-router-0190217c.js";import{_ as B}from"./_plugin-vue_export-helper-c27b6911.js";import{a as l,o as C,U as o,V as s,W as p,a3 as u,X as a,j as r,F as N,a2 as V,$ as e,G as n,a4 as d,u as q,a0 as A,a1 as F}from"./vue-15ee4564.js";const m=c=>(A("data-v-b57f4706"),c=c(),F(),c),R={class:"full-height"},$={class:"card"},j=["src"],z={class:"group-panel"},E={class:"title"},G={class:"time"},L=m(()=>e("small",null,"活动开始时间:",-1)),M={class:"time mt-10"},O=m(()=>e("small",null,"活动结束时间:",-1)),P={key:1,class:"empty"},T={__name:"index",setup(c){const f=S(),i=l([]);l(null),l(3);const h=l({id:20220103140003,content:{pageNumber:1,pageSize:20,where:{condition:""}}}),g=async()=>{const _=await D.requested(h.value);i.value=_.data},v=_=>{f.push({path:"/promotionDetail",query:{id:_.sa_promotionid}})};return C(()=>{g()}),(_,U)=>{const y=o("a-tag"),x=o("a-button"),k=o("a-col"),b=o("a-row"),w=o("a-empty");return s(),p("div",R,[i.value.length>0?(s(),u(b,{key:0,gutter:16},{default:a(()=>[(s(!0),p(N,null,V(i.value,t=>(s(),u(k,{md:{span:24,offset:0},lg:{span:12,offset:0},xxl:{span:12,offset:0},key:t.index},{default:a(()=>[e("div",$,[e("img",{src:t.attinfos[0]?t.attinfos[0].url:"",alt:"",class:"coverImage"},null,8,j),e("div",z,[e("p",E,[n(d(t.promname)+" ",1),r(y,{color:"green"},{default:a(()=>[n(d(t.type),1)]),_:2},1024)]),e("p",G,[L,n(d(t.createdate),1)]),e("p",M,[O,n(d(t.enddate),1)]),r(x,{type:"primary",onClick:W=>v(t),style:{width:"150px"}},{icon:a(()=>[r(q(I))]),default:a(()=>[n(" 进入活动 ")]),_:2},1032,["onClick"])])])]),_:2},1024))),128))]),_:1})):(s(),p("div",P,[r(w,{description:"暂无活动"})]))])}}},Q=B(T,[["__scopeId","data-v-b57f4706"]]);export{Q as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-e40afa4e.js


+ 1 - 0
dist/assets/index-f0277e90.js

@@ -0,0 +1 @@
+import{b as c}from"./index-c9978dc1.js";import{l as u}from"./index-349e8ca3.js";import{_ as d}from"./index-e8ae4702.js";import{u as _}from"./vue-router-0190217c.js";import{a as e,V as o,W as s,j as n,X as m,u as a,G as f,a4 as y,a5 as b}from"./vue-15ee4564.js";import"./base-c15215b2.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={key:0},B={__name:"index",setup(k){_();const i=e();let p=e([]);e([]);let l=e([{label:"时间范围",key:"dateRange",type:"datepickerRange",objKeys:["begindate","enddate"]},{label:"搜索",key:"condition",type:"input"}]),t=e({content:{pageNumber:1,pageSize:20,sort:[{sortname:"默认",sorted:1,sortid:138,reversed:0}],where:{condition:""}},id:20230508113003});return(x,g)=>(o(),s("div",null,[n(u,{ref_key:"list",ref:i,columns:a(p),param:a(t),tableName:"dispatchMxTable",searchType:a(l)},{operation:m(()=>[f(" 发货明细 "),n(d,{param:a(t)},null,8,["param"])]),tb_cell:m(({data:r})=>[r.column.dataIndex==="amount"?(o(),s("span",h,y(a(c).formatAmount(r.record.amount)),1)):b("",!0)]),_:1},8,["columns","param","searchType"])]))}};export{B as default};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-f332d95f.js


+ 1 - 0
dist/assets/index-f4364608.js

@@ -0,0 +1 @@
+import{s as z,A as k}from"./index-c9978dc1.js";import{u as x}from"./vue-router-0190217c.js";import{u as B}from"./base-c15215b2.js";import{a as d,o as K,f as N,U as b,V as v,W as A,R as w,j as V,X as g,a3 as D,G as $,a5 as j}from"./vue-15ee4564.js";const G={__name:"index",props:{columns:Array,param:Object,hideBorder:Boolean,size:String,loading:Boolean,tableRowStyle:Function,rowKey:String},emits:["onSelect"],setup(l,{expose:y,emit:S}){const t=l,f=B();let{tableRecord:n}=z(f);x();const m=d([]),r=d([]),p=d(0),_=(e,a)=>{r.value=e},h=(e,a,s,{currentDataSource:u})=>{r.value=n.value.map(o=>o.itemid),t.param.content.pageNumber=e.current,t.param.content.pageSize=e.pageSize,i()},i=async(e,a)=>{const s=await k.requested(t.param);m.value=s.data,p.value=s.total},C=async(e,a,s,u)=>{a?n.value.push(e):n.value=n.value.filter(o=>o.itemid!==e.itemid),S("onSelect",n.value)},R=(e,a)=>t.tableRowStyle?t.tableRowStyle(e,a):a%2===1?"table-striped":null;return K(()=>{i()}),N(()=>{n.value=[]}),y({listData:i,selectedRowKeys:r,tableRecord:n}),(e,a)=>{const s=b("a-button"),u=b("a-table");return v(),A("div",null,[w(e.$slots,"operation"),V(u,{loading:l.loading,class:"ant-table-striped ant-table-red","row-selection":{type:"checkbox",selectedRowKeys:r.value,onChange:_,fixed:!0,onSelect:C,hideSelectAll:!0},rowKey:t.rowKey||"itemid","keep-selection":!0,columns:t.columns,"data-source":m.value,scroll:{x:"max-content"},pagination:{showSizeChanger:!0,defaultPageSize:20,total:p.value,current:t.param.content.pageNumber},onChange:h,size:l.size,bordered:!l.hideBorder,"row-class-name":(o,c)=>R(o,c)},{bodyCell:g(({column:o,record:c})=>[w(e.$slots,"tb_cell",{data:{column:o,record:c}}),o.dataIndex==="operation"?(v(),D(s,{key:0,type:"link",size:"small",onClick:E=>e.openDrawer(c)},{default:g(()=>[$("详情")]),_:2},1032,["onClick"])):j("",!0)]),_:3},8,["loading","row-selection","rowKey","columns","data-source","pagination","size","bordered","row-class-name"])])}}};export{G as _};

File diff suppressed because it is too large
+ 0 - 0
dist/assets/index-f7dcf718.js


+ 1 - 0
dist/assets/login-676d043d.css

@@ -0,0 +1 @@
+.conatiner[data-v-31b7be21]{background:url(./bg-4325a45f.png);background-size:cover}.title[data-v-31b7be21]{height:33px;margin:0 0 30px;color:#202d40;font-size:1.25rem;font-weight:600;animation:showup 3s forwards}.login-wrap[data-v-31b7be21]{overflow:hidden}.login-wrap .top[data-v-31b7be21]{width:100%;background:#f3f4f591}.login-wrap .top[data-v-31b7be21]{height:calc(100vh - 70px);width:100%}.login-wrap svg[data-v-31b7be21]{height:70%}.login-form[data-v-31b7be21]{position:absolute;right:50%;top:50vh;width:500px;margin-right:-250px;margin-top:-244px;padding:30px;background:rgba(255,255,255,1);border-radius:5px;box-shadow:0 0 12px #0000001a;z-index:9999}.input-wrap[data-v-31b7be21]{width:100%}.color-info[data-v-31b7be21]{color:#999;font-weight:300}.introduce[data-v-31b7be21]{position:absolute;left:10%;top:10vh;font-size:20px;color:#fff;text-indent:3rem;line-height:3rem;text-shadow:0 0px 5px #666}.introduce[data-v-31b7be21]{white-space:pre-wrap;overflow:hidden;max-width:700px;animation:typingH-31b7be21 5s forwards;display:inline-block}.introduce[data-v-31b7be21]:after{content:"";display:inline-block;width:5px;height:1.2em;margin-left:5px}@keyframes typingH-31b7be21{0%{height:0px}to{height:300px}}@media (max-width: 1600px){.login-form[data-v-31b7be21]{transform:scale(.8)}.introduce[data-v-31b7be21]{font-size:15px}}

File diff suppressed because it is too large
+ 0 - 0
dist/assets/login-be799cf2.js


File diff suppressed because it is too large
+ 8 - 0
dist/assets/md5-5743a3ce.js


+ 1 - 0
dist/assets/noAccess-f13dc699.js

@@ -0,0 +1 @@
+import{u as f,s as _,A as g,n as t}from"./index-bdb88cc5.js";import{u as y}from"./vue-router-0190217c.js";import{a as l,o as S,U as b,V as h,W as k,j as x,X as C,$ as O}from"./vue-15ee4564.js";const T=O("p",null,"当前模块未付费,请前往付费使用",-1),J={__name:"noAccess",setup(w,{expose:n}){const c=y(),s=l(),e=l(!1),r=f();let{system:i,mods:u,act_mods:A}=_(r);const m=()=>{sessionStorage.setItem("isPay",1),u.value=i.value[1].modules,e.value=!1,c.push({name:"payOrders"})},d=async()=>{if(console.log(s.value),s.value==="取消")console.log("付费取消"),e.value=!1;else{console.log("付费提醒");const o=await g.requested({classname:"system.payorder.payorder",method:"sendMessage",content:{sys_payorderid:0}});o.code===1?t.info({message:"提醒老板付费",description:"已提醒老板付费",onClick:()=>{}}):t.info({message:"提醒老板付费",description:o.msg,onClick:()=>{}})}};return n({visibleShow:()=>{console.log("11111提醒"),console.log(JSON.parse(sessionStorage.getItem("active_account")).usertype),JSON.parse(sessionStorage.getItem("active_account")).usertype==22?(s.value="提醒付费",e.value=!0):(s.value="取消",e.value=!0)}}),S(()=>{}),(o,a)=>{const p=b("a-modal");return h(),k("div",null,[x(p,{visible:e.value,"onUpdate:visible":a[0]||(a[0]=v=>e.value=v),title:"付费提醒",okText:"付费",cancelText:s.value,onOk:m,onCancel:d,centered:!0,closable:!1},{default:C(()=>[T]),_:1},8,["visible","cancelText"])])}}};export{J as default};

+ 1 - 0
dist/assets/payment-3c6aa860.css

@@ -0,0 +1 @@
+.div_border[data-v-54429eed]{border:2px dashed #c9c3c3;width:850px;height:160px;border-radius:5px}

File diff suppressed because it is too large
+ 5 - 0
dist/assets/payment-e4c4a1ab.js


+ 1 - 0
dist/assets/tableTemp-59d6222b.js

@@ -0,0 +1 @@
+import{u as x,s as A,b as C,A as N}from"./index-c9978dc1.js";import{u as k}from"./base-c15215b2.js";import{u as R}from"./vue-router-0190217c.js";import{a as r,o as z,U as g,V as b,W as B,j as T,X as f,a3 as j,u as D,G as I,a4 as O,R as V}from"./vue-15ee4564.js";const q={__name:"tableTemp",props:{param:Object,tableName:String,dataSource:Array,keyRouteName:String,searchType:Array,detailPage:Object,noAutoQuery:Boolean},emits:["list","onSelect"],setup(S,{expose:_,emit:c}){const o=S;x();const v=k();let{tableRecord:y,fullscreen:E}=A(v);R();const u=r(!1),i=r([]),d=r(0),p=r([]),h=(e,a,t,{currentDataSource:m})=>{p.value=y.value.map(s=>s.itemid),o.param.content.pageNumber=e.current,o.param.content.pageSize=e.pageSize,n()},w=()=>{let e={};e=JSON.parse(sessionStorage.getItem("app")),i.value=e.meta.tables[o.tableName].tablecols.map(a=>({title:a.title,dataIndex:a.columnname,width:a.width==0?"150":a.width,ellipsis:!0,fixed:a.columnname=="operation"?"right":""}))},n=async()=>{u.value=!0;const e=await N.requested(o.param);let a=r([]);e.data?(e.data.forEach(t=>{if(t.isleader===1&&t.enddate!=={}){p.value=[t.userid],a.value[0]=t;return}}),c("onList",e.data),c("onSelect",a.value),d.value=e.total,u.value=!1):n()};return _({tableData:n}),z(()=>{w(),o.noAutoQuery||n()}),(e,a)=>{const t=g("a-tag"),m=g("a-table");return b(),B("div",null,[T(m,{class:"ant-table-striped",loading:u.value,size:"small",dataSource:o.dataSource,columns:i.value,pagination:{showSizeChanger:!0,defaultPageSize:20,total:d.value},scroll:{x:"max-content"},rowKey:"userid",onChange:h,"row-class-name":(s,l)=>l%2===1?"table-striped":null,bordered:""},{bodyCell:f(({column:s,record:l})=>[s.dataIndex==="status"?(b(),j(t,{key:0,color:D(C).statusAndColor(l.status)},{default:f(()=>[I(O(l.status),1)]),_:2},1032,["color"])):V(e.$slots,"tb_cell",{key:1,data:{column:s,record:l}})]),_:3},8,["loading","dataSource","columns","pagination","row-class-name"])])}}};export{q as _};

+ 17 - 0
dist/index2.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="./vite.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>楚楚E订单</title>
+    <script type="module" crossorigin src="./assets/index-c9978dc1.js"></script>
+    <link rel="modulepreload" crossorigin href="./assets/vue-15ee4564.js">
+    <link rel="modulepreload" crossorigin href="./assets/vue-router-0190217c.js">
+    <link rel="stylesheet" href="./assets/index-865bf7aa.css">
+  </head>
+  <body>
+    <div id="app"></div>
+
+  </body>
+</html>

+ 2 - 2
node_modules/.vite/deps/@ant-design_icons-vue.js

@@ -57,10 +57,10 @@ import {
   svgBaseProps,
   useInsertStyles,
   warning
-} from "./chunk-5XDXAD5U.js";
+} from "./chunk-BOZTDRRV.js";
 import {
   createVNode
-} from "./chunk-IDMHQ7FM.js";
+} from "./chunk-3NMN3MUW.js";
 import "./chunk-4EOJPDL2.js";
 
 // node_modules/@ant-design/icons-svg/es/asn/AccountBookFilled.js

File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/@ant-design_icons-vue.js.map


+ 28 - 28
node_modules/.vite/deps/_metadata.json

@@ -1,110 +1,110 @@
 {
-  "hash": "bb98c671",
-  "browserHash": "8cd6e6df",
+  "hash": "301720d8",
+  "browserHash": "aab913a6",
   "optimized": {
     "@ant-design/icons-vue": {
       "src": "../../@ant-design/icons-vue/es/index.js",
       "file": "@ant-design_icons-vue.js",
-      "fileHash": "076b4510",
+      "fileHash": "a193f552",
       "needsInterop": false
     },
     "ant-design-vue": {
       "src": "../../ant-design-vue/es/index.js",
       "file": "ant-design-vue.js",
-      "fileHash": "5483ee6b",
+      "fileHash": "7480056a",
       "needsInterop": false
     },
     "ant-design-vue/es/locale/zh_CN": {
       "src": "../../ant-design-vue/es/locale/zh_CN.js",
       "file": "ant-design-vue_es_locale_zh_CN.js",
-      "fileHash": "3900ed9b",
+      "fileHash": "fac8aed7",
       "needsInterop": false
     },
     "axios": {
       "src": "../../axios/index.js",
       "file": "axios.js",
-      "fileHash": "4cb0738e",
+      "fileHash": "dd624abc",
       "needsInterop": false
     },
     "dayjs": {
       "src": "../../dayjs/dayjs.min.js",
       "file": "dayjs.js",
-      "fileHash": "5b0f6e43",
+      "fileHash": "ff2d339c",
       "needsInterop": true
     },
     "dayjs/locale/zh-cn": {
       "src": "../../dayjs/locale/zh-cn.js",
       "file": "dayjs_locale_zh-cn.js",
-      "fileHash": "9d263560",
+      "fileHash": "c806ad5f",
       "needsInterop": true
     },
     "js-md5": {
       "src": "../../js-md5/src/md5.js",
       "file": "js-md5.js",
-      "fileHash": "f83a1951",
+      "fileHash": "158203fc",
       "needsInterop": true
     },
     "less": {
       "src": "../../less/dist/less.js",
       "file": "less.js",
-      "fileHash": "9b48bf60",
+      "fileHash": "65e2ff47",
       "needsInterop": true
     },
     "mathjs": {
       "src": "../../mathjs/lib/esm/index.js",
       "file": "mathjs.js",
-      "fileHash": "7ae83dc0",
+      "fileHash": "e6af1a23",
       "needsInterop": false
     },
     "pinia": {
       "src": "../../pinia/dist/pinia.mjs",
       "file": "pinia.js",
-      "fileHash": "b6bbe2bd",
+      "fileHash": "899103b1",
       "needsInterop": false
     },
     "pinia-plugin-persist": {
       "src": "../../pinia-plugin-persist/dist/pinia-persist.es.js",
       "file": "pinia-plugin-persist.js",
-      "fileHash": "0f76ef80",
+      "fileHash": "e1042de9",
       "needsInterop": false
     },
     "qrcode.vue": {
       "src": "../../qrcode.vue/dist/qrcode.vue.esm.js",
       "file": "qrcode__vue.js",
-      "fileHash": "1f707bc0",
+      "fileHash": "db37d4e7",
       "needsInterop": false
     },
     "vue": {
       "src": "../../vue/dist/vue.runtime.esm-bundler.js",
       "file": "vue.js",
-      "fileHash": "0f3814f9",
+      "fileHash": "18c17cbb",
       "needsInterop": false
     },
     "vue-router": {
       "src": "../../vue-router/dist/vue-router.mjs",
       "file": "vue-router.js",
-      "fileHash": "7eac6207",
+      "fileHash": "d781e352",
       "needsInterop": false
     }
   },
   "chunks": {
-    "chunk-TQOCY6B2": {
-      "file": "chunk-TQOCY6B2.js"
+    "chunk-5OBJFL24": {
+      "file": "chunk-5OBJFL24.js"
     },
-    "chunk-VCGGRANA": {
-      "file": "chunk-VCGGRANA.js"
+    "chunk-KBUAZBQ3": {
+      "file": "chunk-KBUAZBQ3.js"
     },
-    "chunk-5XDXAD5U": {
-      "file": "chunk-5XDXAD5U.js"
+    "chunk-BOZTDRRV": {
+      "file": "chunk-BOZTDRRV.js"
     },
-    "chunk-IDMHQ7FM": {
-      "file": "chunk-IDMHQ7FM.js"
+    "chunk-3NMN3MUW": {
+      "file": "chunk-3NMN3MUW.js"
     },
-    "chunk-UVFXKAFZ": {
-      "file": "chunk-UVFXKAFZ.js"
+    "chunk-BCNMYODF": {
+      "file": "chunk-BCNMYODF.js"
     },
-    "chunk-WT3GSKHH": {
-      "file": "chunk-WT3GSKHH.js"
+    "chunk-WNF2IDJY": {
+      "file": "chunk-WNF2IDJY.js"
     },
     "chunk-XMOLR7NX": {
       "file": "chunk-XMOLR7NX.js"

+ 5 - 5
node_modules/.vite/deps/ant-design-vue.js

@@ -1,6 +1,6 @@
 import {
   _extends
-} from "./chunk-VCGGRANA.js";
+} from "./chunk-KBUAZBQ3.js";
 import {
   ArrowLeftOutlined_default,
   ArrowRightOutlined_default,
@@ -57,7 +57,7 @@ import {
   ZoomOutOutlined_default,
   generate,
   presetPrimaryColors
-} from "./chunk-5XDXAD5U.js";
+} from "./chunk-BOZTDRRV.js";
 import {
   Comment,
   Fragment,
@@ -104,16 +104,16 @@ import {
   watchEffect,
   withDirectives,
   withModifiers
-} from "./chunk-IDMHQ7FM.js";
+} from "./chunk-3NMN3MUW.js";
 import {
   _objectSpread2,
   zh_CN_default
-} from "./chunk-UVFXKAFZ.js";
+} from "./chunk-BCNMYODF.js";
 import {
   _defineProperty,
   _toPropertyKey,
   _typeof
-} from "./chunk-WT3GSKHH.js";
+} from "./chunk-WNF2IDJY.js";
 import {
   require_dayjs_min
 } from "./chunk-XMOLR7NX.js";

File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/ant-design-vue.js.map


+ 2 - 2
node_modules/.vite/deps/ant-design-vue_es_locale_zh_CN.js

@@ -1,8 +1,8 @@
 import {
   _objectSpread2,
   zh_CN_default
-} from "./chunk-UVFXKAFZ.js";
-import "./chunk-WT3GSKHH.js";
+} from "./chunk-BCNMYODF.js";
+import "./chunk-WNF2IDJY.js";
 import "./chunk-4EOJPDL2.js";
 
 // node_modules/ant-design-vue/es/vc-picker/locale/zh_CN.js

File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/ant-design-vue_es_locale_zh_CN.js.map


File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/axios.js.map


File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/js-md5.js.map


+ 2 - 2
node_modules/.vite/deps/mathjs.js

@@ -1,9 +1,9 @@
 import {
   _extends
-} from "./chunk-VCGGRANA.js";
+} from "./chunk-KBUAZBQ3.js";
 import {
   _defineProperty
-} from "./chunk-WT3GSKHH.js";
+} from "./chunk-WNF2IDJY.js";
 import {
   __commonJS,
   __export,

File diff suppressed because it is too large
+ 0 - 0
node_modules/.vite/deps/mathjs.js.map


+ 1 - 1
node_modules/.vite/deps/pinia-plugin-persist.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../pinia-plugin-persist/dist/pinia-persist.es.js"],
-  "sourcesContent": ["const updateStorage = (strategy, store) => {\r\n  const storage = strategy.storage || sessionStorage;\r\n  const storeKey = strategy.key || store.$id;\r\n  if (strategy.paths) {\r\n    const partialState = strategy.paths.reduce((finalObj, key) => {\r\n      finalObj[key] = store.$state[key];\r\n      return finalObj;\r\n    }, {});\r\n    storage.setItem(storeKey, JSON.stringify(partialState));\r\n  } else {\r\n    storage.setItem(storeKey, JSON.stringify(store.$state));\r\n  }\r\n};\r\nvar index = ({ options, store }) => {\r\n  var _a, _b, _c, _d;\r\n  if ((_a = options.persist) == null ? void 0 : _a.enabled) {\r\n    const defaultStrat = [{\r\n      key: store.$id,\r\n      storage: sessionStorage\r\n    }];\r\n    const strategies = ((_c = (_b = options.persist) == null ? void 0 : _b.strategies) == null ? void 0 : _c.length) ? (_d = options.persist) == null ? void 0 : _d.strategies : defaultStrat;\r\n    strategies.forEach((strategy) => {\r\n      const storage = strategy.storage || sessionStorage;\r\n      const storeKey = strategy.key || store.$id;\r\n      const storageResult = storage.getItem(storeKey);\r\n      if (storageResult) {\r\n        store.$patch(JSON.parse(storageResult));\r\n        updateStorage(strategy, store);\r\n      }\r\n    });\r\n    store.$subscribe(() => {\r\n      strategies.forEach((strategy) => {\r\n        updateStorage(strategy, store);\r\n      });\r\n    });\r\n  }\r\n};\r\nexport { index as default, updateStorage };\r\n"],
+  "sourcesContent": ["const updateStorage = (strategy, store) => {\n  const storage = strategy.storage || sessionStorage;\n  const storeKey = strategy.key || store.$id;\n  if (strategy.paths) {\n    const partialState = strategy.paths.reduce((finalObj, key) => {\n      finalObj[key] = store.$state[key];\n      return finalObj;\n    }, {});\n    storage.setItem(storeKey, JSON.stringify(partialState));\n  } else {\n    storage.setItem(storeKey, JSON.stringify(store.$state));\n  }\n};\nvar index = ({ options, store }) => {\n  var _a, _b, _c, _d;\n  if ((_a = options.persist) == null ? void 0 : _a.enabled) {\n    const defaultStrat = [{\n      key: store.$id,\n      storage: sessionStorage\n    }];\n    const strategies = ((_c = (_b = options.persist) == null ? void 0 : _b.strategies) == null ? void 0 : _c.length) ? (_d = options.persist) == null ? void 0 : _d.strategies : defaultStrat;\n    strategies.forEach((strategy) => {\n      const storage = strategy.storage || sessionStorage;\n      const storeKey = strategy.key || store.$id;\n      const storageResult = storage.getItem(storeKey);\n      if (storageResult) {\n        store.$patch(JSON.parse(storageResult));\n        updateStorage(strategy, store);\n      }\n    });\n    store.$subscribe(() => {\n      strategies.forEach((strategy) => {\n        updateStorage(strategy, store);\n      });\n    });\n  }\n};\nexport { index as default, updateStorage };\n"],
   "mappings": ";;;AAAA,IAAM,gBAAgB,CAAC,UAAU,UAAU;AACzC,QAAM,UAAU,SAAS,WAAW;AACpC,QAAM,WAAW,SAAS,OAAO,MAAM;AACvC,MAAI,SAAS,OAAO;AAClB,UAAM,eAAe,SAAS,MAAM,OAAO,CAAC,UAAU,QAAQ;AAC5D,eAAS,GAAG,IAAI,MAAM,OAAO,GAAG;AAChC,aAAO;AAAA,IACT,GAAG,CAAC,CAAC;AACL,YAAQ,QAAQ,UAAU,KAAK,UAAU,YAAY,CAAC;AAAA,EACxD,OAAO;AACL,YAAQ,QAAQ,UAAU,KAAK,UAAU,MAAM,MAAM,CAAC;AAAA,EACxD;AACF;AACA,IAAI,QAAQ,CAAC,EAAE,SAAS,MAAM,MAAM;AAClC,MAAI,IAAI,IAAI,IAAI;AAChB,OAAK,KAAK,QAAQ,YAAY,OAAO,SAAS,GAAG,SAAS;AACxD,UAAM,eAAe,CAAC;AAAA,MACpB,KAAK,MAAM;AAAA,MACX,SAAS;AAAA,IACX,CAAC;AACD,UAAM,eAAe,MAAM,KAAK,QAAQ,YAAY,OAAO,SAAS,GAAG,eAAe,OAAO,SAAS,GAAG,WAAW,KAAK,QAAQ,YAAY,OAAO,SAAS,GAAG,aAAa;AAC7K,eAAW,QAAQ,CAAC,aAAa;AAC/B,YAAM,UAAU,SAAS,WAAW;AACpC,YAAM,WAAW,SAAS,OAAO,MAAM;AACvC,YAAM,gBAAgB,QAAQ,QAAQ,QAAQ;AAC9C,UAAI,eAAe;AACjB,cAAM,OAAO,KAAK,MAAM,aAAa,CAAC;AACtC,sBAAc,UAAU,KAAK;AAAA,MAC/B;AAAA,IACF,CAAC;AACD,UAAM,WAAW,MAAM;AACrB,iBAAW,QAAQ,CAAC,aAAa;AAC/B,sBAAc,UAAU,KAAK;AAAA,MAC/B,CAAC;AAAA,IACH,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

+ 2 - 2
node_modules/.vite/deps/pinia.js

@@ -1,6 +1,6 @@
 import {
   setupDevtoolsPlugin
-} from "./chunk-TQOCY6B2.js";
+} from "./chunk-5OBJFL24.js";
 import {
   computed,
   effectScope,
@@ -19,7 +19,7 @@ import {
   toRefs,
   unref,
   watch
-} from "./chunk-IDMHQ7FM.js";
+} from "./chunk-3NMN3MUW.js";
 import "./chunk-4EOJPDL2.js";
 
 // node_modules/pinia/node_modules/vue-demi/lib/index.mjs

+ 2 - 2
node_modules/.vite/deps/vue-router.js

@@ -1,6 +1,6 @@
 import {
   setupDevtoolsPlugin
-} from "./chunk-TQOCY6B2.js";
+} from "./chunk-5OBJFL24.js";
 import {
   computed,
   defineComponent,
@@ -18,7 +18,7 @@ import {
   unref,
   watch,
   watchEffect
-} from "./chunk-IDMHQ7FM.js";
+} from "./chunk-3NMN3MUW.js";
 import "./chunk-4EOJPDL2.js";
 
 // node_modules/vue-router/dist/vue-router.mjs

+ 1 - 1
node_modules/.vite/deps/vue.js

@@ -145,7 +145,7 @@ import {
   withMemo,
   withModifiers,
   withScopeId
-} from "./chunk-IDMHQ7FM.js";
+} from "./chunk-3NMN3MUW.js";
 import "./chunk-4EOJPDL2.js";
 export {
   BaseTransition,

+ 4 - 4
src/DRP/SDrpManagement/productGroup/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="full-height">
-    <field-and-class class="mt-10" @onFieldChange="onFieldChange" @onClassChange="onClassChange"></field-and-class>
-    <div style="text-align:center;margin:30px 0">
+    <field-and-class @onFieldChange="onFieldChange" @onClassChange="onClassChange"></field-and-class>
+    <div style="text-align:center;margin:10px 0">
       <a-input-search
         v-model:value="param.content.where.condition"
         placeholder="产品搜索"
@@ -12,7 +12,7 @@
     </div>
     <div v-if="list.length > 0" class="pd-10">
       <a-row class="card-list" :gutter="[16,16]">
-        <a-col :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{span: 6, offset: 0}" :xxxl="{span: 3, offset: 0 }" v-for="item in list" :key="item.index">
+        <a-col :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{span: 4, offset: 0}" :xxxl="{span: 3, offset: 0 }" v-for="item in list" :key="item.index">
           <div class="card" @click="toProductDetail(item)">
             <div style="text-align:center">
               <img :src="item.attinfos[0].url" alt="" style="height:150px;width:150px;margin:0 auto;object-fit:scale-down" >
@@ -181,6 +181,6 @@
   padding: 8px 16px;
 }
 .descript{
-  font-size: .875rem;
+  font-size: .75rem;
 }
 </style>

+ 2 - 2
src/DRP/SDrpManagement/productGroup/modules/fieldAndClass.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="classPanel">
-    <ul style="margin-bottom:1.5em">
+    <ul style="margin-bottom:0.5em">
       <li :class="!at_field?'on':''" @click="fieldClick({sys_enterprise_tradefieldid: null})" style="text-align:left">全部领域</li>
       <li :class="item.sys_enterprise_tradefieldid == at_field?'on':''" v-for="item in fields" :key="item.index" @click="fieldClick(item)">{{item.tradefield}}</li>
     </ul>
@@ -62,7 +62,7 @@
 </script>
 <style scoped>
 .classPanel{
-  padding:20px 10px 10px 10px;
+  padding:10px 10px 1px 10px;
   background: #fff;
 }
 ul{

+ 3 - 2
src/DRP/SDrpManagement/productGroup/modules/tree.vue

@@ -57,7 +57,8 @@ p{
 }
 .classItem{
   flex: 0 1 auto;
-  width: 150px;
+  width: 100px;
+  font-size: .875rem;
   padding:  0 15px;
   cursor: pointer;
   text-align: left;
@@ -67,7 +68,7 @@ p{
   padding:0px 15px;
   overflow: hidden;
   text-overflow: ellipsis;
-  white-space: nowrap;  
+  white-space: nowrap;
   
 }
 .flex-start{

+ 6 - 4
src/DRP/SDrpManagement/shopCart/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="y-container">
-    <prod-temp ref="prod" :columns="columns" :param="param" :hideBorder="true" @onSelect="onProdSelect">
+    <prod-temp ref="prod" :columns="columns" :param="param" :hideBorder="true" size="small" @onSelect="onProdSelect">
       <template #operation>
         <a-input class="search-input" v-model:value="search" @keyup.enter="onSearch" placeholder="搜索产品"></a-input>
       </template>
@@ -8,7 +8,7 @@
         <template v-if="data.column.dataIndex == 'image'">
           <div class="image-panel">
             <a-image
-              :width="80"
+              :width="40"
               :src="data.record.attinfos[0]?data.record.attinfos[0].url:''"
             />
           </div>
@@ -92,12 +92,14 @@
       dataIndex:'qty',
       width:90,
       ellipsis:true,
+      fixed:'right'
     },
     {
       title:'金额',
       dataIndex:'amount',
       width:180,
       ellipsis:true,
+      fixed:'right'
     }
   ]
   const sum =  computed(()=>{
@@ -254,8 +256,8 @@
   display: flex;
   align-items: center;
   justify-content: space-around;
-  height: 100px;
-  width: 100px;
+  height: 50px;
+  width: 50px;
   border-radius: 4px;
   background: #f1f2f3;
   overflow: hidden;

+ 10 - 13
src/components/layout/aside.vue

@@ -2,7 +2,10 @@
   <div class="asides" :style="!collapsed?'max-width:256px':'max-width:79px'">
     <div v-if="siteInfo.attinfos" class="logo-panel flex">
       <div class="flex">
-        <img style="width:40px" :src="siteInfo.attinfos[0].url" alt="">
+        <img style="width:40px;margin-right:5px" :src="siteInfo.attinfos[0].url" alt="">
+        <div v-if="collapsed" class="showCollapse">
+          <menu-unfold-outlined @click="onCollapsed"/>
+        </div>
         <h4 v-if="!collapsed">
           <b>楚楚E订单</b><br/>
           <small style="color:#999">CHUCHU-ESYSTEM</small>
@@ -11,12 +14,13 @@
       <menu-fold-outlined v-if="!collapsed" @click="onCollapsed"/>
     </div>
     <div class="aside-item" :class="act_sys.systemid == item.systemid?'onSystem':''" v-for="item in system" :key="item.index"  @click="onsystemClick(item)">
-      <span v-if="collapsed" class="menu-icon uncollapsed">{{item.systemname.substr(0, 1)}}</span>
+      <span v-if="collapsed" class="menu-icon uncollapsed">
+        <a-tooltip placement="topLeft" :title="item.systemname">
+          {{item.systemname.substr(0, 1)}}
+        </a-tooltip>
+      </span>
       <span class="collapsed" v-else>{{item.systemname}}</span>
     </div>
-    <div v-if="collapsed" class="showCollapse">
-      <menu-unfold-outlined @click="onCollapsed"/>
-    </div>
   </div>
 </template>
 
@@ -35,7 +39,7 @@ const act_sys = ref({})
 let { system,mods } = storeToRefs(store)
 
 const siteInfo = ref({})
-const collapsed = ref(false)
+const collapsed = ref(true)
 const onsystemClick = (item)=>{
 
   act_sys.value = item
@@ -96,13 +100,6 @@ watch (()=>system.value,() => {
   align-items: center;
   justify-content: space-between;
 }
-.showCollapse{
-  position: absolute;
-  bottom: 0px;
-  height: 40px;
-  width: 79px;
-  text-align: center;
-}
 .menu-icon{
   display: inline-block;
   height: 40px;

+ 1 - 2
src/components/layout/header.vue

@@ -5,7 +5,6 @@
     <a-sub-menu v-for="item in mods" :key="item.systemmoduleid">
       <template #title>
         <div>
-          <span class="menu-icon">{{item.systemmodulename.substr(0, 1)}}</span>
           {{item.systemmodulename}}
       </div>
       </template>
@@ -151,7 +150,7 @@ const accountItemClick = (account,bool)=>{
 const setSessionStorage = (account)=>{
   sessionStorage.setItem('active_account',JSON.stringify(account))
   sessionStorage.setItem('token',account.token)
-  act_name.value = `${account.name}-${account.sitename}`
+  act_name.value = `${account.sitename}`
 }
 const routeChange = (app)=>{
 

+ 2 - 2
src/components/webSocket/index.vue

@@ -14,8 +14,8 @@ import {ref, onMounted, onUnmounted, defineExpose} from 'vue'
   const router = useRouter()
   const websock = ref(null)
   const initWebSocket = ()=>{ //初始化weosocket
-    /*const wsuri = 'wss://cucu.cnyunl.com:8079/yos/webSocket/' + sessionStorage.getItem('token')*/
-    const wsuri = 'ws://61.164.207.46:8200/yos/webSocket/' + sessionStorage.getItem('token')
+    const wsuri = 'wss://cucu.cnyunl.com:8079/yos/webSocket/' + sessionStorage.getItem('token')
+    // const wsuri = 'ws://61.164.207.46:8200/yos/webSocket/' + sessionStorage.getItem('token')
     websock.value = new WebSocket(wsuri);
     websock.value.onmessage = websocketonmessage;
     websock.value.onopen = websocketonopen;

+ 3 - 1
src/style.less

@@ -71,7 +71,9 @@ button:focus,
 button:focus-visible {
   outline: 4px auto -webkit-focus-ring-color;
 }
-
+p{
+  margin-bottom:0.2em !important;
+}
 .y-container{
   padding:10px;
   background: #fff;

Some files were not shown because too many files changed in this diff