From b6c854df0d7baa3e2f375306102b906eee127f3d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 31 七月 2025 16:43:39 +0800
Subject: [PATCH] 测试完成
---
src/views/login.vue | 9 +++-
src/views/sfstatistics/percentage/index.vue | 70 ++++++++++++++++++++++++-----------
src/views/patient/propaganda/Missioncreation.vue | 25 ++++++++++--
3 files changed, 75 insertions(+), 29 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index da63f30..fe19af7 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -195,9 +195,12 @@
// this.loginForm.orgid = '1',
this.$store
.dispatch("Login", this.loginForm)
- .then(() => {
- // this.$router.push({ path: this.redirect || "/" }).catch(() => {});
- this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
+ .then((res) => {
+ if (this.loginForm.username=='admin') {
+ this.$router.push({ path:"/index" }).catch(() => {});
+ }else{
+ this.$router.push({ path:"/followvisit/discharge" }).catch(() => {});
+ }
})
.catch(() => {
this.loading = false;
diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue
index c0eebd6..9ba7fa4 100644
--- a/src/views/patient/propaganda/Missioncreation.vue
+++ b/src/views/patient/propaganda/Missioncreation.vue
@@ -124,14 +124,30 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-form-item label="鍙戦�佽缃細" v-if="currenttype != 2">
+ <el-form-item label="鎵ц鍛ㄦ湡" prop="longTask">
+ <el-radio-group v-model="form.longTask">
+ <el-radio :label="0">鑷畾涔夊懆鏈�</el-radio>
+ <el-radio :label="1">闀挎湡浠诲姟</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-row :gutter="20" v-if="form.longTask">
+ <el-col :span="8">
+ <el-form-item label="鍛ㄦ湡鏃堕棿" prop="name">
+ <el-input
+ v-model="form.sendDay"
+ placeholder="榛樿5澶╁悗"
+ ></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-form-item label="鎵ц璁剧疆" v-if="!form.longTask">
<el-radio-group v-model="form.sendType">
<el-radio :label="1">鏃堕棿娈靛彂閫�</el-radio>
<el-radio :label="3">鏃堕棿鐐瑰彂閫�</el-radio>
<el-radio :label="2">鍗冲埢鍙戦��</el-radio>
</el-radio-group>
</el-form-item>
- <el-form-item label="鍙戦�佹棩鏈燂細" v-if="form.sendType == 1">
+ <el-form-item label="鎵ц鏃ユ湡锛�" v-if="form.sendType == 1&& !form.longTask">
<el-date-picker
v-model="daytime"
@change="changeTimeday"
@@ -144,7 +160,7 @@
</el-date-picker>
</el-form-item>
- <el-form-item label="鍙戦�佹椂闂寸偣锛�" v-if="form.sendType == 3">
+ <el-form-item label="鎵ц鏃堕棿鐐癸細" v-if="form.sendType == 3&& !form.longTask">
<div style="display: flex">
<div style="margin-right: 10px">
<el-date-picker
@@ -159,7 +175,7 @@
</div>
</el-form-item>
- <el-form-item label="鍙戦�佹椂闂存锛�" v-if="form.sendType == 1">
+ <el-form-item label="鎵ц鏃堕棿娈碉細" v-if="form.sendType == 1&& !form.longTask">
<div style="display: flex">
<div style="margin-right: 10px">
<span style="font-size: 18px; margin-right: 10px">鈶�</span>
@@ -919,6 +935,7 @@
form: {
patTaskRelevances: [],
sendType: 1,
+ longTask: 0,
templatename: "",
templateid: null,
libtemplateid: null,
diff --git a/src/views/sfstatistics/percentage/index.vue b/src/views/sfstatistics/percentage/index.vue
index e919b2f..1e06ca3 100644
--- a/src/views/sfstatistics/percentage/index.vue
+++ b/src/views/sfstatistics/percentage/index.vue
@@ -44,16 +44,11 @@
v-show="showSearch"
label-width="98px"
>
- <!-- <el-form-item label="鍖婚櫌" prop="userName">
- <el-select v-model="queryParams.value1" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ <!-- <el-form-item label="璐ｄ换鍖荤敓" prop="userName">
+ <el-input
+ v-model="queryParams.drname"
+ placeholder="璇疯緭鍏ヤ富娌诲尰鐢�"
+ ></el-input>
</el-form-item> -->
<el-form-item label="缁熻绫诲瀷" prop="userName">
<el-select
@@ -150,7 +145,7 @@
>
</el-form-item>
<el-col :span="19">
- <el-button
+ <el-button
type="warning"
plain
icon="el-icon-download"
@@ -158,7 +153,7 @@
@click="handleExport"
>瀵煎嚭</el-button
>
- </el-col>
+ </el-col>
</el-form>
<!-- <right-toolbar
:showSearch.sync="showSearch"
@@ -708,6 +703,10 @@
postOptions: [],
// 瑙掕壊閫夐」
roleOptions: [],
+ // 瀛樺偍鎵�鏈夌瀹や唬鐮�
+ allDeptCodes: [],
+ // 瀛樺偍鎵�鏈夌梾鍖轰唬鐮�
+ allWardCodes: [],
// 琛ㄥ崟鍙傛暟
form: {},
forms: {
@@ -784,6 +783,8 @@
serviceType: [2],
dateRange: [],
statisticaltype: 1,
+ leavehospitaldistrictcodes: ["all"], // 榛樿閫変腑鍏ㄩ儴鐥呭尯
+ deptcodes: ["all"], // 榛樿閫変腑鍏ㄩ儴绉戝
},
// 鍒椾俊鎭�
columns: [
@@ -799,14 +800,30 @@
},
watch: {},
created() {
- this.getList();
this.getDeptTree();
+ this.getList();
},
methods: {
/** 鏌ヨ鏍囩鍒楄〃 */
getList() {
- getSfStatistics(this.queryParams).then((response) => {
+ // 澶勭悊鏌ヨ鍙傛暟
+ const params = {
+ ...this.queryParams,
+ // 濡傛灉閫夋嫨浜�"鍏ㄩ儴"锛屽垯浼犳墍鏈夌梾鍖�/绉戝浠ｇ爜
+ leavehospitaldistrictcodes:
+ this.queryParams.leavehospitaldistrictcodes.includes("all")
+ ? this.allWardCodes
+ : this.queryParams.leavehospitaldistrictcodes,
+ deptcodes: this.queryParams.deptcodes.includes("all")
+ ? this.allDeptCodes
+ : this.queryParams.deptcodes,
+ };
+
+ // 绉婚櫎鍙兘瀛樺湪鐨�"all"鍊�
+ delete params.leavehospitaldistrictcodes.all;
+ delete params.deptcodes.all;
+ getSfStatistics(params).then((response) => {
console.log(response);
// this.total = response.total;
this.userList = response.data;
@@ -834,17 +851,26 @@
value: dept.deptCode,
};
});
- this.flatArrayhospit = store.getters.belongWards.map((dept) => {
+ // 瀛樺偍鎵�鏈夌瀹や唬鐮�
+ this.allDeptCodes = store.getters.belongDepts.map(
+ (dept) => dept.deptCode
+ );
+
+ // 鐥呭尯鍒楄〃
+ this.flatArrayhospit = store.getters.belongWards.map((ward) => {
return {
- label: dept.districtName,
- value: dept.districtCode,
+ label: ward.districtName,
+ value: ward.districtCode,
};
});
- // deptTreeSelect().then((response) => {
- // this.deptOptions = response.data;
- // console.log(this.deptOptions, " this.deptOptions");
- // this.flatArray = this.flattenArray(response.data);
- // });
+
+ // 瀛樺偍鎵�鏈夌梾鍖轰唬鐮�
+ this.allWardCodes = store.getters.belongWards.map(
+ (ward) => ward.districtCode
+ );
+ this.flatArraydept.push({ label: "鍏ㄩ儴", value: "all" });
+ this.flatArrayhospit.push({ label: "鍏ㄩ儴", value: "all" });
+
},
flattenArray(multiArray) {
let result = [];
--
Gitblit v1.9.3