Merge branch 'InterfaceStatistics0519' into test

src/components/callRecord/CallRecordManager.vue

@@ -9,16 +9,16 @@
             
           <el-date-picker
             v-model="filter.recepDate"
-            type="daterange"
+            type="datetimerange"
             align="right"
             size="small"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            style="width: 250px"
+            style="width: 320px"
             :class="filter.recepDate === null ? 'active' : ''"
             :default-time="['00:00:00', '23:59:59']"
-            format="yyyy-MM-dd "
-            value-format="yyyy-MM-dd HH:mm:ss"
+            format="yyyy-MM-dd HH:mm"
+            value-format="yyyy-MM-dd HH:mm"
           >
           </el-date-picker>
         </el-form-item>
@@ -26,27 +26,19 @@
           >&nbsp;&nbsp;
           <el-date-picker
             v-model="filter.resDate"
-            type="daterange"
+            type="datetimerange"
             align="right"
             size="small"
             start-placeholder="开始时间"
             end-placeholder="结束时间"
-            style="width: 250px"
+            style="width: 320px"
             :default-time="['00:00:00', '23:59:59']"
-            format="yyyy-MM-dd "
+            format="yyyy-MM-dd HH:mm"
             value-format="yyyy-MM-dd HH:mm:ss"
             unlink-panels
           >
           </el-date-picker>
-          <el-form-item label="患者标识：" prop="patientId">
-            <el-input
-              size="mini"
-              v-model="filter.patientId"
-              placeholder="请输入患者标识"
-              clearable
-              maxlength="50"
-            ></el-input>
-          </el-form-item>
+          
         </el-form-item>
         <!-- <el-form-item label="状态：">
           <el-select
@@ -76,6 +68,15 @@
         </el-form-item> -->
       </el-form>
       <el-form class="secLine" :inline="true">
+        <el-form-item label="患者标识：" prop="patientId">
+            <el-input
+              size="mini"
+              v-model="filter.patientId"
+              placeholder="请输入患者标识"
+              clearable
+              maxlength="50"
+            ></el-input>
+          </el-form-item>
         <el-form-item label="科室：" prop="deptName">
           <el-input
             size="mini"
@@ -520,39 +521,39 @@ export default {
         this.clearFilter();
       }
 
-      // //  接收时间 开始时间补0  结束时间补59
-      // let startGmtReq, endGmtReq, startGmtResp, endGmtResp;
-      // if (this.filter.recepDate) {
-      //   console.log(this.filter.recepDate[0].split(" "));
-      //   if (
-      //     this.filter.recepDate[0].split(0, 9) ===
-      //     this.filter.recepDate[1].split(0, 9)
-      //   ) {
-      //     if (this.filter.recepDate[0]) {
-      //       startGmtReq = this.filter.recepDate[0] + ":00";
-      //       endGmtReq = this.filter.recepDate[1] + ":59";
-      //     }
-      //   } else {
-      //     startGmtReq = this.filter.recepDate[0] + ":00";
-      //     endGmtReq = this.filter.recepDate[1] + ":59";
-      //   }
-      // }
+      //  接收时间 开始时间补0  结束时间补59
+      let startGmtReq, endGmtReq, startGmtResp, endGmtResp;
+      if (this.filter.recepDate) {
+        console.log(this.filter.recepDate[0].split(" "));
+        if (
+          this.filter.recepDate[0].split(0, 9) ===
+          this.filter.recepDate[1].split(0, 9)
+        ) {
+          if (this.filter.recepDate[0]) {
+            startGmtReq = this.filter.recepDate[0] + ":00";
+            endGmtReq = this.filter.recepDate[1] + ":59";
+          }
+        } else {
+          startGmtReq = this.filter.recepDate[0] + ":00";
+          endGmtReq = this.filter.recepDate[1] + ":59";
+        }
+      }
 
-      // //  响应时间 开始时间补0  结束时间补59
-      // if (this.filter.resDate) {
-      //   if (
-      //     this.filter.resDate[0].split(0, 9) ===
-      //     this.filter.resDate[1].split(0, 9)
-      //   ) {
-      //     if (this.filter.resDate[0]) {
-      //       startGmtResp = this.filter.resDate[0] + ":00";
-      //       endGmtResp = this.filter.resDate[1] + ":59";
-      //     }
-      //   } else {
-      //     startGmtResp = this.filter.resDate[0] + ":00";
-      //     endGmtResp = this.filter.resDate[1] + ":59";
-      //   }
-      // }
+      //  响应时间 开始时间补0  结束时间补59
+      if (this.filter.resDate) {
+        if (
+          this.filter.resDate[0].split(0, 9) ===
+          this.filter.resDate[1].split(0, 9)
+        ) {
+          if (this.filter.resDate[0]) {
+            startGmtResp = this.filter.resDate[0] + ":00";
+            endGmtResp = this.filter.resDate[1] + ":59";
+          }
+        } else {
+          startGmtResp = this.filter.resDate[0] + ":00";
+          endGmtResp = this.filter.resDate[1] + ":59";
+        }
+      }
 
       const param = {
         current: this.inCurrentPage || this.currentPage,
@@ -561,10 +562,10 @@ export default {
         sceneName: this.filter.sceneName.trim(), // 服务名
         deptName: this.filter.deptName.trim(), // 服务名
         successFlag: this.filter.successFlag,
-        startGmtReq: this.filter.recepDate ? this.filter.recepDate[0] : "",
-        endGmtReq: this.filter.recepDate ? this.filter.recepDate[1] : "",
-        startGmtResp: this.filter.resDate ? this.filter.resDate[0] : "",
-        endGmtResp: this.filter.resDate ? this.filter.resDate[1] : "",
+        startGmtReq: startGmtReq,
+        endGmtReq: endGmtReq,
+        startGmtResp: startGmtResp,
+        endGmtResp: endGmtResp,
         subHospitalName: this.filter.subHospitalName.trim(), // 子院区
       };
       return param;
@@ -785,4 +786,7 @@ export default {
   justify-content: center;
   margin-top: 20px;
 }
+/deep/.el-input--mini .el-input__inner{
+  width: 95px;
+}
 </style>