Merge branch 'feature/dxp' into 'release'

添加筛选

See merge request !148

src/views/IM/diagnosis-admin/diagnosis-list-new.vue

@@ -10,7 +10,7 @@
         :inline="true"
         class="demo-form-inline from-box"
         :model="searchParam"
-        label-width="80px"
+        label-width="96px"
       >
         <el-collapse-transition>
           <div
@@ -201,6 +201,23 @@
                   />
                 </el-form-item>
               </div>
+              <div>
+                <el-form-item
+                  label="基层意向时间"
+                  class="t-b"
+                >
+                  <el-date-picker
+                    v-model="assistantTime"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="-"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    style="width: 220px"
+                    :picker-options="pickerOptions1"
+                  />
+                </el-form-item>
+              </div>
             </div>
             <div class="form-btn">
               <div class="form-btn-li">
@@ -433,7 +450,7 @@
     },
     data() {
       return {
-        saveFresh:true,
+        saveFresh: true,
         isUp: false,
         endFlag: false,
         beginFlag: false,
@@ -443,6 +460,7 @@
         cancelRangeTime: '',
         orderRangeTime: '',
         completeRangeTime: '',
+        assistantTime: '',
         depList: [],
         tabrefresh: true,
         searchParam: {
@@ -461,6 +479,8 @@
           appointEndTime: '',
           doneTimeBegin: '',
           doneTimeEnd: '',
+          assistantBeginTime: '',
+          assistantEndTime: '',
           pageSize: 15,
           pageNo: 1,
           menuType: 1, // 菜单类型：1、all 2、运营 3、待分诊 4、待接诊 5、外呼
@@ -497,7 +517,7 @@
         doctorId: 0,
         operateUserID: '',
         triageDepartmentId: 0,
-        saveTableData:DIAGNOS_LIST_NEW,
+        saveTableData: DIAGNOS_LIST_NEW,
         pickerOptions1: {
           disabledDate: (time) => {
             return time.getTime() > new Date().getTime(); // 减去一天的时间代表可以选择同一天;
@@ -727,11 +747,13 @@
           cancelRangeTime,
           orderRangeTime,
           completeRangeTime,
+          assistantTime,
         } = this;
         this.setTime('createdTimeBegin', 'createdTimeEnd', createRangeTime);
         this.setTime('cancelTimeBegin', 'cancelTimeEnd', cancelRangeTime);
         this.setTime('appointBeginTime', 'appointEndTime', orderRangeTime);
         this.setTime('doneTimeBegin', 'doneTimeEnd', completeRangeTime);
+        this.setTime('assistantBeginTime', 'assistantEndTime', assistantTime);
       },
       /**
        * btime开始时间
@@ -808,6 +830,7 @@
         this.cancelRangeTime = '';
         this.orderRangeTime = '';
         this.completeRangeTime = '';
+        this.assistantTime = '';
         this.searchParam = Object.assign(this.searchParam, {
           id: '',
           operateName: '',
@@ -824,6 +847,8 @@
           appointEndTime: '',
           doneTimeBegin: '',
           doneTimeEnd: '',
+          assistantBeginTime: '',
+          assistantEndTime: '',
           inNewTimeObj: {},
         });
       },
@@ -1094,7 +1119,7 @@
       .form-li {
         display: flex;
         flex-direction: column;
-        justify-content: space-between;
+        // justify-content: space-between;
       }
       .form-btn {
         display: flex;
@@ -1135,19 +1160,18 @@
   right: 5px;
   top: 10px;
 }
-  body .el-table th.gutter{
-      display: table-cell!important;
-  }
-  
-  body .el-table colgroup.gutter{
-      display: table-cell!important;
-  }
-   .el-table .warning-row {
-    background: oldlace;
-  }
+body .el-table th.gutter {
+  display: table-cell !important;
+}
 
-  .el-table .success-row {
-    background: #f0f9eb;
-  }
+body .el-table colgroup.gutter {
+  display: table-cell !important;
+}
+.el-table .warning-row {
+  background: oldlace;
+}
 
+.el-table .success-row {
+  background: #f0f9eb;
+}
 </style>