no message

src/api/masterManagement.js

@@ -103,6 +103,20 @@ export function workerManagerDetail(params) {
     params
   })
 }
+export function workerManagerCount(params) {
+  return request({
+    url: '/workerManager/count',
+    method: 'post',
+    params
+  })
+}
+export function workerManagerListLog(params) {
+  return request({
+    url: '/workerManager/list/log',
+    method: 'post',
+    params
+  })
+}
 
 export function workerManagerUpdate(data) {
   return request({

src/views/setting/account/index.vue

@@ -231,7 +231,7 @@
                   </el-cascader>
                 </el-form-item>
               </el-col>
-              <el-col :md="6" v-if="addForm.adminUserId == userData.adminUserId">
+              <el-col :md="6" v-if="addForm.adminUserId !== userData.adminUserId">
                 <el-form-item label="角色组" prop="role">
                   <el-select v-model="addForm.role" placeholder="请选择角色组" style="width: 100%">
                     <el-option
@@ -631,7 +631,7 @@ export default {
             this.editId = id
             getUserInfo({ adminUserId: id }).then(res => {
               this.addForm = {
-                adminUserId: res.data.adminUserId,
+                adminUserId: res.data.adminUserId || id,
                 roleName: res.data.roleName,
                 account: res.data.userName,
                 role: res.data.roleId,

src/views/userManagement/masterManagement/index.vue

@@ -23,15 +23,15 @@
           <div slot="moreSearch">
             <el-radio-group v-model="examineStatus" size="mini" @change="changeType">
               <el-radio-button label="">全部</el-radio-button>
-              <el-radio-button label="WAIT">入住申请待审核</el-radio-button>
-              <el-radio-button label="WAIT_WORKER">待师傅购买</el-radio-button>
-              <el-radio-button label="POLICY_WAIT">保险待审核</el-radio-button>
-              <el-radio-button label="OK">状态正常</el-radio-button>
-              <el-radio-button label="FAIL">已驳回</el-radio-button>
-              <el-radio-button label="EXPIRED">证件快过期</el-radio-button>
-              <el-radio-button label="OVERDUE">证件已过期</el-radio-button>
-              <el-radio-button label="STOP">已暂停</el-radio-button>
-              <el-radio-button label="QUIT">已经离职</el-radio-button>
+              <el-radio-button label="WAIT">入住申请待审核({{ workerManagerCount.rzsp }})</el-radio-button>
+              <el-radio-button label="WAIT_WORKER">待师傅购买({{ workerManagerCount.dsfgm }})</el-radio-button>
+              <el-radio-button label="POLICY_WAIT">保险待审核({{ workerManagerCount.bxsp }})</el-radio-button>
+              <el-radio-button label="OK">状态正常({{ workerManagerCount.ztzc }})</el-radio-button>
+              <el-radio-button label="FAIL">已驳回({{ workerManagerCount.ybh }})</el-radio-button>
+              <el-radio-button label="EXPIRED">证件快过期({{ workerManagerCount.zjkgq }})</el-radio-button>
+              <el-radio-button label="OVERDUE">证件已过期({{ workerManagerCount.zjygq }})</el-radio-button>
+              <el-radio-button label="STOP">已暂停({{ workerManagerCount.yzt }})</el-radio-button>
+              <el-radio-button label="QUIT">已经离职({{ workerManagerCount.ylz }})</el-radio-button>
             </el-radio-group>
             <br /><br />
           </div>
@@ -66,6 +66,14 @@
             :form-items="formItems3"
           >
           </zj-form-module>
+          <zj-form-module
+            title="操作记录"
+            label-width="100px"
+            :showPackUp="false"
+            :form-data="formData"
+            :form-items="formItems4"
+          >
+          </zj-form-module>
         </zj-form-container>
         <div slot="footer" class="dialog-footer">
           <el-button
@@ -156,7 +164,9 @@ import {
   workerManagerStop,
   workerManagerUpdate,
   workerManagerExamineWait,
-  workerManagerExamine
+  workerManagerExamine,
+  workerManagerCount,
+  workerManagerListLog
 } from '@/api/masterManagement'
 import operation_mixin from '@/components/template/operation_mixin.js'
 import ImageUpload from '@/components/file-upload'
@@ -210,7 +220,9 @@ export default {
       openType: 0,
       shenheBool: false,
       evaluationColumns: [],
-      evaluationData: []
+      evaluationData: [],
+      workerManagerCount: {},
+      workerManagerListLog: []
     }
   },
   computed: {
@@ -835,6 +847,59 @@ export default {
           }
         }
       ]
+    },
+    formItems4() {
+      return [
+        {
+          name: 'slot-component',
+          md: 24,
+          formItemAttributes: {
+            'label-width': '0px',
+            label: '',
+            prop: '-',
+            rules: []
+          },
+          render: (h, { props }) => {
+            return (
+              <zj-table
+                columns={[
+                  {
+                    columnAttributes: {
+                      label: '操作类型',
+                      prop: 'typeText'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '操作内容',
+                      prop: 'opRemark'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '操作网点',
+                      prop: 'websitName'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '操作人',
+                      prop: 'createBy'
+                    }
+                  },
+                  {
+                    columnAttributes: {
+                      label: '操作时间',
+                      prop: 'createTime'
+                    }
+                  }
+                ]}
+                table-data={this.workerManagerListLog}
+              />
+            )
+          }
+        }
+      ]
     }
   },
   watch: {
@@ -862,6 +927,10 @@ export default {
         return memberListPageV2(pam)
       } catch (error) {
         console.log(error)
+      } finally {
+        workerManagerCount().then(res => {
+          this.workerManagerCount = res.data
+        })
       }
     },
     // 列表导出函数
@@ -1086,6 +1155,9 @@ export default {
       this.$data.formData = this.$options.data().formData
     },
     openWindows(row, cb) {
+      workerManagerListLog({ id: row.id }).then(res => {
+        this.workerManagerListLog = res.data
+      })
       workerManagerDetail({ id: row.id }).then(res => {
         this.formData = {
           ...res.data,