yuwandanmian 2 éve
szülő
commit
edfd172e30

+ 21 - 3
src/views/feedback/list/components/SearchBox.vue

@@ -7,13 +7,29 @@
         </el-select>
       </el-form-item>
       <el-form-item label="">
-        <el-select v-model="data.dep_id" filterable clearable placeholder="科室">
+        <el-select v-model="data.dep_id" filterable clearable placeholder="反馈科室">
           <el-option v-for="item of deportments" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="">
         <el-input v-model="data.user_name" placeholder="反馈人" />
       </el-form-item>
+      <el-form-item label="">
+        <el-date-picker
+          v-model="data.start_time"
+          type="date"
+          :picker-options="pickerOptions1"
+          placeholder="开始日期"
+        />
+      </el-form-item>
+      <el-form-item label="">
+        <el-date-picker
+          v-model="data.end_time"
+          type="date"
+          :picker-options="pickerOptions2"
+          placeholder="结束日期"
+        />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="onSubmit">查询</el-button>
       </el-form-item>
@@ -31,7 +47,9 @@ export default {
         return {
           type_id: '',
           dep_id: '',
-          user_name: ''
+          user_name: '',
+          start_time: '',
+          end_time: ''
         }
       }
     }
@@ -64,7 +82,7 @@ export default {
         },
         {
           id: 2,
-          name: '病指控规则'
+          name: '病指控规则'
         },
         {
           id: 3,

+ 14 - 12
src/views/feedback/list/components/TableBox.vue

@@ -10,26 +10,28 @@
         prop="type_name"
         label="反馈类型"
         width="180"
+      >
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.type_id === 1">临床科研数据查询</el-tag>
+          <el-tag v-if="scope.row.type_id === 2" type="success">病历指控规则</el-tag>
+          <el-tag v-if="scope.row.type_id === 3" type="warning">病案指标</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="content"
+        label="反馈内容"
       />
       <el-table-column
-        prop="dep_name"
-        label="科室"
-        width="180"
+        prop="created_at"
+        label="反馈时间"
       />
       <el-table-column
         prop="user_name"
         label="反馈人"
-        width="180"
       />
       <el-table-column
-        prop="content"
-        label="反馈内容"
-      />
-      <el-table-column
-        prop="created_at"
-        label="反馈时间"
-        width="180"
-        align="right"
+        prop="dep_name"
+        label="反馈科室"
       />
     </el-table>
   </div>

+ 7 - 2
src/views/feedback/list/index.vue

@@ -16,6 +16,7 @@
 import SearchBoxVue from './components/SearchBox.vue'
 import TableBoxVue from './components/TableBox.vue'
 import { feedbackList } from '@/api/admin'
+import { dateFormat } from '@/filters/index'
 
 export default {
   components: {
@@ -28,7 +29,9 @@ export default {
       searchData: {
         type_id: '',
         dep_id: '',
-        user_name: ''
+        user_name: '',
+        start_time: '',
+        end_time: ''
       },
       tableData: [],
       paginationData: {
@@ -43,7 +46,7 @@ export default {
   },
   methods: {
     getList() {
-      const { type_id, dep_id, user_name } = this.searchData
+      const { type_id, dep_id, user_name, start_time, end_time } = this.searchData
       const { page, limit } = this.paginationData
       const params = {
         type_id,
@@ -52,6 +55,8 @@ export default {
         page,
         page_size: limit
       }
+      params.start_time = start_time ? dateFormat(start_time, 'YYYYMMDD') : ''
+      params.end_time = end_time ? dateFormat(end_time, 'YYYYMMDD') : ''
       this.loading = true
       feedbackList(params).then(res => {
         const { p } = res