修改

src/permission.js

@@ -67,8 +67,8 @@ router.beforeEach((to, from, next) => {
       if (store.getters.roles.length === 0) { // 判断当前用户是否已拉取完user_info信息
         store.dispatch('GetUserInfo').then(res => {
           store.dispatch('GetUserMenus').then(res => { // 拉取user_info
-            // const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
-            const roles = myRoles;
+            const roles = res.data.data // note: roles must be a array! such as: ['editor','develop']
+            // const roles = myRoles;
             store.dispatch('GenerateRoutes', { roles }).then(() => { // 根据roles权限生成可访问的路由表
               router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record

src/router/index.js

@@ -121,8 +121,8 @@ export const asyncRouterMap = [
     },
     children: [
       { path: 'exchangeList', component: _import('exchangeManage/exchangeList'), name: 'exchangeList', meta: { title: '兑换列表', noCache: true }},
-      { path: 'approvalList', component: _import('exchangeManage/approvalList'), name: 'approvalList', meta: { title: '兑换审批列表', noCache: true }},
-      { path: 'pasList', component: _import('exchangeManage/pasList'), name: 'pasList', meta: { title: '采购发货列表', noCache: true }},
+      { path: 'approvalList', component: _import('exchangeManage/approvalList'), name: 'approvalList', meta: { title: '待审批列表', noCache: true }},
+      { path: 'pasList', component: _import('exchangeManage/pasList'), name: 'pasList', meta: { title: '待发货列表', noCache: true }},
       { path: 'voidList', component: _import('exchangeManage/voidList'), name: 'voidList', meta: { title: '作废列表', noCache: true }},
     ]
   },

src/views/exchangeManage/approvalList.vue

@@ -7,10 +7,6 @@
                 v-model="listQuery.purchaser"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="订单编号"
                 v-model="listQuery.orderSeq"></el-input>
-            <el-select v-model="listQuery.orderType" clearable placeholder="订单状态" style="top: -4px;width: 200px;">
-                <el-option :key="item.orderType" v-for="item in orderTypeList" :label="item.orderTypeName" :value="item.orderType">
-                </el-option>
-            </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动标题"
                 v-model="listQuery.title"></el-input>
                 <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
@@ -56,9 +52,8 @@
             </el-table-column>
             <el-table-column align="center" label="操作" width="80px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.orderType == 0 || scope.row.orderType == 4" type="success" size="small"
+                    <el-button type="success" size="small"
                         @click="handleClick(scope.row.orderId, 'complete')">处理</el-button>
-                    <el-button v-else type="primary" size="small" @click="handleClick(scope.row.orderId, 'view')">查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -141,14 +136,14 @@
                     </el-form-item>
                 </div>
                 <div style="display: flex;">
-                    <el-form-item v-if="detailData.orderType == 0" label="价格调整">
+                    <el-form-item label="价格调整">
                         <el-input v-model="detailData.nowPrice"></el-input>
                     </el-form-item>
                     
                     
                 </div>
 
-                <el-form-item v-if="detailData.orderType == 0 || detailData.orderType == 4" label="备注">
+                <el-form-item label="备注">
                     <el-input type="textarea" v-model="comment" style="width: 100%"></el-input>
                 </el-form-item>
 
@@ -170,7 +165,7 @@
             </el-table>
 
 
-            <div v-if="detailData.orderType == 0 || detailData.orderType == 4" slot="footer" class="dialog-footer">
+            <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="complete(0)">同意</el-button>
                 <el-button type="danger" @click="complete(1)">驳回</el-button>
             </div>
@@ -260,10 +255,10 @@ export default {
                 limit: 10,
                 purchaser: '',
                 orderSeq: '',
-                orderType: '',
                 title: '',
                 productAttribute:'',
                 deliveryType:'',
+                orderType:0
             },
             dialogVisible: false,
             dialogStatus: '',
@@ -288,24 +283,6 @@ export default {
             window.location.href = process.env.BASE_API + '/mall-order/exportOrderLog?purchaser=' + this.listQuery.purchaser + '&orderSeq=' + this.listQuery.orderSeq + '&orderType=' + this.listQuery.orderType + '&title=' + this.listQuery.title;
         },
         checked(val){
-            if(val.flag == 0 && val.deliveryType==1){
-                if(!val.trackingNumber){
-                    this.$alert("请填写快递单号", "提示", {
-                        confirmButtonText: "确定",
-                    });
-                    return false;
-                }
-                    
-            };
-            if(val.flag == 0 && val.deliveryType==2){
-                if(!val.trackingNumber){
-                    this.$alert("请填写兑换码", "提示", {
-                        confirmButtonText: "确定",
-                    });
-                    return false;
-                }
-                    
-            };
             if(val.flag == 1){
                 if(!val.comment){
                     this.$alert("请填备注", "提示", {

src/views/exchangeManage/exchangeList.vue

@@ -219,23 +219,19 @@ export default {
             orderTypeList: [
                 {
                     orderType: 0,
-                    orderTypeName: '商务待确认'
+                    orderTypeName: '待审核'
                 },
                 {
                     orderType: 1,
-                    orderTypeName: '商务部已确认'
-                },
-                {
-                    orderType: 2,
-                    orderTypeName: '商务部作废'
+                    orderTypeName: '待发货'
                 },
                 {
                     orderType: 3,
-                    orderTypeName: '员工已确认'
+                    orderTypeName: '已确认收货'
                 },
                 {
-                    orderType: 4,
-                    orderTypeName: '员工反馈问题件退回'
+                    orderType: 2,
+                    orderTypeName: '作废'
                 },
             ],
             trackingNumber: '',

src/views/exchangeManage/pasList.vue

@@ -7,10 +7,6 @@
                 v-model="listQuery.purchaser"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="订单编号"
                 v-model="listQuery.orderSeq"></el-input>
-            <el-select v-model="listQuery.orderType" clearable placeholder="订单状态" style="top: -4px;width: 200px;">
-                <el-option :key="item.orderType" v-for="item in orderTypeList" :label="item.orderTypeName" :value="item.orderType">
-                </el-option>
-            </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动标题"
                 v-model="listQuery.title"></el-input>
                 <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
@@ -56,9 +52,8 @@
             </el-table-column>
             <el-table-column align="center" label="操作" width="80px" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                    <el-button v-if="scope.row.orderType == 0 || scope.row.orderType == 4" type="success" size="small"
+                    <el-button type="success" size="small"
                         @click="handleClick(scope.row.orderId, 'complete')">处理</el-button>
-                    <el-button v-else type="primary" size="small" @click="handleClick(scope.row.orderId, 'view')">查看</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -143,27 +138,21 @@
                 <div style="display: flex;">
                     
                     <div v-if="detailData.deliveryType == 1">
-                        <el-form-item v-if="detailData.orderType == 0" label="快递单号">
+                        <el-form-item label="快递单号">
                             <el-input v-model="detailData.trackingNumber"></el-input>
                         </el-form-item>
-                        <el-form-item v-else label="快递单号">
-                            <el-input readonly v-model="detailData.trackingNumber"></el-input>
-                        </el-form-item>
                     </div>
                     <div v-if="detailData.deliveryType == 2">
-                        <el-form-item v-if="detailData.orderType == 0" label="兑换码">
+                        <el-form-item label="兑换码">
                             <el-input v-model="detailData.trackingNumber"></el-input>
                         </el-form-item>
-                        <el-form-item v-else label="兑换码">
-                            <el-input readonly v-model="detailData.trackingNumber"></el-input>
-                        </el-form-item>
                     </div>
                 
                     
                     
                 </div>
 
-                <el-form-item v-if="detailData.orderType == 0 || detailData.orderType == 4" label="备注">
+                <el-form-item label="备注">
                     <el-input type="textarea" v-model="comment" style="width: 100%"></el-input>
                 </el-form-item>
 
@@ -185,7 +174,7 @@
             </el-table>
 
 
-            <div v-if="detailData.orderType == 0 || detailData.orderType == 4" slot="footer" class="dialog-footer">
+            <div slot="footer" class="dialog-footer">
                 <el-button type="primary" @click="complete(0)">同意</el-button>
                 <el-button type="danger" @click="complete(1)">驳回</el-button>
             </div>
@@ -275,10 +264,10 @@ export default {
                 limit: 10,
                 purchaser: '',
                 orderSeq: '',
-                orderType: '',
                 title: '',
                 productAttribute:'',
                 deliveryType:'',
+                orderType:1
             },
             dialogVisible: false,
             dialogStatus: '',

src/views/exchangeManage/voidList.vue

@@ -7,10 +7,6 @@
                 v-model="listQuery.purchaser"></el-input>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="订单编号"
                 v-model="listQuery.orderSeq"></el-input>
-            <el-select v-model="listQuery.orderType" clearable placeholder="订单状态" style="top: -4px;width: 200px;">
-                <el-option :key="item.orderType" v-for="item in orderTypeList" :label="item.orderTypeName" :value="item.orderType">
-                </el-option>
-            </el-select>
             <el-input clearable class="filter-item" style="width: 200px;" placeholder="活动标题"
                 v-model="listQuery.title"></el-input>
                 <el-select v-model="listQuery.productAttribute" clearable placeholder="商品属性" class="filter-item" style="width: 200px">
@@ -264,10 +260,10 @@ export default {
                 limit: 10,
                 purchaser: '',
                 orderSeq: '',
-                orderType: '',
                 title: '',
                 productAttribute:'',
                 deliveryType:'',
+                orderType:4
             },
             dialogVisible: false,
             dialogStatus: '',