修复了404页面跳转的逻辑

dist/assets/ShoppingCartOutlined-2a20eb7b.js → dist/assets/ShoppingCartOutlined-5f01608e.js

@@ -1 +1 @@
-import{a as o}from"./index-0c56b4ee.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-572ee3de.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};

dist/assets/index-41ee9d0f.js → dist/assets/index-01e8fbaf.js

@@ -1 +1 @@
-import{l as i}from"./index-55f75b64.js";import{u as m}from"./vue-router-e674635e.js";import{a as e,V as o,W as p,j as n,u as a}from"./vue-f0dec34d.js";import"./index-0c56b4ee.js";import"./base-9df4194d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={__name:"index",setup(c){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:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),s=e({content:{pageNumber:1,pageSize:20,type:"退货单",where:{condition:"",tablefilter:{}}},id:20230105161503});return(u,d)=>(o(),p("div",null,[n(i,{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 i}from"./index-ec7728fe.js";import{u as m}from"./vue-router-e674635e.js";import{a as e,V as o,W as p,j as n,u as a}from"./vue-f0dec34d.js";import"./index-572ee3de.js";import"./base-ef31c63d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={__name:"index",setup(c){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:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),s=e({content:{pageNumber:1,pageSize:20,type:"退货单",where:{condition:"",tablefilter:{}}},id:20230105161503});return(u,d)=>(o(),p("div",null,[n(i,{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};

dist/assets/index-ca13a84f.js → dist/assets/index-07eb3dfd.js

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

dist/assets/index-130e933a.js → dist/assets/index-6ab01c4f.js

@@ -1 +1 @@
-import{l as o}from"./index-55f75b64.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-0c56b4ee.js";import"./base-9df4194d.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-ec7728fe.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-572ee3de.js";import"./base-ef31c63d.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};

dist/assets/index-1a8bbf8a.js → dist/assets/index-826c90fc.js

@@ -1 +1 @@
-import{A as m}from"./index-0c56b4ee.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-572ee3de.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};

dist/assets/index-f014117d.js → dist/assets/index-9239dbe3.js

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

dist/assets/index-73115ccc.js → dist/assets/index-a7a6eab3.js

@@ -1 +1 @@
-import{b as d}from"./index-0c56b4ee.js";import{l as _}from"./index-55f75b64.js";import{u as y}from"./vue-router-e674635e.js";import{a as e,U as f,V as n,W as r,j as s,X as c,u as t,a4 as b,a5 as k}from"./vue-f0dec34d.js";import"./base-9df4194d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={key:0},B={__name:"index",setup(x){y();const a=e();let p=e([]);e([]);let m=e([{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),l=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230508113003});const i=()=>{a.value.tableData()};return(T,g)=>{const u=f("add-temp");return n(),r("div",null,[s(_,{ref_key:"list",ref:a,columns:t(p),param:t(l),tableName:"dispatchMxTable",searchType:t(m)},{operation:c(()=>[s(u,{onOnSuccess:i})]),tb_cell:c(({data:o})=>[o.column.dataIndex==="amount"?(n(),r("span",h,b(t(d).formatAmount(o.record.amount)),1)):k("",!0)]),_:1},8,["columns","param","searchType"])])}}};export{B as default};
+import{b as d}from"./index-572ee3de.js";import{l as _}from"./index-ec7728fe.js";import{u as y}from"./vue-router-e674635e.js";import{a as e,U as f,V as n,W as r,j as s,X as c,u as t,a4 as b,a5 as k}from"./vue-f0dec34d.js";import"./base-ef31c63d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={key:0},B={__name:"index",setup(x){y();const a=e();let p=e([]);e([]);let m=e([{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),l=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230508113003});const i=()=>{a.value.tableData()};return(T,g)=>{const u=f("add-temp");return n(),r("div",null,[s(_,{ref_key:"list",ref:a,columns:t(p),param:t(l),tableName:"dispatchMxTable",searchType:t(m)},{operation:c(()=>[s(u,{onOnSuccess:i})]),tb_cell:c(({data:o})=>[o.column.dataIndex==="amount"?(n(),r("span",h,b(t(d).formatAmount(o.record.amount)),1)):k("",!0)]),_:1},8,["columns","param","searchType"])])}}};export{B as default};

dist/assets/index-3e4a64d2.js → dist/assets/index-f3b8fc63.js

@@ -1 +1 @@
-import{b as m}from"./index-0c56b4ee.js";import{l as n}from"./index-55f75b64.js";import{u as p}from"./vue-router-e674635e.js";import{a as e,V as r,W as s,j as c,X as u,u as a,a4 as d,a5 as k}from"./vue-f0dec34d.js";import"./base-9df4194d.js";import"./_plugin-vue_export-helper-c27b6911.js";const y={key:0},S={__name:"index",setup(_){p();const o=e();e([]);let l=e([{label:"状态",key:"status",type:"select",dataSource:[{remarks:"新建",value:"新建"},{remarks:"审核",value:"审核"},{remarks:"复核",value:"复核"},{remarks:"关闭",value:"关闭"}]},{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),i=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230320160203});return(b,f)=>(r(),s("div",null,[c(n,{ref_key:"list",ref:o,param:a(i),tableName:"dispatchTable",keyRouteName:"billno",searchType:a(l),detailPage:{name:"dispatchdetail_agent",idname:"sa_dispatchid"}},{tb_cell:u(({data:t})=>[t.column.dataIndex==="sumamount"?(r(),s("span",y,d(a(m).formatAmount(t.record.sumamount)),1)):k("",!0)]),_:1},8,["param","searchType"])]))}};export{S as default};
+import{b as m}from"./index-572ee3de.js";import{l as n}from"./index-ec7728fe.js";import{u as p}from"./vue-router-e674635e.js";import{a as e,V as r,W as s,j as c,X as u,u as a,a4 as d,a5 as k}from"./vue-f0dec34d.js";import"./base-ef31c63d.js";import"./_plugin-vue_export-helper-c27b6911.js";const y={key:0},S={__name:"index",setup(_){p();const o=e();e([]);let l=e([{label:"状态",key:"status",type:"select",dataSource:[{remarks:"新建",value:"新建"},{remarks:"审核",value:"审核"},{remarks:"复核",value:"复核"},{remarks:"关闭",value:"关闭"}]},{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),i=e({content:{pageNumber:1,pageSize:20,where:{condition:""}},id:20230320160203});return(b,f)=>(r(),s("div",null,[c(n,{ref_key:"list",ref:o,param:a(i),tableName:"dispatchTable",keyRouteName:"billno",searchType:a(l),detailPage:{name:"dispatchdetail_agent",idname:"sa_dispatchid"}},{tb_cell:u(({data:t})=>[t.column.dataIndex==="sumamount"?(r(),s("span",y,d(a(m).formatAmount(t.record.sumamount)),1)):k("",!0)]),_:1},8,["param","searchType"])]))}};export{S as default};

dist/assets/index-b432dcde.js → dist/assets/index-f48e6505.js

@@ -1 +1 @@
-import{l as n}from"./index-55f75b64.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-0c56b4ee.js";import"./base-9df4194d.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-ec7728fe.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-572ee3de.js";import"./base-ef31c63d.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};

dist/assets/index-6c37a5b1.js → dist/assets/index-fb0502ff.js

@@ -1 +1 @@
-import{b as d}from"./index-0c56b4ee.js";import{l as _}from"./index-55f75b64.js";import{u as f}from"./vue-router-e674635e.js";import{a as e,U as y,V as r,W as n,j as s,X as l,u as t,a4 as b,a5 as k}from"./vue-f0dec34d.js";import"./base-9df4194d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={key:0},B={__name:"index",setup(x){f();const a=e();let c=e([]);e([]);let m=e([{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),p=e({content:{pageNumber:1,pageSize:20,where:{condition:"",tablefilter:{}}},id:20230508111703});const i=()=>{a.value.tableData()};return(T,g)=>{const u=y("add-temp");return r(),n("div",null,[s(_,{ref_key:"list",ref:a,columns:t(c),param:t(p),tableName:"orderMxTable",searchType:t(m)},{operation:l(()=>[s(u,{onOnSuccess:i})]),tb_cell:l(({data:o})=>[o.column.dataIndex==="amount"?(r(),n("span",h,b(t(d).formatAmount(o.record.amount)),1)):k("",!0)]),_:1},8,["columns","param","searchType"])])}}};export{B as default};
+import{b as d}from"./index-572ee3de.js";import{l as _}from"./index-ec7728fe.js";import{u as f}from"./vue-router-e674635e.js";import{a as e,U as y,V as r,W as n,j as s,X as l,u as t,a4 as b,a5 as k}from"./vue-f0dec34d.js";import"./base-ef31c63d.js";import"./_plugin-vue_export-helper-c27b6911.js";const h={key:0},B={__name:"index",setup(x){f();const a=e();let c=e([]);e([]);let m=e([{label:"起始时间",key:"begindate",type:"datepicker"},{label:"结束时间",key:"enddate",type:"datepicker"},{label:"搜索",key:"condition",type:"input"}]),p=e({content:{pageNumber:1,pageSize:20,where:{condition:"",tablefilter:{}}},id:20230508111703});const i=()=>{a.value.tableData()};return(T,g)=>{const u=y("add-temp");return r(),n("div",null,[s(_,{ref_key:"list",ref:a,columns:t(c),param:t(p),tableName:"orderMxTable",searchType:t(m)},{operation:l(()=>[s(u,{onOnSuccess:i})]),tb_cell:l(({data:o})=>[o.column.dataIndex==="amount"?(r(),n("span",h,b(t(d).formatAmount(o.record.amount)),1)):k("",!0)]),_:1},8,["columns","param","searchType"])])}}};export{B as default};

dist/assets/md5-c692a8f6.js → dist/assets/md5-2d5a7186.js

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

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-0c56b4ee.js"></script>
+    <script type="module" crossorigin src="./assets/index-572ee3de.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-183c40ca.css">

src/DRP/SDrpManagement/myAccountList/index.vue

@@ -33,7 +33,7 @@
 </template>
 
 <script setup>
-import {ref,onMounted} from 'vue'
+import {ref,onMounted,markRaw} from 'vue'
 import { CheckCircleTwoTone } from '@ant-design/icons-vue';
 import Api from '@/api/api'
 import utils from '@/utils/utils'
@@ -75,8 +75,13 @@ const accountClick = (item) =>{
   param.value.content.sa_accountclassid = item.sa_accountclassid
   list.value.tableData()
 }
-const exportTableData = ()=>{
-  console.log(param.value)
+const exportTableData = async ()=>{
+  param.value.content.isExport = true
+  const res = await Api.requested(param.value)
+  utils.message(res,'导出成功',()=>{
+    window.open(res.data[0].url, "_self")
+    param.value.content.isExport = false
+  })
 }
 onMounted(()=>{
   accountData()

src/DRP/SDrpManagement/order/detail/index.vue

@@ -3,17 +3,24 @@
     <detail-template :headData="mainAreaData" :title="'订单号:'+orderData.sonum" :tabs="['订单明细','订单进度','发货单','收支明细']" :delParam="{id:'20221108152102',content:{sa_orderids:[router.currentRoute.value.query.id]}}" :disable="utils.isDisabled(orderData.status,['提交','审核','关闭','预提交','确认'])" size="small" :hideBorder="false" ownertable="sa_order">
       <template #operation>
         <a-space>
-          <edit :data="orderData" @onSuccess="mianData" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))"></edit>
-          <a-button v-if="orderData.type === '特殊订单'" type="primary" @click="preSubmission" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','预提交','确认'])">预提交</a-button>
-          <a-button type="primary" @click="submitOrder" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],(specialOrder('提交')))">提交</a-button>
+          <edit v-if="utils.hasPermission('update')" :data="orderData" @onSuccess="mianData" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))"></edit>
+          <a-button v-if="orderData.type === '特殊订单' && utils.hasPermission('preSubmission')" type="primary" @click="preSubmission" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭','预提交','确认'])">预提交</a-button>
+          <a-button v-if="utils.hasPermission('submit')" type="primary" @click="submitOrder" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],(specialOrder('提交')))">提交</a-button>
           <!-- <a-button type="primary" @click="backOrder" :disabled="utils.isDisabled(orderData.status,['新建','审核','关闭'],specialOrder('撤回'))">撤回</a-button> -->
         </a-space>
       </template>
       <template #tab0>
         <div class="flex">
           <a-space class="mt-10">
-            <select-product :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" :param="listParam" @onSelect="addProductToBody"></select-product>
-            <a-button :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],(selectProductList.length == 0 || specialOrder('编辑')))" type="primary" @click="deleteProd">删除产品</a-button>
+            <!-- 添加产品 -->
+            <select-product v-if="utils.hasPermission('orderDetail')" :disabled="utils.isDisabled(orderData.status,['提交','审核','关闭'],specialOrder('编辑'))" :param="listParam" @onSelect="addProductToBody">
+              <template #tb_cell="{data}">
+                <div v-if="data.column.dataIndex === 'qty'">
+                  <a-input-number style="width:100%" id="inputNumber" v-model:value="data.record.qty" :min="data.record.orderminqty" :step="data.record.orderaddqty"/>
+                </div>
+              </template>
+            </select-product>
+            <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" @onSelect="onProdSelect">
@@ -251,10 +258,12 @@ const addProductToBody = async (val) =>{
     return {
       sa_orderitemsid:0,
       itemid:e.itemid,
-      qty:1
+      qty:e.qty
     }
   })
-  updateProd(data,'添加成功')
+  updateProd(data,'添加成功',()=>{
+    prodlist.value.tableRecord = []
+  })
 }
 const inputChange = (val) =>{
   let data = [{
@@ -274,6 +283,7 @@ const onProdSelect = (val) => {
   selectProductList.value = val
 }
 const deleteProd = ()=>{
+  console.log(selectProductList.value)
   Modal.confirm({
     title: '删除产品',
     icon: createVNode(ExclamationCircleOutlined),
@@ -292,6 +302,7 @@ const deleteProd = ()=>{
       utils.message(res,'删除成功',()=>{
         loading.value = false
         prodlist.value.selectedRowKeys = []
+        prodlist.value.tableRecord = []
         selectProductList.value = []
         prodlist.value.listData()
         mianData()

src/DRP/SDrpManagement/order/index.vue

@@ -2,7 +2,7 @@
   <div>
     <listTemp ref="list" :columns="columns" :param="param" :tableName="'orderTable'" keyRouteName="sonum" :searchType="searchType" :detailPage="{name:'agent_orderDetails',idname:'sa_orderid'}">
       <template #operation>
-        <add-temp @onSuccess="onSuccess"></add-temp>
+        <add-temp v-if="utils.hasPermission('insert')" @onSuccess="onSuccess"></add-temp>
       </template>
       <template #tb_cell="{data}">
         <template v-if="data.column.dataIndex === 'amount'">

src/components/layout/header.vue

@@ -194,23 +194,21 @@ const setTheme = (themeName)=> {
     });
   }
   
-  console.log(colorState.value)
 }
 const shoppingCartCount = async ()=>{
   const res = await Api.optionstype('shoppingcartcount')
   count.value = res.data
 }
-const checkHasApp = ()=>{
+const checkHasApp = (to)=>{
   let [arr, mode, app] = [[], [], []];
-
-  system.value.map(e=>e.modules).forEach(e=>{
-    mode = mode.concat(...e)
+  system.value.forEach(e=>{
+    mode = mode.concat(...e.modules)
   })
-  app = mode.map(e=>e.apps)
-  app.forEach(e=>{
-    arr = arr.concat(...e)
+
+  mode.forEach(e=>{
+    arr = arr.concat(...e.apps)
   })
-  let hasApp = arr.some(e=>e.name == router.currentRoute.value.meta.name)
+  let hasApp = arr.some(e=>e.name == to.meta.name)
   if (!hasApp) 
     return router.replace({name:'404'})
 }
@@ -220,7 +218,8 @@ onMounted(()=>{
   shoppingCartCount()
 })
 watch(() => router.currentRoute.value,(to, from) => {
-  checkHasApp()
+  // console.log(to)
+  checkHasApp(to)
 })
 </script>
 <style>

src/router/SDrpManagement.js

@@ -4,8 +4,7 @@ const SDrpManagement = [
     name: 'order',
     meta: {
       title: '订货订单',
-      name: 'order',
-      keepAlive:false
+      name: 'order'
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/order/index.vue'),
   },
@@ -33,7 +32,6 @@ const SDrpManagement = [
     meta: {
       title: '产品组查询',
       name: 'productgroup',
-      keepAlive:true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/productGroup/index.vue')
   },
@@ -79,7 +77,6 @@ const SDrpManagement = [
     meta: {
       title: '打款凭证',
       name:'remitvoucher',
-      keepAlive:false
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/remitvoucher/index.vue')
   },
@@ -98,7 +95,6 @@ const SDrpManagement = [
     meta: {
       title: '我的账户',
       name:'myaccountclass',
-      keepAlive:false
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/myAccountList/index.vue')
   },
@@ -108,7 +104,6 @@ const SDrpManagement = [
     meta: {
       title: '发货单',
       name: 'dispatch_agent',
-      keepAlive:false
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/dispatchAgent/index.vue')
   },
@@ -135,8 +130,7 @@ const SDrpManagement = [
     name: 'salerafterbill',
     meta: {
       title: '退换单',
-      name: 'salerafterbill',
-      keepAlive:false
+      name: 'salerafterbill'
     },
     component: () => import(/* webpackChunkName: "about" */ '@/DRP/SDrpManagement/salerAfterBill/index.vue'),
   },
@@ -152,6 +146,10 @@ const SDrpManagement = [
   {
     path: '/message',
     name: 'msgcenter',
+    meta: {
+      title: '消息中心',
+      name: 'msgcenter',
+    },
     component: ()=>import(/* webpackChunkName: "about" */ '@/views/message/index.vue'),
     children:[]
   },

src/router/index.js

@@ -16,11 +16,19 @@ const routes = [
       {
         path: '/setenterpriseInfo',
         name: 'setenterpriseInfo',
+        meta: {
+          title: '企业信息',
+          name: 'setenterpriseInfo'
+        },
         component: ()=>import(/* webpackChunkName: "about" */ '@/views/setEnterpriseInfo/index.vue'),
       },
       {
         path: '/reportcenter',
         name: 'reportcenter',
+        meta: {
+          title: '报表中心',
+          name: 'reportcenter'
+        },
         component: ()=>import(/* webpackChunkName: "about" */ '@/views/reportcenter/index.vue'),
       }
     ]

src/template/billProductTable/index.vue

@@ -67,6 +67,7 @@
     } else {
       tableRecord.value.push(record)
     }
+    console.log(tableRecord.value)
     emit('onSelect',tableRecord.value)
   }
   onMounted(()=>{
@@ -77,7 +78,8 @@
   })
   defineExpose({
     listData,
-    selectedRowKeys
+    selectedRowKeys,
+    tableRecord
   })
 </script>
 <style>

src/template/selectProduct/index.vue

@@ -2,17 +2,28 @@
 <template>
   <div>
     <a-button type="primary" @click="showModel" :disabled="disabled">添加产品</a-button>
-    <a-modal v-model:visible="visible" title="产品" width="900px" @ok="onOK">
+    <!-- <a-modal v-model:visible="visible" title="产品" width="900px" @ok="onOK"> -->
+    <a-drawer
+        title="产品"
+        :closable="false"
+        :visible="visible"
+        width="90%"
+        @close="onClose"
+      >
+      <template #extra>
+        <a-button style="margin-right: 8px" @click="onClose">关闭</a-button>
+        <a-button type="primary" @click="onOK">添加</a-button>
+      </template>
       <a-input class="search-panel" v-model:value="search" placeholder="搜索内容" @keyup.enter="searchData" allowClear></a-input>
       <a-table
         :loading="loading"
         class="ant-table-striped"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,fixed:true }"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange,onSelect:onSelect,fixed:true }"
         rowKey="itemid"
         :columns="columns"
         :data-source="data"
-        :scroll="{x:'max-content',y:500}"
-        :pagination="{showSizeChanger:true,defaultPageSize:20,total:total}"
+        :scroll="{x:'max-content'}"
+        :pagination="{showSizeChanger:true,defaultPageSize:20,current:props.param.content.pageNumber,total:total}"
         @change="onChange"
         size="small"
         :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-striped' : null)">
@@ -23,7 +34,7 @@
           <slot name="tb_cell" :data="{column, record}"></slot>
         </template>
       </a-table>
-    </a-modal>
+    </a-drawer>
   </div>
 </template>
 
@@ -32,6 +43,10 @@
   import utils from '@/utils/utils'
   import Api  from '@/api/api'
   import { useRouter } from "vue-router";
+  import { useBaseStore } from '@/stores/modules/base'
+  import { storeToRefs } from 'pinia'
+  const base = useBaseStore()
+  let { tableRecord } = storeToRefs(base)
   const router = useRouter()
   const props = defineProps({
     param: Object,
@@ -48,56 +63,55 @@
   const columns = [
     {
       title:'行号',
-      dataIndex:'rowno',
+      dataIndex:'rowindex',
       width:90,
-      ellipsis:true,
     },
     {
       title:'产品名称',
       dataIndex:'itemname',
       width:180,
-      ellipsis:true,
     },
     {
       title:'产品编号',
       dataIndex:'itemno',
       width:180,
-      ellipsis:true,
-    },
-    {
-      title:'型号',
-      dataIndex:'model',
-      width:180,
-      ellipsis:true,
     },
     {
       title:'单价',
       dataIndex:'price',
       width:180,
-      ellipsis:true,
     },
     {
       title:'特殊说明',
       dataIndex:'specalnote',
       width:180,
-      ellipsis:true,
     },
-    
+    {
+      title:'数量',
+      dataIndex:'qty',
+      width:90,
+    },
   ]
+  const onClose = ()=>{
+    visible.value = false
+    tableRecord.value = []
+     props.param.content.pageNumber = 1
+  }
   const showModel = ()=>{
     visible.value = true
     listData()
   }
   const onSelectChange = (changableRowKeys, selectedRows)=>{
     selectedRowKeys.value = changableRowKeys
-    selectRows.value = selectedRows
   }
   const onOK = (changableRowKeys, selectedRows)=>{
-    emit('onSelect',selectRows.value)
+    emit('onSelect',tableRecord.value)
     visible.value = false
     selectedRowKeys.value = []
+    tableRecord.value = []
   }
   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()
@@ -105,9 +119,21 @@
   const listData = async ()=> {
     props.param.content.sa_orderid = router.currentRoute.value.query.id
     const res = await Api.requested(props.param)
-    data.value = res.data
+    data.value = res.data.filter(e=>{
+      e.qty = e.orderminqty
+      return e
+    })
     total.value = res.total
   }
+  const onSelect = async (record, selected, selectedRows, nativeEvent)=>{
+    if (!selected) {
+      tableRecord.value = tableRecord.value.filter(e=>e.itemid !== record.itemid)
+    } else {
+      tableRecord.value.push(record)
+    }
+    console.log(tableRecord.value)
+    // emit('onSelect',tableRecord.value)
+  }
   const searchData = ()=>{
     props.param.content.where.condition = search.value
     props.param.content.pageNumber = 1