Преглед изворни кода

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

lilei пре 4 година
родитељ
комит
c789d104e6

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

@@ -259,14 +259,14 @@ export const asyncRouterMap = [{
       ]
     },
     {
-		  path: '/userInfo/allLdDetail',
-		  name: 'allLdDetail',
-		  component: () => import(/* webpackChunkName: "releaseRecord" */ '@/views/userInfo/allLdDetail.vue'),
-		  meta: {
-		    title: '乐豆明细',
-		    icon: 'profile'
-        // permission: 'M_allLdDetail'
-		  }
+      path: '/userInfo/allLdDetail',
+      name: 'allLdDetail',
+      component: () => import(/* webpackChunkName: "releaseRecord" */ '@/views/userInfo/allLdDetail.vue'),
+      meta: {
+        title: '乐豆明细',
+        icon: 'profile',
+        permission: 'M_allLdDetail'
+      }
     },
     {
       path: '/userInfo/releaseRecord/list',
@@ -282,70 +282,70 @@ export const asyncRouterMap = [{
   },
   // 清运管理
   {
-	  path: '/cleanManage',
-	  redirect: '/cleanManage/statisticalReport',
-	  component: PageView,
-	  meta: {
-	    title: '清运管理',
-	    icon: 'car'
-      // permission: 'M_driverManage'
-	  },
-	  children: [{
-	    path: '/cleanManage/statisticalReport',
-	    name: 'statisticalReport',
-	    component: () => import(/* webpackChunkName: "equipmentManage" */
-	      '@/views/cleanManage/statisticalReport.vue'),
-	    meta: {
-	      title: '统计报表',
-	      icon: 'bar-chart'
-        // permission: 'M_statisticalReport'
-	    }
-	  },
-	  {
-	    path: '/cleanManage/driverManage',
-	    name: 'driverManage',
-	    component: () => import(/* webpackChunkName: "equipmentManage" */
-	      '@/views/cleanManage/driverManage.vue'),
-	    meta: {
-	      title: '司机管理',
-	      icon: 'contacts'
-        // permission: 'M_driverManage_list'
-	    }
-	  },
-	  {
-	    path: '/cleanManage/cleanDetail',
-	    name: 'cleanDetail',
-	    component: () => import(/* webpackChunkName: "equipmentManage" */
-	      '@/views/cleanManage/cleanDetail.vue'),
-	    meta: {
-	      title: '清运明细',
-	      icon: 'unordered-list'
-        // permission: 'M_cleanDetail_list'
-	    }
-	  },
-	  {
-	    path: '/cleanManage/netWorkCleanRecord',
-	    name: 'netWorkCleanRecord',
-	    component: () => import(/* webpackChunkName: "equipmentManage" */
-	      '@/views/cleanManage/netWorkCleanRecord.vue'),
-	    meta: {
-	      title: '网点清运记录',
-	      icon: 'line-chart'
-        // permission: 'M_netWorkCleanRecord_list'
-	    }
-	  },
-	  {
-	    path: '/cleanManage/notCleanNetwork',
-	    name: 'notCleanNetwork',
-	    component: () => import(/* webpackChunkName: "equipmentManage" */
-	      '@/views/cleanManage/notCleanNetwork.vue'),
-	    meta: {
-	      title: '待清运网点',
-	      icon: 'cluster'
-        // permission: 'M_notCleanNetwork_list'
-	    }
-	  }
-	  ]
+    path: '/cleanManage',
+    redirect: '/cleanManage/statisticalReport',
+    component: PageView,
+    meta: {
+      title: '清运管理',
+      icon: 'car',
+      permission: 'M_driverManage'
+    },
+    children: [{
+      path: '/cleanManage/statisticalReport',
+      name: 'statisticalReport',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/cleanManage/statisticalReport.vue'),
+      meta: {
+        title: '统计报表',
+        icon: 'bar-chart',
+        permission: 'M_statisticalReport'
+      }
+    },
+    {
+      path: '/cleanManage/driverManage',
+      name: 'driverManage',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/cleanManage/driverManage.vue'),
+      meta: {
+        title: '司机管理',
+        icon: 'contacts',
+        permission: 'M_driverManage_list'
+      }
+    },
+    {
+      path: '/cleanManage/cleanDetail',
+      name: 'cleanDetail',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/cleanManage/cleanDetail.vue'),
+      meta: {
+        title: '清运明细',
+        icon: 'unordered-list',
+        permission: 'M_cleanDetail_list'
+      }
+    },
+    {
+      path: '/cleanManage/netWorkCleanRecord',
+      name: 'netWorkCleanRecord',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/cleanManage/netWorkCleanRecord.vue'),
+      meta: {
+        title: '网点清运记录',
+        icon: 'line-chart',
+        permission: 'M_netWorkCleanRecord_list'
+      }
+    },
+    {
+      path: '/cleanManage/notCleanNetwork',
+      name: 'notCleanNetwork',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/cleanManage/notCleanNetwork.vue'),
+      meta: {
+        title: '待清运网点',
+        icon: 'cluster',
+        permission: 'M_notCleanNetwork_list'
+      }
+    }
+    ]
   },
   // 报表
   {
@@ -483,15 +483,15 @@ export const asyncRouterMap = [{
       }
     },
     {
-	  path: '/equipmentManage/electronicScale',
-	  name: 'electronicScale',
-	  component: () => import(/* webpackChunkName: "equipmentManage" */
-	    '@/views/equipmentManage/electronicScale/electronicScale.vue'),
-	  meta: {
-	    title: '电子秤管理',
-	    icon: 'dashboard'
-        // permission: 'M_electronicScale_list'
-	  }
+      path: '/equipmentManage/electronicScale',
+      name: 'electronicScale',
+      component: () => import(/* webpackChunkName: "equipmentManage" */
+        '@/views/equipmentManage/electronicScale/electronicScale.vue'),
+      meta: {
+        title: '电子秤管理',
+        icon: 'dashboard',
+        permission: 'M_electronicScale_list'
+      }
     },
     {
       path: '/equipmentManage/boxSetting',

+ 2 - 1
src/views/cleanManage/cleanDetail.vue

@@ -72,7 +72,8 @@
       bordered
     >
       <span slot="action" slot-scope="text,record">
-        <a-button type="primary" @click="handleDetail(record)">查看清运明细</a-button>
+        <a-button type="primary" @click="handleDetail(record)" v-hasPermission="'B_cleanDetail'">查看清运明细</a-button>
+		<span v-if="!$hasPermissions('B_cleanDetail')"></span>
       </span>
     </s-table>
     <!-- 详情弹窗 -->

+ 4 - 11
src/views/cleanManage/cleanDetailModal.vue

@@ -1,12 +1,6 @@
 <template>
   <a-modal title="清运详情" :footer="null" v-model="isShow" @cancel="cancel" centered>
-    <!-- <div class="detail-item"><span>废旧衣物:</span>{{ clothes }} kg</div>
-    <div class="detail-item"><span>废旧金属:</span>{{ metal }} kg</div>
-    <div class="detail-item"><span>废旧塑料:</span>{{ plasticv }} kg</div>
-    <div class="detail-item"><span>废旧纸张:</span>{{ paper }} kg</div>
-    <div class="detail-item"><span>废旧玻璃:</span>{{ glass }} kg</div>
-    <div class="detail-item"><span>可回收物:</span>{{ recycling }} kg</div> -->
-    <div class="detail-item" v-for="item in itemData" :key="item.index"><span>{{item.rubbishType}}:</span>{{ (item.cleanWeight/1000).toFixed(2)}} kg</div>
+    <div class="detail-item" v-for="item in itemData" :key="item.index"><span>{{ item.rubbishType }}:</span>{{ (item.cleanWeight/1000).toFixed(2) }} kg</div>
   </a-modal>
 </template>
 
@@ -35,13 +29,12 @@ export default {
     }
   },
   methods: {
-	  cancel (e) {
-	    this.$emit('close')
-	  },
+    cancel (e) {
+      this.$emit('close')
+    },
     getDetailInfo () {
       getCleanDetails({ deviceNo: this.deviceNo, cleanDate: this.cleanTime }).then(res => {
         this.itemData = res.data
-		
       })
     }
   },

+ 2 - 2
src/views/cleanManage/cleanModal.vue

@@ -82,12 +82,12 @@ export default {
     // 保存
     handleSubmit () {
       this.$refs.ruleForm.validate(valid => {
-		 const _this = this
+			const _this = this
         if (valid) {
           const params = {
             stationNo: this.stationNo,
             deviceNo: this.deviceNo,
-            operatorUserId: this.queryParam.diverId,
+            dirverUserId: this.queryParam.diverId,
             remarks: this.queryParam.remarks
           }
           cleanByDevice(params).then(res => {

+ 12 - 6
src/views/cleanManage/driverManage.vue

@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="司机姓名" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear placeholder="请输入司机姓名" v-model.trim="queryParam.name" id="driverManage-name" />
+              <a-input allowClear placeholder="请输入司机姓名" v-model.trim="queryParam.name" id="driverManage-name" :maxLength="30"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
@@ -28,7 +28,13 @@
     </div>
     <!-- 新增 -->
     <div class="table-operator">
-      <a-button type="primary" icon="plus" @click="openModal" id="driverManage-openModal" style="margin-top: 18px;">新增</a-button>
+      <a-button
+        type="primary"
+        icon="plus"
+        @click="openModal"
+        id="driverManage-openModal"
+        style="margin-top: 18px;"
+        v-hasPermission="'B_driverManage_add'">新增</a-button>
     </div>
     <!-- 列表 -->
     <s-table
@@ -42,10 +48,10 @@
         <span :style="{'color': (record.loginFlag == 0 ? 'red' : 'green')}">{{ record.loginFlag == 0 ? '禁用' :record.loginFlag == 1 ? '启用' : '--' }}</span>
       </template>
       <span slot="action" slot-scope="text, record">
-        <a-icon type="unlock" title="重置密码" class="actionBtn icon-orange" @click="resetPassword(record)" />
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
-        <a-icon v-if="record.loginFlag == 0" type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" />
-        <!-- <span v-if="!$hasPermissions('B_userManage_edit') && !($hasPermissions('B_userManage_resetPwd') && record.loginFlag==1) && !($hasPermissions('B_userManage_del') && record.loginFlag==0) ">--</span> -->
+        <a-icon type="unlock" title="重置密码" class="actionBtn icon-orange" @click="resetPassword(record)" v-hasPermission="'B_driverManage_restPwd'"/>
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_driverManage_edit'"/>
+        <a-icon v-if="record.loginFlag == 0 && $hasPermissions('B_driverManage_del')" type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" />
+        <span v-if="!$hasPermissions('B_driverManage_edit') && !($hasPermissions('B_driverManage_restPwd')) && !($hasPermissions('B_driverManage_del') && record.loginFlag==0) ">--</span>
       </span>
     </s-table>
     <!-- 新增、编辑弹窗 -->

+ 2 - 1
src/views/cleanManage/netWorkCleanRecord.vue

@@ -55,7 +55,8 @@
       bordered
     >
       <span slot="action" slot-scope="text,record">
-        <a-button type="primary" @click="handleDetail(record)">查看详情</a-button>
+        <a-button type="primary" @click="handleDetail(record)" v-hasPermission="'B_netWorkCleanRecord_detail'" id="netWorkCleanRecord-handleDetail">查看详情</a-button>
+        <span v-if="!$hasPermissions('B_netWorkCleanRecord_detail')">--</span>
       </span>
     </s-table>
     <!-- 详情弹窗 -->

+ 4 - 3
src/views/cleanManage/notCleanNetwork.vue

@@ -37,12 +37,12 @@
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="设备编号" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.srcDeviceCode" id="notCleanNetwork-stationNo" />
+              <a-input allowClear placeholder="请输入设备编号" v-model.trim="queryParam.srcDeviceCode" id="notCleanNetwork-srcDeviceCode" />
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="5">
             <a-form-model-item label="排序规则" :label-col="formItemLayout.labelCol" :wrapper-col="formItemLayout.wrapperCol">
-              <v-select code="WAIT_CLEAN_SORT_RULE" v-model="queryParam.orderType" allowClear placeholder="请选择" id="notCleanNetwork-stationNo"></v-select>
+              <v-select code="WAIT_CLEAN_SORT_RULE" v-model="queryParam.orderType" allowClear placeholder="请选择" id="notCleanNetwork-orderType"></v-select>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="6" :lg="4">
@@ -133,7 +133,8 @@
       </template>
       <!-- 操作 -->
       <span slot="action" slot-scope="text,record">
-        <a-button type="primary" @click="handleDetail(record)">立即清运</a-button>
+        <a-button type="primary" @click="handleDetail(record)" v-hasPermission="'B_notCleanNetwork_edit'" id="notCleanNetwork-handleDetail">立即清运</a-button>
+        <span v-if="!$hasPermissions('B_notCleanNetwork_edit')">--</span>
       </span>
     </s-table>
     <!-- 清运弹窗 -->

+ 7 - 6
src/views/equipmentManage/electronicScale/electronicScale.vue

@@ -6,18 +6,18 @@
         <a-row :gutter="24">
           <a-col :xs="24" :sm="12" :md="8" :lg="6">
             <a-form-model-item label="设备MAC码" :label-col="{ span: 7 }" :wrapper-col="{ span: 17 }">
-              <a-input v-model="searchForm.macAddress" placeholder="请输入设备MAC码" :maxLength="12" allowClear />
+              <a-input v-model="searchForm.macAddress" placeholder="请输入设备MAC码" :maxLength="12" allowClear id="electronicScale-macAddress"/>
             </a-form-model-item>
           </a-col>
           <a-col :xs="24" :sm="12" :md="8" :lg="6">
-            <a-button class="handle-btn serach-btn" type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-            <a-button class="handle-btn" type="" @click="handleReset">重置</a-button>
+            <a-button class="handle-btn serach-btn" type="primary" @click="$refs.table.refresh(true)" id="electronicScale-refresh">查询</a-button>
+            <a-button class="handle-btn" type="" @click="handleReset" id="electronicScale-handleReset">重置</a-button>
           </a-col>
         </a-row>
       </a-form-model>
     </div>
     <!-- 新增 -->
-    <div class="electronicScale-container-add"><a-button type="primary" icon="plus" @click="openModal">新增</a-button></div>
+    <div class="electronicScale-container-add"><a-button type="primary" icon="plus" @click="openModal" id="electronicScale-openModal" v-hasPermission="'B_electronicScale_add'">新增</a-button></div>
     <!-- 合计 -->
     <a-alert type="info" showIcon style="margin-bottom:15px">
       <div class="ftext" slot="message">
@@ -29,9 +29,10 @@
     <s-table ref="table" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
       <span slot="action" slot-scope="text, record">
         <a-icon type="qrcode" title="二维码" class="actionBtn icon-green" @click="getQrCode(record)" />
-        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" />
-        <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" />
+        <a-icon type="edit" title="编辑" class="actionBtn icon-blues" @click="handleEdit(record)" v-hasPermission="'B_electronicScale_edit'"/>
+        <a-icon type="delete" title="删除" class="actionBtn icon-red" @click="delect(record)" v-hasPermission="'B_electronicScale_del'"/>
       </span>
+      <span v-if="!($hasPermissions('B_electronicScale_edit') && $hasPermissions('B_electronicScale_del'))">--</span>
     </s-table>
     <!-- 新增/编辑弹窗 -->
     <addElectronicScale :visible="isOpenModal" :id="itemId" :deviceCode="itemDeviceCode" @refresh="refreshTable" @close="isOpenModal = false"></addElectronicScale>

+ 1 - 1
src/views/userInfo/allLdDetail.vue

@@ -100,7 +100,7 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 60, align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: 200, align: 'center' },
-        { title: '用户手机', dataIndex: 'customerMobile', width: 200, align: 'center' },
+        { title: '用户手机', dataIndex: 'customerMobile', width: 200, align: 'center', customRender: (text) => { return text || '--' } },
         { title: '变动类型', dataIndex: 'changeTypeDictValue', width: 200, align: 'center' },
         { title: '变动原因', dataIndex: 'operateTypeDictValue', width: 200, align: 'center' },
         { title: '乐豆变动量(个)', dataIndex: 'changeNum', width: 200, align: 'center' }