duwendi il y a 1 an
Parent
commit
a6ad3cd6b3

+ 5 - 2
src/api/article_liao.js

@@ -34,11 +34,14 @@ export default {
34 34
   optPersonnelManagementBasicPage(params){
35 35
     return axios.get('/opt/personnel/management/basic/page', {params})
36 36
   },
37
-  //获取收费员下拉列表
37
+  //获取员下拉列表
38 38
   optPersonnelDic(params){
39
+    return axios.get('/opt/common/select/sysman', {params})
40
+  },
41
+  //获取人员下拉列表
42
+  optTollmanDic(params){
39 43
     return axios.get('/opt/common/select/tollman', {params})
40 44
   },
41
-
42 45
   //获取收费员信息分页
43 46
   optPersonnelManagementBasicDetail(params){
44 47
     return axios.get('/opt/personnel/management/basic/page', {params})

+ 2 - 2
src/api/article_z.js

@@ -14,9 +14,9 @@ export default {
14 14
   querySelectParkListByPage(params) {
15 15
     return axios.get(`/opt/common/select/park`, {params})
16 16
   },
17
-  // 收费员
17
+  // 获取人员下拉列表
18 18
   querySelectTollmanListByPage(params) {
19
-    return axios.get(`/opt/common/select/tollman`, {params})
19
+    return axios.get(`/opt/common/select/sysman`, {params})
20 20
   },
21 21
   // 取证类型
22 22
   queryEvidenceType(params) {

+ 2 - 2
src/pages/index/components/exception_handing.vue

@@ -170,8 +170,8 @@
170 170
                   <el-option
171 171
                     v-for="(item,index) in tollmanOptions"
172 172
                     :key="index"
173
-                    :label="item.tollmanName"
174
-                    :value="item.id" />
173
+                    :label="item.realname"
174
+                    :value="item.loginname" />
175 175
                 </el-select>
176 176
               </el-form-item>
177 177
               <el-form-item label="授权人员电话" prop="tollmanPhone">

+ 4 - 4
src/pages/index/components/inspection_management.vue

@@ -115,8 +115,8 @@
115 115
                   <el-option
116 116
                     v-for="(item,index) in tollmanOptions"
117 117
                     :key="index"
118
-                    :label="item.tollmanName"
119
-                    :value="item.id" />
118
+                    :label="item.realname"
119
+                    :value="item.loginname" />
120 120
                 </el-select>
121 121
               </el-form-item>
122 122
             </el-col>
@@ -176,8 +176,8 @@
176 176
                   <el-option
177 177
                     v-for="(item,index) in tollmanOptions"
178 178
                     :key="index"
179
-                    :label="item.tollmanName"
180
-                    :value="item.id" />
179
+                    :label="item.realname"
180
+                    :value="item.loginname" />
181 181
                 </el-select>
182 182
               </el-form-item>
183 183
             </el-col>

+ 9 - 9
src/pages/index/components/performance_assess.vue

@@ -8,8 +8,8 @@
8 8
               <el-option
9 9
                 v-for="(item,index) in peopleOptions"
10 10
                 :key="index"
11
-                :label="item.tollmanName"
12
-                :value="item.id" />
11
+                :label="item.realname"
12
+                :value="item.loginname" />
13 13
             </el-select>
14 14
           </el-form-item>
15 15
           <el-form-item>
@@ -28,13 +28,13 @@
28 28
       </el-tab-pane>
29 29
       <el-tab-pane label="稽查员稽查工作统计" name="稽查员稽查工作统计">
30 30
         <el-form class="form-wrapper" :inline="true" :model="formInline2">
31
-          <el-form-item label="稽查员姓名: ">
31
+          <el-form-item label="稽查员: ">
32 32
             <el-select filterable clearable v-model="formInline2.inspectionmanId" placeholder="请选择">
33 33
               <el-option
34 34
                 v-for="(item,index) in peopleOptions"
35 35
                 :key="index"
36
-                :label="item.tollmanName"
37
-                :value="item.id" />
36
+                :label="item.realname"
37
+                :value="item.loginname" />
38 38
             </el-select>
39 39
           </el-form-item>
40 40
           <el-form-item>
@@ -58,8 +58,8 @@
58 58
               <el-option
59 59
                 v-for="(item,index) in peopleOptions"
60 60
                 :key="index"
61
-                :label="item.tollmanName"
62
-                :value="item.id" />
61
+                :label="item.realname"
62
+                :value="item.loginname" />
63 63
             </el-select>
64 64
           </el-form-item>
65 65
           <el-form-item label="稽查员: ">
@@ -67,8 +67,8 @@
67 67
               <el-option
68 68
                 v-for="(item,index) in peopleOptions"
69 69
                 :key="index"
70
-                :label="item.tollmanName"
71
-                :value="item.id" />
70
+                :label="item.realname"
71
+                :value="item.loginname" />
72 72
             </el-select>
73 73
           </el-form-item>
74 74
           <el-form-item>

+ 4 - 4
src/pages/index/components/personnel_management.vue

@@ -247,7 +247,7 @@ export default {
247 247
       },
248 248
       columns2: [
249 249
         {
250
-          label: '收费员id',
250
+          label: '收费员账号',
251 251
           key: 'id'
252 252
         },
253 253
         {
@@ -323,7 +323,7 @@ export default {
323 323
     },
324 324
     //人员
325 325
     getPeople(){
326
-      api_l.optPersonnelDic({}).then(res => {
326
+      api_l.optTollmanDic({type: 1}).then(res => {
327 327
         this.peopleOptions = res.data || []
328 328
       })
329 329
     },
@@ -377,7 +377,7 @@ export default {
377 377
           this.getTableData2()
378 378
         })
379 379
       }else if (this.title2 === '添加') {
380
-        api_l.optPersonnelManagementBasicAdd(this.formLabelAlign2).then(res => {
380
+        api_l.optPersonnelManagementBasicAdd({type: 1, ...this.formLabelAlign2}).then(res => {
381 381
           this.dialogVisible2 = false
382 382
           this.getTableData2()
383 383
       })
@@ -398,7 +398,7 @@ export default {
398 398
     getTableData2() {
399 399
       this.loading2 = true
400 400
       const {pageNum2, pageSize2} = this
401
-      api_l.optPersonnelManagementBasicDetail({current: pageNum2, size: pageSize2, ...this.queryParams2}).then(res => {
401
+      api_l.optPersonnelManagementBasicPage({type: 1, current: pageNum2, size: pageSize2, ...this.queryParams2}).then(res => {
402 402
         this.loading2 = false
403 403
         this.tableData2 = res.data.records
404 404
         this.total2 = res.data.total