病例列表增加筛选字段

medical_history-vue/src/views/admin/AdminMedicalHistoryList.vue

@@ -15,9 +15,33 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="分类名称">
+              <j-input placeholder="请输入分类名称" v-model="queryParam.uploadingName"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                style="width: 210px"
+                v-model="queryParam.createTimeRange"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+                @ok="onDateOk"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+               <a-button type="primary" icon="download" @click="handleExportXls('病例管理')"style="margin-left: 8px">导出</a-button>
+              <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+              <!--        <a-button type="primary" icon="import">导入</a-button>-->
+              <!--      </a-upload>-->
+              <!-- 高级查询区域 -->
+              <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+                     @handleSuperQuery="handleSuperQuery" style="margin-left: 8px"></j-super-query>
               <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
               <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
               <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
@@ -32,13 +56,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('病例管理')">导出</a-button>
-      <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
-      <!--        <a-button type="primary" icon="import">导入</a-button>-->
-      <!--      </a-upload>-->
-      <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+
       <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
       <!--        <a-menu slot="overlay">-->
       <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
@@ -187,6 +205,7 @@ import AdminMedicalHistoryModal from './modules/AdminMedicalHistoryModal'
 import DM from './modules/DM'
 import { httpAction } from '@api/manage'
 import store from '@/store'
+import { filterObj } from '@/utils/util'
 
 
 export default {
@@ -198,6 +217,9 @@ export default {
   data() {
     return {
       description: '病例管理管理页面',
+      queryParam: {
+        createTimeRange:[],
+      },
       userId: '',
       picNew: '',
       picNewArr: [],
@@ -411,6 +433,27 @@ export default {
       this.visiblezz2 = false
 
     },
+    getQueryParams(){
+      var param = Object.assign({}, this.queryParam,this.isorter);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      delete param.createTimeRange; // 时间参数不传递后台
+      if (this.superQueryParams) {
+        param['superQueryParams'] = encodeURI(this.superQueryParams)
+        param['superQueryMatchType'] = this.superQueryMatchType
+      }
+
+      return filterObj(param);
+    },
+    onDateChange: function (value, dateString) {
+      console.log(dateString[0],dateString[1]);
+      this.queryParam.createTime_begin=dateString[0];
+      this.queryParam.createTime_end=dateString[1];
+    },
+    onDateOk(value) {
+      console.log(value);
+    },
 
     //========拍照图片详情
     handleCancelzz() {

medical_history-vue/src/views/admin/AdminMedicalHistoryList2.vue

@@ -15,12 +15,36 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="分类名称">
+              <j-input placeholder="请输入分类名称" v-model="queryParam.uploadingName"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                style="width: 210px"
+                v-model="queryParam.createTimeRange"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+                @ok="onDateOk"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
               <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
               <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
               <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
+                <a-button type="primary" icon="download" @click="handleExportXls('病例管理')"style="margin-left: 8px">导出</a-button>
+              <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
+              <!--        <a-button type="primary" icon="import">导入</a-button>-->
+              <!--      </a-upload>-->
+              <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+                     @handleSuperQuery="handleSuperQuery" style="margin-left: 8px"></j-super-query>
               <!--              </a>-->
             </span>
           </a-col>
@@ -32,13 +56,13 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('病例管理')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('病例管理')">导出</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--        <a-button type="primary" icon="import">导入</a-button>-->
       <!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!--                     @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
       <!--        <a-menu slot="overlay">-->
       <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
@@ -131,6 +155,7 @@ import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import AdminMedicalHistoryModal from './modules/AdminMedicalHistoryModal2'
 import { httpAction } from '@api/manage'
+import { filterObj } from '@/utils/util'
 
 
 export default {
@@ -142,6 +167,9 @@ export default {
   data() {
     return {
       description: '初审通过病例列表',
+      queryParam: {
+        createTimeRange:[],
+      },
       // 表头
       columns: [
         {
@@ -315,6 +343,27 @@ export default {
 
       })
     },
+    getQueryParams(){
+      var param = Object.assign({}, this.queryParam,this.isorter);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      delete param.createTimeRange; // 时间参数不传递后台
+      if (this.superQueryParams) {
+        param['superQueryParams'] = encodeURI(this.superQueryParams)
+        param['superQueryMatchType'] = this.superQueryMatchType
+      }
+
+      return filterObj(param);
+    },
+    onDateChange: function (value, dateString) {
+      console.log(dateString[0],dateString[1]);
+      this.queryParam.createTime_begin=dateString[0];
+      this.queryParam.createTime_end=dateString[1];
+    },
+    onDateOk(value) {
+      console.log(value);
+    },
     initDictConfig() {
     },
     returnDetail(id) {

medical_history-vue/src/views/admin/AdminMedicalHistoryList4.vue

@@ -15,9 +15,30 @@
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="分类名称">
+              <j-input placeholder="请输入分类名称" v-model="queryParam.uploadingName"></j-input>
+            </a-form-item>
+          </a-col>
+          <a-col :md="6" :sm="10">
+            <a-form-item label="提交时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-range-picker
+                style="width: 210px"
+                v-model="queryParam.createTimeRange"
+                format="YYYY-MM-DD"
+                :placeholder="['开始时间', '结束时间']"
+                @change="onDateChange"
+                @ok="onDateOk"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
               <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+                    <a-button type="primary" icon="download" @click="handleExportXls('病例管理')"style="margin-left: 8px">导出</a-button>
+
+                    <j-super-query :fieldList="superFieldList" ref="superQueryModal"
+                                   @handleSuperQuery="handleSuperQuery" style="margin-left: 8px"></j-super-query>
               <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
               <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
               <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
@@ -32,13 +53,13 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
-      <a-button type="primary" icon="download" @click="handleExportXls('病例管理')">导出</a-button>
+<!--      <a-button type="primary" icon="download" @click="handleExportXls('病例管理')">导出</a-button>-->
       <!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
       <!--        <a-button type="primary" icon="import">导入</a-button>-->
       <!--      </a-upload>-->
       <!-- 高级查询区域 -->
-      <j-super-query :fieldList="superFieldList" ref="superQueryModal"
-                     @handleSuperQuery="handleSuperQuery"></j-super-query>
+<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal"-->
+<!--                     @handleSuperQuery="handleSuperQuery"></j-super-query>-->
       <!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
       <!--        <a-menu slot="overlay">-->
       <!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
@@ -122,6 +143,7 @@ import '@/assets/less/TableExpand.less'
 import { mixinDevice } from '@/utils/mixin'
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import AdminMedicalHistoryModal from './modules/AdminMedicalHistoryModal4'
+import { filterObj } from '@/utils/util'
 
 export default {
   name: 'AdminMedicalHistoryList4',
@@ -132,6 +154,9 @@ export default {
   data() {
     return {
       description: '优秀病例列表（专家审核通过的病例列表',
+      queryParam: {
+        createTimeRange:[],
+      },
       // 表头
       columns: [
         {
@@ -279,6 +304,27 @@ export default {
   methods: {
     initDictConfig() {
     },
+    getQueryParams(){
+      var param = Object.assign({}, this.queryParam,this.isorter);
+      param.field = this.getQueryField();
+      param.pageNo = this.ipagination.current;
+      param.pageSize = this.ipagination.pageSize;
+      delete param.createTimeRange; // 时间参数不传递后台
+      if (this.superQueryParams) {
+        param['superQueryParams'] = encodeURI(this.superQueryParams)
+        param['superQueryMatchType'] = this.superQueryMatchType
+      }
+
+      return filterObj(param);
+    },
+    onDateChange: function (value, dateString) {
+      console.log(dateString[0],dateString[1]);
+      this.queryParam.createTime_begin=dateString[0];
+      this.queryParam.createTime_end=dateString[1];
+    },
+    onDateOk(value) {
+      console.log(value);
+    },
     getSuperFieldList() {
       let fieldList = []
       fieldList.push({ type: 'string', value: 'phone', text: '提交人账号', dictCode: '' })