follow

src/components/follow/FollowQuery.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="display: flex;">
     <div
-      :style="'display: flex;flex-wrap: wrap;height: 90px;background-color: #fff;border-radius: 8px;margin-bottom: 5px;align-items: center;padding: 10px;width:' + (window.pageWidth  - 145) + 'px;'">
+      :style="'display: flex;flex-wrap: wrap;height: 90px;background-color: #fff;border-radius: 8px;margin-bottom: 5px;align-items: center;padding: 10px;width:' + (window.pageWidth  - 165) + 'px;'">
       <div class="query">
             <span>体检单位：</span>
             <el-input placeholder="请选择体检单位" v-model="patientRegister.query.cusOrgOCX" style="width: 240px" size="small"
@@ -59,12 +59,28 @@
         </el-select>
       </div>
       <div class="query">
-        <span class="spanClass">短信随访创建完成</span>
-        <el-checkbox v-model="patientRegister.query.isSmsComplete" true-label="Y" false-label="N"></el-checkbox>
+        <span class="spanClass">短信随访</span>
+        <el-select v-model="patientRegister.query.isSmsComplete" placeholder="请选择" clearable style="width: 80px"
+          size="small">
+            <el-option label="创建完成" value="Y"/>
+            <el-option label="未创建" value="N"/>
+        </el-select>
       </div>
       <div class="query">
-        <span class="spanClass">电话随访创建完成</span>
-        <el-checkbox v-model="patientRegister.query.isPhoneComplete" true-label="Y" false-label="N"></el-checkbox>
+        <span class="spanClass">电话随访</span>
+        <el-select v-model="patientRegister.query.isPhoneComplete" placeholder="请选择" clearable style="width: 80px"
+          size="small">
+            <el-option label="创建完成" value="Y"/>
+            <el-option label="未创建" value="N"/>
+        </el-select>
+      </div>
+      <div class="query">
+        <span class="spanClass">电话随访日期</span>
+        <el-date-picker v-model="patientRegister.query.startDate" type="date" placeholder="起始日期" size="small"
+          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
+        <span class="spanClass">至</span>
+        <el-date-picker v-model="patientRegister.query.endDate" type="date" placeholder="截止日期" size="small"
+          style="width:90px;" value-format="yyyy-MM-dd" :picker-options="pickerOptions" />
       </div>
       <div class="query">
         <span class="spanClass">诊断级别</span>
@@ -79,13 +95,20 @@
     <!-- 按钮区域 -->
     <div style="margin-left: 10px;">
       <div class="listBtn">
-        <el-button class="commonbutton" @click="btnQuery">查询</el-button>
+        <div style="display: flex;justify-content: space-between;">
+          <el-button class="btnClass" @click="btnQuery">查询</el-button>
+          <el-button type="danger" class="btnClass" @click="btnClear">重置</el-button>
+        </div>
       </div>      
       <div class="listBtn">
-        <el-button type="danger" class="commonbutton" @click="btnClear">清除条件</el-button>
+        <el-tooltip content="仅导出危急人员列表" placement="left-start">
+          <el-button type="danger" class="commonbutton" style="width: 122px" @click="exportTable">人员导出</el-button>
+        </el-tooltip>
       </div>
       <div class="listBtn">
-        <el-button type="danger" class="commonbutton" @click="exportTable">导出excel</el-button>
+        <el-tooltip content="导出危急人员及随访信息" placement="left-start">
+          <el-button type="danger" class="commonbutton" style="width: 122px" @click="exportTable2">综合导出</el-button>
+        </el-tooltip>
       </div>
     </div>
     <!--通用选单位、体检次数、分组的控件-->
@@ -156,6 +179,7 @@ export default {
   //挂载完成
   mounted() {
     this.init(this.patientRegister.query.customerOrgId)
+    this.btnClear()
     this.enterToQuery()
   },
 
@@ -174,10 +198,21 @@ export default {
       this.patientRegister.query.sex = ''
       this.patientRegister.query.phone = ''
       this.patientRegister.query.idCardNo = ''
+
+      this.patientRegister.query.isSmsComplete = ''
+      this.patientRegister.query.isPhoneComplete = ''
+      this.patientRegister.query.startDate = ''
+      this.patientRegister.query.endDate = ''
     },
+
     exportTable(){
       this.window.export=true
     },
+
+    exportTable2(){
+      this.window.export2=true
+    },
+
     init(customerOrgId) {
       if (!customerOrgId || customerOrgId == this.dict.personOrgId) {
         this.patientRegister.query.customerOrgRegister = null
@@ -373,10 +408,10 @@ export default {
 }
 
 .btnClass {
-  /* position: absolute; */
-  /* left: 0;
-  top: 0; */
-  width: 100px;
+  margin-left: 2px;
+  /* height: 22px; */
+  /*padding: 2px 2px;*/
+  /*原始 默认值 500 */
 }
 
 .spanClass {

src/store/index.js

@@ -93,7 +93,8 @@ export default new Vuex.Store({
 
             shift: false, //是否按下 shift键
             ctrl: false, //是否按下 ctrl键
-            export: false //是否导出excel
+            export: false, //是否导出excel
+            export2: false, //是否导出excel
         },
         elProgress: { //通用进度条相关参数
             display: false, //是否显示