liyangzheng 1 год назад
Родитель
Сommit
38b1885990
2 измененных файлов с 40 добавлено и 15 удалено
  1. 39 14
      src/views/backend/inspectHis/index.vue
  2. 1 1
      src/views/backend/meeting/index.vue

+ 39 - 14
src/views/backend/inspectHis/index.vue

@@ -7,7 +7,7 @@
           <el-input v-model="queryParams.taskName" placeholder="请输入任务名称" clearable @keyup.enter.native="handleQuery" />
         </el-form-item>
         <el-form-item label="任务类型" prop="taskType">
-          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small">
+          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable size="small" @change="typeChange">
             <el-option v-for="dict in this.getDictDatas(DICT_TYPE.TASK_TYPE)" :key="dict.value" :label="dict.label"
               :value="dict.value" />
           </el-select>
@@ -49,8 +49,8 @@
                           </el-form-item> -->
         <el-form-item prop="inspectName">
           <template #label>
-    <div style="min-width: auto;">检查项名称</div>
-  </template>
+            <div style="min-width: auto;">检查项名称</div>
+          </template>
           <el-input v-model="queryParams.inspectName" placeholder="请输入检查项名称" clearable
             @keyup.enter.native="handleQuery" />
         </el-form-item>
@@ -76,14 +76,14 @@
     <!-- <el-table v-loading="loading" :data="list" :height="list.length ? tableHeight : 'auto'"> -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="检查项名称" align="center" prop="insp_name" width="150"/>
+      <el-table-column label="检查项名称" align="center" prop="insp_name" width="150" />
       <el-table-column label="任务名称" align="center" prop="task_name" width="130" />
-      <el-table-column label="任务类型" align="center"  prop="task_type">
+      <el-table-column label="任务类型" align="center" prop="task_type">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.TASK_TYPE" :value="scope.row.task_type" />
         </template>
       </el-table-column>
-      <el-table-column label="任务内容" align="center" prop="description"/>
+      <el-table-column label="任务内容" align="center" prop="description" />
       <el-table-column label="任务状态" align="center" prop="taskStatus" width="120">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.TASK_STATUS" :value="scope.row.taskStatus" />
@@ -95,7 +95,7 @@
           <span>{{ parseTime(scope.row.inspect_time) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="所属单位" align="center" prop="org_name" width="150"/>
+      <el-table-column label="所属单位" align="center" prop="org_name" width="150" />
       <!-- <el-table-column label="检查结果" align="center" prop="inspResult">
         <template v-slot="scope">
           <dict-tag :type="DICT_TYPE.DENGER_HANDLE" :value="scope.row.inspResult" />
@@ -222,7 +222,7 @@
     </el-dialog>
     <!-- 对话框(添加 / 修改) -->
     <el-dialog title="查看" :visible.sync="opensee" width="800px" v-dialogDrag append-to-body class="detail">
-      <el-form ref="form" :model="form"  label-width="auto" label-position="left"  :rules="rules">
+      <el-form ref="form" :model="form" label-width="auto" label-position="left" :rules="rules">
         <el-row>
           <el-col :span="12">
             <el-form-item label="检查项名称" prop="inspName">
@@ -262,7 +262,7 @@
             <el-form-item label="所属单位" prop="orgId">
               <strong>{{ form.orgId }}</strong>
             </el-form-item></el-col>
-            <el-col :span="12">
+          <el-col :span="12">
             <el-form-item label="单位类型" prop="orgType">
               <dict-tag :type="DICT_TYPE.COMPANY_inspectitem_kind" :value="form.orgType" /> </el-form-item>
           </el-col>
@@ -369,8 +369,10 @@ export default {
       },
       // 是否显示查看弹出层
       opensee: false,
-
       tableHeight: "",
+      searchType: "",
+      // searchName:"",
+      // searchMisson:'',
     };
   },
   props: ["orgId", "taskType"],
@@ -455,8 +457,22 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNo = 1;
-      this.getList();
+      // this.queryParams.pageNo = 1;
+      // this.getList();
+      // getInspectHisPage({ taskName: this.queryParams.taskName, taskType: this.searchType, inspName: this.queryParams.inspectName }).then(res => {
+      //   console.log(res, 'ssss');
+      // })
+      const params = {
+        taskName: this.queryParams.taskName && this.queryParams.taskName,
+        taskType: this.searchType,
+        inspName: this.queryParams.inspectName && this.queryParams.inspectName,
+      };
+
+      getInspectHisPage(params).then(res => {
+        this.list = res.data.list
+        console.log(res, 'ssss');
+      });
+
     },
     /** 重置按钮操作 */
     resetQuery() {
@@ -535,7 +551,7 @@ export default {
       params.pageSize = undefined;
       // 执行导出
       this.$modal
-      .confirm("是否确认导出?")
+        .confirm("是否确认导出?")
         .then(() => {
           this.exportLoading = true;
           return exportInspectHisExcel(params);
@@ -546,6 +562,14 @@ export default {
         })
         .catch(() => { });
     },
+    typeChange(e) {
+      // console.log(e,'change');
+      this.searchType = e
+      getInspectHisPage({ pageNo: 1, pageSize: 10, taskType: e }).then(res => {
+        this.list = res.data.list
+        // console.log(res,'ooo');
+      })
+    }
   },
 };
 </script>
@@ -563,4 +587,5 @@ export default {
     color: #444444 !important;
     font-size: 14px;
   }
-}</style>
+}
+</style>

+ 1 - 1
src/views/backend/meeting/index.vue

@@ -182,7 +182,7 @@
         </el-table-column>
         <el-table-column prop="ppTel" label="电话号">
           <template scope="scope">
-            <span>{{ dutyComputed ||scope.row.ppDuty }}</span>
+            <span>{{ dutyComputed || scope.row.ppDuty }}</span>
           </template>
         </el-table-column>
       </el-table>