From 844feac50da042b548fffe36e969c4527b49cc86 Mon Sep 17 00:00:00 2001 From: "LAPTOP-86ICAA31\\Administrator" <55056727@qq.com> Date: Tue, 14 Feb 2023 18:11:52 +0800 Subject: [PATCH] no message --- public/index.html | 2 +- src/pages/agent/list.vue | 16 +- src/pages/order/detail.vue | 464 +++++++++++------------------------------ src/pages/order/orderCheck.vue | 151 ++++++++++++++ src/router/config.js | 5 + src/services/Common.js | 12 +- 6 files changed, 298 insertions(+), 352 deletions(-) create mode 100644 src/pages/order/orderCheck.vue diff --git a/public/index.html b/public/index.html index 17eb782..175a20c 100644 --- a/public/index.html +++ b/public/index.html @@ -20,7 +20,7 @@ -
+
diff --git a/src/pages/agent/list.vue b/src/pages/agent/list.vue index 471b648..8323437 100644 --- a/src/pages/agent/list.vue +++ b/src/pages/agent/list.vue @@ -49,7 +49,16 @@ export default { data(){ return{ listInput:[ - {type:'input',name:'code',title:'关键词',value:'',alt:'全匹配'}, + {type:'select',name:'type',title:'平台类型',value:'', width:'120px', + option:resSelects('platformType'), + }, + {type:'select',name:'state',title:'状态',value:'', width:'120px', + option:[ + {value:'1',text:'启用'}, + {value:'2',text:'禁用'}, + ], + }, + // {type:'input',name:'code',title:'平台类型',value:'',alt:''}, // {type:'input',name:'name',title:'商户名称',value:'',alt:'模糊匹配'}, {type:'button',name:'newAgent',title:'新增平台',value:'',alt:'',fn:this.showNEAgent}, ], @@ -159,10 +168,13 @@ export default { } let count = (this.pagination.current-1)*this.pagination.pageSize; let params={ - code:this.listInput[0].value, pageIndex: this.pagination.current, pageSize: this.pagination.pageSize } + for (let i in this.listInput){ + let ts = this.listInput[i]; + if (ts.value!=='') params[ts.name] = ts.value; + } // console.log(params) this.fetch(params); }, diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue index b96d604..4367eda 100644 --- a/src/pages/order/detail.vue +++ b/src/pages/order/detail.vue @@ -2,15 +2,15 @@
- - 审核订单 - 复审 - 修改订单 - 退出修改 + 调整订单金额 - 申请外发报价 - - + 审核订单 + + + + + +
- - - - - 审核通过 - 审核不通过驳回 + + + + + + + + 不加急 + 加急 - +
@@ -481,89 +335,32 @@ diff --git a/src/pages/order/orderCheck.vue b/src/pages/order/orderCheck.vue new file mode 100644 index 0000000..1677700 --- /dev/null +++ b/src/pages/order/orderCheck.vue @@ -0,0 +1,151 @@ + + + + + \ No newline at end of file diff --git a/src/router/config.js b/src/router/config.js index 6e61c21..524416f 100644 --- a/src/router/config.js +++ b/src/router/config.js @@ -26,6 +26,11 @@ const options = { component: () => import('@/pages/exception/403'), }, { + path: '/orderCheck', + name: '审核订单', + component: () => import('@/pages/order/orderCheck'), + }, + { path: '/account', name: '帐号管理', component: TabsView, diff --git a/src/services/Common.js b/src/services/Common.js index a361fb9..6a95e77 100644 --- a/src/services/Common.js +++ b/src/services/Common.js @@ -62,7 +62,7 @@ function padLeftZero (str) { //订单类型:orderType //订单状态:orderStatus //解析状态:parseStatue -//平台类别:platformType +//订单来源/平台类别:sourceType/platformType export function resSelects(type='',val=''){ // console.log(type,val) let list = []; @@ -72,7 +72,7 @@ export function resSelects(type='',val=''){ {value:'1',text:'打样'}, ] } - else if (type==='sourceType'){ + else if (type==='sourceType' || type==='platformType'){ list = [ {value:'0',text:'内贸'}, {value:'1',text:'外贸'}, @@ -98,14 +98,6 @@ export function resSelects(type='',val=''){ {value:'3',text:'解析失败'}, ] } - else if (type==='platformType'){ - list = [ - {value:'1',text:'内贸'}, - {value:'2',text:'外贸'}, - {value:'3',text:'调度平台'}, - {value:'4',text:'精密铝基板'}, - ] - } else return false; //返回内容 if(val!==''){