浏览代码

指标替换 部门接口

yuwandanmian 2 年之前
父节点
当前提交
5a7cd21c4d

+ 1 - 10
src/views/allcase/caseIndexAnalysis.vue

@@ -30,15 +30,6 @@
             </el-form-item>
             <el-form-item label="">
               <el-date-picker v-model="formInline.end_time" type="date" :picker-options="pickerOptions2" placeholder="结束日期"></el-date-picker>
-              <!-- <el-date-picker
-                v-model="formInline.time"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :picker-options="pickerOptions"
-                value-format="yyyyMMdd"
-              /> -->
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSearch">查询</el-button>
@@ -416,7 +407,7 @@ export default {
     // 跳转列表页
     toPage(row, status) {
       const { time } = this.formInline;
-      this.$router.push({ path: '/caseIndexAnalysisList', query: { ruleId: this.ruleId, ruleName: this.ruleName, start: time[0], end: time[1], dep_id: row.dep_id, status } });
+      this.$router.push({ path: '/caseIndexAnalysisList', query: { ruleId: this.ruleId, ruleName: this.ruleName, start: time[0], end: time[1], dep_name: row.dep_name, status } });
     },
   },
 };

+ 5 - 5
src/views/allcase/caseIndexAnalysisList.vue

@@ -36,7 +36,7 @@
       return {
         searchData: {
           time: [],
-          dep_id: '',
+          dep_name: '',
           status: '',
         },
         tableData: [],
@@ -63,13 +63,13 @@
       },
       getList() {
         const { ruleId } = this.$route.query
-        const { time, dep_id, status } = this.searchData
+        const { time, dep_name, status } = this.searchData
         const { currentPage, pageSize } = this.paginationData
         const params = {
           type: ruleId,
           page: currentPage,
           page_size: pageSize,
-          dep_id,
+          dep_name,
           status: parseInt(status)
         }
         
@@ -88,10 +88,10 @@
       },
       // 导出
       handleExport() {
-        const { dep_id, time, status } = this.searchData
+        const { dep_name, time, status } = this.searchData
         const { ruleId } = this.$route.query
         const params = {
-          dep_id,
+          dep_name,
           type: ruleId,
           status
         }

+ 9 - 4
src/views/allcase/caseIndexList.vue

@@ -19,8 +19,8 @@
           <el-form-item label="科室" style="margin-bottom: 0">
             <el-select v-model="searchData.AAC11N" clearable filterable placeholder="请选择">
               <el-option
-                v-for="item in departmentList"
-                :key="item.id"
+                v-for="(item, index) in departmentList"
+                :key="index"
                 :label="item.name"
                 :value="item.name">
               </el-option>
@@ -108,6 +108,11 @@ export default {
   watch: {
     $route(to, from) {
       if (from.path === '/caseIndex' && to.path === '/caseIndexList') {
+        this.searchData.is_error = ''
+        this.searchData.AAA28 = ''
+        this.searchData.AAC11N = ''
+        this.searchData.order = ''
+        this.searchData.order_sort = ''
         this.tableData = []
         this.paginationData.currentPage = 1
         this.paginationData.pageSize = 10
@@ -140,9 +145,9 @@ export default {
       this.$router.push({ path: '/caseIndex', query: { type: 'children' }})
     },
     getDepartmentList() {
-      this.$axios.post("/selectInfo").then((res) => {
+      this.$axios.post("/get_department_list").then((res) => {
         // 不要全部选项
-        this.departmentList = res.data.department.slice(1, res.data.department.length)
+        this.departmentList = res.data
       });
     },
     // 获取指标数据

+ 7 - 7
src/views/allcase/components/CaseIndexAnalysisListSearch.vue

@@ -2,8 +2,8 @@
   <div>
     <el-form :inline="true" :model="data" class="demo-form-inline">
       <el-form-item label="科室">
-        <el-select v-model="data.dep_id" filterable placeholder="请选择">
-          <el-option v-for="item of departments" :key="item.id" :label="item.name" :value="item.id" />
+        <el-select v-model="data.dep_name" filterable placeholder="请选择">
+          <el-option v-for="(item, index) of departments" :key="index" :label="item.name" :value="item.name" />
         </el-select>
       </el-form-item>
       <el-form-item label="状态" style="margin-bottom: 0">
@@ -43,7 +43,7 @@
         type: Object,
         default() {
           return {
-            dep_id: '',
+            dep_name: '',
             time: [],
             status: ''
           }
@@ -62,8 +62,8 @@
     },
     async created() {
       await this.getDeportmentList()
-      const { dep_id, start, end, status } = this.$route.query
-      this.data.dep_id = parseInt(dep_id)
+      const { dep_name, start, end, status } = this.$route.query
+      this.data.dep_name = dep_name
       this.data.time = [start, end]
       this.data.status = status ? parseInt(status) : ''
       this.onSubmit()
@@ -79,9 +79,9 @@
         this.$emit('search')
       },
       getDeportmentList() {
-        this.$axios.post("/selectInfo").then((res) => {
+        this.$axios.post("/get_department_list").then((res) => {
           // 不要全部选项
-          this.departments = res.data.department.slice(1, res.data.department.length)
+          this.departments = res.data
         });
       },
       onBack() {