소스 검색

箱体类型权限

zhangdan 4 년 전
부모
커밋
d472e76943
3개의 변경된 파일19개의 추가작업 그리고 12개의 파일을 삭제
  1. 2 2
      src/config/router.config.js
  2. 4 3
      src/views/equipmentManage/boxSetting/boxSetting.vue
  3. 13 7
      src/views/releaseRecord/releaseRecordList.vue

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

@@ -296,8 +296,8 @@ export const asyncRouterMap = [{
       component: () => import(/* webpackChunkName: "equipmentManage" */ '@/views/equipmentManage/boxSetting/boxSetting.vue'),
       component: () => import(/* webpackChunkName: "equipmentManage" */ '@/views/equipmentManage/boxSetting/boxSetting.vue'),
       meta: {
       meta: {
         title: '箱体类型设置',
         title: '箱体类型设置',
-        icon: 'block'
-        // permission: 'M_tenants_list'
+        icon: 'block',
+        permission: 'M_boxSetting_list'
       }
       }
     },
     },
     {
     {

+ 4 - 3
src/views/equipmentManage/boxSetting/boxSetting.vue

@@ -16,7 +16,7 @@
       </a-form>
       </a-form>
     </div>
     </div>
     <div class="table-operator">
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal">新增</a-button>
+      <a-button type="primary" icon="plus" @click="openModal" id="roleList-openModal" v-hasPermission="'B_boxSetting_add'">新增</a-button>
     </div>
     </div>
     <s-table
     <s-table
       ref="table"
       ref="table"
@@ -27,8 +27,9 @@
       bordered>
       bordered>
       <!-- 操作 -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
       <template slot="action" slot-scope="text, record">
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" v-if="!record.isEnable" @click="delect(record)" />
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_boxSetting_edit'" />
+        <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" v-if="$hasPermissions('B_boxSetting_del') && !record.isEnable"/>
+        <span v-if="!$hasPermissions('B_boxSetting_del') && (!$hasPermissions('B_boxSetting_del') && !record.isEnable)"></span>
       </template>
       </template>
     </s-table>
     </s-table>
     <!-- 新增/编辑 弹窗 -->
     <!-- 新增/编辑 弹窗 -->

+ 13 - 7
src/views/releaseRecord/releaseRecordList.vue

@@ -47,6 +47,11 @@
               <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
               <a-input id="releaseRecordList-customerMobile" allowClear :maxLength="11" v-model=" queryParam.customerMobile" placeholder="请输入用户账号" />
             </a-form-item>
             </a-form-item>
           </a-col>
           </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>
+            </a-form-item>
+          </a-col>
         </a-row>
         </a-row>
       </a-form>
       </a-form>
     </div>
     </div>
@@ -129,15 +134,16 @@ export default {
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '网点名称', dataIndex: 'stationName', width: 200, align: 'center' },
         { title: '设备编号', dataIndex: 'srcDeviceCode', 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: 'goldNum', width: 200, align: 'center' },
+        { title: '投递方式', dataIndex: 'customerMobile', width: 200, align: 'center' },
+        { title: '本次兑换乐豆(个)', dataIndex: 'goldNum', width: 100, align: 'center' },
         { title: '内置各箱体投放重量(g)',
         { title: '内置各箱体投放重量(g)',
 				  children: [
 				  children: [
-            { title: '废旧衣物', width: 200, align: 'center', scopedSlots: { customRender: 'one' } },
-            { title: '废旧纸张', width: 200, align: 'center', scopedSlots: { customRender: 'two' } },
-            { title: '废旧塑料', width: 200, align: 'center', scopedSlots: { customRender: 'three' } },
-            { title: '废旧金属', width: 200, align: 'center', scopedSlots: { customRender: 'four' } },
-            { title: '有害垃圾', width: 200, align: 'center', scopedSlots: { customRender: 'five' } },
-            { title: '废旧金属/塑料', width: 200, align: 'center', scopedSlots: { customRender: 'six' } }
+            { title: '废旧衣物', width: 100, align: 'center', scopedSlots: { customRender: 'one' } },
+            { title: '废旧纸张', width: 100, align: 'center', scopedSlots: { customRender: 'two' } },
+            { title: '废旧塑料', width: 100, align: 'center', scopedSlots: { customRender: 'three' } },
+            { title: '废旧金属', width: 100, align: 'center', scopedSlots: { customRender: 'four' } },
+            { title: '有害垃圾', width: 100, align: 'center', scopedSlots: { customRender: 'five' } },
+            { title: '废旧金属/塑料', width: 100, align: 'center', scopedSlots: { customRender: 'six' } }
 				  ]
 				  ]
         }
         }