From cb1f69717eed3b6a61b6c61a8934bac752782b2d Mon Sep 17 00:00:00 2001
From: wwl <xchao828@163.com>
Date: 星期三, 05 三月 2025 17:00:38 +0800
Subject: [PATCH] 1
---
src/views/system/positive/index.vue | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/views/system/positive/index.vue b/src/views/system/positive/index.vue
index c0f7599..549f031 100644
--- a/src/views/system/positive/index.vue
+++ b/src/views/system/positive/index.vue
@@ -5,7 +5,9 @@
<el-input v-model="queryParams.tjNumber" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable @keyup.enter.native="handleQuery" />
</el-form-item> -->
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker clearable v-model="queryParams.createTimeList" style="width: 240px" value-format="yyyy-MM-dd"
+ <el-date-picker clearable v-model="createTimeList" :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="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡"
:picker-options="pickerOptions"></el-date-picker>
</el-form-item>
@@ -37,7 +39,7 @@
</el-date-picker>
</el-form-item> -->
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin: 0 15px;">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
@@ -46,7 +48,7 @@
<el-col :span="1.5">
<!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['hosp:order:export']" :disabled="multiple">瀵煎嚭</el-button> -->
- <el-button type="primary" size="mini" @click="transmittext" :disabled="multiple">鎵归噺鍙戦�佺煭淇�</el-button>
+ <el-button type="primary" size="mini" @click="transmittext" :disabled="multiple" style="margin: 0 15px;">鎵归噺鍙戦�佺煭淇�</el-button>
<el-button type="primary" size="mini" @click="transmit" :disabled="multiple">鎵归噺鍙戦�侀偖浠�</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -62,6 +64,7 @@
<template slot-scope="scope">
<span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
<span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
+ <span v-if="scope.row.tjCustomerSex == '2'">鏈煡</span>
</template>
</el-table-column>
<el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" height="10px" />
@@ -169,11 +172,12 @@
</template>
<script>
-import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage } from "@/api/hosp/order";
+import { listOrder, getPdf, getTjNumber, sendEmail, getsendEmail, getsendMessage, getNewDateList } from "@/api/hosp/order";
import { listSendTemplate, } from "@/api/hosp/sendTemplate";
import ViewPdf from "@/components/ViewPdf";
import { listEmer } from "@/api/system/emer";
import { getCompany, queryCompany } from "@/api/team/tuanti";
+import moment from "moment";
export default {
components: {
ViewPdf,
@@ -219,6 +223,7 @@
url: "",
flag: true,
tempId: null,
+ createTimeList:[],
bill: null,
Treedata: [],
defaultProps: {
@@ -322,11 +327,21 @@
};
},
created() {
- this.getNowTime();
- this.getList();
+ // this.getNowTime();
+
this.getListEmer();
+ this.getdate();
},
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();
+ });
+ },
dialogVisibles() {
this.$message.error("璇疯繛鎺ユ嫧鍙峰櫒锛�");
},
@@ -339,7 +354,7 @@
var threeDays = curDate - dayNum;
var sDay = this.getLocalTime(threeDays);
var end = this.getLocalTime(curDate);
- this.queryParams.createTimeList = [sDay, end];
+ this.createTimeList = [sDay, end];
},
add0(m) {
return m < 10 ? "0" + m : m;
@@ -358,6 +373,13 @@
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
this.loading = true;
+ if (this.createTimeList) {
+ this.queryParams.createTime = this.createTimeList[0];
+ this.queryParams.finishTime = this.createTimeList[1];
+ } else {
+ this.queryParams.createTime = null;
+ this.queryParams.finishTime = null;
+ }
listOrder(this.queryParams).then((response) => {
this.orderList = response.rows;
response.rows.forEach((item, index) => {
@@ -466,6 +488,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList =[]
this.resetForm("queryForm");
this.handleQuery();
},
--
Gitblit v1.8.0