From e3a63203c823a4b7fcb12a52769c34acdc0b7a19 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期一, 18 三月 2024 18:03:51 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 2
src/views/system/role/index.vue | 3
src/views/standard/tijiancom/index.vue | 43 +++-----
vue.config.js | 2
src/views/mall/history/index.vue | 3
src/views/record/record/index.vue | 1
src/views/hosp/ruleAdvice/index.vue | 2
src/views/hosp/fuzhen/index.vue | 12 ++
src/views/mall/checklog/index.vue | 3
src/views/mall/timeConfig/index.vue | 3
src/views/system/positive/index.vue | 20 +++-
src/views/mall/aftersale/index.vue | 3
src/views/mall/cart/index.vue | 3
src/views/count/disease/index.vue | 10 +
src/views/hosp/teamAppLog/index.vue | 3
src/views/count/chart/index.vue | 103 +++++++++-----------
src/views/system/comp/index.vue | 7 +
src/views/mall/footprint/index.vue | 3
src/views/standard/renshunum/index.vue | 3
src/views/system/circle/index.vue | 4
src/views/team/reportresults/index.vue | 5 +
src/views/system/visit/index.vue | 4
22 files changed, 134 insertions(+), 108 deletions(-)
diff --git a/src/views/count/chart/index.vue b/src/views/count/chart/index.vue
index 1fdaa72..0561b51 100644
--- a/src/views/count/chart/index.vue
+++ b/src/views/count/chart/index.vue
@@ -1,25 +1,10 @@
<template>
<div>
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin: 10px 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
<el-form-item label="浣撴鏃堕棿" prop="date">
- <el-date-picker
- v-model="value1"
- type="datetimerange"
- align="right"
- start-placeholder="寮�濮嬫棩鏈�"
- :picker-options="pickerOptions"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-date-picker v-model="value1" type="datetimerange" align="right" start-placeholder="寮�濮嬫棩鏈�"
+ :picker-options="pickerOptions" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -32,8 +17,8 @@
</div>
</div>
</template>
-
-
+
+
<script>
import { GetChartByDate } from "@/api/count/chart";
const echarts = require("echarts/lib/echarts");
@@ -55,32 +40,32 @@
data() {
return {
pickerOptions: {
- shortcuts: [{
- text: '鏈�杩戜竴鍛�',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
- picker.$emit('pick', [start, end]);
- }
- }, {
- text: '鏈�杩戜竴涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
- picker.$emit('pick', [start, end]);
- }
- }, {
- text: '鏈�杩戜笁涓湀',
- onClick(picker) {
- const end = new Date();
- const start = new Date();
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
- picker.$emit('pick', [start, end]);
- }
- }]
- },
+ shortcuts: [{
+ text: '鏈�杩戜竴鍛�',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜竴涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit('pick', [start, end]);
+ }
+ }, {
+ text: '鏈�杩戜笁涓湀',
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit('pick', [start, end]);
+ }
+ }]
+ },
value1: "",
DateList: [],
startTime: "",
@@ -93,21 +78,28 @@
};
},
-created() {
+ created() {
this.getdate();
},
methods: {
getdate() {
getNewDateList().then((res) => {
this.value1 = [
- moment(res.data).format("YYYY-MM-DD 00:00:00"),
- moment(res.data).format("YYYY-MM-DD 23:59:00")
- ];;
+ moment(res.data).format("YYYY-MM-DD 00:00:00"),
+ moment(res.data).format("YYYY-MM-DD 23:59:00")
+ ];;
+ this.getList()
});
},
getList() {
- this.queryParams.startDate = this.startTime[0];
- this.queryParams.endDate = this.startTime[1];
+ if (this.value1) {
+ this.queryParams.startDate = this.value1[0];
+ this.queryParams.endDate = this.value1[1];
+ } else {
+ this.queryParams.startDate = this.startTime[0];
+ this.queryParams.endDate = this.startTime[1];
+ }
+
GetChartByDate(this.queryParams).then((response) => {
this.DateList = response;
console.log(this.DateList);
@@ -170,7 +162,4 @@
height: 580px;
background-color: #fff;
}
-</style>
-
-
-
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/count/disease/index.vue b/src/views/count/disease/index.vue
index d3abe73..cf361ea 100644
--- a/src/views/count/disease/index.vue
+++ b/src/views/count/disease/index.vue
@@ -164,8 +164,14 @@
// 鎼滅储
submitForm() {
this.queryParams.pageNum = 1;
- this.queryParams.beginTime = this.startTime[0];
- this.queryParams.endTime = this.startTime[1];
+ if(this.value1){
+ this.queryParams.beginTime = this.value1[0];
+ this.queryParams.endTime = this.value1[1];
+ }else{
+
+ this.queryParams.beginTime = this.startTime[0];
+ this.queryParams.endTime = this.startTime[1];
+ }
let disesseName = this.queryParams.disesseName;
if (disesseName) {
illness(this.queryParams).then(response => {
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index ce52fdc..0c729ff 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -232,7 +232,7 @@
鎬у埆锛�
</td>
<td style="border: 1px solid #dfe6ec; border-collapse: collapse">
- {{ tableAll.cusSex }}
+ {{ tableAll.cusSex}}
</td>
</tr>
<tr style="border: 1px solid #dfe6ec; border-collapse: collapse">
diff --git a/src/views/hosp/fuzhen/index.vue b/src/views/hosp/fuzhen/index.vue
index b44b2ab..e97e564 100644
--- a/src/views/hosp/fuzhen/index.vue
+++ b/src/views/hosp/fuzhen/index.vue
@@ -383,7 +383,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getListEmer();
this.getDictListEmer();
this.getdate();
@@ -400,6 +400,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
dialogVisibles() {
@@ -461,8 +462,14 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.startTime[0];
+ if(this.createTimeList){
+ this.queryParams.djbeginTime = this.createTimeList[0];
+ this.queryParams.djendTime = this.createTimeList[1];
+ }else{
+ this.queryParams.djbeginTime = this.startTime[0];
this.queryParams.djendTime = this.startTime[1];
+ }
+
this.queryParams.bgbeginTime = this.startTime1[0];
this.queryParams.bgendTime = this.startTime1[1];
this.loading = true;
@@ -609,6 +616,7 @@
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
this.reportTimeList =[]
+ this.createTimeList=[]
this.startTime =[]
this.startTime1 =[]
this.resetForm("queryForm");
diff --git a/src/views/hosp/ruleAdvice/index.vue b/src/views/hosp/ruleAdvice/index.vue
index 4c0b7c9..d8b945a 100644
--- a/src/views/hosp/ruleAdvice/index.vue
+++ b/src/views/hosp/ruleAdvice/index.vue
@@ -13,7 +13,7 @@
style="margin-bottom: 20px"
/>
</div>
- <div class="head-tree">
+ <div class="head-tree" style="height: 486px; overflow-y: scroll;">
<el-tree
ref="tree"
node-key="id"
diff --git a/src/views/hosp/teamAppLog/index.vue b/src/views/hosp/teamAppLog/index.vue
index be5fcb7..cabe4f9 100644
--- a/src/views/hosp/teamAppLog/index.vue
+++ b/src/views/hosp/teamAppLog/index.vue
@@ -467,7 +467,7 @@
};
},
created() {
- this.getList();
+
this.getdate();
// this.username = this.form.contactUserId;
@@ -479,6 +479,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
/** 鏌ヨ灏忕▼搴忓洟闃熼绾﹁褰曞垪琛� */
diff --git a/src/views/mall/aftersale/index.vue b/src/views/mall/aftersale/index.vue
index 0fb9676..d88f013 100644
--- a/src/views/mall/aftersale/index.vue
+++ b/src/views/mall/aftersale/index.vue
@@ -372,7 +372,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
methods: {
@@ -382,6 +382,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/mall/cart/index.vue b/src/views/mall/cart/index.vue
index 35d96bd..17f9fa7 100644
--- a/src/views/mall/cart/index.vue
+++ b/src/views/mall/cart/index.vue
@@ -421,7 +421,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
methods: {
@@ -431,6 +431,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/mall/checklog/index.vue b/src/views/mall/checklog/index.vue
index b048841..afb5fb7 100644
--- a/src/views/mall/checklog/index.vue
+++ b/src/views/mall/checklog/index.vue
@@ -333,7 +333,7 @@
},
created() {
// this.getNowTime()
- this.getList();
+
this.getdate();
},
methods: {
@@ -343,6 +343,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
getNowTime() {
diff --git a/src/views/mall/footprint/index.vue b/src/views/mall/footprint/index.vue
index bd26df6..9d1e003 100644
--- a/src/views/mall/footprint/index.vue
+++ b/src/views/mall/footprint/index.vue
@@ -307,7 +307,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
methods: {
@@ -317,6 +317,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/mall/history/index.vue b/src/views/mall/history/index.vue
index 7afc6a7..4ff53da 100644
--- a/src/views/mall/history/index.vue
+++ b/src/views/mall/history/index.vue
@@ -310,7 +310,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
methods: {
@@ -320,6 +320,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/mall/timeConfig/index.vue b/src/views/mall/timeConfig/index.vue
index a5247fa..777c37f 100644
--- a/src/views/mall/timeConfig/index.vue
+++ b/src/views/mall/timeConfig/index.vue
@@ -363,7 +363,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
methods: {
@@ -373,6 +373,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
// / 澶勭悊榛樿閫変腑褰撳墠鏃ユ湡
diff --git a/src/views/record/record/index.vue b/src/views/record/record/index.vue
index 9e859a9..d176175 100644
--- a/src/views/record/record/index.vue
+++ b/src/views/record/record/index.vue
@@ -359,6 +359,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.queryParams.cateringId = ""
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/standard/renshunum/index.vue b/src/views/standard/renshunum/index.vue
index 291416b..91a8092 100644
--- a/src/views/standard/renshunum/index.vue
+++ b/src/views/standard/renshunum/index.vue
@@ -93,7 +93,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getdate();
},
@@ -104,6 +104,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList();
});
},
getList() {
diff --git a/src/views/standard/tijiancom/index.vue b/src/views/standard/tijiancom/index.vue
index 3e63cb7..b3d9b66 100644
--- a/src/views/standard/tijiancom/index.vue
+++ b/src/views/standard/tijiancom/index.vue
@@ -1,25 +1,10 @@
<template>
<div>
- <el-form
- :model="queryParams"
- ref="tableList"
- :inline="true"
- label-width="76px"
- style="margin: 10px 10px"
- >
+ <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin: 10px 10px">
<el-form-item label="缁熻鍖洪棿" prop="date">
- <el-date-picker
- v-model="value1"
- type="datetimerange"
- align="right"
- start-placeholder="寮�濮嬫棩鏈�"
- :picker-options="pickerOptions"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-date-picker v-model="value1" type="datetimerange" align="right" start-placeholder="寮�濮嬫棩鏈�"
+ :picker-options="pickerOptions" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -32,8 +17,8 @@
</div>
</div>
</template>
-
-
+
+
<script>
import { GetChartByDate } from "@/api/count/chart";
const echarts = require("echarts/lib/echarts");
@@ -101,11 +86,18 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00"),
];
+ this.getList()
});
},
getList() {
- this.queryParams.startDate = this.startTime[0];
- this.queryParams.endDate = this.startTime[1];
+ if (this.value1) {
+ this.queryParams.startDate = this.value1[0];
+ this.queryParams.endDate = this.value1[1];
+ } else {
+ this.queryParams.startDate = this.startTime[0];
+ this.queryParams.endDate = this.startTime[1];
+ }
+
let myChart = this.$echarts.init(document.getElementById("main"));
//浣犺繘鍏ラ〉闈㈠厛鎶婂浘琛ㄦ覆鏌撲簡 鐒跺悗鎵嶈幏鍙栫殑鏁版嵁鎶�
myChart.setOption({
@@ -184,7 +176,4 @@
height: 580px;
background-color: #fff;
}
-</style>
-
-
-
\ No newline at end of file
+</style>
\ No newline at end of file
diff --git a/src/views/system/circle/index.vue b/src/views/system/circle/index.vue
index 8afe0fe..942f3e5 100644
--- a/src/views/system/circle/index.vue
+++ b/src/views/system/circle/index.vue
@@ -393,7 +393,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.Company();
this.getListEmer();
this.getDictListEmer();
@@ -411,6 +411,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
dialogVisibles() {
@@ -590,6 +591,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/comp/index.vue b/src/views/system/comp/index.vue
index 5f9ac22..9441f2f 100644
--- a/src/views/system/comp/index.vue
+++ b/src/views/system/comp/index.vue
@@ -889,10 +889,15 @@
})
},
submitrighr() {
- this.openss = false
+ if(this.pacList.length >= 1){
+ this.openss = false
this.forms.pacName = this.pacList[0].pacName
this.forms.price = this.queryParams.price
this.forms.ysPrice = (this.forms.price * (this.forms.limits / 10)).toFixed(2);
+ }else{
+ this.$modal.msgError("璇烽�夋嫨濂楅");
+ }
+
},
// 濂楅鍗曢」鑾峰彇
handleChangeOne(selection) {
diff --git a/src/views/system/positive/index.vue b/src/views/system/positive/index.vue
index 7c1eb18..7e09717 100644
--- a/src/views/system/positive/index.vue
+++ b/src/views/system/positive/index.vue
@@ -5,7 +5,7 @@
<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" :default-time="['00:00:00', '23:59:00']"
+ <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="缁撴潫鏃ユ湡"
@@ -223,6 +223,7 @@
url: "",
flag: true,
tempId: null,
+ createTimeList:[],
bill: null,
Treedata: [],
defaultProps: {
@@ -327,17 +328,18 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.getListEmer();
this.getdate();
},
methods: {
getdate() {
getNewDateList().then((res) => {
- this.queryParams.createTimeList = [
+ 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() {
@@ -352,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;
@@ -371,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) => {
@@ -479,6 +488,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList =[]
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 499bacb..dd41612 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -494,7 +494,7 @@
};
},
created() {
- this.getList();
+
this.getdate();
},
methods: {
@@ -504,6 +504,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
/** 鏌ヨ瑙掕壊鍒楄〃 */
diff --git a/src/views/system/visit/index.vue b/src/views/system/visit/index.vue
index 3987680..0906285 100644
--- a/src/views/system/visit/index.vue
+++ b/src/views/system/visit/index.vue
@@ -429,7 +429,7 @@
},
created() {
// this.getNowTime();
- this.getList();
+
this.Company();
this.getListEmer();
this.getdate();
@@ -446,6 +446,7 @@
moment(res.data).format("YYYY-MM-DD 00:00:00"),
moment(res.data).format("YYYY-MM-DD 23:59:00")
];;
+ this.getList();
});
},
dialogVisibles() {
@@ -615,6 +616,7 @@
},
/** 閲嶇疆鎸夐挳鎿嶄綔 */
resetQuery() {
+ this.createTimeList = []
this.resetForm("queryForm");
this.handleQuery();
},
diff --git a/src/views/team/reportresults/index.vue b/src/views/team/reportresults/index.vue
index 030fe30..ef10ed9 100644
--- a/src/views/team/reportresults/index.vue
+++ b/src/views/team/reportresults/index.vue
@@ -433,6 +433,11 @@
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
projectGetList().then((response) => {
this.Treedata = response.data.list;
+ this.Treedata.forEach(item => {
+ if(item.proParentId == "0"){
+ item.disabled = true
+ }
+ })
this.loading = false;
});
},
diff --git a/vue.config.js b/vue.config.js
index 2c15e68..697baa5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -53,7 +53,7 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
//target: `https://ltpeis.xaltjdkj.cn:5501/prod-api/getInfo`,
- target: `http://192.168.0.112:5011`,
+ target: `http://192.168.0.108:5011`,
// // target: `http://192.168.0.99:8080/ltkj-admin`,
// target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
// target: `http://10.168.0.9:5011`,
--
Gitblit v1.8.0