From 139668c8d897c13d8e3bb68882cca47de47106eb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 24 五月 2024 14:42:37 +0800
Subject: [PATCH] 11
---
src/views/login.vue | 12 ++--
src/views/project/statistics/caseStatistics/index.vue | 4 +
src/views/project/statistics/chargeStatistics/index.vue | 79 ++++++++++++++++++++++----
src/views/project/indexstatistics/index.vue | 10 +-
src/views/project/fundstatistics/index.vue | 33 ++++++----
5 files changed, 101 insertions(+), 37 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index f3be51b..aac1184 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -157,12 +157,12 @@
},
getAuthCode() {
this.$dingtalk.runtime.permission.requestAuthCode({
- corpId: "dingac30cec5f3570bbea39a90f97fcb1e09",
+ corpId: "dingd31f00f4fbc0ff5bf5bf40eda33b7ba0",
onSuccess: result => {
// 鍦ㄨ繖閲屽鐞嗘巿鏉冩垚鍔熷悗鐨勯�昏緫锛宺esult涓寘鍚巿鏉冪爜绛変俊鎭�
- this.authCode = result.codde;
+ // this.authCode = result.codde;
this.$message.success("鎴愬姛鑾峰彇鎺堟潈鐮侊細" + result.code);
- this.avoidLogin();
+ this.avoidLogin(result.code);
},
onFail: err => {
// 鍦ㄨ繖閲屽鐞嗘巿鏉冨け璐ュ悗鐨勯�昏緫
@@ -173,13 +173,13 @@
}
});
},
- avoidLogin() {
+ avoidLogin(authCode) {
this.loading = true;
- this.loginForm.authCode = this.authCode;
+ // this.$message.error(authCode, "1鍙蜂綅");
+ this.loginForm.authCode = authCode;
this.$store
.dispatch("Login", this.loginForm)
.then(res => {
- this.$message.error(this.$store.state);
if (this.$store.state.user.code == 200) {
this.$router.push({ path: this.redirect || "/" }).catch(() => {});
} else {
diff --git a/src/views/project/fundstatistics/index.vue b/src/views/project/fundstatistics/index.vue
index 14f98d8..334c2ea 100644
--- a/src/views/project/fundstatistics/index.vue
+++ b/src/views/project/fundstatistics/index.vue
@@ -52,7 +52,7 @@
:data="donationCaseTableData"
>
<el-table-column
- label="鎶ュ憡鏃堕棿"
+ label="妗堜緥鏃堕棿"
align="center"
prop="reporttime"
width="150"
@@ -77,15 +77,21 @@
</template>
</el-table-column>
<el-table-column
- label="鍖荤枟鏈烘瀯"
+ label="涓撹亴浜哄憳"
+ align="center"
+ prop="reportername"
+ width="100"
+ />
+ <el-table-column
+ label="涓氬姟缁�"
align="center"
prop="treatmenthospitalname"
/>
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
<dict-tag
- :options="dict.type.sys_DonationStatus"
- :value="scope.row.recordstate"
+ :options="dict.type.sys_donornode"
+ :value="scope.row.workflow"
/>
</template>
</el-table-column>
@@ -165,7 +171,7 @@
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
- FundSummary,
+ FundSummary
},
dicts: [
"sys_Organ",
@@ -174,6 +180,7 @@
"sys_IDType",
"sys_AgeUnit",
"sys_DonationStatus",
+ "sys_donornode"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -192,18 +199,18 @@
name: "",
pageSize: 10,
name: null,
- donorno: null,
+ donorno: null
},
curdonorno: null,
showType: "list",
curCaseInfo: {
donorno: null,
name: null,
- id: null,
+ id: null
},
headers: {
Authorization: "Bearer " + getToken()
- },
+ }
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -218,7 +225,7 @@
if (this.queryParams.recordstate == "") {
this.queryParams.recordstate = null;
}
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donationCaseTableData = response.rows;
this.total = response.total;
this.loading = false;
@@ -248,7 +255,7 @@
},
//瀵煎嚭姹囨�昏〃
exportSummary(id) {
- exportFundCost(id).then((res) => {
+ exportFundCost(id).then(res => {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
var urlBase = process.env.VUE_APP_BASE_API;
@@ -272,14 +279,14 @@
console.log(url);
const link = document.createElement("a");
link.href = url;
- const name=fileUrl["downloadName"]
+ const name = fileUrl["downloadName"];
link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
document.body.appendChild(link);
link.click();
link.parentNode.removeChild(link);
});
});
- },
+ }
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
@@ -293,7 +300,7 @@
updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index 5bc9909..62a739b 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -431,10 +431,10 @@
>鍚勫湴鍖哄尰闄㈡渚嬫暟鎹�</span
>
</el-col>
-
+
</el-row>
<el-row>
-
+
</el-row>
<dv-scroll-board
:config="config"
@@ -631,7 +631,7 @@
isloading: false,
maxHeight: 0,
provinceData: [
- { label: "鍏ㄩ儴", value: "" },
+ { label: "鍏ㄩ儴鍦板競", value: "" },
{ label: "鏉窞甯�", value: "1" },
{ label: "瀹佹尝甯�", value: "2" },
{ label: "娓╁窞甯�", value: "3" },
@@ -676,7 +676,7 @@
value: 0,
code: "C22"
},
-
+
{
key: "leftRenal",
name: "宸﹁偩",
@@ -1158,7 +1158,7 @@
listDonatebaseinfo({}).then(res => {
let list = res.rows;
let reportlist = [];
- reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
+ reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴浜哄憳" });
list.forEach(element => {
reportlist.push({
reporterno: element.reporterno,
diff --git a/src/views/project/statistics/caseStatistics/index.vue b/src/views/project/statistics/caseStatistics/index.vue
index 314de6d..caaa5de 100644
--- a/src/views/project/statistics/caseStatistics/index.vue
+++ b/src/views/project/statistics/caseStatistics/index.vue
@@ -398,7 +398,9 @@
this.form.treatmenthospitalno = "";
- this.queryParams = {};
+ this.queryParams = {
+ pacasestate: "0"
+ };
this.selecttime = [];
this.getTimeList();
this.searchAddress = {
diff --git a/src/views/project/statistics/chargeStatistics/index.vue b/src/views/project/statistics/chargeStatistics/index.vue
index fbfd775..61a46fd 100644
--- a/src/views/project/statistics/chargeStatistics/index.vue
+++ b/src/views/project/statistics/chargeStatistics/index.vue
@@ -17,19 +17,19 @@
/>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="缁熻绫诲瀷">
- <el-select
- v-model="queryParams.pachageflag"
- placeholder="璇烽�夋嫨妗堜緥鐘舵��"
+ <el-col :span="12">
+ <el-form-item label="缁熻鏃ユ湡">
+ <el-date-picker
+ style="width: 100%"
+ v-model="selecttime"
+ type="monthrange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�"
+ end-placeholder="缁撴潫鏈堜唤"
+ value-format="yyyy-MM-dd"
+ @change="getTimeList"
>
- <el-option
- v-for="item in reportlist"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -284,6 +284,61 @@
this.resetForm("queryForm");
this.handleQuery();
},
+ getTimeList(e) {
+ if (this.selecttime != 0) {
+ this.queryParams.pabegtime = this.selecttime[0];
+ this.queryParams.paendtime = this.selecttime[1];
+ // if (this.queryParams.paendtime == this.queryParams.pabegtime) {
+ let num = Number(this.queryParams.paendtime.slice(5, 7));
+ if (num < 9) {
+ let mon = Number(this.queryParams.paendtime.slice(6, 7));
+ this.queryParams.paendtime =
+ this.queryParams.paendtime.slice(0, 5) +
+ "0" +
+ (mon + 1) +
+ "-" +
+ "01" +
+ " " +
+ "00" +
+ ":" +
+ "00" +
+ ":" +
+ "00";
+ }
+ // this.queryParams.paendtime=this.queryParams.paendtime.slice(0,5)骞�
+ else if (num >= 10) {
+ this.queryParams.paendtime =
+ this.queryParams.paendtime.slice(0, 5) +
+ (num + 1) +
+ "-" +
+ "01" +
+ " " +
+ "00" +
+ ":" +
+ "00" +
+ ":" +
+ "00";
+ } else {
+ this.queryParams.paendtime =
+ this.queryParams.paendtime.slice(0, 5) +
+ "10" +
+ "-" +
+ "01" +
+ " " +
+ "00" +
+ ":" +
+ "00" +
+ ":" +
+ "00";
+ }
+ this.queryParams.pabegtime =
+ this.queryParams.pabegtime + " " + "00" + ":" + "00" + ":" + "00";
+ // }
+ } else {
+ // this.queryParams.pabegtime = "1998-01-01 00:00:00";
+ // this.queryParams.paendtime = "2998-01-01 00:00:00";
+ }
+ },
getSummaries(param) {
const { columns, data } = param;
const sums = [];
--
Gitblit v1.9.3