|
@@ -15,32 +15,32 @@
|
|
|
<el-form-item label="接收时间: ">
|
|
|
|
|
|
<el-date-picker
|
|
|
- v-model="recepDate"
|
|
|
+ v-model="filter.recepDate"
|
|
|
type="datetimerange"
|
|
|
align="right"
|
|
|
size="small"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
style="width: 240px"
|
|
|
- :default-time="['12:00:00', '08:00:00']"
|
|
|
- format="yyyy-MM-dd HH:mm:ss"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
+ format="yyyy-MM-dd HH:mm"
|
|
|
+ value-format="yyyy-MM-dd HH:mm"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="响应时间: "
|
|
|
>
|
|
|
<el-date-picker
|
|
|
- v-model="resDate"
|
|
|
+ v-model="filter.resDate"
|
|
|
type="datetimerange"
|
|
|
align="right"
|
|
|
size="small"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
style="width: 240px"
|
|
|
- :default-time="['12:00:00', '08:00:00']"
|
|
|
- format="yyyy-MM-dd HH:mm:ss"
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
|
+ format="yyyy-MM-dd HH:mm"
|
|
|
+ value-format="yyyy-MM-dd HH:mm"
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
@@ -203,7 +203,7 @@
|
|
|
prop="subHospitalName"
|
|
|
label="子院区"
|
|
|
align="center"
|
|
|
- width="100"
|
|
|
+ width="120"
|
|
|
show-overflow-tooltip
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
@@ -217,7 +217,6 @@
|
|
|
label="子院区编码"
|
|
|
align="center"
|
|
|
width="100"
|
|
|
- show-overflow-tooltip
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
<span>
|
|
@@ -277,7 +276,9 @@ export default {
|
|
|
successFlag: "",
|
|
|
patientId: "",
|
|
|
sceneName: "",
|
|
|
- subHospitalName: '' // 子院区
|
|
|
+ subHospitalName: '', // 子院区
|
|
|
+ recepDate: '', // 接收日期
|
|
|
+ resDate: '', // 响应日期
|
|
|
},
|
|
|
cacheData: {},
|
|
|
currentPage: 1,
|
|
@@ -286,8 +287,7 @@ export default {
|
|
|
pageLayout: config.pageLayout,
|
|
|
total: 0,
|
|
|
titleWidth: "970px", //头部最小宽度
|
|
|
- recepDate: '', // 接收日期
|
|
|
- resDate: '', // 响应日期
|
|
|
+
|
|
|
reqVisible: false,
|
|
|
respVisible: false,
|
|
|
params: '',
|
|
@@ -395,16 +395,43 @@ export default {
|
|
|
if (isTurnPage && !this.searched) {
|
|
|
this.clearFilter();
|
|
|
}
|
|
|
+ console.log(this.filter.recepDate);
|
|
|
+ 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]+':00'
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ 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]+':00'
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
const param = {
|
|
|
current: this.inCurrentPage || this.currentPage,
|
|
|
size: this.pageSize,
|
|
|
patientId: this.filter.patientId, // 患者标识
|
|
|
sceneName: this.filter.sceneName, // 服务名
|
|
|
successFlag: this.filter.successFlag,
|
|
|
- startGmtReq: this.recepDate ? this.recepDate[0] : null,
|
|
|
- endGmtReq: this.recepDate ? this.recepDate[1] : null,
|
|
|
- startGmtResp: this.resDate ? this.resDate[0] : null,
|
|
|
- endGmtResp: this.resDate ? this.resDate[1] : null,
|
|
|
+ startGmtReq: startGmtReq,
|
|
|
+ endGmtReq: endGmtReq,
|
|
|
+ startGmtResp: startGmtResp,
|
|
|
+ endGmtResp: endGmtResp,
|
|
|
subHospitalName: this.filter.subHospitalName.trim()
|
|
|
};
|
|
|
return param;
|
|
@@ -485,8 +512,8 @@ export default {
|
|
|
patientId: "",
|
|
|
sceneName: "",
|
|
|
subHospitalName: "",
|
|
|
- recepDate: "",
|
|
|
- resDate: ""
|
|
|
+ recepDate: '', // 接收日期
|
|
|
+ resDate: '', // 响应日期
|
|
|
};
|
|
|
},
|
|
|
update() {
|
|
@@ -580,4 +607,9 @@ export default {
|
|
|
-o-text-overflow:ellipsis;
|
|
|
}
|
|
|
|
|
|
+/deep/.el-dialog__body {
|
|
|
+ overflow-y: auto;
|
|
|
+ height: 550px;
|
|
|
+}
|
|
|
+
|
|
|
</style>
|