From 772d8df8a3ee02a6fe2dbd6ba7216e3e3ee0ec63 Mon Sep 17 00:00:00 2001 From: qx <2540746708@qq.com> Date: 星期四, 20 六月 2024 22:18:38 +0800 Subject: [PATCH] qxtj --- src/views/system/Checkout/index.vue | 67 ++++++++++++++++++++++++++------- 1 files changed, 53 insertions(+), 14 deletions(-) diff --git a/src/views/system/Checkout/index.vue b/src/views/system/Checkout/index.vue index a2adf35..ab8b5a5 100644 --- a/src/views/system/Checkout/index.vue +++ b/src/views/system/Checkout/index.vue @@ -33,8 +33,9 @@ clearable v-model="createTimeList" @change="dateChangebirthday1" - style="width: 240px" - value-format="yyyy-MM-dd" + :default-time="['00:00:00', '23:59:00']" + format="yyyy-MM-dd HH:mm" + value-format="yyyy-MM-dd HH:mm" type="daterange" range-separator="-" start-placeholder="寮�濮嬫棩鏈�" @@ -323,7 +324,7 @@ <el-table-column label="寮冩" prop="type2" width="86" align="center"> <template slot-scope="scope"> <el-checkbox - @change="handelcheckbox" + @change="handelcheckbox(scope.row)" v-model="scope.row.type2" :disabled="leave" > @@ -334,7 +335,7 @@ <el-table-column label="寤舵湡" prop="type3" width="86" align="center"> <template slot-scope="scope"> <el-checkbox - @change="handelcheck" + @change="handelcheck(scope.row)" v-model="scope.row.type3" :disabled="leave" > @@ -390,7 +391,9 @@ goOut, getPdf, goabandon, + getNewDateList, } from "@/api/hosp/order"; +import moment from "moment"; import { getwater } from "@/api/hosp/customer"; import ViewPdf from "@/components/ViewPdf"; import { projectGetList, getaddtTransition } from "@/api/system/tijian"; @@ -406,7 +409,7 @@ leave: false, checked: false, radioId1: false, - createTimeList: "", + createTimeList: [], cusId: "", payType: "0", dialogVisible: false, @@ -519,8 +522,9 @@ }; }, created() { - this.getNowTime(); - this.getList(); + // this.getNowTime(); + + this.getdate(); }, mounted() { this.$nextTick(() => { @@ -528,6 +532,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(); @@ -552,8 +565,18 @@ }, /** 鏌ヨ浣撴璁板綍鍒楄〃 */ getList() { - this.queryParams.djbeginTime = this.startTime[0]; - this.queryParams.djendTime = this.startTime[1]; + if (this.startTime) { + this.queryParams.djbeginTime = this.startTime[0]; + this.queryParams.djendTime = this.startTime[1]; + } else 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; + } + + this.loading = true; getQianLiList(this.queryParams).then((response) => { this.orderList = response.data.list; @@ -637,18 +660,20 @@ }; this.resetForm("form"); }, - hb(){ - if (this.queryParams.tjNum != undefined) { + hb() { + if (this.queryParams.tjNum != undefined) { this.handleQuery(); } }, /** 鎼滅储鎸夐挳鎿嶄綔 */ handleQuery() { - this.queryParams.pageNum = 1; - this.getList(); + this.queryParams.pageNum = 1; + this.getList(); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { + this.createTimeList = [] + this.startTime= [] this.resetForm("queryForm"); this.handleQuery(); }, @@ -749,11 +774,15 @@ // } // }) for (let i = 0; i <= this.numberList.length; i++) { + if(val.proId == this.numberList[i].proId){ if (this.numberList[i].type2 === true) { this.numberList[i].type3 = false; this.tcShow = false; return; + }else{ + return } + } } // this.type2 = val // this.numberList.forEach(item => { @@ -771,6 +800,7 @@ }, handelcheck(val) { + // this.numberList.forEach(item => { // if(item.type3 === true){ // item.type2 = false @@ -779,12 +809,21 @@ // this.tcShow = false // } // }) + for (let i = 0; i <= this.numberList.length; i++) { - if (this.numberList[i].type3 === true) { + if(val.proId == this.numberList[i].proId){ + if(this.numberList[i].type3){ + if (this.numberList[i].type3 === true) { this.numberList[i].type2 = false; this.tcShow = true; return; } + }else{ + return + } + } + + } // this.numberList.forEach(item => { // if (item.type === true) { -- Gitblit v1.8.0