From 9f468e0447a71eb7fcc4f1d78df3be9d348f6fe0 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 25 三月 2024 11:33:02 +0800
Subject: [PATCH] 11
---
src/utils/request.js | 2
src/views/project/donationdetails/index.vue | 23 ++
src/views/home/index.vue | 13 -
src/store/modules/user.js | 11 +
src/views/login.vue | 34 ++-
src/views/project/donateorganstatics/index.vue | 335 +++++++++++++++++++++++++++++++----------
src/views/project/indexstatistics/index.vue | 15 -
7 files changed, 309 insertions(+), 124 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 822f6f9..7475b22 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -8,6 +8,8 @@
token: getToken(),
name: '',
avatar: '',
+ code: '',
+ msg: '',
roles: [],
permissions: []
},
@@ -15,6 +17,12 @@
mutations: {
SET_TOKEN: (state, token) => {
state.token = token
+ },
+ SET_LOGCODE: (state, code) => {
+ state.code = code
+ },
+ SET_LOGMSG: (state, msg) => {
+ state.msg = msg
},
SET_NAME: (state, name) => {
state.name = name
@@ -39,8 +47,11 @@
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
+ console.log(res,'log');
setToken(res.token)
commit('SET_TOKEN', res.token)
+ commit('SET_LOGCODE', res.code)
+ commit('SET_LOGMSG', res.msg)
resolve()
}).catch(error => {
reject(error)
diff --git a/src/utils/request.js b/src/utils/request.js
index d0e96d7..d0a5db3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -95,7 +95,7 @@
location.href = '/index';
})
}).catch(() => {});
- return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍銆�')
+ return Promise.reject('鏃犳晥鐨勪細璇濓紝鎴栬�呬細璇濆凡杩囨湡锛岃閲嶆柊鐧诲綍1銆�')
} else {
return res.data
}
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 5ba0e4b..4fab88a 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1049,19 +1049,10 @@
},
{
key: "fullLiver",
- name: "鍏ㄨ倽",
+ name: "鑲濊剰",
value: 0
},
- {
- key: "leftLiver",
- name: "宸﹁倽",
- value: 0
- },
- {
- key: "rightLiver",
- name: "鍙宠倽",
- value: 0
- },
+
{
key: "leftRenal",
diff --git a/src/views/login.vue b/src/views/login.vue
index 02932ef..df7a011 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -96,7 +96,7 @@
data() {
return {
codeUrl: "",
- cookiePassword: "",
+ cookiePassword: "",
loginForm: {
username: "",
password: "",
@@ -182,10 +182,20 @@
}
this.$store
.dispatch("Login", this.loginForm)
- .then(() => {
- this.$router.push({ path: this.redirect || "/" }).catch(() => {});
+ .then(res => {
+ console.log(this.$store.state.user.code, "44");
+ console.log(this.$store.state.user.msg, "22");
+ if (this.$store.state.user.code == 200) {
+ this.$router
+ .push({ path: this.redirect || "/" })
+ .catch(() => {});
+ } else {
+ this.loading = false;
+ this.$message.error(this.$store.state.user.msg);
+ }
})
- .catch(() => {
+ .catch(err => {
+ console.log(err);
this.loading = false;
// this.$message.error("鐧婚檰澶辫触璇烽噸璇曘��");
if (this.captchaOnOff) {
@@ -206,14 +216,14 @@
align-items: center;
height: 100%;
background-position: center center;
-/* 鑳屾櫙鍥句笉骞抽摵 */
-background-repeat: no-repeat;
-/* 褰撳唴瀹归珮搴﹀ぇ浜庡浘鐗囬珮搴︽椂锛岃儗鏅浘鍍忕殑浣嶇疆鐩稿浜巚iewport鍥哄畾 */
-background-attachment: fixed;
-/* 璁╄儗鏅浘鍩轰簬瀹瑰櫒澶у皬浼哥缉 */
-background-size: cover;
-/* 璁剧疆鑳屾櫙棰滆壊锛岃儗鏅浘鍔犺浇杩囩▼涓細鏄剧ず鑳屾櫙鑹� */
-background-color: #464646;
+ /* 鑳屾櫙鍥句笉骞抽摵 */
+ background-repeat: no-repeat;
+ /* 褰撳唴瀹归珮搴﹀ぇ浜庡浘鐗囬珮搴︽椂锛岃儗鏅浘鍍忕殑浣嶇疆鐩稿浜巚iewport鍥哄畾 */
+ background-attachment: fixed;
+ /* 璁╄儗鏅浘鍩轰簬瀹瑰櫒澶у皬浼哥缉 */
+ background-size: cover;
+ /* 璁剧疆鑳屾櫙棰滆壊锛岃儗鏅浘鍔犺浇杩囩▼涓細鏄剧ず鑳屾櫙鑹� */
+ background-color: #464646;
background-image: url("../assets/images/login-bgc.jpg");
background-size: cover;
}
diff --git a/src/views/project/donateorganstatics/index.vue b/src/views/project/donateorganstatics/index.vue
index f15b614..a58a2e7 100644
--- a/src/views/project/donateorganstatics/index.vue
+++ b/src/views/project/donateorganstatics/index.vue
@@ -1,6 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="鎹愮尞妗堜緥ID" prop="infoid">
<el-input
v-model="queryParams.infoid"
@@ -20,11 +26,14 @@
/>
</el-form-item>
<el-form-item label="鎹愮尞鏃堕棿" prop="donatetime">
- <el-date-picker clearable size="small"
+ <el-date-picker
+ clearable
+ size="small"
v-model="queryParams.donatetime"
type="date"
value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鎹愮尞鏃堕棿">
+ placeholder="閫夋嫨鎹愮尞鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="濮撳悕" prop="name">
@@ -37,15 +46,23 @@
/>
</el-form-item>
<el-form-item label="鍑虹敓骞存湀" prop="borthdate">
- <el-date-picker clearable size="small"
+ <el-date-picker
+ clearable
+ size="small"
v-model="queryParams.borthdate"
type="date"
value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鍑虹敓骞存湀">
+ placeholder="閫夋嫨鍑虹敓骞存湀"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="queryParams.sex" placeholder="璇烽�夋嫨鎬у埆" clearable size="small">
+ <el-select
+ v-model="queryParams.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ clearable
+ size="small"
+ >
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
@@ -58,7 +75,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory" prop="donationcategory">
+ <el-form-item
+ label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory"
+ prop="donationcategory"
+ >
<el-input
v-model="queryParams.donationcategory"
placeholder="璇疯緭鍏ユ崘鐚被鍒� 鏍规嵁瀛楀吀sys_DonationCategory"
@@ -67,19 +87,19 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍏ㄨ倽鎺ュ彈鍖婚櫌" prop="hospitalC22">
+ <el-form-item label="鑲濊剰鎺ュ彈鍖婚櫌" prop="hospitalC22">
<el-input
v-model="queryParams.hospitalC22"
- placeholder="璇疯緭鍏ュ叏鑲濇帴鍙楀尰闄�"
+ placeholder="璇疯緭鍏ヨ倽鑴忔帴鍙楀尰闄�"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="鍏ㄨ倽璐圭敤" prop="feeC22">
+ <el-form-item label="鑲濊剰璐圭敤" prop="feeC22">
<el-input
v-model="queryParams.feeC22"
- placeholder="璇疯緭鍏ュ叏鑲濊垂鐢�"
+ placeholder="璇疯緭鍏ヨ倽鑴忚垂鐢�"
clearable
size="small"
@keyup.enter.native="handleQuery"
@@ -338,8 +358,16 @@
/>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
@@ -352,7 +380,8 @@
size="mini"
@click="handleAdd"
v-hasPermi="['system:donateorganstatics:add']"
- >鏂板</el-button>
+ >鏂板</el-button
+ >
</el-col>
<el-col :span="1.5">
<el-button
@@ -363,7 +392,8 @@
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:donateorganstatics:edit']"
- >淇敼</el-button>
+ >淇敼</el-button
+ >
</el-col>
<el-col :span="1.5">
<el-button
@@ -374,7 +404,8 @@
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:donateorganstatics:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button
+ >
</el-col>
<el-col :span="1.5">
<el-button
@@ -385,61 +416,127 @@
:loading="exportLoading"
@click="handleExport"
v-hasPermi="['system:donateorganstatics:export']"
- >瀵煎嚭</el-button>
+ >瀵煎嚭</el-button
+ >
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="donateorganstaticsList" @selection-change="handleSelectionChange">
+ <el-table
+ v-loading="loading"
+ :data="donateorganstaticsList"
+ @selection-change="handleSelectionChange"
+ >
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="鎹愮尞妗堜緥ID" align="center" prop="infoid" />
<el-table-column label="OPO缂栧彿" align="center" prop="donateno" />
- <el-table-column label="鎹愮尞鏃堕棿" align="center" prop="donatetime" width="180">
+ <el-table-column
+ label="鎹愮尞鏃堕棿"
+ align="center"
+ prop="donatetime"
+ width="180"
+ >
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.donatetime, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" />
- <el-table-column label="鍑虹敓骞存湀" align="center" prop="borthdate" width="180">
+ <el-table-column
+ label="鍑虹敓骞存湀"
+ align="center"
+ prop="borthdate"
+ width="180"
+ >
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.borthdate, '{y}-{m}-{d}') }}</span>
+ <span>{{ parseTime(scope.row.borthdate, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鎬у埆" align="center" prop="sex" />
<el-table-column label="骞撮緞" align="center" prop="age" />
- <el-table-column label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory" align="center" prop="donationcategory" />
- <el-table-column label="鍏ㄨ倽鎺ュ彈鍖婚櫌" align="center" prop="hospitalC22" />
- <el-table-column label="鍏ㄨ倽璐圭敤" align="center" prop="feeC22" />
- <el-table-column label="宸﹁倽鎺ュ彈鍖婚櫌" align="center" prop="hospitalC22l" />
+ <el-table-column
+ label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory"
+ align="center"
+ prop="donationcategory"
+ />
+ <el-table-column label="鑲濊剰鎺ュ彈鍖婚櫌" align="center" prop="hospitalC22" />
+ <el-table-column label="鑲濊剰璐圭敤" align="center" prop="feeC22" />
+ <el-table-column
+ label="宸﹁倽鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC22l"
+ />
<el-table-column label="宸﹁倽璐圭敤" align="center" prop="feeC22l" />
- <el-table-column label="宸﹀鍙舵帴鍙楀尰闄�" align="center" prop="hospitalC22le" />
+ <el-table-column
+ label="宸﹀鍙舵帴鍙楀尰闄�"
+ align="center"
+ prop="hospitalC22le"
+ />
<el-table-column label="宸﹀璐圭敤" align="center" prop="feeC22le" />
- <el-table-column label="鍙宠倽鎺ュ彈鍖婚櫌" align="center" prop="hospitalC22r" />
+ <el-table-column
+ label="鍙宠倽鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC22r"
+ />
<el-table-column label="鍙宠倽璐圭敤" align="center" prop="feeC22r" />
- <el-table-column label="宸﹁偩鎺ュ彈鍖婚櫌" align="center" prop="hospitalC64l" />
+ <el-table-column
+ label="宸﹁偩鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC64l"
+ />
<el-table-column label="宸﹁偩璐圭敤" align="center" prop="feeC64l" />
- <el-table-column label="鍙宠偩鎺ュ彈鍖婚櫌" align="center" prop="hospitalC64r" />
+ <el-table-column
+ label="鍙宠偩鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC64r"
+ />
<el-table-column label="鍙宠偩璐圭敤" align="center" prop="feeC64r" />
<el-table-column label="蹇冭剰鎺ュ彈鍖婚櫌" align="center" prop="hospitalC38" />
<el-table-column label="蹇冭剰璐圭敤" align="center" prop="feeC38" />
<el-table-column label="鍙岃偤鎺ュ彈鍖婚櫌" align="center" prop="hospitalC34" />
<el-table-column label="鍙岃偤璐圭敤" align="center" prop="feeC34" />
- <el-table-column label="宸﹁偤鎺ュ彈鍖婚櫌" align="center" prop="hospitalC34l" />
+ <el-table-column
+ label="宸﹁偤鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC34l"
+ />
<el-table-column label="宸﹁偤璐圭敤" align="center" prop="feeC34l" />
- <el-table-column label="鍙宠偤绉绘鍖婚櫌" align="center" prop="hospitalC34r" />
+ <el-table-column
+ label="鍙宠偤绉绘鍖婚櫌"
+ align="center"
+ prop="hospitalC34r"
+ />
<el-table-column label="鍙宠偤璐圭敤" align="center" prop="feeC34r" />
<el-table-column label="灏忚偁鎺ュ彈鍖婚櫌" align="center" prop="hospitalC17" />
<el-table-column label="灏忚偁璐圭敤" align="center" prop="feeC17" />
- <el-table-column label="宸︾溂缁勭粐鎺ュ彈鍖婚櫌" align="center" prop="hospitalC69l" />
+ <el-table-column
+ label="宸︾溂缁勭粐鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC69l"
+ />
<el-table-column label="宸︾溂缁勭粐璐圭敤" align="center" prop="feeC69l" />
- <el-table-column label="鍙崇溂缁勭粐鎺ュ彈鍖婚櫌" align="center" prop="hospitalC69r" />
+ <el-table-column
+ label="鍙崇溂缁勭粐鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC69r"
+ />
<el-table-column label="鍙崇溂缁勭粐璐圭敤" align="center" prop="feeC69r" />
- <el-table-column label="鍏朵粬缁勭粐鎺ュ彈鍖婚櫌" align="center" prop="hospitalC01" />
+ <el-table-column
+ label="鍏朵粬缁勭粐鎺ュ彈鍖婚櫌"
+ align="center"
+ prop="hospitalC01"
+ />
<el-table-column label="鍏朵粬缁勭粐璐圭敤" align="center" prop="feeC01" />
<el-table-column label="閬椾綋鎺ュ彈鍗曚綅" align="center" prop="unitBody" />
<el-table-column label="鍚堣璐圭敤" align="center" prop="feeCount" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
<template slot-scope="scope">
<el-button
size="mini"
@@ -447,20 +544,22 @@
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['system:donateorganstatics:edit']"
- >淇敼</el-button>
+ >淇敼</el-button
+ >
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:donateorganstatics:remove']"
- >鍒犻櫎</el-button>
+ >鍒犻櫎</el-button
+ >
</template>
</el-table-column>
</el-table>
-
+
<pagination
- v-show="total>0"
+ v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@@ -477,22 +576,28 @@
<el-input v-model="form.donateno" placeholder="璇疯緭鍏PO缂栧彿" />
</el-form-item>
<el-form-item label="鎹愮尞鏃堕棿" prop="donatetime">
- <el-date-picker clearable size="small"
+ <el-date-picker
+ clearable
+ size="small"
v-model="form.donatetime"
type="date"
value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鎹愮尞鏃堕棿">
+ placeholder="閫夋嫨鎹愮尞鏃堕棿"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="濮撳悕" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
</el-form-item>
<el-form-item label="鍑虹敓骞存湀" prop="borthdate">
- <el-date-picker clearable size="small"
+ <el-date-picker
+ clearable
+ size="small"
v-model="form.borthdate"
type="date"
value-format="yyyy-MM-dd"
- placeholder="閫夋嫨鍑虹敓骞存湀">
+ placeholder="閫夋嫨鍑虹敓骞存湀"
+ >
</el-date-picker>
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
@@ -503,89 +608,137 @@
<el-form-item label="骞撮緞" prop="age">
<el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
</el-form-item>
- <el-form-item label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory" prop="donationcategory">
- <el-input v-model="form.donationcategory" placeholder="璇疯緭鍏ユ崘鐚被鍒� 鏍规嵁瀛楀吀sys_DonationCategory" />
+ <el-form-item
+ label="鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory"
+ prop="donationcategory"
+ >
+ <el-input
+ v-model="form.donationcategory"
+ placeholder="璇疯緭鍏ユ崘鐚被鍒� 鏍规嵁瀛楀吀sys_DonationCategory"
+ />
</el-form-item>
- <el-form-item label="鍏ㄨ倽鎺ュ彈鍖婚櫌" prop="hospitalC22">
- <el-input v-model="form.hospitalC22" placeholder="璇疯緭鍏ュ叏鑲濇帴鍙楀尰闄�" />
+ <el-form-item label="鑲濊剰鎺ュ彈鍖婚櫌" prop="hospitalC22">
+ <el-input
+ v-model="form.hospitalC22"
+ placeholder="璇疯緭鍏ヨ倽鑴忔帴鍙楀尰闄�"
+ />
</el-form-item>
- <el-form-item label="鍏ㄨ倽璐圭敤" prop="feeC22">
- <el-input v-model="form.feeC22" placeholder="璇疯緭鍏ュ叏鑲濊垂鐢�" />
+ <el-form-item label="鑲濊剰璐圭敤" prop="feeC22">
+ <el-input v-model="form.feeC22" placeholder="璇疯緭鍏ヨ倽鑴忚垂鐢�" />
</el-form-item>
<el-form-item label="宸﹁倽鎺ュ彈鍖婚櫌" prop="hospitalC22l">
- <el-input v-model="form.hospitalC22l" placeholder="璇疯緭鍏ュ乏鑲濇帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC22l"
+ placeholder="璇疯緭鍏ュ乏鑲濇帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="宸﹁倽璐圭敤" prop="feeC22l">
<el-input v-model="form.feeC22l" placeholder="璇疯緭鍏ュ乏鑲濊垂鐢�" />
</el-form-item>
<el-form-item label="宸﹀鍙舵帴鍙楀尰闄�" prop="hospitalC22le">
- <el-input v-model="form.hospitalC22le" placeholder="璇疯緭鍏ュ乏澶栧彾鎺ュ彈鍖婚櫌" />
+ <el-input
+ v-model="form.hospitalC22le"
+ placeholder="璇疯緭鍏ュ乏澶栧彾鎺ュ彈鍖婚櫌"
+ />
</el-form-item>
<el-form-item label="宸﹀璐圭敤" prop="feeC22le">
<el-input v-model="form.feeC22le" placeholder="璇疯緭鍏ュ乏澶栬垂鐢�" />
</el-form-item>
<el-form-item label="鍙宠倽鎺ュ彈鍖婚櫌" prop="hospitalC22r">
- <el-input v-model="form.hospitalC22r" placeholder="璇疯緭鍏ュ彸鑲濇帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC22r"
+ placeholder="璇疯緭鍏ュ彸鑲濇帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="鍙宠倽璐圭敤" prop="feeC22r">
<el-input v-model="form.feeC22r" placeholder="璇疯緭鍏ュ彸鑲濊垂鐢�" />
</el-form-item>
<el-form-item label="宸﹁偩鎺ュ彈鍖婚櫌" prop="hospitalC64l">
- <el-input v-model="form.hospitalC64l" placeholder="璇疯緭鍏ュ乏鑲炬帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC64l"
+ placeholder="璇疯緭鍏ュ乏鑲炬帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="宸﹁偩璐圭敤" prop="feeC64l">
<el-input v-model="form.feeC64l" placeholder="璇疯緭鍏ュ乏鑲捐垂鐢�" />
</el-form-item>
<el-form-item label="鍙宠偩鎺ュ彈鍖婚櫌" prop="hospitalC64r">
- <el-input v-model="form.hospitalC64r" placeholder="璇疯緭鍏ュ彸鑲炬帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC64r"
+ placeholder="璇疯緭鍏ュ彸鑲炬帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="鍙宠偩璐圭敤" prop="feeC64r">
<el-input v-model="form.feeC64r" placeholder="璇疯緭鍏ュ彸鑲捐垂鐢�" />
</el-form-item>
<el-form-item label="蹇冭剰鎺ュ彈鍖婚櫌" prop="hospitalC38">
- <el-input v-model="form.hospitalC38" placeholder="璇疯緭鍏ュ績鑴忔帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC38"
+ placeholder="璇疯緭鍏ュ績鑴忔帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="蹇冭剰璐圭敤" prop="feeC38">
<el-input v-model="form.feeC38" placeholder="璇疯緭鍏ュ績鑴忚垂鐢�" />
</el-form-item>
<el-form-item label="鍙岃偤鎺ュ彈鍖婚櫌" prop="hospitalC34">
- <el-input v-model="form.hospitalC34" placeholder="璇疯緭鍏ュ弻鑲烘帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC34"
+ placeholder="璇疯緭鍏ュ弻鑲烘帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="鍙岃偤璐圭敤" prop="feeC34">
<el-input v-model="form.feeC34" placeholder="璇疯緭鍏ュ弻鑲鸿垂鐢�" />
</el-form-item>
<el-form-item label="宸﹁偤鎺ュ彈鍖婚櫌" prop="hospitalC34l">
- <el-input v-model="form.hospitalC34l" placeholder="璇疯緭鍏ュ乏鑲烘帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC34l"
+ placeholder="璇疯緭鍏ュ乏鑲烘帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="宸﹁偤璐圭敤" prop="feeC34l">
<el-input v-model="form.feeC34l" placeholder="璇疯緭鍏ュ乏鑲鸿垂鐢�" />
</el-form-item>
<el-form-item label="鍙宠偤绉绘鍖婚櫌" prop="hospitalC34r">
- <el-input v-model="form.hospitalC34r" placeholder="璇疯緭鍏ュ彸鑲虹Щ妞嶅尰闄�" />
+ <el-input
+ v-model="form.hospitalC34r"
+ placeholder="璇疯緭鍏ュ彸鑲虹Щ妞嶅尰闄�"
+ />
</el-form-item>
<el-form-item label="鍙宠偤璐圭敤" prop="feeC34r">
<el-input v-model="form.feeC34r" placeholder="璇疯緭鍏ュ彸鑲鸿垂鐢�" />
</el-form-item>
<el-form-item label="灏忚偁鎺ュ彈鍖婚櫌" prop="hospitalC17">
- <el-input v-model="form.hospitalC17" placeholder="璇疯緭鍏ュ皬鑲犳帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC17"
+ placeholder="璇疯緭鍏ュ皬鑲犳帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="灏忚偁璐圭敤" prop="feeC17">
<el-input v-model="form.feeC17" placeholder="璇疯緭鍏ュ皬鑲犺垂鐢�" />
</el-form-item>
<el-form-item label="宸︾溂缁勭粐鎺ュ彈鍖婚櫌" prop="hospitalC69l">
- <el-input v-model="form.hospitalC69l" placeholder="璇疯緭鍏ュ乏鐪肩粍缁囨帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC69l"
+ placeholder="璇疯緭鍏ュ乏鐪肩粍缁囨帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="宸︾溂缁勭粐璐圭敤" prop="feeC69l">
<el-input v-model="form.feeC69l" placeholder="璇疯緭鍏ュ乏鐪肩粍缁囪垂鐢�" />
</el-form-item>
<el-form-item label="鍙崇溂缁勭粐鎺ュ彈鍖婚櫌" prop="hospitalC69r">
- <el-input v-model="form.hospitalC69r" placeholder="璇疯緭鍏ュ彸鐪肩粍缁囨帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC69r"
+ placeholder="璇疯緭鍏ュ彸鐪肩粍缁囨帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="鍙崇溂缁勭粐璐圭敤" prop="feeC69r">
<el-input v-model="form.feeC69r" placeholder="璇疯緭鍏ュ彸鐪肩粍缁囪垂鐢�" />
</el-form-item>
<el-form-item label="鍏朵粬缁勭粐鎺ュ彈鍖婚櫌" prop="hospitalC01">
- <el-input v-model="form.hospitalC01" placeholder="璇疯緭鍏ュ叾浠栫粍缁囨帴鍙楀尰闄�" />
+ <el-input
+ v-model="form.hospitalC01"
+ placeholder="璇疯緭鍏ュ叾浠栫粍缁囨帴鍙楀尰闄�"
+ />
</el-form-item>
<el-form-item label="鍏朵粬缁勭粐璐圭敤" prop="feeC01">
<el-input v-model="form.feeC01" placeholder="璇疯緭鍏ュ叾浠栫粍缁囪垂鐢�" />
@@ -606,7 +759,14 @@
</template>
<script>
-import { listDonateorganstatics, getDonateorganstatics, delDonateorganstatics, addDonateorganstatics, updateDonateorganstatics, exportDonateorganstatics } from "@/api/project/donateorganstatics";
+import {
+ listDonateorganstatics,
+ getDonateorganstatics,
+ delDonateorganstatics,
+ addDonateorganstatics,
+ updateDonateorganstatics,
+ exportDonateorganstatics
+} from "@/api/project/donateorganstatics";
export default {
name: "Donateorganstatics",
@@ -678,8 +838,7 @@
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
- rules: {
- }
+ rules: {}
};
},
created() {
@@ -757,9 +916,9 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
- this.multiple = !selection.length
+ this.ids = selection.map(item => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
@@ -770,7 +929,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- const id = row.id || this.ids
+ const id = row.id || this.ids;
getDonateorganstatics(id).then(response => {
this.form = response.data;
this.open = true;
@@ -800,23 +959,31 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒楃紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
- return delDonateorganstatics(ids);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒楃紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�')
+ .then(function() {
+ return delDonateorganstatics(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const queryParams = this.queryParams;
- this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夋崘鐚渚嬪櫒瀹樺垪鏁版嵁椤癸紵').then(() => {
- this.exportLoading = true;
- return exportDonateorganstatics(queryParams);
- }).then(response => {
- this.$download.name(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.$modal
+ .confirm("鏄惁纭瀵煎嚭鎵�鏈夋崘鐚渚嬪櫒瀹樺垪鏁版嵁椤癸紵")
+ .then(() => {
+ this.exportLoading = true;
+ return exportDonateorganstatics(queryParams);
+ })
+ .then(response => {
+ this.$download.name(response.msg);
+ this.exportLoading = false;
+ })
+ .catch(() => {});
}
}
};
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index a95f530..af7326d 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2825,6 +2825,7 @@
let searchParam = {
infoid: this.infoid
};
+ console.log(this.procureddata, "procureddata");
if (this.actives == 1) {
this.activetele = "鍖诲璇勪及";
@@ -2893,7 +2894,11 @@
// );
}
});
- } else if (this.actives == 5 && !this.witnessform.id) {
+ } else if (
+ this.actives == 5 &&
+ !this.witnessform.id &&
+ !this.procureddata[0]
+ ) {
// 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
if (this.witnessform.id) {
return;
@@ -2905,7 +2910,11 @@
this.procureddata.infoid = this.infoid;
} else {
this.procureddata = this.allocateddata.filter(
- obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�"
+ obj =>
+ obj.organname !== "宸﹀崐鑲�" &&
+ obj.organname !== "鍙冲崐鑲�" &&
+ obj.organname !== "宸﹁倽" &&
+ obj.organname !== "鍙宠倽"
);
this.procureddata.infoid = this.infoid;
}
@@ -3066,11 +3075,11 @@
// 淇濆瓨浜岀骇琛ㄦ寜閽�
Savethedetails() {
console.log(this.actives);
- this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.actives == 1) {
this.medicineform.infoid = this.infoid;
this.$refs["medicineform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.medicineform.id != null) {
updateMedicalevaluation(this.medicineform).then(response => {
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
@@ -3091,6 +3100,7 @@
this.affirmform.kinship = this.kinship.join(",");
this.$refs["affirmform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.affirmform.id != null) {
this.affirmform.residenceprovincename = this.defultAddresss.sheng;
this.affirmform.residencecityname = this.defultAddresss.shi;
@@ -3115,6 +3125,7 @@
this.ethicform.infoid = this.infoid;
this.$refs["ethicform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
if (this.ethicform.id != null) {
// updateDonateflowchart(this.ethicform).then(response => {
updateEthicalreviewopinions(this.ethicform).then(res => {
@@ -3134,6 +3145,8 @@
} else if (this.actives == 4) {
this.procureddata.infoid = this.infoid;
this.$refs["allocateddataform"].validate(valid => {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
/**
let rows = [];
this.allocateddata.map(item => {
@@ -3184,6 +3197,8 @@
}
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
if (this.witnessform.id != null) {
updateDonationwitness(this.witnessform).then(response => {
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
@@ -3212,6 +3227,8 @@
this.accomplishform.infoid = this.infoid;
this.$refs["accomplishform"].validate(valid => {
if (valid) {
+ this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
// 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
this.transplantdata.infoid = this.infoid;
console.log(this.form);
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index 7c1a8e9..5bc9909 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -672,22 +672,11 @@
},
{
key: "fullLiver",
- name: "鍏ㄨ倽",
+ name: "鑲濊剰",
value: 0,
code: "C22"
},
- {
- key: "leftLiver",
- name: "宸﹁倽",
- value: 0,
- code: "C22L"
- },
- {
- key: "rightLiver",
- name: "鍙宠倽",
- value: 0,
- code: "C22R"
- },
+
{
key: "leftRenal",
name: "宸﹁偩",
--
Gitblit v1.9.3