소스 검색

交接班添加无法提交

交接班添加无法提交
Liao 1 년 전
부모
커밋
86ce278879
3개의 변경된 파일42개의 추가작업 그리고 20개의 파일을 삭제
  1. 4 0
      src/api/article_liao.js
  2. 32 14
      src/pages/index/components/performance_assess.vue
  3. 6 6
      src/pages/index/components/personnel_management.vue

+ 4 - 0
src/api/article_liao.js

@@ -14,6 +14,10 @@ export default {
14 14
   optPersonnelManagementShiftDetail(params){
15 15
     return axios.get('/opt/personnel/management/shift/detail', {params})
16 16
   },
17
+//获取交接班记录分页
18
+  optPersonnelManagementShiftAdd(params){
19
+  return axios.post('/opt/personnel/management/shift/add', params)
20
+},
17 21
   //获取交接班记录分页
18 22
   optPersonnelManagementShiftPage(params){
19 23
     return axios.get('/opt/personnel/management/shift/page', {params})

+ 32 - 14
src/pages/index/components/performance_assess.vue

@@ -61,13 +61,25 @@
61 61
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
62 62
           <el-row>
63 63
             <el-col :span="8">
64
-              <el-form-item label="收费员:">
65
-                <el-input v-model="formInline3.tollCollector" placeholder="请输入"></el-input>
64
+              <el-form-item label="收费员: ">
65
+                <el-select clearable v-model="formInline3.id" placeholder="请选择">
66
+                  <el-option
67
+                    v-for="(item,index) in peopleOptions"
68
+                    :key="index"
69
+                    :label="item.tollmanName"
70
+                    :value="item.id" />
71
+                </el-select>
66 72
               </el-form-item>
67 73
             </el-col>
68 74
             <el-col :span="8">
69
-              <el-form-item label="稽查员:">
70
-                <el-input v-model="formInline3.inspector" placeholder="请输入"></el-input>
75
+              <el-form-item label="稽查员: ">
76
+                <el-select clearable v-model="formInline3.id2" placeholder="请选择">
77
+                  <el-option
78
+                    v-for="(item,index) in peopleOptions"
79
+                    :key="index"
80
+                    :label="item.tollmanName"
81
+                    :value="item.id" />
82
+                </el-select>
71 83
               </el-form-item>
72 84
             </el-col>
73 85
             <el-col :span="8">
@@ -158,7 +170,8 @@ export default {
158 170
         rollmanId:'',
159 171
         inspectionManName:'',
160 172
         inspectionCount:'',
161
-        perMinutes:''
173
+        perMinutes:'',
174
+        tollmanName:'',
162 175
       },
163 176
       columns3: [
164 177
         {
@@ -180,7 +193,9 @@ export default {
180 193
       pageNum3: 1,
181 194
       formInline3: {
182 195
         tollCollector: '',
183
-        inspector:''
196
+        inspector:'',
197
+        id:'',
198
+        id2:''
184 199
       },
185 200
     }
186 201
   },
@@ -188,7 +203,7 @@ export default {
188 203
      this.getTableData1()
189 204
      this.getTableData2()
190 205
      this.getTableData3()
191
-     this.getPeopleName()
206
+     this.getPeople()
192 207
   },
193 208
   watch: {
194 209
   },
@@ -201,23 +216,20 @@ export default {
201 216
     },
202 217
     onSubmit2() {
203 218
       const {pageNum2, pageSize2} = this
204
-      api_l.optPerformanceAssessStat1page({inspectionmanId:this.formInline2.inspectionmanId}).then(res => {
219
+      api_l.optPerformanceAssessStat1page({inspectionmanId:this.formInline2.id}).then(res => {
205 220
         this.tableData2 = res.data.records
206 221
         this.total2 = res.data.total
207 222
       })
208 223
     },
209 224
     onSubmit3() {
210 225
       const {pageNum3, pageSize3} = this
211
-      api_l.optPerformanceAssessStat2page({inspectionmanId:this.formInline2.inspectionmanId,rollmanId:this.formInline2.rollmanId}).then(res => {
212
-        this.tableData2 = res.data.records
213
-        this.total2 = res.data.total
226
+      api_l.optPerformanceAssessStat2page({inspectionmanId:this.formInline3.id,rollmanId:this.formInline3.id2}).then(res => {
227
+        this.tableData3 = res.data.records
228
+        this.total3 = res.data.total
214 229
       })
215 230
     },
216 231
     handlePageChange1() {
217 232
       this.getTableData1()
218
-    },
219
-    getPeopleName(){
220
-
221 233
     },
222 234
     getTableData1() {
223 235
       const {pageNum1, pageSize1} = this
@@ -226,6 +238,12 @@ export default {
226 238
         this.total1 = res.data.total
227 239
       })
228 240
     },
241
+    //人员
242
+    getPeople(){
243
+      api_l.optPersonnelManagementBasicPage({}).then(res => {
244
+        this.peopleOptions = res.data.records
245
+      })
246
+    },
229 247
     handlePageChange2() {
230 248
       this.getTableData2()
231 249
     },

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

@@ -76,7 +76,7 @@
76 76
                 <el-input v-model="formLabelAlign.vehicleStatus"></el-input>
77 77
               </el-form-item>
78 78
               <el-form-item label="交班人员: ">
79
-                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
79
+                <el-select clearable v-model="formLabelAlign.tollmanFinishId" placeholder="请选择">
80 80
                   <el-option
81 81
                     v-for="(item,index) in peopleOptions"
82 82
                     :key="index"
@@ -85,7 +85,7 @@
85 85
                 </el-select>
86 86
               </el-form-item>
87 87
               <el-form-item label="接班人员: ">
88
-                <el-select clearable v-model="formLabelAlign.carParkName" placeholder="请选择">
88
+                <el-select clearable v-model="formLabelAlign.tollmanReceiveId" placeholder="请选择">
89 89
                   <el-option
90 90
                     v-for="(item,index) in peopleOptions"
91 91
                     :key="index"
@@ -324,13 +324,13 @@ export default {
324 324
     },
325 325
     //人员
326 326
     getPeople(){
327
-      api_l.optPersonnelManagementBasicDetail.then(res => {
328
-        this.peopleOptions = res.data
327
+      api_l.optPersonnelManagementBasicPage({}).then(res => {
328
+        this.peopleOptions = res.data.records
329 329
       })
330 330
     },
331 331
     handleConfirm() {
332 332
       if (this.title === '修改') {
333
-        api_l.optPersonnelManagementShiftEdit({id:this.formLabelAlign2.id,incomeFee: this.formLabelAlign2.incomeFee, parkingNum: this.formLabelAlign2.parkingNum, excptionEvent: this.formLabelAlign2.excptionEvent, deviceStatus: this.formLabelAlign2.deviceStatus, vehicleStatus: this.formLabelAlign2.vehicleStatus}).then(res => {
333
+        api_l.optPersonnelManagementShiftAdd({id:this.formLabelAlign.id,tollmanFinishId:this.formLabelAlign.tollmanFinishId,tollmanReceiveId:this.formLabelAlign.tollmanReceiveId,incomeFee: this.formLabelAlign.incomeFee, parkingNum: this.formLabelAlign.parkingNum, excptionEvent: this.formLabelAlign.excptionEvent, deviceStatus: this.formLabelAlign.deviceStatus, vehicleStatus: this.formLabelAlign.vehicleStatus}).then(res => {
334 334
           this.getTableData1()
335 335
           this.dialogVisible = false
336 336
         })
@@ -379,7 +379,7 @@ export default {
379 379
       this.getTableData1()
380 380
     },
381 381
     getTableData1() {
382
-      api_l.optPerformanceAssessStat1page({}).then(res => {
382
+      api_l.optPersonnelManagementShiftPage().then(res => {
383 383
         this.tableData1 = res.data.records
384 384
       })
385 385
     },