zhangdan 4 년 전
부모
커밋
144b07159c

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

@@ -87,7 +87,7 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '大数据看板',
-      icon: 'fund',
+      icon: 'fund'
       // permission: 'M_dataView'
     },
     hideChildrenInMenu: true,
@@ -98,7 +98,7 @@ export const asyncRouterMap = [{
       component: RouteView,
       meta: {
         title: '大数据看板',
-        icon: 'fund',
+        icon: 'fund'
         // permission: 'M_dataView'
       },
       hideChildrenInMenu: true,
@@ -687,8 +687,8 @@ export const asyncRouterMap = [{
     component: PageView,
     meta: {
       title: '上门回收管理',
-      icon: 'car'
-      // permission: 'M_cleanManage'
+      icon: 'car',
+      permission: 'M_recoveryManage'
     },
     children: [{
       path: '/recoveryManage/bannerSet',
@@ -697,8 +697,8 @@ export const asyncRouterMap = [{
         '@/views/recoveryManage/bannerSet.vue'),
       meta: {
         title: 'banner图设置',
-        icon: 'bar-chart'
-        // permission: 'M_statisticalReport'
+        icon: 'bar-chart',
+        permission: 'M_bannerSet_list'
       }
     },
     {
@@ -708,8 +708,8 @@ export const asyncRouterMap = [{
         '@/views/recoveryManage/riderSet.vue'),
       meta: {
         title: '骑手管理',
-        icon: 'contacts'
-        // permission: 'M_driverManage_list'
+        icon: 'contacts',
+        permission: 'M_riderSet_list'
       }
     },
     {
@@ -719,8 +719,8 @@ export const asyncRouterMap = [{
         '@/views/recoveryManage/riderRecoveryTotal.vue'),
       meta: {
         title: '骑手回收统计',
-        icon: 'unordered-list'
-        // permission: 'M_cleanDetail_list'
+        icon: 'unordered-list',
+        permission: 'M_riderRecoveryTotal_list'
       }
     },
     {
@@ -730,8 +730,8 @@ export const asyncRouterMap = [{
         '@/views/recoveryManage/riderOrderRecord.vue'),
       meta: {
         title: '订单记录',
-        icon: 'line-chart'
-        // permission: 'M_netWorkCleanRecord_list'
+        icon: 'line-chart',
+        permission: 'M_riderOrderRecord_list'
       }
     },
     {
@@ -741,8 +741,8 @@ export const asyncRouterMap = [{
         '@/views/recoveryManage/recoveryPriceSet.vue'),
       meta: {
         title: '回收价格设置',
-        icon: 'cluster'
-        // permission: 'M_notCleanNetwork_list'
+        icon: 'cluster',
+        permission: 'M_recoveryPriceSet_list'
       }
     }
     ]
@@ -830,7 +830,7 @@ export const asyncRouterMap = [{
   hidden: true
 }
 ]
- 
+
 /**
  * 基础路由
  * @type { *[] }

+ 6 - 4
src/views/recoveryManage/bannerSet.vue

@@ -3,7 +3,7 @@
     <div class="add">
       <a-button
         type="primary"
-        v-if="$hasPermissions('B_adBanner_new')"
+        v-if="$hasPermissions('B_bannerSet_add')"
         icon="plus"
         class="addBtn"
         @click="showModal"
@@ -19,7 +19,7 @@
       bordered>
       <!-- 操作 -->
       <template slot="sort" slot-scope="text, record, index">
-        <div v-if="$hasPermissions('B_adBanner_sort')">
+        <div v-if="$hasPermissions('B_bannerSet_sort')">
           <a-icon
             title="下移"
             v-if="index != list.length-1"
@@ -40,12 +40,13 @@
           type="eye"
           id="bannerSetting-handleView"
           title="查看"
+          v-if="$hasPermissions('B_bannerSet_detail')"
           class="actionBtn icon-green"
           @click="handleEdit(record, 1)" />
         <a-icon
           type="edit"
           id="bannerSetting-handleEdit"
-          v-if="record.status == 0"
+          v-if="record.status == 0 && $hasPermissions('B_bannerSet_edit')"
           title="编辑"
           class="actionBtn icon-blues"
           @click="handleEdit(record, 0)" />
@@ -53,7 +54,7 @@
           type="delete"
           id="bannerSetting-delect"
           title="删除"
-          v-if="record.status == 0"
+          v-if="record.status == 0 && $hasPermissions('B_bannerSet_del')"
           class="actionBtn icon-red"
           @click="delect(record)" />
       </span>
@@ -61,6 +62,7 @@
         <a-switch
           checkedChildren="启用"
           unCheckedChildren="禁用"
+          v-if="$hasPermissions('B_bannerSet_enable')"
           id="bannerSetting-changeFlagHandle"
           v-model="record.status == 1 ? true : false"
           @change="changeFlagHandle(text, record)"

+ 8 - 3
src/views/recoveryManage/recoveryPriceSet.vue

@@ -23,7 +23,7 @@
           id="storeSettlementPrice-price"
           v-model="record.advicePrice"
           :precision="2"
-          :min="0"
+          :min="1"
           :max="999"
           style="width: 70%;"
           placeholder="请输入回收价格"
@@ -32,7 +32,7 @@
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <div class="editable-row-operations">
-          <span >
+          <span v-hasPermission="'B_recoveryPriceSet_save'">
             <a-popconfirm title="确定要保存吗?" @confirm="() => save(record.id,record.advicePrice)" @cancel="record.advicePrice = record.currentValue">
               <template slot="title">
                 <p> 保存</p>
@@ -91,7 +91,12 @@ export default {
     },
     // 保存价格
     save (id, advicePrice) {
-      savPrice({ adviceType: this.type, id: id, advicePrice: advicePrice }).then(res => {
+      const params = { adviceType: this.type, id: id, advicePrice: advicePrice }
+      if (!params.advicePrice) {
+        this.$message.warning('回收价格不能为空')
+        return false
+      }
+      savPrice(params).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
 		  this.getListData()

+ 3 - 2
src/views/recoveryManage/riderOrderModal.vue

@@ -6,6 +6,7 @@
       v-model="isshow"
       @cancle="cancel"
       width="70%"
+      :footer="null"
       :centered="true">
       <a-row :gutter="48" >
         <a-col :span="8" class="item-cont">
@@ -40,7 +41,7 @@
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">回收重量(kg):</p>
-          <p class="item-main">{{ pageInfo.reserveWeightDictValue ? pageInfo.reserveWeightDictValue : '0' }}</p>
+          <p class="item-main">{{ pageInfo.totalWeight ?(pageInfo.totalWeight/1000).toFixed(3)/1 : '0' }}</p>
         </a-col>
         <a-col :span="8" class="item-cont" v-if="pageInfo.orderStatus=='FINISH'">
           <p class="item-label">支付金额(元):</p>
@@ -75,7 +76,7 @@
           <viewer :images="pageInfo.imageList? pageInfo.imageList:[]" class="viewer" ref="viewer" @inited="inited" rebuild>
             <img v-for="src in pageInfo.imageList" :src="src" :key="src" class="image">
           </viewer>
-          <P style="margin-bottom: 0;">{{ pageInfo.imageList ? pageInfo.imageList.length+' 张' :'0 张' }}</P>
+          <P style="margin-bottom: 0;">{{ pageInfo.imageList ? pageInfo.imageList.length+' 张' :'' }}</P>
         </a-col>
         <a-col :span="8" class="item-cont">
           <p class="item-label">下单账号:</p>

+ 3 - 3
src/views/recoveryManage/riderSet.vue

@@ -39,7 +39,7 @@
         icon="plus"
         @click="openModal"
         id="userList-openModal"
-        v-hasPermission="'B_power_user_add'"
+        v-hasPermission="'B_riderSet_enable'"
         style="margin-top:18px ;">新增</a-button>
     </div>
 
@@ -52,7 +52,7 @@
       bordered>
       <span slot="status" slot-scope="text, record">
         <a-switch
-          v-hasPermission="'B_power_user_enable'"
+          v-hasPermission="'B_riderSet_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           v-model="record.loginFlag"
@@ -62,7 +62,7 @@
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon
-          v-hasPermission="'B_power_user_edit'"
+          v-hasPermission="'B_riderSet_edit'"
           type="edit"
           title="编辑"
           class="actionBtn icon-blues"