Browse Source

加权限

chenrui 4 năm trước cách đây
mục cha
commit
d929d82d95

+ 2 - 2
src/config/router.config.js

@@ -117,7 +117,7 @@ export const asyncRouterMap = [{
         meta: {
           title: '用户管理',
           icon: 'user',
-          permission: 'M_power_user'
+          permission: 'M_power_user_list'
         }
       },
       {
@@ -127,7 +127,7 @@ export const asyncRouterMap = [{
         meta: {
           title: '角色管理',
           icon: 'solution',
-          permission: 'M_power_role'
+          permission: 'M_power_role_list'
         }
       }
     ]

+ 7 - 3
src/views/SetmealSales/PurchasedSetmeal.vue

@@ -36,7 +36,7 @@
                 v-model="searchForm.orderFlag"
                 ref="orderFlag"
                 id="purchasedSetmeal-status"
-                code="ORDER_TYPE"
+                code="PAY_STATUS"
                 placeholder="请选择单据状态"
                 allowClear></v-select>
             </a-form-item>
@@ -82,9 +82,9 @@
         <span v-else>--</span>
       </p>
       <!-- 单据状态 -->
-      <span slot="orderFlag" slot-scope="text">{{ $refs.orderFlag.getNameByCode(text) }}</span>
+      <span slot="orderFlag" slot-scope="text, record">{{ $refs.orderFlag.getNameByCode(record.orderFlag) }}</span>
       <!-- 结算状态 -->
-      <span slot="salesChannelSettleStatus" slot-scope="text">{{ $refs.salesChannelSettleStatus.getNameByCode(text) }}</span>
+      <span slot="salesChannelSettleStatus" slot-scope="text, record">{{ $refs.salesChannelSettleStatus.getNameByCode(record.salesChannelSettleStatus) }}</span>
       <!-- 操作 -->
       <span slot="action" slot-scope="text, record">
         <a-button type="primary" id="purchasedSetmeal-look" @click="seeDetail(record)">详情</a-button>
@@ -238,6 +238,10 @@ export default {
         orderFlag: this.searchForm.orderFlag,
         salesChannelSettleStatus: this.searchForm.salesChannelSettleStatus
       }
+      if (!params.beginDate && !params.endDate) {
+        this.$message.error('请先选择需要导出的下单时间区间再进行导出!')
+        return
+      }
       // 判断两个时间段是否相差m个月
       if (!completeDate(params.beginDate, params.endDate, 3)) {
         this.$message.error('单次最多只能导出3个月的数据,请缩小查询区间后再进行导出!')

+ 17 - 15
src/views/SetmealSales/SetmealDetailModal.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="DetailsSetmeal">
+    <v-select v-show="false" ref="payType" code="PAY_PROCUCT_TYPE" placeholder="支付方式"></v-select>
     <a-modal
       class="DetailsSetmealModal"
       title="套餐购买详情"
@@ -27,7 +28,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">销售合作商:</p>
-          <p class="item-main">{{ detailsData.orderBundle.useStoreName || '--' }}</p>
+          <p class="item-main">{{ detailsData.dataSourceName || '--' }}</p>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">套餐名称:</p>
@@ -47,7 +48,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">支付方式:</p>
-          <p class="item-main">{{ detailsData.orderBundle.payType || '--' }}</p>
+          <p class="item-main">{{ $refs.payType.getNameByCode(detailsData.paymentDetailList[0].payType) }}</p>
         </a-col>
       </a-row>
       <a-tabs type="card">
@@ -73,6 +74,10 @@
             :dataSource="recordData"
             :pagination="false"
             bordered>
+            <!-- 车牌号 -->
+            <span slot="vehicleNumber" slot-scope="text, record">{{ record.orderBundle.vehicleNumber || '--' }}</span>
+            <!-- 服务门店 -->
+            <span slot="dataSourceName" slot-scope="text, record">{{ record.orderBundle.dataSourceName || '--' }}</span>
           </a-table>
         </a-tab-pane>
       </a-tabs>
@@ -109,12 +114,12 @@ export default {
       ],
       recordColumns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
-        { title: '使用时间', dataIndex: 'orderNo', width: 100, align: 'center' },
-        { title: '车牌号', dataIndex: 'orderTime', width: 100, align: 'center' },
-        { title: '服务内容', dataIndex: 'orderTimes', width: 100, align: 'center' },
-        { title: '服务门店', dataIndex: 'orderTimess', width: 100, align: 'center' },
-        { title: '使用数量', dataIndex: 'orderTimesss', width: 100, align: 'center' },
-        { title: '工单', dataIndex: 'orderTimessss', width: 100, align: 'center' }
+        { title: '使用时间', dataIndex: 'createDate', width: 100, align: 'center' },
+        { title: '车牌号', scopedSlots: { customRender: 'vehicleNumber' }, width: 100, align: 'center' },
+        { title: '服务内容', dataIndex: 'itemName', width: 100, align: 'center' },
+        { title: '服务门店', scopedSlots: { customRender: 'dataSourceName' }, width: 100, align: 'center' },
+        { title: '使用数量', dataIndex: 'times', width: 100, align: 'center' },
+        { title: '工单', dataIndex: 'orderBundle.number', width: 100, align: 'center' }
       ],
       setMealData: [], //  套餐内容
       recordData: [], //  使用记录
@@ -146,17 +151,14 @@ export default {
       customerBundleUseHistory({ id: id }).then(res => {
         console.log(res)
         if (res.status == 200) {
-          // this.recordData = res.data.customerBundleItemList
-          const recordData = []
           if (res.data.customerBundleItemList && res.data.customerBundleItemList.length > 0) {
             res.data.customerBundleItemList.map((item, index) => {
-              recordData.push({
-                no: index + 1
-
-              })
+              item.no = index + 1
             })
+            this.recordData = res.data.customerBundleItemList
+          } else {
+            this.recordData = []
           }
-          this.recordData = recordData
         } else {
           this.recordData = []
         }

+ 1 - 1
src/views/SetmealSales/SetmealPayMoney.vue

@@ -139,7 +139,7 @@ export default {
               totalAmount: this.setmealData.price
             },
             paymentDetailList: [
-              { payType: 'PAY_CASH' }
+              { payType: 10001 }
             ]
           }
           bundleBuy(params).then(res => {

+ 5 - 5
src/views/power/role/roleList.vue

@@ -22,7 +22,7 @@
     </div>
     <a-divider/>
     <div class="table-operator">
-      <a-button id="role-btn-add" type="primary" icon="plus" @click="openModal">新建</a-button>
+      <a-button id="role-btn-add" v-hasPermission="'B_power_role_add'" type="primary" icon="plus" @click="openModal">新建</a-button>
     </div>
 
     <s-table
@@ -34,14 +34,14 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="" unCheckedChildren="" v-model="record.isEnable" @change="changeFlagHandle(text, record)"/>
+        <a-switch v-hasPermission="'B_power_role_enable'" checkedChildren="" unCheckedChildren="" v-model="record.isEnable" @change="changeFlagHandle(text, record)"/>
       </span>
 
       <span slot="action" slot-scope="text, record">
         <template>
-          <a class="action-button menu-text" id="role-btn-menu" @click="openMenuModal(record)">菜单权限</a>
-          <a class="action-button" id="role-btn-edit" @click="handleEdit(record)">修改</a>
-          <a v-if="!record.isEnable" class="action-button red-text" id="role-btn-del" @click="delect(record)">删除</a>
+          <a v-hasPermission="'B_power_role_menu'" class="action-button menu-text" id="role-btn-menu" @click="openMenuModal(record)">菜单权限</a>
+          <a v-hasPermission="'B_power_role_edit'" class="action-button" id="role-btn-edit" @click="handleEdit(record)">修改</a>
+          <a v-if="!record.isEnable" v-hasPermission="'B_power_role_del'" class="action-button red-text" id="role-btn-del" @click="delect(record)">删除</a>
         </template>
       </span>
     </s-table>

+ 5 - 5
src/views/power/user/userList.vue

@@ -27,7 +27,7 @@
     </div>
     <a-divider/>
     <div class="table-operator">
-      <a-button id="user-btn-add" type="primary" icon="plus" @click="openModal">新建</a-button>
+      <a-button id="user-btn-add" v-hasPermission="'B_power_user_add'" type="primary" icon="plus" @click="openModal">新建</a-button>
     </div>
 
     <s-table
@@ -39,7 +39,7 @@
       bordered
     >
       <span slot="status" slot-scope="text, record">
-        <a-switch checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
+        <a-switch v-hasPermission="'B_power_user_enable'" checkedChildren="" unCheckedChildren="" v-model="record.loginFlag" @change="changeFlagHandle(text, record)"/>
       </span>
       <div slot="roleNames" slot-scope="text, record" :title="record.roleNames">
         <span v-if="record.roleNames">{{ record.roleNames.substr(0,12) + '...' }}</span>
@@ -48,9 +48,9 @@
       <span slot="action" slot-scope="text, record">
         <template>
           <div >
-            <a class="action-button" @click="handleEdit(record)">修改</a>
-            <a v-if="record.loginFlag" class="action-button reset-text" id="user-btn-resetPass" @click="resetPassword(record)">重置密码</a>
-            <a v-if="!record.loginFlag" class="action-button red-text" id="user-btn-del" @click="delect(record)">删除</a>
+            <a class="action-button" v-hasPermission="'B_power_user_edit'" @click="handleEdit(record)">修改</a>
+            <a v-if="record.loginFlag" v-hasPermission="'B_power_user_resetPsd'" class="action-button reset-text" id="user-btn-resetPass" @click="resetPassword(record)">重置密码</a>
+            <a v-if="!record.loginFlag" v-hasPermission="'B_power_user_del'" class="action-button red-text" id="user-btn-del" @click="delect(record)">删除</a>
           </div>
         </template>
       </span>