报告单管理添加评估版本，科室

web_admin/src/views/his/Evaluation/index.vue

@@ -59,22 +59,7 @@
           <el-option label="异常" value="1"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="评估版本" prop="param.version">
-        <el-select
-          v-model="queryParams.param.version"
-          placeholder="请选择"
-          size="small"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="item in versionList"
-            :key="item.id"
-            :label="item.version"
-            :value="item.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="科室" prop="param.deptId">
         <treeselect
           v-model="queryParams.param.deptId"
@@ -260,7 +245,7 @@ import { deptTreeSelect } from "@/api/system/user";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { userStatistics } from "@/views/index.js";
-import { versionQuery } from "@/api/his/hospital";
+
 export default {
   name: "Evaluation",
   components: { scaleTable, Treeselect },
@@ -315,7 +300,6 @@ export default {
 
       deptOptions: [], // 科室选择
       workloadList: [], // 工作量统计列表
-      versionList: [], // 版本列表
     };
   },
   created() {
@@ -326,19 +310,11 @@ export default {
     this.getScaleLists();
     this.getDeptTree();
     this.getuserStatistics();
-    this.getVersion();
+   
     this.getList();
   },
   methods: {
-    /** 查询版本列表 */
-    getVersion() {
-      versionQuery({
-        pageNum: -1,
-        param: {},
-      }).then((response) => {
-        this.versionList = response.data.list;
-      });
-    },
+    
     // 工作量统计
     getuserStatistics() {
       userStatistics({}).then((res) => {

web_admin/src/views/his/Report/index.vue

@@ -13,13 +13,6 @@
           clearable
         ></el-input>
       </el-form-item>
-      <el-form-item label="评估师">
-        <el-input
-          v-model="queryParams.param.testerName"
-          placeholder="请输入"
-          clearable
-        ></el-input>
-      </el-form-item>
       <el-form-item label="状态">
         <el-select
           v-model="queryParams.param.completeStatus"
@@ -31,7 +24,32 @@
           <el-option label="结束评估" :value="2"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="测评时间" prop="param.time">
+      <el-form-item label="评估版本" prop="param.version">
+        <el-select
+          v-model="queryParams.param.version"
+          placeholder="请选择"
+          size="small"
+          clearable
+          filterable
+        >
+          <el-option
+            v-for="item in versionList"
+            :key="item.id"
+            :label="item.version"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="科室" prop="param.deptId">
+        <treeselect
+          v-model="queryParams.param.deptId"
+          :options="deptOptions"
+          :show-count="true"
+          placeholder="请选择"
+          style="width: 220px"
+        />
+      </el-form-item>
+      <el-form-item label="时间范围" prop="param.time">
         <el-date-picker
           v-model="queryParams.param.time"
           type="daterange"
@@ -359,12 +377,15 @@ import {
   doctorExport,
   positiveExport,
 } from "@/api/his/evaluation";
-
+import { versionQuery } from "@/api/his/hospital";
+import { deptTreeSelect } from "@/api/system/user";
 import scaleTable from "./ReportDetail/scaleTable.vue";
 import { getScaleList } from "@/api/his/scale";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 export default {
   name: "Evaluation",
-  components: { scaleTable },
+  components: { scaleTable, Treeselect },
   data() {
     return {
       completeStatus: {
@@ -393,6 +414,8 @@ export default {
           searchValue: "",
           testerName: "",
           completeStatus: "",
+          version: "",
+          deptId: undefined,
           // showType: 1,
         },
         pageNum: 1,
@@ -420,13 +443,32 @@ export default {
       timestamp: "",
       reportPath: "",
       patientDetail: null,
+      deptOptions: [], // 科室选择
+      versionList: [], // 版本列表
     };
   },
   created() {
     this.getList();
     this.getScaleLists();
+    this.getVersion();
+    this.getDeptTree();
   },
   methods: {
+    /** 获取科室数据 */
+    getDeptTree() {
+      deptTreeSelect().then((response) => {
+        this.deptOptions = response.data;
+      });
+    },
+    /** 查询版本列表 */
+    getVersion() {
+      versionQuery({
+        pageNum: -1,
+        param: {},
+      }).then((response) => {
+        this.versionList = response.data.list;
+      });
+    },
     // 报告单报出
     async handlePatientExport(_type, _printFlat, _row) {
       this.patientDetail = _row;
@@ -522,6 +564,8 @@ export default {
           searchValue: "",
           testerName: "",
           completeStatus: "",
+          version: "",
+          deptId: undefined,
           // showType: 1,
         },
       };