浏览代码

代码上传

zhangqiOMG 2 年之前
父节点
当前提交
93386ec598
共有 75 个文件被更改,包括 479 次插入70 次删除
  1. 1 1
      dist/assets/ShoppingCartOutlined-258c376a.js
  2. 0 0
      dist/assets/base-f9dd6b43.js
  3. 1 0
      dist/assets/dispatchAndReturnMxAgent-0a133ab3.js
  4. 0 0
      dist/assets/index-01bea60a.js
  5. 0 0
      dist/assets/index-05ec3098.js
  6. 0 1
      dist/assets/index-06203e10.js
  7. 1 1
      dist/assets/index-0778dcb8.js
  8. 0 0
      dist/assets/index-0dc779ff.js
  9. 0 1
      dist/assets/index-0dd5f597.css
  10. 0 1
      dist/assets/index-11adc99a.css
  11. 0 0
      dist/assets/index-1a0934fe.js
  12. 1 1
      dist/assets/index-1ed5d6a6.css
  13. 0 0
      dist/assets/index-1f9d1a2b.js
  14. 0 0
      dist/assets/index-285f5cec.js
  15. 0 0
      dist/assets/index-28c4fcca.js
  16. 1 0
      dist/assets/index-2e36624c.css
  17. 0 0
      dist/assets/index-31df294e.js
  18. 0 1
      dist/assets/index-3de29187.css
  19. 0 0
      dist/assets/index-4ae5546f.js
  20. 1 0
      dist/assets/index-4d57817f.js
  21. 0 0
      dist/assets/index-4e890b4b.css
  22. 1 0
      dist/assets/index-61efed26.js
  23. 1 0
      dist/assets/index-69e61c33.css
  24. 1 1
      dist/assets/index-69ffdd27.css
  25. 0 0
      dist/assets/index-6fd0f328.js
  26. 0 0
      dist/assets/index-752e055c.js
  27. 1 1
      dist/assets/index-75598b0b.js
  28. 0 0
      dist/assets/index-78256b58.js
  29. 1 1
      dist/assets/index-7ac254ac.js
  30. 1 1
      dist/assets/index-7d41d22d.js
  31. 0 0
      dist/assets/index-7ecfa15b.js
  32. 0 0
      dist/assets/index-8b4cd12c.js
  33. 1 0
      dist/assets/index-9049cd7f.css
  34. 0 0
      dist/assets/index-9115762e.js
  35. 0 0
      dist/assets/index-94af80da.js
  36. 1 0
      dist/assets/index-9644c91c.js
  37. 0 0
      dist/assets/index-97b97955.js
  38. 0 0
      dist/assets/index-9a0790c9.js
  39. 1 1
      dist/assets/index-a15757b5.js
  40. 0 0
      dist/assets/index-a69d1a20.js
  41. 0 0
      dist/assets/index-acff3619.js
  42. 0 0
      dist/assets/index-af6268e3.js
  43. 1 0
      dist/assets/index-b453d7c5.css
  44. 1 1
      dist/assets/index-b86fadc0.js
  45. 1 1
      dist/assets/index-bba0a869.js
  46. 0 1
      dist/assets/index-bce2daef.js
  47. 0 0
      dist/assets/index-bd761525.js
  48. 1 0
      dist/assets/index-ca63cce1.css
  49. 0 0
      dist/assets/index-d81fdc71.js
  50. 1 1
      dist/assets/index-e76190d3.js
  51. 1 1
      dist/assets/index-f14e1d4d.css
  52. 0 0
      dist/assets/index-fccbde00.js
  53. 0 0
      dist/assets/index-fe408352.js
  54. 0 0
      dist/assets/login-89e09aa3.js
  55. 1 1
      dist/assets/md5-3c41fc14.js
  56. 1 1
      dist/index2.html
  57. 1 1
      src/DRP/SDrpManagement/dispatchAgent/index.vue
  58. 56 0
      src/DRP/SDrpManagement/dispatchMxAgent/dispatchAndReturnMxAgent.vue
  59. 124 0
      src/DRP/SDrpManagement/myAccountList/detail/index.vue
  60. 4 0
      src/DRP/SDrpManagement/myAccountList/index.vue
  61. 17 11
      src/DRP/SDrpManagement/order/detail/index.vue
  62. 2 2
      src/DRP/SDrpManagement/order/index.vue
  63. 4 1
      src/DRP/SDrpManagement/order/modules/add.vue
  64. 19 4
      src/DRP/SDrpManagement/orderMxAgent/index.vue
  65. 10 2
      src/DRP/SDrpManagement/salerPromotion/detail/index.vue
  66. 0 13
      src/components/layout/header.vue
  67. 11 5
      src/components/listTemplate/field/index.vue
  68. 2 1
      src/components/listTemplate/index.vue
  69. 3 0
      src/components/reportPrint/index.vue
  70. 20 1
      src/router/SDrpManagement.js
  71. 25 5
      src/template/billProductTable/index.vue
  72. 134 0
      src/template/normalTable/index.vue
  73. 4 2
      src/template/selectProduct/index.vue
  74. 2 1
      src/utils/utils.js
  75. 18 2
      vite.config.js

+ 1 - 1
dist/assets/ShoppingCartOutlined-370892a5.js → dist/assets/ShoppingCartOutlined-258c376a.js

@@ -1 +1 @@
-import{a as o}from"./index-03e027c3.js";import{j as l}from"./vue-f0dec34d.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};
+import{a as o}from"./index-285f5cec.js";import{j as l}from"./vue-f0dec34d.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/base-f9dd6b43.js


+ 1 - 0
dist/assets/dispatchAndReturnMxAgent-0a133ab3.js

@@ -0,0 +1 @@
+import{b as p}from"./index-285f5cec.js";import{l as k}from"./index-1f9d1a2b.js";import{_ as b}from"./index-0778dcb8.js";import{u as h}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-f9dd6b43.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-01bea60a.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-05ec3098.js


+ 0 - 1
dist/assets/index-06203e10.js

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

+ 1 - 1
dist/assets/index-e11eca67.js → dist/assets/index-0778dcb8.js

@@ -1 +1 @@
-import{A as r,b as n}from"./index-03e027c3.js";import{U as p,V as c,W as i,j as m,X as _,G as l}from"./vue-f0dec34d.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 _};
+import{A as r,b as n}from"./index-285f5cec.js";import{U as p,V as c,W as i,j as m,X as _,G as l}from"./vue-f0dec34d.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 _};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-0dc779ff.js


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

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

+ 0 - 1
dist/assets/index-11adc99a.css

@@ -1 +0,0 @@
-.accountAmount[data-v-e02acb3b]{font-size:1.5rem}.account-item-panel[data-v-e02acb3b]{display:flex;padding:10px;cursor:pointer}.account-item-panel-content[data-v-e02acb3b]{width:100%;padding:0 20px;border-right:1px solid #f1f2f3}.mt-10[data-v-e02acb3b]{margin-bottom:10px}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-1a0934fe.js


+ 1 - 1
dist/assets/index-32eab43f.css → dist/assets/index-1ed5d6a6.css

@@ -1 +1 @@
-.info[data-v-e7a74245]{color:#999}.ant-table-striped[data-v-7a733783] td{font-size:12px}.ant-table-striped[data-v-7a733783] .table-striped td{background-color:#fafafa}.ant-table-striped[data-v-f2447080] td{font-size:12px}.ant-table-striped[data-v-f2447080] .table-striped td{background-color:#fafafa}.flex[data-v-f733c4d9]{display:flex}.search-input[data-v-f733c4d9]{width:300px;margin-bottom:20px}
+.info[data-v-e7a74245]{color:#999}.ant-table-striped[data-v-7a733783] td{font-size:12px}.ant-table-striped[data-v-7a733783] .table-striped td{background-color:#fafafa}.ant-table-striped[data-v-f2447080] td{font-size:12px}.ant-table-striped[data-v-f2447080] .table-striped td{background-color:#fafafa}.flex[data-v-d0b4ac9a]{display:flex}.search-input[data-v-d0b4ac9a]{width:300px;margin-bottom:20px}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-1f9d1a2b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-285f5cec.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-28c4fcca.js


+ 1 - 0
dist/assets/index-2e36624c.css

@@ -0,0 +1 @@
+.info[data-v-55301a44]{color:#999}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-31df294e.js


+ 0 - 1
dist/assets/index-3de29187.css

@@ -1 +0,0 @@
-.info[data-v-a291d3d2]{color:#999}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-4ae5546f.js


+ 1 - 0
dist/assets/index-4d57817f.js

@@ -0,0 +1 @@
+import{s as z,A as k}from"./index-285f5cec.js";import{u as x}from"./vue-router-e674635e.js";import{u as B}from"./base-f9dd6b43.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-f0dec34d.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 _};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-4e890b4b.css


+ 1 - 0
dist/assets/index-61efed26.js

@@ -0,0 +1 @@
+import{A as i,b as t}from"./index-285f5cec.js";import{d as m}from"./index-94af80da.js";import{u as b}from"./vue-router-e674635e.js";import{a as r,o as v,V as p,W as d,j as f,X as _,u as o}from"./vue-f0dec34d.js";import"./base-f9dd6b43.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};

+ 1 - 0
dist/assets/index-69e61c33.css

@@ -0,0 +1 @@
+.header .ant-menu-horizontal{border-bottom:none}.header[data-v-a7e80837]{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-a7e80837]{margin-top:-1px}.color-red[data-v-a7e80837]{color:red}.flex[data-v-a7e80837]{display:flex;align-items:center;justify-content:space-around}.asides[data-v-0859bbc7]{position:relative;width:256px;background:#fff;box-shadow:2px 0 6px #a8adb159;transition:.1s ease-out all}.aside-item[data-v-0859bbc7]{cursor:pointer;color:#333;margin:10px;border-radius:5px;transition:.2s linear;overflow:hidden}.logo-panel[data-v-0859bbc7]{padding:10px;margin-bottom:10px;border-bottom:1px solid #f1f2f3;background:#fff}.logo-panel h4[data-v-0859bbc7]{color:#333;margin:0 0 0 10px}.flex[data-v-0859bbc7]{display:flex;align-items:center;justify-content:space-between}.showCollapse[data-v-0859bbc7]{position:absolute;bottom:0px;height:40px;width:79px;text-align:center}.menu-icon[data-v-0859bbc7]{display:inline-block;height:40px;width:100%;font-size:14px;text-align:center;line-height:40px}.collapsed[data-v-0859bbc7]{display:block;padding:10px 20px}.onSystem .uncollapsed[data-v-0859bbc7]{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)}

+ 1 - 1
dist/assets/index-c1b49392.css → dist/assets/index-69ffdd27.css

@@ -1 +1 @@
-.search-panel[data-v-6fde3a9e]{width:300px;margin-bottom:10px}.scroll-panel[data-v-5892590e]{height:400px;overflow-y:scroll}.avatar[data-v-5892590e]{position:relative;height:40px;width:40px;border-radius:100%;font-size:1.5rem;text-align:center;line-height:40px;color:#fff;font-weight:500;background:#3874F6;cursor:pointer;overflow:hidden}.panel[data-v-5892590e]{display:flex;align-items:center;padding:10px;margin-top:10px}.panel[data-v-5892590e]:hover{background:#f1f2f3;cursor:pointer;border-radius:4px}.panel p[data-v-5892590e]{margin-bottom:0}.info[data-v-5892590e]{color:#666}.on[data-v-5892590e]{background:#3874f626!important;border-radius:4px}.search-panel[data-v-c623142e],.search-panel[data-v-a5cf20af],.search-panel[data-v-8e37d4da]{width:300px;margin-bottom:10px}
+.search-panel[data-v-547c1f28]{width:300px;margin-bottom:10px}.scroll-panel[data-v-5892590e]{height:400px;overflow-y:scroll}.avatar[data-v-5892590e]{position:relative;height:40px;width:40px;border-radius:100%;font-size:1.5rem;text-align:center;line-height:40px;color:#fff;font-weight:500;background:#3874F6;cursor:pointer;overflow:hidden}.panel[data-v-5892590e]{display:flex;align-items:center;padding:10px;margin-top:10px}.panel[data-v-5892590e]:hover{background:#f1f2f3;cursor:pointer;border-radius:4px}.panel p[data-v-5892590e]{margin-bottom:0}.info[data-v-5892590e]{color:#666}.on[data-v-5892590e]{background:#3874f626!important;border-radius:4px}.search-panel[data-v-c623142e],.search-panel[data-v-a5cf20af],.search-panel[data-v-8e37d4da]{width:300px;margin-bottom:10px}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-6fd0f328.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-752e055c.js


+ 1 - 1
dist/assets/index-1c95b65b.js → dist/assets/index-75598b0b.js

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-78256b58.js


+ 1 - 1
dist/assets/index-19739935.js → dist/assets/index-7ac254ac.js

@@ -1 +1 @@
-import{b as c}from"./index-03e027c3.js";import{l as u}from"./index-97b97955.js";import{_ as d}from"./index-e11eca67.js";import{u as _}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-4f9d21d6.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};
+import{b as c}from"./index-285f5cec.js";import{l as u}from"./index-1f9d1a2b.js";import{_ as d}from"./index-0778dcb8.js";import{u as _}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-f9dd6b43.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};

+ 1 - 1
dist/assets/index-3be3a8a3.js → dist/assets/index-7d41d22d.js

@@ -1 +1 @@
-import{l as n}from"./index-97b97955.js";import{u as c}from"./vue-router-e674635e.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-f0dec34d.js";import"./index-03e027c3.js";import"./base-4f9d21d6.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};
+import{l as n}from"./index-1f9d1a2b.js";import{u as c}from"./vue-router-e674635e.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-f0dec34d.js";import"./index-285f5cec.js";import"./base-f9dd6b43.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-7ecfa15b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-8b4cd12c.js


+ 1 - 0
dist/assets/index-9049cd7f.css

@@ -0,0 +1 @@
+.ant-table-small :deep td{font-size:12px;min-width:150px}.ant-table-small :deep(.table-striped) td{background-color:#f8f9fd}.table-striped-red{color:#d9363e}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-9115762e.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-94af80da.js


+ 1 - 0
dist/assets/index-9644c91c.js

@@ -0,0 +1 @@
+import{A as f,b as u}from"./index-285f5cec.js";import{l as b}from"./index-1f9d1a2b.js";import{_ as h}from"./index-0778dcb8.js";import{u as x}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-f9dd6b43.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-97b97955.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-9a0790c9.js


+ 1 - 1
dist/assets/index-490dcfbb.js → dist/assets/index-a15757b5.js

@@ -1 +1 @@
-import{A as m,b as d}from"./index-03e027c3.js";import{l as u}from"./index-97b97955.js";import{u as y}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-4f9d21d6.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};
+import{A as m,b as d}from"./index-285f5cec.js";import{l as u}from"./index-1f9d1a2b.js";import{u as y}from"./vue-router-e674635e.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-f0dec34d.js";import"./base-f9dd6b43.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};

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-a69d1a20.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-acff3619.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-af6268e3.js


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

@@ -0,0 +1 @@
+.accountAmount[data-v-5ca5c42f]{font-size:1.5rem}.account-item-panel[data-v-5ca5c42f]{display:flex;padding:10px;cursor:pointer}.account-item-panel-content[data-v-5ca5c42f]{width:100%;padding:0 20px;border-right:1px solid #f1f2f3}.mt-10[data-v-5ca5c42f]{margin-bottom:10px}

+ 1 - 1
dist/assets/index-1e232320.js → dist/assets/index-b86fadc0.js

@@ -1 +1 @@
-import{l as o}from"./index-97b97955.js";import{u as m}from"./vue-router-e674635e.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-f0dec34d.js";import"./index-03e027c3.js";import"./base-4f9d21d6.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};
+import{l as o}from"./index-1f9d1a2b.js";import{u as m}from"./vue-router-e674635e.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-f0dec34d.js";import"./index-285f5cec.js";import"./base-f9dd6b43.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};

+ 1 - 1
dist/assets/index-1a68a039.js → dist/assets/index-bba0a869.js

@@ -1 +1 @@
-import{A as D,d as I}from"./index-03e027c3.js";import{u as S}from"./vue-router-e674635e.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-f0dec34d.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};
+import{A as D,d as I}from"./index-285f5cec.js";import{u as S}from"./vue-router-e674635e.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-f0dec34d.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};

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

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-bd761525.js


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

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

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-d81fdc71.js


+ 1 - 1
dist/assets/index-ff741c77.js → dist/assets/index-e76190d3.js

@@ -1 +1 @@
-import{l as o}from"./index-97b97955.js";import{u as m}from"./vue-router-e674635e.js";import{a as e,V as n,W as i,j as p,u as a}from"./vue-f0dec34d.js";import"./index-03e027c3.js";import"./base-4f9d21d6.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};
+import{l as o}from"./index-1f9d1a2b.js";import{u as m}from"./vue-router-e674635e.js";import{a as e,V as n,W as i,j as p,u as a}from"./vue-f0dec34d.js";import"./index-285f5cec.js";import"./base-f9dd6b43.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};

+ 1 - 1
dist/assets/index-b2acd48b.css → dist/assets/index-f14e1d4d.css

@@ -1 +1 @@
-.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.btn-link[data-v-fb7b6f9f]{text-decoration:underline}.ant-table-striped[data-v-fb7b6f9f] td{font-size:12px}.ant-table-striped[data-v-fb7b6f9f] .table-striped td{background-color:#fafafa}
+.fieldPanel{margin-bottom:10px}#components-form-demo-advanced-search .ant-form{max-width:none}#components-form-demo-advanced-search .search-result-list{margin-top:16px;border:1px dashed #e9e9e9;border-radius:2px;background-color:#fafafa;min-height:200px;text-align:center;padding-top:80px}[data-theme=dark] .ant-advanced-search-form{background:rgba(255,255,255,.04);border:1px solid #434343;padding:24px;border-radius:2px}[data-theme=dark] #components-form-demo-advanced-search .search-result-list{border:1px dashed #434343;background:rgba(255,255,255,.04)}.btn-link[data-v-08cecd9e]{text-decoration:underline}.ant-table-striped[data-v-08cecd9e] td{font-size:12px}.ant-table-striped[data-v-08cecd9e] .table-striped td{background-color:#fafafa}

文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-fccbde00.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/index-fe408352.js


文件差异内容过多而无法显示
+ 0 - 0
dist/assets/login-89e09aa3.js


+ 1 - 1
dist/assets/md5-cb134f22.js → dist/assets/md5-3c41fc14.js

@@ -1,4 +1,4 @@
-import{c as commonjsGlobal}from"./index-03e027c3.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(t){md5Exports=t}};/**
+import{c as commonjsGlobal}from"./index-285f5cec.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(t){md5Exports=t}};/**
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5

+ 1 - 1
dist/index2.html

@@ -5,7 +5,7 @@
     <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-03e027c3.js"></script>
+    <script type="module" crossorigin src="./assets/index-285f5cec.js"></script>
     <link rel="modulepreload" crossorigin href="./assets/vue-f0dec34d.js">
     <link rel="modulepreload" crossorigin href="./assets/vue-router-e674635e.js">
     <link rel="stylesheet" href="./assets/index-865bf7aa.css">

+ 1 - 1
src/DRP/SDrpManagement/dispatchAgent/index.vue

@@ -22,7 +22,7 @@
   let dataSource = ref([])
   const statusTypeOptions = ref([])
   let searchType = ref([
-    {label:'状态',key:'status',type:'select',dataSource:statusTypeOptions},
+    {label:'筛选',key:'status',type:'select',dataSource:statusTypeOptions},
     {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
     {label:'搜索',key:'condition',type:'input'},
   ])

+ 56 - 0
src/DRP/SDrpManagement/dispatchMxAgent/dispatchAndReturnMxAgent.vue

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <listTemp ref="list" :columns="columns" :param="param" :tableName="'dispatchMxTable'" :searchType="searchType">
+      <template #operation>
+        发退货明细
+        <table-export :param="param"></table-export>
+      </template>
+      
+      <template #tb_cell="{data}">
+        <template v-if="data.column.dataIndex === 'price'">
+          <span>{{utils.formatAmount(data.record.price)}}</span>
+        </template>
+        <template v-if="data.column.dataIndex === 'amount'">
+          <span>{{utils.formatAmount(data.record.amount)}}</span>
+        </template>
+        <template v-if="data.column.dataIndex === 'billno'">
+          <router-link v-if="data.record.type == '发货'" :to="{path:'/dispatchdetail_agent',query:{id:data.record.id}}">{{data.record.billno}}</router-link>
+          <router-link v-else :to="{path:'/aftersalesBillDetail',query:{id:data.record.id}}">{{data.record.billno}}</router-link>
+        </template>
+      </template>
+    </listTemp>
+  </div>
+</template>
+<script setup>
+  import utils from '@/utils/utils'
+  import Api from '@/api/api'
+  import listTemp from '@/components/listTemplate/index.vue';
+  import tableExport from '@/components/tableExport/index.vue'
+  import { ref } from 'vue'
+  import { useRouter } from "vue-router";
+  import { onMounted } from "vue";
+  const router = useRouter()
+  const list = ref()
+  let columns = ref([])
+  let dataSource = ref([])
+  let searchType = ref([
+    {label:'类型',key:'type',type:'select',dataSource:[{remarks:'发货',value:'发货'},{remarks:'退货',value:'退货'}]},
+    {label:'出库时间',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+    {label:'搜索',key:'condition',type:'input'},
+  ])
+  let param = ref({
+    "content": {
+      "pageNumber": 1,
+      "pageSize": 20,
+      "where": {
+        "condition": ""
+      }
+    },
+    "id": 20230626104003,
+  })
+  const onSuccess = ()=>{
+    list.value.tableData()
+  }
+</script>
+<style>
+</style>

+ 124 - 0
src/DRP/SDrpManagement/myAccountList/detail/index.vue

@@ -0,0 +1,124 @@
+<template>
+  <div>
+    <detail-template :headData="mainAreaData" :title="'凭证号:' + billData.billno" :tabs="[]" :delParam="{id:'20221009103203',content:{sa_cashbillids:[router.currentRoute.value.query.id]}}" :disable="utils.isDisabled(billData.status,['审核'])">
+      <template #tab0>
+      </template>
+    </detail-template>
+  </div>
+</template>
+
+<script setup>
+import Api from '@/api/api'
+import utils  from '@/utils/utils'
+import detailTemplate from '@/components/detailTemplate/index.vue'
+import { Modal } from 'ant-design-vue'
+import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
+import { useRouter } from "vue-router";
+import { onMounted,ref,createVNode } from "vue";
+const router = useRouter()
+const mainAreaData = ref([])
+const billData = ref({})
+const mianData = async ()=>{
+  const res = await Api.requested({
+    "id":'20221009103003',
+    "content": {
+      "nocache":true,
+      "sa_cashbillid": router.currentRoute.value.query.id
+    }
+  })
+  billData.value = res.data
+  changeDataStructure(res.data)
+
+}
+const changeDataStructure = (data) => {
+  mainAreaData.value = [
+    {
+      label:'单号',
+      value:data.billno
+    },
+    {
+      label:'状态',
+      value:data.status,
+      style:function () {
+        let style = {}
+        switch (data.status) {
+          case '新建':
+            style = {color:"#000000"}
+            break;
+          case '审核':
+            style = {color:"#52C41A"}
+            break;
+          default:
+            break;
+        }
+        return style
+      }
+    },
+    {
+      label:'账户类型',
+      value:data.accountname
+    },
+    {
+      label:'经销商',
+      value:data.enterprisename
+    },
+    {
+      label:'金额',
+      value:utils.formatAmount(data.amount)
+    },
+    {
+      label:'分类',
+      value:data.class
+    },
+    {
+      label:'分类明细',
+      value:data.subclass
+    },
+    {
+      label:'单据日期',
+      value:data.createdate
+    },
+    {
+      label:'凭证来源',
+      value:data.sourse
+    },
+    {
+      label:'凭证来源说明',
+      value:data.sourcenote
+    },
+    {
+      label:'备注',
+      value:data.remarks
+    },
+    {
+      label:'确认金额',
+      value:data.status === '审核'?utils.formatAmount(data.amount):'--'
+    },
+  ]
+}
+
+const checkBill = async ()=>{
+  Modal.confirm({
+    title: '提示',
+    icon: createVNode(ExclamationCircleOutlined),
+    content: `确定审核该支出凭证吗?`,
+    async onOk() {
+      const res = await Api.requested({
+        id:20221009103103,
+        content:{
+          "sa_cashbillid": billData.value.sa_cashbillid
+        }
+      })
+      utils.message(res,'审核成功',()=>{
+        mianData()
+      })
+    },
+    onCancel() {},
+  })
+}
+onMounted (()=>{
+  mianData()
+})
+</script>
+<style>
+</style>

+ 4 - 0
src/DRP/SDrpManagement/myAccountList/index.vue

@@ -21,6 +21,9 @@
         <table-export :param="param"></table-export>
       </template>
       <template #tb_cell="{data}">
+        <template v-if="data.column.dataIndex === 'billno'">
+          <router-link :to="{name:'accountBillDetail',query:{id:data.record.sa_cashbillid}}">{{data.record.billno}}</router-link>
+        </template>
         <template v-if="data.column.dataIndex === 'type'">
           <span :style="data.record.type == 0?'color:green':'color:red'">{{data.record.type == 0 ? '支出' : '收入'}}</span>
         </template>
@@ -40,6 +43,7 @@ import utils from '@/utils/utils'
 import listTemp from '@/components/listTemplate/index.vue';
 import tableExport from '@/components/tableExport/index.vue'
 let searchType = ref([
+  {label:'类型',key:'type',type:'select',dataSource:[{remarks:'支出',value:'0'},{remarks:'收入',value:'1'}]},
   {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
   {label:'搜索',key:'condition',type:'input'},
 ])

+ 17 - 11
src/DRP/SDrpManagement/order/detail/index.vue

@@ -24,16 +24,16 @@
             <a-button v-if="utils.hasPermission('orderDetail')" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],(selectProductList.length == 0 || specialOrder('编辑')))" type="primary" @click="deleteProd">删除产品</a-button>
           </a-space>
         </div>
-        <product-list :loading="loading" ref="prodlist" :columns="columns" :param="param" size="small" :hideBorder="true" @onSelect="onProdSelect">
+        <product-list :loading="loading" ref="prodlist" :columns="columns" :param="param" size="small" rowKey="sa_orderitemsid" :hideBorder="true" @onSelect="onProdSelect" :tableRowStyle="formatter">
           <template #operation>
             <a-input class="search-input" v-model:value="param.content.where.condition" @keyup.enter="onSearch" placeholder="搜索产品"></a-input>
           </template>
           <template #tb_cell="{data}">
             <template v-if="data.column.dataIndex === 'qty'">
-              <a-input-number style="width:100%" id="inputNumber" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" v-model:value="data.record.qty" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="inputChange(data.record)" :precision="2"/>
+              <a-input-number style="width:100%" id="inputNumber" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" v-model:value="data.record.qty" :min="data.record.orderminqty" :step="data.record.orderaddqty" @change="data.record.isedit = true" @blur="inputChange(data.record)" :precision="2"/>
             </template>
             <template v-if="data.column.dataIndex === 'remarks'">
-              <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" v-model:value="data.record.remarks" :min="1" @change="inputChange(data.record)" placeholder="请输入产品备注"/>
+              <a-input style="width:100%" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" v-model:value="data.record.remarks" :min="1" @change="data.record.isedit = true" @blur="inputChange(data.record)" placeholder="请输入产品备注"/>
             </template>
             <template v-if="data.column.dataIndex === 'defaultprice'">
               {{utils.formatAmount(data.record.defaultprice)}}
@@ -273,6 +273,7 @@ const updateProd = async (data,msg) =>{
   prodlist.value.listData()
   loading.value = false
 }
+
 const addProductToBody = async (val) =>{
   let data = val.map(e=>{
     return {
@@ -291,25 +292,22 @@ const onAddQtyChange = (val) =>{
     val.qty = res
   })
 }
-const inputChange = (val) =>{
-  if(time.value !== null){
-    clearTimeout(time.value);
-  }
-  time.value = setTimeout(() => {
+const inputChange = (val,bool) =>{
+  if (val.isedit == true) {
     let data = [{
       sa_orderitemsid:val.sa_orderitemsid,
       itemid:val.itemid,
       qty:val.qty,
       remarks:val.remarks
     }]
-    updateProd(data,'修改成功')
-  },500)
+    updateProd(data,'修改成功',bool)
+  }
+  
 }
 const onProdSelect = (val) => {
   selectProductList.value = val
 }
 const deleteProd = ()=>{
-  console.log(selectProductList.value)
   Modal.confirm({
     title: '删除产品',
     icon: createVNode(ExclamationCircleOutlined),
@@ -402,6 +400,14 @@ const onSearch = ()=>{
   param.value.content.pageNumber = 1
   prodlist.value.listData()
 }
+const formatter = (_record, index) => {
+  console.log(_record.undeliqty)
+  if (_record.undeliqty > 0) {
+    return 'table-striped-red'
+  } else {
+    return null
+  }
+}
 const columns = [
   {
     title:'行号',

+ 2 - 2
src/DRP/SDrpManagement/order/index.vue

@@ -14,11 +14,11 @@
 </template>
 <script setup>
   import utils from '@/utils/utils'
+  import Api from '@/api/api'
   import listTemp from '@/components/listTemplate/index.vue';
   import addTemp from './modules/add.vue'
-  import { ref } from 'vue'
+  import { ref,onMounted } from 'vue'
   import { useRouter } from "vue-router";
-  import { onMounted } from "vue";
   const router = useRouter()
   const list = ref()
   let columns = ref([])

+ 4 - 1
src/DRP/SDrpManagement/order/modules/add.vue

@@ -88,6 +88,7 @@ const form = ref({
   type:"标准订单",
   sa_brandid:null,
   tradefield:null,
+  typemx:'',
   remarks:""
 })
 const brandsOptions = ref([])
@@ -119,7 +120,9 @@ const fieldAndbrand = async ()=>{
 const submit = async () => {
   try {
     const values = await formRef.value.validateFields();
-    console.log('Success:', values);
+    if (form.value.type == '特殊订单') {
+      form.value.typemx = '特价'
+    }
     const res = await Api.requested({
       "id":20221108111402,
       "content":form.value

+ 19 - 4
src/DRP/SDrpManagement/orderMxAgent/index.vue

@@ -12,6 +12,9 @@
         <template v-if="data.column.dataIndex === 'amount'">
           <span>{{utils.formatAmount(data.record.amount)}}</span>
         </template>
+        <template v-if="data.column.dataIndex === 'undeliqty'">
+          <span>{{data.record.undeliqty + data.record.unsoldqty}}</span>
+        </template>
       </template>
     </listTemp>
   </div>
@@ -28,10 +31,7 @@
   const list = ref()
   let columns = ref([])
   let dataSource = ref([])
-  let searchType = ref([
-    {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
-    {label:'搜索',key:'condition',type:'input'},
-  ])
+  let searchType = ref([])
   let param = ref({
     "content": {
       "pageNumber": 1,
@@ -48,6 +48,21 @@
   const onSuccess = ()=>{
     list.value.tableData()
   }
+  const specordermx = async ()=> {
+    const res = await Api.optionstype('specordermx')
+    let obj = {label:'分类明细',key:'type',type:'select',dataSource:res.data}
+     searchType.value = [
+      {label:'状态',key:'status',type:'select',dataSource:[{remarks:'审核',value:'审核'},{remarks:'关闭',value:'关闭'},{remarks:'手工关闭',value:'手工关闭'}]},
+      {label:'时间范围',key:'dateRange',type:'datepickerRange',objKeys:['begindate','enddate']},
+      // {label:'是否未发',key:'isuncheckout',type:'select',dataSource:[{remarks:'是',value:'1'},{remarks:'否',value:'0'}]},
+      {label:'未发查询',key:'datetype',type:'select',dataSource:[{remarks:'7日未发',value:'7'},{remarks:'30日未发',value:'30'},{remarks:'90日未发',value:'90'},{remarks:'所有未发',value:''}],method:(param)=>{param.isuncheckout = 1}},
+      obj,
+      {label:'搜索',key:'condition',type:'input'},
+    ]
+  }
+  onMounted(()=>{
+    specordermx()
+  })
 </script>
 <style>
 </style>

+ 10 - 2
src/DRP/SDrpManagement/salerPromotion/detail/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="y-container">
-    <prodTemp ref="prod" :columns="columns" :param="param" :hideBorder="true" @onSelect="onProdSelect">
+    <prodTemp ref="prod" rowKey="sa_promotion_itemsid" :columns="columns" :param="param" :hideBorder="true" @onSelect="onProdSelect">
       <template #operation>
         <a-input class="search-input" v-model:value="search" @keyup.enter="onSearch" placeholder="搜索产品"></a-input>
       </template>
@@ -124,6 +124,12 @@
       width:180,
       ellipsis:true,
     },
+    {
+      title:'特征码',
+      dataIndex:'signaturecode',
+      width:180,
+      ellipsis:true,
+    },
     {
       title:'原价',
       dataIndex:'oldprice',
@@ -214,8 +220,10 @@
               return {
                 "sa_orderitemsid": 0, //写死0
                 "itemid": e.itemid, //产品ID
+                "sa_promotion_itemsid": e.sa_promotion_itemsid, //表ID
                 "sa_brandid": e.sa_brandid,
-                "qty": e.qty //数量
+                "qty": e.qty, //数量
+                "signaturecode":e.signaturecode,
               }
             })
           }

+ 0 - 13
src/components/layout/header.vue

@@ -260,17 +260,4 @@ watch(() => router.currentRoute.value,(to, from) => {
   align-items: center;
   justify-content: space-around;
 }
-.menu-icon{
-  display: inline-block;
-  height: 20px;
-  width: 20px;
-  padding-top: -2px;
-  font-size: 10px;
-  text-align: center;
-  line-height: 20px;
-  color: #999;
-  border-radius:100% ;
-  border:1px solid #f1f2f3;
-  background: #f1f2f3;
-}
 </style>

+ 11 - 5
src/components/listTemplate/field/index.vue

@@ -19,7 +19,7 @@
                 layout="vertical"
               >
                 <a-input v-if="i.type=='input'" v-model:value="formState[i.key]" :placeholder="i.label"></a-input>
-                <a-select v-if="i.type=='select'" v-model:value="formState[i.key]" :placeholder="i.label">
+                <a-select v-if="i.type=='select'" v-model:value="formState[i.key]" :placeholder="i.label" @change="selectChange(i)">
                   <a-select-option v-for="item in i.dataSource" :key="item.index" :value="item.value">{{item.remarks}}</a-select-option>
                 </a-select>
                 <a-date-picker style="width:100%" v-if="i.type == 'datepicker'" v-model:value="formState[i.key]" value-format="YYYY-MM-DD" :placeholder="i.label"/>
@@ -31,7 +31,7 @@
             <a-col :span="24">
               <a-space>
                 <a-button type="primary" html-type="submit">查询</a-button>
-                <a-button @click="() => formRef.resetFields()">重置</a-button>
+                <a-button @click="resetField">重置</a-button>
               </a-space>
             </a-col>
           </a-row>
@@ -68,11 +68,17 @@ const dateRangeChange = (dates,i)=>{
     formState.value[o] = dates[i]
   });
 }
+const selectChange = (i)=>{
+  i.method?i.method(formState.value):""
+}
+
+const resetField = ()=>{
+  formState.value = {}
+  formRef.value.resetFields()
+  console.log(formState.value)
+}
 onMounted(()=>{
   if (localStorage.getItem('formState')) {
-    // let val = localStorage.getItem('formState')
-    // formState.value = JSON.parse(val)
-    // emit('onSubmit',formState.value)
   }
   
 })

+ 2 - 1
src/components/listTemplate/index.vue

@@ -93,7 +93,8 @@
     router.push({name:props.detailPage.name,query:{id:record[props.detailPage.idname]}})
   }
   const search = (val)=>{
-    props.param.content.where = Object.assign({},props.param.content.where,val)
+    // props.param.content.where = Object.assign({},props.param.content.where,val)
+    props.param.content.where = val
     tableData()
   }
   defineExpose({

+ 3 - 0
src/components/reportPrint/index.vue

@@ -64,6 +64,9 @@ const getData = async ()=>{
     }
   })
   dataSource.value = res.data
+  if (dataSource.value.length == 1) {
+    printData(dataSource.value[0])
+  }
 }
 const DynamicAcquisitionURL = ()=> {
     var str = window.location.href;

+ 20 - 1
src/router/SDrpManagement.js

@@ -102,6 +102,16 @@ const SDrpManagement = [
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/myAccountList/index.vue')
   },
+  {
+    path: '/accountBillDetail',
+    name:'accountBillDetail',
+    meta: {
+      title: '流水详情',
+      name:'myaccountclass',
+      keepAlive:false
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/myAccountList/detail/index.vue')
+  },
   {
     path: '/dispatch_agent',
     name: 'dispatch_agent',
@@ -125,11 +135,20 @@ const SDrpManagement = [
     path: '/dispatchMxAgent',
     name: 'dispatchMxAgent',
     meta: {
-      title: '单明细',
+      title: '发货单明细',
       name: 'dispatchMxAgent'
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/dispatchMxAgent/index.vue')
   },
+  {
+    path: '/dispatchAndReturnMxAgent',
+    name: 'dispatchAndReturnMxAgent',
+    meta: {
+      title: '发退货明细',
+      name: 'dispatchAndReturnMxAgent'
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/dispatchMxAgent/dispatchAndReturnMxAgent.vue')
+  },
   {
     path: '/salerafterbill',
     name: 'salerafterbill',

+ 25 - 5
src/template/billProductTable/index.vue

@@ -4,9 +4,9 @@
     <slot name="operation"></slot>
     <a-table
       :loading="loading"
-      class="ant-table-striped"
+      class="ant-table-striped ant-table-red"
       :row-selection="{type:'checkbox', selectedRowKeys: selectedRowKeys, onChange: onSelectChange,fixed:true,onSelect:onSelect ,hideSelectAll:true}"
-      rowKey="itemid"
+      :rowKey="props.rowKey || 'itemid'"
       :keep-selection="true"
       :columns="props.columns"
       :data-source="data"
@@ -15,7 +15,7 @@
       @change="onChange"
       :size="size"
       :bordered="!hideBorder"
-      :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)">
+       :row-class-name="(_record, index) => formatter(_record, index)">
       <template #bodyCell="{ column, record }">
         <slot name="tb_cell" :data="{column, record}"></slot>
         <template v-if="column.dataIndex === 'operation'">
@@ -41,7 +41,8 @@
     hideBorder:Boolean,
     size:String,
     loading:Boolean,
-    tableRowStyle:Function
+    tableRowStyle:Function,
+    rowKey:String,
   })
   const data = ref([])
   const selectedRowKeys = ref([])
@@ -70,6 +71,15 @@
     }
     emit('onSelect',tableRecord.value)
   }
+  const formatter = (_record, index) => {
+    if (props.tableRowStyle) 
+      return props.tableRowStyle(_record, index)
+    if (index % 2 === 1) {
+      return 'table-striped'
+    } else {
+      return null
+    }
+  }
   onMounted(()=>{
     listData()
   })
@@ -83,7 +93,17 @@
   })
 </script>
 <style>
-
+.ant-table-small :deep td{
+  font-size: 12px;
+  min-width: 150px;
+}
+.ant-table-small :deep(.table-striped) td {
+  background-color: #f8f9fd;
+  
+}
+.table-striped-red {
+  color: #d9363e;
+}
 </style>
 <style scoped>
 </style>

+ 134 - 0
src/template/normalTable/index.vue

@@ -0,0 +1,134 @@
+// 单据中使用产品表
+<template>
+  <div id="normalTable" :style="fullscreen?'padding:15px':''">
+    <div class="flex" v-if="props.tableName ? true :false">
+      <slot name="operation"></slot>
+      <a-space size="middle">
+        <setting-columns ref="setColumns" :columns="columns" :tableName="props.tableName"></setting-columns>
+        <fullScreen domId="normalTable"></fullScreen>
+      </a-space>
+    </div>
+    <a-table
+      :loading="loading"
+      class="ant-table-striped"
+      :row-selection="{type:props.filterMultiple?'radio':'checkbox', selectedRowKeys: selectedRowKeys, onChange: onSelectChange,fixed:true,onSelect:onSelect ,hideSelectAll:true}"
+      :rowKey="rowKey"
+      :keep-selection="true"
+      :columns="columns"
+      :data-source="data"
+      :scroll="fullscreen?{x:'max-content',y:'86vh'}:{x:'max-content'}"
+      :pagination="{showSizeChanger:true,defaultPageSize:props.param.content.pageSize,total:total,current:props.param.content.pageNumber}"
+      @change="onChange"
+      :size="size"
+      :bordered="!hideBorder"
+      :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)">
+      <template #headerCell="{ column }">
+        <div style="width:100%" v-if="column.filter == 1 || column.filter == 2">
+          <a-input v-model:value="column.value" :placeholder="column.title" @change="setSearchParam(column.dataIndex,column.value)" @pressEnter="listData"></a-input>
+        </div>
+        <span v-else style="display:inline-block;padding:0;">{{column.title}}</span>
+      </template>
+      <template #bodyCell="{ column, record }">
+        <slot name="tb_cell" :data="{column, record}"></slot>
+      </template>
+    </a-table>
+  </div>
+</template>
+
+<script setup>
+  import {defineEmits,ref,defineProps,defineExpose,onMounted,onUnmounted,computed,watch,onActivated } from 'vue';
+  import Api  from '@/api/api'
+  import { storeToRefs } from 'pinia'
+  import { useRouter } from "vue-router";
+  import { useBaseStore } from '@/stores/modules/base'
+  // import { useColumnsStore } from '@/stores/modules/columns'
+  import { useAuthStore } from '@/stores/modules/auth'
+  const store = useAuthStore()
+  // const colStore = useColumnsStore()
+  const base = useBaseStore()
+  let { app } = storeToRefs(store)
+  let { tableRecord,fullscreen} = storeToRefs(base)
+  // let { selectedColumns } = storeToRefs(colStore)
+  const router = useRouter()
+  const props = defineProps({
+    tableName:String,
+    columns: Array,
+    param: Object,
+    hideBorder:Boolean,
+    size:String,
+    tableid:Number,
+    rowKey:String,
+    filterMultiple:Boolean,
+    noQuery:false
+  })
+  const columns = ref(props.columns)
+  const data = ref([])
+  const selectedRowKeys = ref([])
+  const total = ref(0)
+  const emit = defineEmits(['onSelect','listData'])
+
+  const onSelectChange =(changableRowKeys, selectedRows)=>{
+    selectedRowKeys.value = changableRowKeys;
+  }
+  const onChange = (pagination, filters, sorter, { currentDataSource })=>{
+    selectedRowKeys.value = tableRecord.value.map(e=>e.itemid)
+    props.param.content.pageNumber = pagination.current
+    props.param.content.pageSize = pagination.pageSize
+    listData()
+  }
+  const loading = ref(false)
+  const listData = async (num,size)=> {
+    loading.value = true
+    props.param.content.tableid = props.tableid
+    const res = await Api.requested(props.param)
+    data.value = res.data
+    total.value = res.total
+    loading.value = false
+    emit('listData',data.value)
+  }
+  const onSelect = async (record, selected, selectedRows, nativeEvent)=>{
+    if (!selected) {
+      tableRecord.value = tableRecord.value.filter(e=>e[props.rowKey] !== record[props.rowKey])
+    } else {
+      tableRecord.value.push(record)
+    }
+    emit('onSelect',tableRecord.value)
+  }
+  const reloadSelect = () =>{
+    selectedRowKeys.value = []
+    tableRecord.value = []
+    emit('onSelect',tableRecord.value)
+  }
+  const cache = ref([])
+  const setSearchParam = (dataIndex,value)=>{
+    props.param.content.where.tablefilter = props.param.content.where.tablefilter ? props.param.content.where.tablefilter : {}
+    props.param.content.where.tablefilter[dataIndex] = value
+  }
+  onMounted(()=>{
+     columns.value = utils.TBLayout(props.tableName)
+    props.noQuery ? '' : listData()
+  })
+  onUnmounted(()=>{
+    tableRecord.value = []
+  })
+  defineExpose({
+    listData,
+    reloadSelect
+  })
+</script>
+<style>
+
+</style>
+<style scoped>
+.ant-table-striped :deep td{
+  font-size: 12px;
+}
+#normalTable{
+  background: #fff;
+}
+.flex{
+  display: flex;
+  align-content: center;
+  justify-content: space-between;
+}
+</style>

+ 4 - 2
src/template/selectProduct/index.vue

@@ -19,7 +19,7 @@
         :loading="loading"
         class="ant-table-striped"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect,fixed:true }"
-        rowKey="itemid"
+        :rowKey="props.rowKey?props.rowKey:'itemid'"
         :columns="columns"
         :data-source="data"
         :scroll="{x:'max-content'}"
@@ -51,7 +51,8 @@
   const props = defineProps({
     param: Object,
     disabled:Boolean,
-    loading:Boolean
+    loading:Boolean,
+    rowKey:String
   })
   const visible = ref(false)
   const search = ref('')
@@ -105,6 +106,7 @@
   }
   const showModel = ()=>{
     visible.value = true
+     tableRecord.value = []
     listData()
   }
   const onSelectChange = (changableRowKeys, selectedRows)=>{

+ 2 - 1
src/utils/utils.js

@@ -9,7 +9,7 @@ const config = {
 const math = create(all, config)
 
 export default {
-
+  
   // 检查权限是否存在
   hasPermission (permission) {
 
@@ -44,6 +44,7 @@ export default {
 
   // 金额格式化
   formatAmount(amount, decimalDigits = 0) {
+    amount = Number(amount)
     const { hiddenSensitiveFields } = useAuthStore()
     if (hiddenSensitiveFields) return '****'
     let amt = math.format(amount, {notation: 'fixed',precision: 2})

+ 18 - 2
vite.config.js

@@ -10,21 +10,37 @@ export default defineConfig({
       '@': resolve(__dirname, 'src')
     }
   },
+  // define: {
+  //   'process.env': {
+  //     'BASE_API':"https://cucu.cnyunl.com:8079/"
+  //   }
+  // },
+  // server: {
+  //   proxy: {
+  //     "/api": {
+  //       target: "https://cucu.cnyunl.com:8079/",
+  //       ws: true,
+  //       changeOrigin: true,
+  //       rewrite: (path) => path.replace(/^\/api/, ""),
+  //     },
+  //   },
+  // },
   define: {
     'process.env': {
-      'BASE_API':"https://cucu.cnyunl.com:8079/"
+      'BASE_API':"http://61.164.207.46:8200/"
     }
   },
   server: {
     proxy: {
       "/api": {
-        target: "https://cucu.cnyunl.com:8079/",
+        target: "http://61.164.207.46:8200/",
         ws: true,
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),
       },
     },
   },
+  
   build: {
     rollupOptions: {
       output: {

部分文件因为文件数量过多而无法显示