瀏覽代碼

Merge branch 'deploy' of http://git.chelingzhu.com/chelingzhu-web/zxyj-admin-html into deploy

1004749546@qq.com 4 年之前
父節點
當前提交
f7b76009fa

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

@@ -190,7 +190,7 @@ export const asyncRouterMap = [{
         meta: {
           title: '用户管理',
           icon: 'profile',
-          permission: 'M_user_userManage_list'
+          permission: 'M_user_userManage'
         },
         hideChildrenInMenu: true,
         children: [{
@@ -255,8 +255,8 @@ export const asyncRouterMap = [{
         component: () => import(/* webpackChunkName: "shopSetting" */ '@/views/shop/bannerSetting.vue'),
         meta: {
           title: '推广位设置',
-          icon: 'picture'
-          // permission: 'M_AdBanner_list'
+          icon: 'picture',
+          permission: 'M_shopSetting_bannerSetting'
         }
       }
     ]

+ 1 - 1
src/views/businessManage/userManage/userManage.vue

@@ -78,7 +78,7 @@
           v-model="record.loginFlag"
           @change="changeFlagHandle(text, record)"
           id="userList-changeFlagHandle" />
-        <span v-if="$hasPermissions('B_userManage_enable')">--</span>
+        <span v-if="!$hasPermissions('B_userManage_enable')">--</span>
       </span>
       <span slot="action" slot-scope="text, record">
         <a-icon

+ 1 - 1
src/views/businessManage/userManage/userModal.vue

@@ -73,7 +73,7 @@
                 @focus="handleFocus"
                 @blur="handleBlur"
                 @change="handleChange">
-                <a-select-option v-for="item in optionData" :key="item.orgCode" :value="item.orgCode">{{ item.name }}</a-select-option>
+                <a-select-option v-for="item in optionData" :key="item.orgCode" :value="item.orgCode" :disabled="item.state == '0' ? true : false">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-item>
           </a-col>

+ 2 - 2
src/views/releaseRecord/releaseRecordList.vue

@@ -49,7 +49,7 @@
           </a-col>
           <a-col :span="6">
             <a-form-item label="投递方式" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
-              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择投递方式" id="releaseRecordList-customerMobile"></v-select>
+              <v-select code="ENABLE_FLAG" v-model="queryParam.loginFlag" allowClear placeholder="请选择投递方式" id="releaseRecordList-loginFlag"></v-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -134,7 +134,7 @@ export default {
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', width: 200, align: 'center' },
         { title: '用户账号', dataIndex: 'customerMobile', width: 200, align: 'center' },
-        { title: '投递方式', dataIndex: 'customerMobile', width: 200, align: 'center' },
+        { title: '投递方式', dataIndex: '', width: 200, align: 'center' },
         { title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
         { title: '内置各箱体投放重量(g)',
 				  children: [

+ 12 - 6
src/views/userInfo/userManageList.vue

@@ -35,7 +35,13 @@
     </div>
     <a-divider />
     <div class="table-operator">
-      <a-button class="export-btn" id="releaseRecordList-btn-export" type="" :loading="loading" @click="handleExport" v-hasPermission="'B_user_userManage_export'">导出</a-button>
+      <a-button
+        class="export-btn"
+        id="releaseRecordList-btn-export"
+        type=""
+        :loading="loading"
+        @click="handleExport"
+        v-hasPermission="'B_user_userManage_export'">导出</a-button>
     </div>
     <s-table
       ref="table"
@@ -47,19 +53,19 @@
       <!--启用禁用 -->
       <template slot="state" slot-scope="text, record">
         <a-switch
-		v-hasPermission="'B_user_userManage_enable'"
+          v-hasPermission="'B_user_userManage_enable'"
           checkedChildren="启用"
           unCheckedChildren="禁用"
           id="releaseRecordList-changeFlagHandle"
           :checked="record.state == 1 ? true : false"
           @change="changeFlagHandle(text, record)" />
-		  <span v-if="!$hasPermissions('B_user_userManage_enable')"></span>
+        <span v-if="!$hasPermissions('B_user_userManage_enable')">--</span>
       </template>
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
-			 <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
-			 <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_userDetails'">乐豆明细</a-button> 
-			 <span v-if="!$hasPermissions('B_user_userManage_userDetails') && !$hasPermissions('B_user_userManage_userDetails')">--</span>
+        <a-button id="releaseRecordList-handleUser" type="link" @click="handleUser(record)" v-hasPermission="'B_user_userManage_userDetails'">用户详情</a-button>
+        <a-button id="releaseRecordList-handleLd" type="link" @click="handleLd(record)" v-hasPermission="'B_user_userManage_userDetails'">乐豆明细</a-button>
+        <span v-if="!$hasPermissions('B_user_userManage_userDetails') && !$hasPermissions('B_user_userManage_userDetails')">--</span>
       </template>
     </s-table>
   </a-card>