Merge remote-tracking branch 'origin/master'

assets/ShoppingCartOutlined-52f8d00a.js → assets/ShoppingCartOutlined-87e9707a.js

@@ -1 +1 @@
-import{a as o}from"./index-ecc1f5cd.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-e2f32207.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};

assets/index-01d476c0.css

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

assets/index-63d52a64.js → assets/index-309f0eea.js

@@ -1 +1 @@
-import{A as m,b as d}from"./index-ecc1f5cd.js";import{l as u}from"./index-091bebae.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-6d593406.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-e2f32207.js";import{l as u}from"./index-7be5801b.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-a97bc293.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};

assets/index-3337a1cd.css

@@ -0,0 +1 @@
+.search-input[data-v-d9a3659f]{width:300px;margin-bottom:20px}

assets/index-961c8d2f.js → assets/index-35d8a5b6.js

@@ -1 +1 @@
-import{A as m}from"./index-ecc1f5cd.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-e2f32207.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};

assets/index-3de29187.css

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

assets/index-baa14960.js → assets/index-507d5d49.js

@@ -1 +1 @@
-import{b as c}from"./index-ecc1f5cd.js";import{l as u}from"./index-091bebae.js";import{_ as d}from"./index-ff4da5d1.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-6d593406.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-e2f32207.js";import{l as u}from"./index-7be5801b.js";import{_ as d}from"./index-7f0a42ed.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-a97bc293.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};

assets/index-bece587a.js → assets/index-604cc429.js

@@ -1 +1 @@
-import{l as o}from"./index-091bebae.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-ecc1f5cd.js";import"./base-6d593406.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-7be5801b.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-e2f32207.js";import"./base-a97bc293.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};

assets/index-bf85d2f5.js → assets/index-606a40e4.js

@@ -1 +1 @@
-import{b as n}from"./index-ecc1f5cd.js";import{l as _}from"./index-091bebae.js";import{_ as f}from"./index-ff4da5d1.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-6d593406.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};
+import{b as n}from"./index-e2f32207.js";import{l as _}from"./index-7be5801b.js";import{_ as f}from"./index-7f0a42ed.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-a97bc293.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};

assets/index-c3382c8d.js → assets/index-7db5f450.js

@@ -1 +1 @@
-import{A as D,d as I}from"./index-ecc1f5cd.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-e2f32207.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};

assets/index-ff4da5d1.js → assets/index-7f0a42ed.js

@@ -1 +1 @@
-import{A as r,b as n}from"./index-ecc1f5cd.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-e2f32207.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 _};

assets/index-d109319b.js → assets/index-8376eebc.js

@@ -1 +1 @@
-import{l as n}from"./index-091bebae.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-ecc1f5cd.js";import"./base-6d593406.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-7be5801b.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-e2f32207.js";import"./base-a97bc293.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};

assets/index-d5390e01.js → assets/index-bec4dfb8.js

@@ -1 +1 @@
-import{l as o}from"./index-091bebae.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-ecc1f5cd.js";import"./base-6d593406.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-7be5801b.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-e2f32207.js";import"./base-a97bc293.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};

assets/index-e3c40cdb.js

@@ -1 +0,0 @@
-import{s as k,A as B}from"./index-ecc1f5cd.js";import{u as R}from"./vue-router-e674635e.js";import{u as _}from"./base-6d593406.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 f,a3 as D,G as K,a5 as $}from"./vue-f0dec34d.js";const G={__name:"index",props:{columns:Array,param:Object,hideBorder:Boolean,size:String,loading:Boolean},emits:["onSelect"],setup(l,{expose:S,emit:h}){const n=l,w=_();let{tableRecord:t}=k(w);R();const m=d([]),r=d([]),p=d(0),C=(e,s)=>{r.value=e},y=(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 B.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),h("onSelect",t.value)};return x(()=>{i()}),N(()=>{t.value=[]}),S({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:C,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:y,size:l.size,bordered:!l.hideBorder,"row-class-name":(a,c)=>c%2===1?"table-striped":null},{bodyCell:f(({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:f(()=>[K("详情")]),_:2},1032,["onClick"])):$("",!0)]),_:3},8,["loading","row-selection","columns","data-source","pagination","size","bordered","row-class-name"])])}}};export{G as _};

assets/index-e86d3027.js

@@ -0,0 +1 @@
+import{s as k,A as R}from"./index-e2f32207.js";import{u as B}from"./vue-router-e674635e.js";import{u as _}from"./base-a97bc293.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 _};

assets/index-ffa9ee2b.css

@@ -1 +0,0 @@
-.search-input[data-v-61df89b5]{width:300px;margin-bottom:20px}

assets/md5-d98b46af.js → assets/md5-30a0d894.js

@@ -1,4 +1,4 @@
-import{c as commonjsGlobal}from"./index-ecc1f5cd.js";var md5Exports={},md5$1={get exports(){return md5Exports},set exports(t){md5Exports=t}};/**
+import{c as commonjsGlobal}from"./index-e2f32207.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

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-ecc1f5cd.js"></script>
+    <script type="module" crossorigin src="./assets/index-e2f32207.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">

src/HDrpManagement/dispatch/details/index.vue

@@ -16,6 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
+        <add class="inline-16"/>
         <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.STATUS == '新建'" :data="mainData" @onSuccess="onSuccess" />
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'cancelBill')" :disabled="mainData.STATUS !== '复核'" @click="cancelBill">手工关闭</el-button>
         <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
@@ -36,6 +37,7 @@
 
 <script>
 import Edit from '../modules/edit'
+import add from '../modules/add'
 import productList from '../modules/productlist.vue'
 import erpInfo from '../modules/erpInfo.vue'
 import defaultInfo from '../modules/defaultInfo.vue'
@@ -48,6 +50,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
       }
     },
     components:{
+      add,
       Edit,
       productList,
       defaultInfo,

src/HDrpManagement/dispatch/index.vue

@@ -12,6 +12,7 @@
       :apiId="{query:20221114135403,del:20221114135503}"
       :fixRightData="['remarks']"
       :fixLeftData="['billno','status']"
+      :autoQuery="autoQuery"
       :detailPath="{
         path:'/dispatchdetail'
       }">
@@ -90,6 +91,7 @@
   export default {
     data () {
       return {
+        autoQuery:true,
         options:[],
         dateSelect:[],
         value:'',
@@ -128,6 +130,17 @@
           return '';
         }
       }
+    },
+    created () {
+      if (this.$route.query.id){
+        this.autoQuery = false
+      }
+    },
+    mounted () {
+      if (this.$route.query.id){
+        this.$refs.basicLayout.param.content.where.sa_orderitemsid = this.$route.query.id
+        this.$refs.basicLayout.listData()
+      }
     }
   }
 

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -9,7 +9,7 @@
         <tableLayout :layout="tablecols" checkbox="true"  :data="tableData" :opwidth="200" height="calc(100vh - 550px)" :width="true" :custom="true" fixedName="offerPrice amount" @selectionChange="handleSelectionChange">
           <template v-slot:customcol="scope">
             <p v-if="scope.column.columnname == 'qty'">
-              <el-input-number :controls="true" controls-position='right' v-if="data.STATUS === '新建'" size="mini" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.column.index)" :precision="2"></el-input-number>
+              <el-input-number :controls="true" controls-position='right' v-if="data.STATUS === '新建'" size="mini" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.column.index,scope.column.data.batchno = '')" :precision="2"></el-input-number>
               <span v-else>{{scope.column.data.qty}}</span>
             </p>
             <p v-else-if="scope.column.columnname == 'batchno'">
@@ -249,7 +249,8 @@ export default {
       const res = await this.$api.requested({
         "id": "20230427101303",
         "content": {
-          "itemnos":[row.itemno]
+          "itemnos":[row.itemno],
+          "qty":row.qty
         }
       })
       this.options = res.data

src/HDrpManagement/dispatchMx/index.vue

@@ -5,7 +5,8 @@
       ref="basicLayout"
       tableName="dispatchMxTable"
       :apiId="{query:20230508113003}"
-      :options="options">
+      :options="options"
+      :autoQuery="autoQuery">
       <template #custom>
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
@@ -74,6 +75,7 @@
 export default {
   data () {
     return {
+      autoQuery:true,
       options:[],
       tradefieldList:'',
       where: {
@@ -105,15 +107,13 @@ export default {
     },
     routeToOrder (id) {
       this.$store.dispatch('changeDetailDrawer',true)
-      this.$router.push({path:'/orderdetail',query:{id:id}})
+      this.$router.push({path:'/orderdetail',query:{id:id,changePage:0}})
     },
     routeToDispatch (id) {
       this.$store.dispatch('changeDetailDrawer',true)
-      this.$router.push({path:'/dispatchdetail',query:{id:id}})
+      this.$router.push({path:'/dispatchdetail',query:{id:id,changePage:0}})
     }
   },
-  created () {
-  }
 }
 
 </script>

src/HDrpManagement/orderManage/details/tabs/addProduct.vue

@@ -3,7 +3,7 @@
   <div class="flex-align-center flex-between mt-10">
     <div>
       <el-input class="inline-16" style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="品名,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>
-      <el-select v-model="params.content.where.isonsale" placeholder="上下架状态" size="small" @change="listData(params.content.pageNumber = 1)" clearable>
+      <el-select class="inline-16" v-model="params.content.where.isonsale" placeholder="上下架状态" size="small" @change="listData(params.content.pageNumber = 1)" clearable>
         <el-option
           label="上架"
           :value="1">
@@ -13,6 +13,8 @@
           :value="0">
         </el-option>
       </el-select>
+      <el-button size="small" @click="reloadParam">重 置</el-button>
+      <el-button size="small" @click="addAll">添加全部产品</el-button>
     </div>
     <el-button type="primary" size="small" :disabled="tableSelectData.length === 0" @click="onConfirm">添加选中产品</el-button>
   </div>
@@ -165,6 +167,15 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
     },
+    async addAll () {
+      this.params.content.isall = true
+      const res = await this.$api.requested(this.params)
+      res.data = res.data.filter(e=>{
+        e.qty = e.orderminqty
+        return e
+      })
+      this.$emit('onConfirm',res.data,true)
+    },
     handlePullApi (pullApi) {
       pullApi.content = JSON.parse(JSON.stringify(this.params.content))
       pullApi.id = JSON.parse(JSON.stringify(this.params.id))
@@ -222,6 +233,11 @@ export default {
     },
     clearSelection () {
       this.$refs.multipleTable.clearSelection();
+    },
+    reloadParam () {
+      this.params.content.where.condition = ''
+      this.params.content.where.isonsale = ''
+      this.listData()
     }
   },
   mounted () {

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -5,18 +5,20 @@
         <slot name="operation"></slot>
         <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
         <excel style="margin:0 0 10px 10px" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
+        <el-input  style="width:200px;margin:0 0 10px 10px" placeholder="根据商品/品号搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition"
+                   @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+        </el-input>
         <el-tooltip class="item" effect="dark" content="输入整单折扣,订单行进行计算,回车保存" placement="top-start">
           <el-input :disabled="data.status !== '新建' && data.status !== '预提交'" v-if="tool.checkAuth($route.name,'quickDiscountrate')" v-model.number="discountrate" size="small" style="width:200px;margin:0 0 10px 10px" type="number" :min="0" :max="1" placeholder="输入折扣" @change="discountrateValidate" @keydown.enter.native="quickDiscountrate"></el-input>
         </el-tooltip>
         <el-button style="margin:0 0 10px 10px" type="text" size="small" @click="reloadPrice" class="inline-16">重置价格</el-button>
-        <el-input  style="width:200px;" placeholder="根据商品/品号搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition"
-                   @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
-        </el-input>
+        <el-button style="margin:0 0 10px 10px" type="text" size="small" @click="changeSort">未发降序</el-button>
       </div>
       <el-table
         v-loading="loading"
         ref="multipleTable"
         :data="tableData"
+        :row-class-name="tableClassNamed"
         size="small"
         max-height="500px"
         stripe
@@ -232,6 +234,9 @@ export default {
           "sa_orderid": 0, //订单ID
           "pageNumber": 1,
           "pageSize": 20,
+          "sort":[
+           
+          ],
           "where": {
             "condition": ""
           }
@@ -270,7 +275,6 @@ export default {
       this.total = res.total
       this.totalPage = Math.ceil(this.total /200)
       this.currentPage = res.pageNumber
-      this.queryBasicInfo()
       if (this.selectNumber[this.param.content.pageNumber -1]){
         this.$refs.multipleTable.toggleRowSelection(this.tableData[3])
       }
@@ -406,7 +410,7 @@ export default {
       })
        if (res.code == 1) {
         this.$emit('onSuccess')
-        this.listData()
+        // this.listData()
       } else {
         this.$message({
           message:res.data + ':' + res.msg,
@@ -454,6 +458,10 @@ export default {
     },
     // 订单添加产品
     async onConfirm (data,isupload) {
+      const loading = this.$loading({
+        lock: true,
+        text: '数据插入中...',
+      });
       if (isupload) {
         const res = await this.$api.requested({
           "id": 20221109093602,
@@ -471,10 +479,12 @@ export default {
             })
           },
         })
+        loading.close();
       }
       this.listData()
       this.$emit('onSuccess')
       this.$refs.addpro.tableSelectData = []
+      this.$refs.addpro.listData()
     },
     async queryStock (val) {
       const res = await this.$api.requested({
@@ -573,14 +583,24 @@ export default {
     },
     onClose(){
       this.drawer = false
-      this.$refs.addpro.params.content.where.condition = ''
-      this.$refs.addpro.params.content.where.isonsale = ''
+      // this.$refs.addpro.params.content.where.condition = ''
+      // this.$refs.addpro.params.content.where.isonsale = ''
+    },
+    tableClassNamed ({row,rowIndex}) {
+      if (row.undeliqty > 0) {
+        return 'bg-red';
+      } else {
+        return '';
+      }
+    },
+    changeSort(){
+      this.param.content.sort = [{sortname: "默认", sorted: 1, sortid: 146, reversed: 0}]
+      this.listData()
     }
-
   },
   mounted () {
     this.listData()
-    // this.queryStock()
+    this.queryBasicInfo()
     this.columnTitle  = []
     this.$refs.multipleTable.$children.forEach(obj => {
 
@@ -598,4 +618,7 @@ export default {
 body .el-table th.gutter{
 display: table-cell!important;
 }
+.bg-red{
+  color:red !important;
+}
 </style>

src/HDrpManagement/orderManage/modules/add.vue

@@ -12,7 +12,8 @@
       title="新建订单"
       :visible.sync="drawer"
       direction="rtl"
-      :show-close="false"
+      :show-close="true"
+      :wrapperClosable="false"
       append-to-body
       size="800px"
       @close="refresh">

src/HDrpManagement/orderMx/index.vue

@@ -104,6 +104,9 @@
         <div v-else-if="scope.data.column.columnname == 'isfreeze'">
           <span>{{scope.data.column.data.isfreeze == 1?'是':'否'}}</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'Fh'">
+          <el-button type="text" size="small" @click="toFHbill(scope.data.column.data.sa_orderitemsid)">发货单明细</el-button>
+        </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
@@ -156,6 +159,9 @@ export default {
       this.$store.dispatch('changeDetailDrawer',true)
       this.$router.push({path:'/orderdetail',query:{id:id}})
     },
+    toFHbill (id) {
+       this.$router.push({path:'/dispatch',query:{id:id}})
+    },
     /*筛选排序*/
     handleCommand(command){
       let sort = [

src/HManagement/accountManage/modules/account_detail.vue

@@ -42,7 +42,7 @@ import useTemp from './useAccdount.vue'
 import restPas from "./restPassword.vue"
 
 import detailInfo from '@/components/detailInfo/index'
-import teamInformation from './teamInformation/index'
+import teamInformation from './teamInformation/index.vue'
 
 export default {
   name: "detail",

src/HManagement/siteManage/custom_option/index.vue

@@ -31,7 +31,7 @@ import normalLayout from '@/components/normal-basic-layout/normal.vue'
 import list from './modules/list.vue'
 import edit from './modules/edit'
 import del_option from './modules/delete'
-import details_list from './modules/detailsList'
+import details_list from './modules/detailsList.vue'
 import add from './modules/add'
 import { log } from '@antv/g2plot/lib/utils'
 export default {

src/components/normal-basic-layout/details/index.vue

@@ -22,7 +22,7 @@
             <slot name="customOperation"></slot>
           </div>
           <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
-         <div>
+         <div v-if="changePage == 1">
             <el-button size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
             <el-button size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
           </div>
@@ -87,6 +87,7 @@ export default {
   props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler'],
   data () {
     return {
+      changePage:1,
       routerName:'',
       rowindex:0,
       total:0,
@@ -333,6 +334,7 @@ export default {
   },
   mounted () {
     // this.checkPaginationData()
+    this.changePage = this.$route.query.changePage ? this.$route.query.changePage: 1
     this.idx = this.$route.query.rowindex
 
   },

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -30,6 +30,7 @@ export default {
   },
   watch:{
     closeDrawerTemp (val) {
+      console.log(this.$router)
       val === false ? this.$emit('onSuccess'):''
       val === false ? this.$store.dispatch('setHistoryRouter',null):""
     }

yos/assets/index-01d476c0.css

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

yos/assets/index-ffa9ee2b.css

@@ -1 +0,0 @@
-.search-input[data-v-61df89b5]{width:300px;margin-bottom:20px}

yos/css/5188.1a6bc3a9.css

@@ -1 +0,0 @@
-.upload_image__panel[data-v-b87b2cdc]{position:relative;height:148px;width:148px;border-radius:6px;margin-right:10px;margin-bottom:10px;border:1px solid #c0ccda;overflow:hidden}.upload_image__panel img[data-v-b87b2cdc]{width:100%;height:100%}.upload_image__panel_mod[data-v-b87b2cdc]{position:absolute;top:0;left:0;width:100%;height:100%;color:#fff;background:rgba(0,0,0,.8);opacity:0;transition:.3s linear;cursor:pointer}.upload_image__panel:hover .upload_image__panel_mod[data-v-b87b2cdc]{opacity:1}.pionter[data-v-b87b2cdc]{margin:6px 0;padding:10px;transition:.2s linear;cursor:pointer;border-radius:5px}.pionter[data-v-b87b2cdc]:hover{box-shadow:0 5px 10px rgba(0,0,0,.1)}

yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.62dea0e6.js"></script><link href="css/app.3e10b046.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.dd2399b5.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.5cc949cf.js"></script><link href="css/app.795f71b7.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.5bc43116.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>

yos/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-ecc1f5cd.js"></script>
+    <script type="module" crossorigin src="./assets/index-e2f32207.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">