whj 2 gadi atpakaļ
vecāks
revīzija
b817ebf64a
2 mainītis faili ar 59 papildinājumiem un 1 dzēšanām
  1. 15 0
      src/api/fill/task.js
  2. 44 1
      src/views/fill/task/FillGatherTask.vue

+ 15 - 0
src/api/fill/task.js

@@ -249,3 +249,18 @@ export function updatetasks (parameter) {
     data: parameter
   })
 }
+/**
+ * export file
+ * parameter: { }
+ * @param parameter :
+  * @returns {*}
+ */
+export function getUser (parameter) {
+  return axios({
+    url: '/upms/users?' + stringify(parameter),
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    }
+  })
+}

+ 44 - 1
src/views/fill/task/FillGatherTask.vue

@@ -9,6 +9,42 @@
                 <a-input v-model="queryParam.keyword" placeholder="请输入名称/类型名称" />
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="巡检人">
+                <a-select v-model="queryParam.checkerName" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in statusMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="巡检主管">
+                <a-select v-model="queryParam.leaderName" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in statusMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="巡检状态">
+                <a-select v-model="queryParam.status" placeholder="请选择">
+                  <a-select-option
+                    v-for="(label,value) in statusMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
             <!-- </a-row>
           <a-row :gutter="48"> -->
             <a-col :md="6" :sm="24" >
@@ -139,7 +175,8 @@ import {
   deleteFillGatherTasks,
   fetchFillGatherTask,
   exportFillGatherTask,
-  updateName
+  updateName,
+  getUser
 } from '@/api/fill/task'
 
 export default {
@@ -293,6 +330,12 @@ export default {
     // 下拉框map
     this.tableOption()
     this.statusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.FILL_GATHER_TASK_STATUS)
+    getUser({ roleCode: 'FILL_CHECKER' }).then(res => {
+      console.log(res)
+    })
+    getUser({ roleCode: 'FILL_CHECKER_LEADER' }).then(res => {
+      console.log(res)
+    })
     if (this.$route.query.id) {
       fetchFillGatherTask({ id: this.$route.query.id }).then(res => {
         this.handleView(res.data)