From 5f5425c1be29b82205f19b7779cda67cfcc3a6e5 Mon Sep 17 00:00:00 2001 From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com> Date: 星期三, 19 六月 2024 17:53:26 +0800 Subject: [PATCH] qxtj --- src/views/system/bill/index.vue | 37 ++++++++++++++++++++++++++++++------- 1 files changed, 30 insertions(+), 7 deletions(-) diff --git a/src/views/system/bill/index.vue b/src/views/system/bill/index.vue index 86131ec..e59b977 100644 --- a/src/views/system/bill/index.vue +++ b/src/views/system/bill/index.vue @@ -73,7 +73,7 @@ <el-button type="primary" icon="el-icon-search" - size="mini" + size="mini" style="margin-right:15px;" @click="handleQuery" >鎼滅储</el-button > @@ -198,8 +198,8 @@ :show-overflow-tooltip="true" > <template slot-scope="scope"> - <span v-if="scope.row.tjType == '1'">涓汉</span> - <span v-if="scope.row.tjType == '2'">鍥㈤槦</span> + <span v-if="scope.row.tjType == '2'">涓汉</span> + <span v-if="scope.row.tjType == '1'">鍥㈤槦</span> </template> </el-table-column> <el-table-column @@ -468,7 +468,9 @@ hasReport, hasPrintCode, getOrderList, + getNewDateList } from "@/api/hosp/order"; +import moment from "moment"; import ViewPdf from "@/components/ViewPdf"; import { projectGetList, getOrder } from "@/api/system/tijian"; import { SubmitCompany, getCompany, queryCompany } from "@/api/team/tuanti"; @@ -632,9 +634,10 @@ }; }, created() { - this.getNowTime(); - this.getList(); + // this.getNowTime(); + this.Company(); + this.getdate(); }, mounted() { this.$nextTick(() => { @@ -642,6 +645,15 @@ }); }, methods: { + getdate() { + getNewDateList().then((res) => { + this.createTimeList = [ + moment(res.data).format("YYYY-MM-DD 00:00:00"), + moment(res.data).format("YYYY-MM-DD 23:59:00"), + ]; + this.getList(); + }); + }, // / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡 getNowTime() { var curDate = new Date().getTime(); @@ -810,8 +822,18 @@ }, /** 鏌ヨ浣撴璁板綍鍒楄〃 */ getList() { - this.queryParams.djbeginTime = this.startTime[0]; + if(this.createTimeList){ + this.queryParams.djbeginTime = this.createTimeList[0]; + this.queryParams.djendTime = this.createTimeList[1]; + }else if(this.createTimeList == null){ + this.queryParams.djbeginTime = null; + this.queryParams.djendTime = null; + }else{ + this.queryParams.djbeginTime = this.startTime[0]; this.queryParams.djendTime = this.startTime[1]; + } + + this.loading = true; getOrderList(this.queryParams).then((response) => { this.orderList = response.data.list; @@ -879,7 +901,7 @@ this.resetForm("form"); }, hb(){ - console.log(this.queryParams.tjNum); + // console.log(this.queryParams.tjNum); if (this.queryParams.tjNum != undefined) { this.handleQuery(); } @@ -891,6 +913,7 @@ }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { + this.createTimeList=[] this.resetForm("queryForm"); this.handleQuery(); }, -- Gitblit v1.8.0