Commit 61ee128c by 唐玉峰

.

parent 50694927
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<!-- 弹出层 --> <!-- 弹出层 -->
<el-dialog center :visible.sync="addrecordEnrollmentShow" class="fullscreen" :before-close="closeDialog" :fullscreen="true"> <el-dialog center :visible.sync="addrecordEnrollmentShow" class="fullscreen" :before-close="closeDialog" :fullscreen="true">
<!-- 病案分组 --> <!-- 病案分组 -->
<diagList :code="casehisObj" :isshow="addrecordEnrollmentShow"></diagList> <diagList :code="$route.query.isSerach ? null : casehisObj" :isshow="addrecordEnrollmentShow"></diagList>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="addrecordEnrollmentShow1"> <el-dialog :visible.sync="addrecordEnrollmentShow1">
<div class="outpatientDetails_bottom_rght1"> <div class="outpatientDetails_bottom_rght1">
......
...@@ -89,35 +89,8 @@ ...@@ -89,35 +89,8 @@
<el-option label="盈亏>0" :value="1"> </el-option> <el-option label="盈亏>0" :value="1"> </el-option>
<el-option label="盈亏<0" :value="2"> </el-option> <el-option label="盈亏<0" :value="2"> </el-option>
</el-select> </el-select>
<span class="font-14 color-999">入院时间:</span>
<el-select
v-model="searchFrom.currentDate"
placeholder="当前年月"
size="mini"
class="mar-right-10"
clearable
style="width: 100px"
@change="handleCurrentDateChange"
>
<el-option label="当前年" :value="1"> </el-option>
<el-option label="当前月" :value="2"> </el-option>
</el-select>
<el-date-picker
v-model="time"
size="mini"
style="width: 210px"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
class="mar-right-10"
@change="search"
range-separator="至"
start-placeholder="入院日期"
end-placeholder="结束日期"
>
</el-date-picker>
</div> </div>
<div> <div class="mar-bottom-10">
<el-input <el-input
size="mini" size="mini"
class="mar-right-10" class="mar-right-10"
...@@ -188,6 +161,62 @@ ...@@ -188,6 +161,62 @@
<el-option label="已审核" value="已审"> </el-option> <el-option label="已审核" value="已审"> </el-option>
<el-option label="未审核" value="未审"> </el-option> <el-option label="未审核" value="未审"> </el-option>
</el-select> </el-select>
</div>
<div>
<span class="font-14 color-999">入院时间:</span>
<el-select
v-model="searchFrom.currentDate"
placeholder="当前年月"
size="mini"
class="mar-right-10"
clearable
style="width: 100px"
@change="handleCurrentDateChange"
>
<el-option label="当前年" :value="1"> </el-option>
<el-option label="当前月" :value="2"> </el-option>
</el-select>
<el-date-picker
v-model="time"
size="mini"
style="width: 210px"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
class="mar-right-10"
@change="search"
range-separator="至"
start-placeholder="入院日期"
end-placeholder="结束日期"
>
</el-date-picker>
<span class="font-14 color-999">出院时间:</span>
<el-select
v-model="searchFrom.currentDate2"
placeholder="当前年月"
size="mini"
class="mar-right-10"
clearable
style="width: 100px"
@change="handleCurrentDateChange2"
>
<el-option label="当前年" :value="1"> </el-option>
<el-option label="当前月" :value="2"> </el-option>
</el-select>
<el-date-picker
v-model="time2"
size="mini"
style="width: 210px"
type="daterange"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
class="mar-right-10"
@change="search"
range-separator="至"
start-placeholder="出院日期"
end-placeholder="结束日期"
>
</el-date-picker>
<span class="font-14 color-999">结算时间:</span> <span class="font-14 color-999">结算时间:</span>
<el-select <el-select
v-model="searchFrom.currentDate1" v-model="searchFrom.currentDate1"
...@@ -415,6 +444,7 @@ export default { ...@@ -415,6 +444,7 @@ export default {
return { return {
time: "", time: "",
time1: "", time1: "",
time2: "",
pageNumber: 1, pageNumber: 1,
pageSize: 100, pageSize: 100,
searchFrom: { searchFrom: {
...@@ -424,6 +454,7 @@ export default { ...@@ -424,6 +454,7 @@ export default {
isjoin: null, isjoin: null,
currentDate: null, currentDate: null,
currentDate1: null, currentDate1: null,
currentDate2: null,
isout: null, isout: null,
insuranceType: null, insuranceType: null,
doctorName: "", doctorName: "",
...@@ -512,6 +543,8 @@ export default { ...@@ -512,6 +543,8 @@ export default {
endDate: this.time ? this.time[1] : "", endDate: this.time ? this.time[1] : "",
jssjBeginDate: this.time1 ? this.time1[0] : "", jssjBeginDate: this.time1 ? this.time1[0] : "",
jssjEndDate: this.time1 ? this.time1[1] : "", jssjEndDate: this.time1 ? this.time1[1] : "",
b15_BeginDate: this.time2 ? this.time2[0] : "",
b15_EndDate: this.time2 ? this.time2[1] : "",
}; };
http.post(`/screen/hos/GetHistoryListExcelDownload`, parmar, { http.post(`/screen/hos/GetHistoryListExcelDownload`, parmar, {
responseType: "blob", responseType: "blob",
...@@ -548,6 +581,8 @@ export default { ...@@ -548,6 +581,8 @@ export default {
endDate: this.time ? this.time[1] : "", endDate: this.time ? this.time[1] : "",
jssjBeginDate: this.time1 ? this.time1[0] : "", jssjBeginDate: this.time1 ? this.time1[0] : "",
jssjEndDate: this.time1 ? this.time1[1] : "", jssjEndDate: this.time1 ? this.time1[1] : "",
b15_BeginDate: this.time2 ? this.time2[0] : "",
b15_EndDate: this.time2 ? this.time2[1] : "",
}; };
http.post(`/screen/hos/GetHistoryList`, parmar) http.post(`/screen/hos/GetHistoryList`, parmar)
.then((data) => { .then((data) => {
...@@ -616,6 +651,17 @@ export default { ...@@ -616,6 +651,17 @@ export default {
} }
this.search(); this.search();
}, },
handleCurrentDateChange2() {
if (this.searchFrom.currentDate2 === 1) {
this.time2 = [`${dayjs().format("YYYY")}-01-01`, `${dayjs().format("YYYY")}-12-31`];
} else if (this.searchFrom.currentDate2 === 2) {
this.time2 = [
`${dayjs().format("YYYY-MM")}-01`,
`${dayjs().format("YYYY-MM")}-${this.getDayNumByYearMonth(dayjs().format("YYYY"), dayjs().format("MM"))}`,
];
}
this.search();
},
}, },
}; };
</script> </script>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment