提交修改

.env.development

@@ -3,9 +3,9 @@ ENV = 'development'
 
 # base api
 # VUE_APP_BASE_API = '/dev-api'
-# VUE_APP_BASE_API = 'http://192.168.2.102:9104'
+VUE_APP_BASE_API = 'http://192.168.2.102:9104'
 # VUE_APP_BASE_API = 'http://192.168.2.67:9104'
-VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
+# VUE_APP_BASE_API = 'https://mai-b.caimei365.com'
 # VUE_APP_BASE_API = 'http://192.168.2.103:9104'
 # VUE_APP_BASE_API = 'http://192.168.78.1:9104/'
 

src/router/index.js

@@ -8,7 +8,7 @@ import Layout from '@/layout'
 
 /* Router Modules */
 import clubRouter from './modules/club'
-import procureRouter from './modules/procure'
+// import procureRouter from './modules/procure'
 import centralizedRouter from './modules/centralized'
 import floorRouter from './modules/floor'
 import goodsRouter from './modules/goods'
@@ -69,7 +69,7 @@ export const constantRoutes = [
  */
 export const asyncRoutes = [
   clubRouter,
-  procureRouter,
+  // procureRouter,
   centralizedRouter,
   goodsRouter,
   campaign,

src/store/modules/permission.js

@@ -62,7 +62,7 @@ const actions = {
         const res = await getInfo(getToken())
         const data = res.data
         if (data.personnelType === 1) {
-          accessedRoutes[8].children.unshift({
+          accessedRoutes[7].children.unshift({
             path: 'user',
             name: 'User',
             component: () => import('@/views/sys/user-list'),

src/views/finance/details.vue

@@ -29,7 +29,6 @@
             <el-col :span="7">
               <b>订单类型：</b>
               <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
-              <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
             </el-col>
           </el-row>
           <template v-if="repacts.payWay === 1">

src/views/order/detail.vue

@@ -20,7 +20,6 @@
           <el-col :span="7">
             <b>订单类型：</b>
             <span style="margin: 0;">{{ order.orderType === 1 ? '自主订单' : '采购员订单' }}</span>
-            <span v-if="order.orderType === 0" style="margin: 0;">({{ order.spName }})</span>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="box-row">

src/views/order/list.vue

@@ -148,8 +148,7 @@
       <el-table-column label="订单编号" align="center" prop="orderNo" />
       <el-table-column label="订单类型" align="center" prop="payTotalFee">
         <template slot-scope="{row}">
-          <p style="margin: 0;">{{ row.orderType === 1 ? '自主订单' : '采购员订单' }}</p>
-          <p v-if="row.orderType === 0" style="margin: 0;">({{ row.spName }})</p>
+          {{ row.orderType === 1 ? '自主订单' : '采购员订单' }}
         </template>
       </el-table-column>
       <el-table-column label="机构" align="center" prop="clubName" />