From 91e59d9bb51c24063b065b0589d63c66ff25c837 Mon Sep 17 00:00:00 2001
From: "LAPTOP-86ICAA31\\Administrator" <55056727@qq.com>
Date: Mon, 13 Feb 2023 11:24:32 +0800
Subject: [PATCH] no message

---
 src/pages/agent/list.vue    |  6 +++---
 src/pages/order/list.vue    | 12 +++++++-----
 src/services/Common.js      |  9 +++------
 src/services/order/Order.js | 11 ++++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/pages/agent/list.vue b/src/pages/agent/list.vue
index b8d89d6..d4fd282 100644
--- a/src/pages/agent/list.vue
+++ b/src/pages/agent/list.vue
@@ -3,7 +3,7 @@
     <inc-search :listInput="listInput" :loadSoBn="tableLoad" :onSearch="filterSearch"></inc-search>
     <a-table class="tablesa" :columns="tableColumns" :data-source="tableData" :rowKey="lists => lists.id" :pagination="pagination" :loading="tableLoad" @change="filterSearch">
       <div slot="state" slot-scope="text"><span :style="'color:#'+(text==2?'f30':'f90')">{{text==1?'启用':'禁用'}}</span></div>
-      <span slot="type" slot-scope="text">{{getResSelects('platformType',text)}}</span>
+      <span slot="type" slot-scope="text">{{getSelTxt('platformType',text)}}</span>
       <div slot="id" slot-scope="text,record,index">
         <a-spin :spinning="record.load">
           <a-space>
@@ -192,8 +192,8 @@ export default {
     randPWD(){
       this.formNA.password = getRandCode();
     },
-    getResSelects(type,val){
-      return resSelects(type,val)
+    getSelTxt(type,val){
+      return resSelects(type,val||'null')
     }
   }
 }
diff --git a/src/pages/order/list.vue b/src/pages/order/list.vue
index 4128bd0..0e9c9d3 100644
--- a/src/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -6,7 +6,7 @@
       <i v-if="record.memberLevel!==null" :class="'star s'+record.memberLevel">{{record.memberLevel}}</i>{{text}}
     </div>
     <div slot="orderNo" slot-scope="text,record">
-      <router-link class="fontovdd" :title="text" :to="'detail?Id='+record.orderNo"><a-icon type="file-text" /> {{text}}</router-link>
+      <router-link class="fontovdd" :title="text" :to="'detail?id='+record.id"><a-icon type="file-text" /> {{text}}</router-link>
       <span :style="'color:'+(record.isJiaJi?'#f90':'#999')">加急：{{record.isJiaJi?'是':'否'}}</span><br>
       <span :style="'color:'+(record.isReorder?'#f90':'#999')">返单：{{record.isReorder?'是':'否'}}</span>
     </div>
@@ -14,7 +14,9 @@
       ￥{{record.orderMoney}}<br>
       <span :style="'color:'+(record.isPay?'#f90':'#999')">{{record.isPay?'已支付':'未支付'}}</span>
     </div>
-    <span slot="orderType" slot-scope="text,record">{{getSelTxt('orderType',text)}}<br>{{getSelTxt('sourceType',record.sourceType)}}</span>
+    <span slot="orderType" slot-scope="text,record">
+      <span style="color:#999">类型：</span>{{getSelTxt('orderType',text)}}<br>
+      <span style="color:#999">来源：</span>{{getSelTxt('sourceType',record.sourceType)}}</span>
     <span slot="status" slot-scope="text">{{getSelTxt('orderStatus',text)}}</span>
     <div slot="groupNo" slot-scope="text">{{text}}<br></div>
     <span slot="parsingStatus" slot-scope="text">{{getSelTxt('parseStatue',text)}}</span>
@@ -66,9 +68,9 @@ export default {
       tableColumns:[
         // {title: '加急/返单',dataIndex: 'isJiaJi',key: 'isJiaJi',align:'center',width:'100px',scopedSlots: { customRender: 'isJiaJi' },},
         {title: '订单编号',dataIndex: 'orderNo',key: 'orderNo',width:'160px',scopedSlots: { customRender: 'orderNo' },},
-        {title: '类型/来源',dataIndex: 'orderType',key: 'orderType',align:'center',width:'100px',scopedSlots: { customRender: 'orderType' },},
-        {title: '订单包',dataIndex: 'groupNo',key: 'groupNo',width:'200px',scopedSlots: { customRender: 'groupNo' },},
         {title: '订单金额',dataIndex: 'orderMoney',key: 'orderMoney',width:'120px',scopedSlots: { customRender: 'orderMoney' },},
+        {title: '类型/来源',dataIndex: 'orderType',key: 'orderType',align:'center',width:'130px',scopedSlots: { customRender: 'orderType' },},
+        {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'},
@@ -92,7 +94,7 @@ export default {
   },
   methods:{
     getSelTxt(type,key){
-      return resSelects(type,key);
+      return resSelects(type,key||'null');
     },
     filterSearch(page){
       // console.log(this.listInput)
diff --git a/src/services/Common.js b/src/services/Common.js
index 1be736f..4ca9e72 100644
--- a/src/services/Common.js
+++ b/src/services/Common.js
@@ -64,15 +64,12 @@ function padLeftZero (str) {
 //解析状态:parseStatue
 //平台类别:platformType
 export function resSelects(type='',val=''){
-  // console.log(type,val)
+  console.log(type,val)
   let list = [];
   if (type==='orderType'){
     list = [
-      {value:'0',text:'内贸'},
-      {value:'1',text:'外贸'},
-      {value:'2',text:'精密'},
-      {value:'3',text:'铝基板'},
-      {value:'4',text:'调度中心'},
+      {value:'2',text:'批量'},
+      {value:'1',text:'打样'},
     ]
   }
   else if (type==='sourceType'){
diff --git a/src/services/order/Order.js b/src/services/order/Order.js
index d25fb7e..a7afd19 100644
--- a/src/services/order/Order.js
+++ b/src/services/order/Order.js
@@ -4,6 +4,12 @@ import {requestApi, METHOD, requestOss} from '@/utils/request';
 export function OrderList(params) {
   return requestApi('/api/app/order/page-list', METHOD.GET, params)
 }
+//获取订单详情
+export function OrderDetail(id) {
+  return requestApi('/api/app/order/async-by-id/'+id, METHOD.GET, null)
+}
+
+/* 以下待删 */
 
 //获取SMT订单详情
 export function OrderSmtDetail(id) {
@@ -47,11 +53,6 @@ export function OrderSmtBind(params) {
     requestApi('/api/admin/orders/smt/bind', METHOD.POST, params).then(res=>{resolve(res);}).catch(err=>{reject(err);})
   })
 }
-
-//获取PCB订单详情
-export function OrderPcbDetail(id) {
-  return requestApi('/api/admin/orders/pcb/'+id, METHOD.GET, null)
-}
 //获取PCB订单详细信息（多用于编辑时渲染）
 export function OrderPcbEditDetail(id) {
   return requestApi('/api/admin/orders/pcb/'+id+'/info', METHOD.GET, null)