From f97233d273ea48b4301e6959f8b02b96c1754896 Mon Sep 17 00:00:00 2001
From: "LAPTOP-86ICAA31\\Administrator" <55056727@qq.com>
Date: Tue, 14 Feb 2023 14:31:35 +0800
Subject: [PATCH] no message

---
 src/layouts/tabs/TabsView.vue | 16 ++++++++++++----
 src/pages/agent/list.vue      |  4 ++--
 src/pages/order/list.vue      |  8 ++++----
 src/router/index.js           |  2 +-
 src/services/Common.js        |  2 +-
 src/services/order/Order.js   |  5 +++++
 6 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index d356d7b..60cb6ee 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -391,15 +391,23 @@ table.tablesd{border:1px solid #eee; border-right:none; border-bottom:none; widt
 .boxListSpecials{
   float: left; margin:0 1em .5em 0; min-width:500px;
   .t{display: inline-block; margin-right:.5em}
-  em{font-size:10px; color:#999; margin:0 .5em;}
+  em{font-size:10px; color:#999; margin:0 .5em}
 }
-.listFiles{padding:0; margin:0; list-style: none}
+.listFiles{padding:0; margin:0; list-style:none}
 .listFiles li{display: flex; padding:.3em 0}
 .listFiles li a{overflow: hidden; line-height:1em; margin-left:.5em}
 .listFiles li .anticon-delete{padding:0 .5em; color:#666; cursor:pointer}
 .listFiles li .anticon-delete:hover{color:#f90}
-.boxCraftDto{margin:0; padding: 0; overflow:hidden;}
-.boxCraftDto li{float: left; list-style: none; border:1px solid #eee; padding: 10px; border-radius:.5em; margin:0 20px 10px 0;}
+.boxCraftDto{margin:0; padding: 0; overflow:hidden}
+.boxCraftDto li{float: left; list-style: none; border:1px solid #eee; padding: 10px; border-radius:.5em; margin:0 20px 10px 0}
+.listTable{border:1px solid #eee; border-right:none; border-bottom:none; display: flex; flex-wrap: wrap; padding:0; margin:0 0 1.5em}
+.listTable>li{border:1px solid #eee; border-left:none; border-top:none; width:25%; list-style: none; margin:0; display:flex}
+.listTable>li span.t,.listTable>li p.n{padding:.5em}
+.listTable>li span.t{width:15em; background-color: #f9f9f9; text-align:right}
+.listTable>li p.n{width:100%; margin-bottom:0}
+@media screen and (max-width:1300px) {
+  .listTable>li{width:33.333%}
+}
 </style>
 <style scoped lang="less">
   .tabs-view{
diff --git a/src/pages/agent/list.vue b/src/pages/agent/list.vue
index d4fd282..471b648 100644
--- a/src/pages/agent/list.vue
+++ b/src/pages/agent/list.vue
@@ -192,8 +192,8 @@ export default {
     randPWD(){
       this.formNA.password = getRandCode();
     },
-    getSelTxt(type,val){
-      return resSelects(type,val||'null')
+    getSelTxt(type,key){
+      return resSelects(type,key===0?key:key||'null');
     }
   }
 }
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index 0e9c9d3..14b0d2f 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -73,7 +73,7 @@ export default {
         {title: '订单包',dataIndex: 'groupNo',key: 'groupNo',width:'200px',scopedSlots: { customRender: 'groupNo' },},
         {title: '客户编号',dataIndex: 'memberNo',key: 'memberNo',width:'140px',scopedSlots: { customRender: 'memberNo' },},
         {title: '审单员',dataIndex: 'checkAccountName',align:'center',key:'checkAccountName',width:'80px'},
-        {title: '跟单人员账号',dataIndex: 'followAccount',align:'center',key:'followAccount',width:'160px'},
+        {title: '跟单员',dataIndex: 'followAccount',align:'center',key:'followAccount',width:'160px'},
         {title: '状态',dataIndex: 'status',key: 'status',width:'100px',scopedSlots: { customRender: 'status' },},
         {title: '解析状态',dataIndex: 'parsingStatus',align:'center',key: 'parsingStatus',width:'100px',scopedSlots: { customRender: 'parsingStatus' },},
         {title: '文件',dataIndex: 'pcbFileName',key: 'pcbFileName',width:'160px',scopedSlots: { customRender: 'pcbFileName' },},
@@ -93,9 +93,6 @@ export default {
     this.filterSearch()
   },
   methods:{
-    getSelTxt(type,key){
-      return resSelects(type,key||'null');
-    },
     filterSearch(page){
       // console.log(this.listInput)
       if(typeof(page)=='object'){
@@ -131,6 +128,9 @@ export default {
     formatDateTime(time){
       return formatDate(time,'yyyy-MM-dd hh:mm');
     },
+    getSelTxt(type,key){
+      return resSelects(type,key===0?key:key||'null');
+    },
   }
 }
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 570bb5e..0a94b4e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,7 +13,7 @@ Router.prototype.push = function push(location) {
 // 不需要登录拦截的路由配置
 const loginIgnore = {
   names: ['404', '403'], //根据路由名称匹配
-  paths: ['/loginjmp', '/loginOA'], //根据路由fullPath匹配
+  paths: ['/loginjmp', '/loginOA','/orderCheck'], //根据路由fullPath匹配
   /**
      * 判断路由是否包含在该配置中
      * @param route vue-router 的 route 对象
diff --git a/src/services/Common.js b/src/services/Common.js
index 4ca9e72..a361fb9 100644
--- a/src/services/Common.js
+++ b/src/services/Common.js
@@ -64,7 +64,7 @@ function padLeftZero (str) {
 //解析状态:parseStatue
 //平台类别:platformType
 export function resSelects(type='',val=''){
-  console.log(type,val)
+  // console.log(type,val)
   let list = [];
   if (type==='orderType'){
     list = [
diff --git a/src/services/order/Order.js b/src/services/order/Order.js
index a7afd19..a44131f 100644
--- a/src/services/order/Order.js
+++ b/src/services/order/Order.js
@@ -9,6 +9,11 @@ export function OrderDetail(id) {
   return requestApi('/api/app/order/async-by-id/'+id, METHOD.GET, null)
 }
 
+//获取订单详情参数模板
+export function OrderParamDetail(id) {
+  return requestApi('/api/app/order/pram-by-order-id/'+id, METHOD.GET, null)
+}
+
 /* 以下待删 */
 
 //获取SMT订单详情