From a40c5148ad225760859297b7c55b664da4c4aa28 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 19 三月 2024 11:07:15 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 42
src/views/project/statistics/caseStatistics/index.vue | 2
src/views/project/tallage/index.vue | 446 +++++++++++++++++
src/views/project/donatebaseinfo/index.vue | 57 +-
src/views/project/statistics/chargeStatistics/index.vue | 3
src/views/project/components/orgselect/index.vue | 2
src/views/project/fundcheck/officeExpenseCheck/index.vue | 4
src/views/project/indexstatistics/index.vue | 15
src/views/project/medicalevaluation/index.vue | 7
src/views/project/donateannex/index.vue | 2
src/views/project/unitCost/index.vue | 39 +
src/views/project/relativesconfirmation/index.vue | 2
src/views/project/fundcheck/medicalCostCheck/index.vue | 4
src/views/project/fundcheck/expertFeeCheck/index.vue | 4
src/views/project/organallocation/index.vue | 393 +++++++++++----
src/views/project/tallage/computingBill/index.vue | 336 +++++-------
src/views/project/donatefinish/index.vue | 5
src/views/project/fundcheck/performanceCheck/index.vue | 4
src/api/project/reimbursementpayee.js | 4
src/api/project/tallage.js | 68 ++
src/views/project/donationwitness/index.vue | 14
21 files changed, 1,049 insertions(+), 404 deletions(-)
diff --git a/src/api/project/reimbursementpayee.js b/src/api/project/reimbursementpayee.js
index 67973a8..bf4033b 100644
--- a/src/api/project/reimbursementpayee.js
+++ b/src/api/project/reimbursementpayee.js
@@ -4,8 +4,8 @@
export function listReimbursementpayee(query) {
return request({
url: '/project/reimbursementpayee/list',
- method: 'get',
- params: query
+ method: 'post',
+ data: query
})
}
diff --git a/src/api/project/tallage.js b/src/api/project/tallage.js
new file mode 100644
index 0000000..7cd97c1
--- /dev/null
+++ b/src/api/project/tallage.js
@@ -0,0 +1,68 @@
+import request from '@/utils/request'
+
+
+// 鑾峰彇鍗曟嵁鏈�澶ч『搴�
+export function getMaxFundTaxId(query) {
+ return request({
+ url: '/project/fundtax/getMaxFundTaxId',
+ method: 'get',
+ })
+ }
+ // 鎵归噺绠楃◣
+export function listbxiaostatistics(query) {
+ return request({
+ url: '/project/fundtax/batchFundTax',
+ method: 'post',
+ data: query
+ })
+ }
+ // 鏍规嵁鏉冮檺鏌ヨ瀹℃牳鍒楄〃
+export function getExpertfeeList(query) {
+ return request({
+ url: '/project/fundtax/list',
+ method: 'get',
+ params: query
+ })
+ }
+ // 鏌ヨ涓撳璐圭敤绠楃◣鐢宠涓昏缁�
+export function getFundtax(id) {
+ return request({
+ url: '/project/fundtax/getInfo/' + id,
+ method: 'get'
+ })
+}
+
+// 鏂板涓撳璐圭敤绠楃◣鐢宠涓�
+export function addFundtax(data) {
+ return request({
+ url: '/project/fundtax/add',
+ method: 'post',
+ data: data
+ })
+}
+
+// 淇敼涓撳璐圭敤绠楃◣鐢宠涓�
+export function updateFundtax(data) {
+ return request({
+ url: '/project/fundtax/edit',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鍒犻櫎涓撳璐圭敤绠楃◣鐢宠涓�
+export function delFundtax(id) {
+ return request({
+ url: '/project/fundtax/remove/' + id,
+ method: 'get'
+ })
+}
+
+// 瀵煎嚭涓撳璐圭敤绠楃◣鐢宠涓�
+export function exportFundtax(query) {
+ return request({
+ url: '/project/fundtax/export',
+ method: 'get',
+ params: query
+ })
+}
\ No newline at end of file
diff --git a/src/views/project/components/orgselect/index.vue b/src/views/project/components/orgselect/index.vue
index a0d2660..ad0b8cd 100644
--- a/src/views/project/components/orgselect/index.vue
+++ b/src/views/project/components/orgselect/index.vue
@@ -17,7 +17,7 @@
value-key="organizationid"
allow-create
reserve-keyword
- :placeholder="placeholder ? placeholder : '璇疯緭鍏ユ満鏋勫悕绉�'"
+ :placeholder="placeholder ? placeholder : '璇烽�夋嫨'"
class="full-block"
ref="selecter"
>
diff --git a/src/views/project/donateannex/index.vue b/src/views/project/donateannex/index.vue
index a212994..ecea083 100644
--- a/src/views/project/donateannex/index.vue
+++ b/src/views/project/donateannex/index.vue
@@ -154,7 +154,7 @@
:value="scope.row.recordstate"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" width="120" />
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 6345c11..b939ea5 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -267,7 +267,7 @@
:value="scope.row.workflow"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
<el-table-column
@@ -1058,7 +1058,7 @@
diagnosisname: null,
bloodtype: "0",
inpatientno: null,
- rhyin: '0',
+ rhyin: "0",
donorno: null,
donationcategory: null,
illnessoverview: null,
@@ -1217,7 +1217,6 @@
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
this.$moment(this.$route.params.endtime)
- .add(-1, "month")
.format("YYYY-MM-DD")
];
}
@@ -1732,8 +1731,8 @@
console.log(this.form);
this.$refs["form"].validate(valid => {
if (valid) {
- const date = {...this.form};
- console.log(date,'date');
+ const date = { ...this.form };
+ console.log(date, "date");
this.form.birthday = this.$moment(this.form.birthday).format(
"YYYY-MM-DD HH:mm:ss"
);
@@ -1781,32 +1780,28 @@
this.form.redorganname = this.form.redorganno;
}
-
-
- this.form.workflow = 0;
- this.form.recordstate = 0;
- addDonatebaseinfo(this.form).then(res => {
- console.log('22');
- console.log(res.code);
- if (res.code == 200) {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.$router.push({
- path: "/organ/donationdetails/",
- query: {
- id: res.data.id,
- organType: "edit"
- }
- });
- this.open = false;
- } else {
- console.log('1');
- this.form = date;
- console.log(this.form,'form');
- this.$modal.msgError("鏂板澶辫触锛�" + res.msg);
-
- }
- });
-
+ this.form.workflow = 0;
+ this.form.recordstate = 0;
+ addDonatebaseinfo(this.form).then(res => {
+ console.log("22");
+ console.log(res.code);
+ if (res.code == 200) {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: res.data.id,
+ organType: "edit"
+ }
+ });
+ this.open = false;
+ } else {
+ console.log("1");
+ this.form = date;
+ console.log(this.form, "form");
+ this.$modal.msgError("鏂板澶辫触锛�" + res.msg);
+ }
+ });
}
});
},
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index a1fd544..9b7f714 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -192,7 +192,7 @@
:value="scope.row.workflow"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
@@ -720,8 +720,7 @@
if (this.$route.params.starttime != null && this.$route.params.endtime) {
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
- this.$moment(this.$route.params.endtime)
- .format("YYYY-MM-DD")
+ this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
];
}
if (this.$route.params.reporterno != "") {
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 9285831..a95f530 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -573,7 +573,7 @@
>
<el-checkbox-group v-model="form.kinship">
<el-checkbox
- v-for="dict in dict.type.sys_Kinship"
+ v-for="dict in dict.type.sys_kinship"
:key="dict.value"
:label="dict.value"
>
@@ -1042,13 +1042,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
- <el-checkbox-group v-model="organdecision">
+ <el-checkbox-group v-model="kinship">
<el-checkbox
- v-for="item in kinshiplist"
- :key="item"
- :label="item"
+ v-for="item in dict.type.sys_kinshipConfirm"
+ :label="item.value"
+ :value="item.value"
>
- {{ item == "瀛愬コ" ? item + "(浜�)" : item }}
+ {{
+ item.label == "鎴愬勾瀛愬コ"
+ ? item.label + "(浜�)"
+ : item.label
+ }}
</el-checkbox>
</el-checkbox-group>
</el-form-item>
@@ -2495,9 +2499,11 @@
},
affirmform: {
infoid: null,
- organdecision: []
+ organdecision: [],
+ kinship: []
},
organdecision: [],
+ kinship: [],
ethicform: {
infoid: null
},
@@ -2840,6 +2846,9 @@
if (this.affirmform.organdecision) {
this.organdecision = this.affirmform.organdecision.split(",");
}
+ if (this.affirmform.kinship) {
+ this.kinship = this.affirmform.kinship.split(",");
+ }
if (!this.affirmform) {
this.affirmform = {};
this.affirmform.residenceprovincename = "";
@@ -2849,14 +2858,6 @@
this.defultAddresss.sheng = this.affirmform.residenceprovincename;
this.defultAddresss.shi = this.affirmform.residencecityname;
this.defultAddresss.qu = this.affirmform.residencetownname;
- // if (this.affirmform.kinship) {
- // this.affirmform.kinship = this.affirmform.kinship.split(",");
- // }
- // if (this.affirmform.organdecision) {
- // this.affirmform.organdecision = this.affirmform.organdecision.split(
- // ","
- // );
- // }
} else {
// this.$modal.msgError(
// "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
@@ -2904,7 +2905,7 @@
this.procureddata.infoid = this.infoid;
} else {
this.procureddata = this.allocateddata.filter(
- obj => obj.organname !== "宸﹁倽" && obj.organname !== "鍙宠倽"
+ obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�"
);
this.procureddata.infoid = this.infoid;
}
@@ -3087,6 +3088,7 @@
} else if (this.actives == 2) {
this.affirmform.infoid = this.infoid;
this.affirmform.organdecision = this.organdecision.join(",");
+ this.affirmform.kinship = this.kinship.join(",");
this.$refs["affirmform"].validate(valid => {
if (valid) {
if (this.affirmform.id != null) {
@@ -3098,6 +3100,9 @@
this.$modal.closeLoading();
});
} else {
+ this.affirmform.residenceprovincename = this.defultAddresss.sheng;
+ this.affirmform.residencecityname = this.defultAddresss.shi;
+ this.affirmform.residencetownname = this.defultAddresss.qu;
addRelativesconfirmation(this.affirmform).then(response => {
this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
this.$modal.closeLoading();
@@ -3843,7 +3848,7 @@
"sys_0_1",
"sys_patientstate",
"sys_DonationCategory",
- "sys_Kinship",
+ "sys_kinship",
"sys_Infectious",
"sys_bloodtype_rhd",
"sys_InfoSources",
@@ -3855,7 +3860,8 @@
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
"sys_EthicalReview",
- "materials_DBD"
+ "materials_DBD",
+ "sys_kinshipConfirm"
]
};
</script>
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index ac949c6..87dbb83 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -202,7 +202,7 @@
:value="scope.row.workflow"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
@@ -847,7 +847,6 @@
import { updatedonatorno } from "@/api/project/relativesconfirmation";
import { getToken } from "@/utils/auth";
-
export default {
components: {
Li_area_select,
@@ -1036,9 +1035,7 @@
this.getCoordinatorList1();
this.getCoordinatorList2();
},
- activated() {
-
- },
+ activated() {},
mounted(e) {
this.selecttime = "";
this.reportervalue = "";
@@ -1050,8 +1047,7 @@
if (this.$route.params.starttime != null && this.$route.params.endtime) {
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
- this.$moment(this.$route.params.endtime)
- .format("YYYY-MM-DD")
+ this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
];
}
if (this.$route.params.reporterno != "") {
@@ -1359,7 +1355,7 @@
path: "/organ/donationdetails/",
query: {
id: row.id,
- organType: "edit",
+ organType: "edit"
}
});
// this.reset();
@@ -1613,7 +1609,7 @@
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();
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index ce5d9a1..ec7fea6 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -88,9 +88,9 @@
</template>
</el-table-column> -->
<el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" />
- <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
+ <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="applyTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 98d55a0..4b2da11 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -67,9 +67,9 @@
</el-table-column>
-->
<el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" />
- <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
+ <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 579080a..c70309e 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -68,9 +68,9 @@
-->
<el-table-column label="鎶ラ攢鍗曞彿" align="center" prop="bh" width="150px" />
- <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
+ <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
diff --git a/src/views/project/fundcheck/performanceCheck/index.vue b/src/views/project/fundcheck/performanceCheck/index.vue
index 4b5ff52..041d2d3 100644
--- a/src/views/project/fundcheck/performanceCheck/index.vue
+++ b/src/views/project/fundcheck/performanceCheck/index.vue
@@ -57,9 +57,9 @@
<dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
</template>
</el-table-column>
- <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
+ <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="applyTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index 8e47899..7c1a8e9 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -171,13 +171,12 @@
style="margin-top: 10px; font-size: 18px; font-weight: bold"
>
<el-col :span="6">
-
- <el-card shadow="always" style="color: #566f94">
- <svg-icon icon-class="druid" /> 瀹屾垚鍣ㄥ畼鍒嗛厤绱锛歿{
- donateNumData.numberOfDonatePeople
- }} 涓�
- <!-- donateNumData.numberOfOrgans -->
- </el-card>
+ <el-card shadow="always" style="color: #566f94">
+ <svg-icon icon-class="druid" /> 瀹屾垚鍣ㄥ畼鍒嗛厤绱锛歿{
+ donateNumData.numberOfDonatePeople
+ }} 涓�
+ <!-- donateNumData.numberOfOrgans -->
+ </el-card>
</el-col>
<el-col :span="6">
<router-link
@@ -627,7 +626,7 @@
return {
city: "",
reportno: "",
- selecttime: [],
+ selecttime: [ new Date(new Date().getFullYear(), 0),new Date()],
year: "閫夋嫨骞翠唤",
isloading: false,
maxHeight: 0,
diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue
index 3312ba8..80c906e 100644
--- a/src/views/project/medicalevaluation/index.vue
+++ b/src/views/project/medicalevaluation/index.vue
@@ -202,11 +202,11 @@
<template slot-scope="scope">
<div v-if="!scope.row.terminationCase">
<dict-tag
- :options="dict.type.sys_donornode"
+ :options="dict.type.sys_donornode"
:value="scope.row.workflow"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
@@ -632,7 +632,7 @@
"sys_CoreAssessConclusion",
"sys_BaseAssessConclusion",
"sys_OrganDecision",
- 'sys_donornode'
+ "sys_donornode"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -758,7 +758,6 @@
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
this.$moment(this.$route.params.endtime)
- .add(-1, "month")
.format("YYYY-MM-DD")
];
}
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index 6083ca4..1a3fb06 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -2,45 +2,85 @@
<template>
<div class="app-container">
<!-- 鎼滅储鏉′欢 -->
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="70px"
+ >
<el-row :gutter="8">
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select v-model="queryParams.workflow" placeholder="璇烽�夋嫨鎹愮尞杩涘害" clearable size="small">
- <el-option v-for="dict in dict.type.sys_donornode" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.workflow"
+ placeholder="璇烽�夋嫨鎹愮尞杩涘害"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_donornode"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
- <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno" />
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalno"
+ >
+ <org-selecter
+ ref="orgSelecter"
+ :org-type="'3'"
+ v-model="queryParams.treatmenthospitalno"
+ />
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="鎹愮尞鍦板競">
<el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
- <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
+ <el-option
+ v-for="item in provinceData"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
-
</el-row>
<el-row :gutter="8">
<el-col :span="6">
<el-form-item label="鎶ュ憡浜�">
- <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
- <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
+ <el-select
+ v-model="queryParams.reporterno"
+ placeholder="璇烽�夋嫨鎶ュ憡浜�"
+ >
+ <el-option
+ v-for="item in reportlist"
+ :key="item.index"
+ :label="item.reportername"
+ :value="item.reporterno"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -48,16 +88,32 @@
<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-date-picker
+ style="width: 100%"
+ v-model="selecttime"
+ type="monthrange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫湀浠�"
+ end-placeholder="缁撴潫鏈堜唤"
+ value-format="yyyy-MM-dd"
+ @change="getTimeList"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="getBaseInfoList">鎼滅储</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="getBaseInfoList"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-col>
</el-row>
@@ -68,30 +124,83 @@
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
<el-table v-loading="loading" border :data="donationCaseTableData">
- <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="150">
+ <el-table-column
+ label="妗堜緥鏃堕棿"
+ align="center"
+ prop="donatetime"
+ width="150"
+ >
<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" width="120" />
+ <el-table-column
+ label="濮撳悕"
+ align="center"
+ prop="name"
+ width="120"
+ />
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
+ <dict-tag
+ :options="dict.type.sys_user_sex"
+ :value="parseInt(scope.row.sex)"
+ />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
- <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="120" />
- <el-table-column label="妗堜緥褰掑睘" align="center" width="200px" prop="deptname" />
- <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="200" fixed="right">
+ <el-table-column
+ label="骞撮緞"
+ align="center"
+ prop="age"
+ width="100"
+ />
+ <el-table-column
+ label="鎶ュ憡浜�"
+ align="center"
+ prop="reportername"
+ width="120"
+ />
+ <el-table-column
+ label="妗堜緥褰掑睘"
+ align="center"
+ width="200px"
+ prop="deptname"
+ />
+ <el-table-column
+ label="鍖荤枟鏈烘瀯"
+ align="center"
+ prop="treatmenthospitalname"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="200"
+ fixed="right"
+ >
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="selectDonotor(scope.row)">鎹愮尞璇︽儏</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="selectDonotor(scope.row)"
+ >鎹愮尞璇︽儏</el-button
+ >
</template>
</el-table-column>
</el-table>
<!-- hide-on-single-page -->
- <pagination v-show="total > 0" small layout="prev, pager, next" :total="total" :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
+ <pagination
+ v-show="total > 0"
+ small
+ layout="prev, pager, next"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getBaseInfoList"
+ />
</el-card>
</el-col>
<!-- <el-col :span="16">
@@ -149,18 +258,32 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀瑰櫒瀹樺垎閰嶅璇濇 -->
- <el-dialog :title="distributionFormTitle" :visible.sync="showDistributionForm" :close-on-click-modal="false"
- width="1000px" append-to-body>
+ <el-dialog
+ :title="distributionFormTitle"
+ :visible.sync="showDistributionForm"
+ :close-on-click-modal="false"
+ width="1000px"
+ append-to-body
+ >
<el-form ref="form" :model="form" :rules="rules" label-width="160px">
<el-row>
<el-col :span="16">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input v-model="distributionForm.donorno" placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" disabled />
- </el-form-item> </el-col><el-col :span="8">
+ <el-input
+ v-model="distributionForm.donorno"
+ placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�"
+ disabled
+ />
+ </el-form-item> </el-col
+ ><el-col :span="8">
<el-form-item label="鍒嗛厤鐘舵��" prop="organstate">
<el-select v-model="form.organstate" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��">
- <el-option v-for="dict in dict.type.sys_organstate" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-option
+ v-for="dict in dict.type.sys_organstate"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -168,31 +291,61 @@
<el-row>
<el-col :span="8">
<el-form-item label="鎹愮尞濮撳悕" prop="curdonorname">
- <el-input v-model="curdonorname" placeholder="鎹愮尞鑰呭鍚�" disabled />
+ <el-input
+ v-model="curdonorname"
+ placeholder="鎹愮尞鑰呭鍚�"
+ disabled
+ />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="鍣ㄥ畼鍚嶇О" prop="organnumber">
- <el-select ref="organNameSelect" v-model="form.organnumber" placeholder="璇烽�夋嫨鍣ㄥ畼缂栧彿" clearable size="small"
- disabled>
- <el-option v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ ref="organNameSelect"
+ v-model="form.organnumber"
+ placeholder="璇烽�夋嫨鍣ㄥ畼缂栧彿"
+ clearable
+ size="small"
+ disabled
+ >
+ <el-option
+ v-for="dict in dict.type.sys_Organ"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
- </el-form-item> </el-col><el-col :span="8">
+ </el-form-item> </el-col
+ ><el-col :span="8">
<el-form-item label="绯荤粺缂栧彿" prop="ageunit">
<el-input v-model="form.ageunit" placeholder="璇疯緭鍏ョ郴缁熺紪鍙�" />
</el-form-item>
</el-col>
</el-row>
- <el-row><el-col :span="8">
+ <el-row
+ ><el-col :span="8">
<el-form-item label="鎺ユ敹鏃堕棿" prop="applicanttime">
- <el-date-picker clearable size="small" style="width: 100%" v-model="form.applicanttime" type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鎺ユ敹鏃堕棿">
+ <el-date-picker
+ clearable
+ size="small"
+ style="width: 100%"
+ v-model="form.applicanttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+ >
</el-date-picker>
- </el-form-item> </el-col><el-col :span="16">
+ </el-form-item> </el-col
+ ><el-col :span="16">
<el-form-item label="绉绘鍖婚櫌" prop="treatmenthospitalno">
- <org-selecter ref="tranHosSelect" :org-type="'4'" v-model="form.transplanthospitalno" style="width: 100%" />
- </el-form-item> </el-col></el-row><el-row>
+ <org-selecter
+ ref="tranHosSelect"
+ :org-type="'4'"
+ v-model="form.transplanthospitalno"
+ style="width: 100%"
+ />
+ </el-form-item> </el-col></el-row
+ ><el-row>
<el-col :span="8">
<el-form-item label="鍙椾綋濮撴皬" prop="name">
<el-input v-model="form.name" placeholder="濮撴皬" />
@@ -200,13 +353,24 @@
</el-col>
<el-col :span="8">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨绉绘浜鸿瘉浠剁被鍨�">
- <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
+ <el-select
+ v-model="form.idcardtype"
+ placeholder="璇烽�夋嫨绉绘浜鸿瘉浠剁被鍨�"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_IDType"
+ :key="dict.value"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ ></el-option>
</el-select>
- </el-form-item> </el-col><el-col :span="8">
+ </el-form-item> </el-col
+ ><el-col :span="8">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ョЩ妞嶄汉璇佷欢鍙风爜" />
+ <el-input
+ v-model="form.idcardno"
+ placeholder="璇疯緭鍏ョЩ妞嶄汉璇佷欢鍙风爜"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -223,7 +387,7 @@
//杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
import {
- listDonatebaseinfo,
+ listDonatebaseinfo
// exportProvincemessage,
} from "@/api/project/donatebaseinfo";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -233,21 +397,21 @@
addDonateorgan,
delDonateorgan,
getDonateorgan,
- updateDonateorgan,
+ updateDonateorgan
} from "@/api/project/donateorgan";
import {
listOrganallocation,
getOrganallocation,
addOrganallocation,
delOrganallocation,
- updateOrganallocation,
+ updateOrganallocation
} from "@/api/project/organallocation";
import Li_area_select from "@/components/Address";
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "Organallocation",
@@ -257,7 +421,7 @@
"sys_user_sex",
"sys_IDType",
"sys_AgeUnit",
- "sys_donornode",
+ "sys_donornode"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -284,13 +448,13 @@
{ label: "琛㈠窞甯�", value: "8" },
{ label: "鑸熷北甯�", value: "9" },
{ label: "鍙板窞甯�", value: "A" },
- { label: "涓芥按甯�", value: "B" },
+ { label: "涓芥按甯�", value: "B" }
],
searchAddress: {
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
},
//鎼滅储鍙傛暟
@@ -306,7 +470,7 @@
endtime: null,
endReporttime: null,
reportervalue: null,
- city: null,
+ city: null
},
//褰撳墠閫変腑鎹愮尞妗堜緥缂栧彿
@@ -326,7 +490,7 @@
//閫夋嫨鍣ㄥ畼琛ㄥ崟
organalForm: {
//鍣ㄥ畼鍒楄〃
- organname: [],
+ organname: []
},
//鍣ㄥ畼鍒嗛厤鍒楄〃
organalTableData: [],
@@ -338,18 +502,18 @@
defultAddress: {
sheng: "娴欐睙鐪�",
shi: "",
- qu: "",
+ qu: ""
},
form: {},
rules: {
applicanttime: [
- { required: true, message: "璇疯緭鍏ユ帴鏀舵椂闂�", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ユ帴鏀舵椂闂�", trigger: "blur" }
+ ]
},
// 閬僵灞�
loading: true,
title: "",
- selectedRow: null,
+ selectedRow: null
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -367,9 +531,7 @@
if (this.$route.params.starttime != null && this.$route.params.endtime) {
this.selecttime = [
this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
- this.$moment(this.$route.params.endtime)
- .add(-1, "month")
- .format("YYYY-MM-DD"),
+ this.$moment(this.$route.params.endtime).format("YYYY-MM-DD")
];
}
if (this.$route.params.reporterno != "") {
@@ -404,14 +566,14 @@
//鏂规硶闆嗗悎
methods: {
LoadReportList() {
- listDonatebaseinfo().then((res) => {
+ listDonatebaseinfo().then(res => {
console.log("娼滃湪鎹愮尞琛�", res);
let list = res.rows;
let reportlist = [];
- list.forEach((element) => {
+ list.forEach(element => {
reportlist.push({
reporterno: element.reporterno,
- reportername: element.reportername,
+ reportername: element.reportername
});
});
console.log("dwada", reportlist);
@@ -423,7 +585,7 @@
},
resetArr(Arr) {
var hash = {};
- Arr = Arr.reduce(function (arr, current) {
+ Arr = Arr.reduce(function(arr, current) {
hash[current.reporterno]
? ""
: (hash[current.reporterno] = true && arr.push(current));
@@ -494,27 +656,27 @@
this.showDistributionForm = true;
this.reset();
- getDonateorgan(data.id).then((res) => {
+ getDonateorgan(data.id).then(res => {
let obj = res.data;
obj.organstate = 99;
- updateDonateorgan(obj).then((res) => {
+ updateDonateorgan(obj).then(res => {
// if(res.code === 200){
this.form.organstate = data.organstate;
this.form.organno = data.organno;
this.form.organnumber = data.organno;
let loactionSearcParam = {
- organid: data.id,
+ organid: data.id
};
- listOrganallocation(loactionSearcParam).then((res) => {
+ listOrganallocation(loactionSearcParam).then(res => {
if (res.rows != 0) {
let list = res.rows[0];
// this.form.ageunit = list.ageunit;
this.form.applicanttime = list.applicanttime;
// this.form.treatmenthospitalno = list.treatmenthospitalno;
// this.form.transplanthospitalname = list.transplanthospitalname
- };
+ }
});
console.log("Organallocation", this.form);
});
@@ -546,7 +708,7 @@
// this.queryParams.residenceprovince = this.$refs.areaSelect.getSheng();
// this.queryParams.residencecity = this.$refs.areaSelect.getShi();
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donationCaseTableData = response.rows;
console.log(this.donationCaseTableData, "Donation");
this.total = response.total;
@@ -576,7 +738,7 @@
reportername: null,
reporttime: null,
city: null,
- treatmenthospitalno: null,
+ treatmenthospitalno: null
};
this.selecttime = [];
this.getTimeList();
@@ -584,7 +746,7 @@
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
};
//this.$refs.areaSelect.clean();
@@ -602,7 +764,7 @@
this.organalTableData.push({
organname: this.dict.type.sys_Organ[i].label,
organno: this.dict.type.sys_Organ[i].value,
- id: null,
+ id: null
});
}
}
@@ -624,10 +786,10 @@
if (data.id != null) {
//鎼滅储鍣ㄥ畼鍒嗛厤璁板綍
let loactionSearcParam = {
- organid: data.id,
+ organid: data.id
};
this.showDistributionForm = true;
- listOrganallocation(loactionSearcParam).then((response) => {
+ listOrganallocation(loactionSearcParam).then(response => {
if (response.rows.length == 1) {
let resData = response.rows[0];
resData.organstate = data.organstate;
@@ -656,7 +818,7 @@
path: "/organ/donationdetails/",
query: {
id: row.id,
- organType: "edit",
+ organType: "edit"
}
});
// this.selectedRow = row;
@@ -671,10 +833,10 @@
GetDonortedList() {
this.loading = true;
let oraganqueryParam = {
- infoid: this.curInfoid,
+ infoid: this.curInfoid
};
// donorno: this.curdonorno,
- listDonateorgan(oraganqueryParam).then((response) => {
+ listDonateorgan(oraganqueryParam).then(response => {
this.loading = false;
if (response.code == 200) {
this.organalTableData = [];
@@ -687,7 +849,7 @@
organname: response.rows[i].organname,
transplanthospitalno: response.rows[i].transplanthospitalno,
transplanthospitalname: response.rows[i].transplanthospitalname,
- organstate: response.rows[i].organstate,
+ organstate: response.rows[i].organstate
});
}
} else {
@@ -699,16 +861,14 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
if (valid) {
-
if (this.form.id != null) {
//鏇存柊鎹愮尞鍣ㄥ畼琛�
this.form.allocationstatus = this.form.organstate;
- updateOrganallocation(this.form).then((response) => {
- });
+ updateOrganallocation(this.form).then(response => {});
//鑾峰彇鍣ㄥ畼淇℃伅
- getDonateorgan(this.form.organid).then((response2) => {
+ getDonateorgan(this.form.organid).then(response2 => {
let organData = response2.data;
(organData.organname = this.$refs.organNameSelect.selectedLabel),
(organData.organstate = this.form.allocationstatus);
@@ -716,19 +876,21 @@
organData.transplanthospitalno = this.form.transplanthospitalno;
try {
- organData.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organData.transplanthospitalno).organizationname;
+ organData.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(
+ organData.transplanthospitalno
+ ).organizationname;
} catch {
- organData.transplanthospitalname = organData.transplanthospitalno;
+ organData.transplanthospitalname =
+ organData.transplanthospitalno;
}
//鏇存柊鎹愮尞鍣ㄥ畼琛�
- updateDonateorgan(organData).then((response3) => {
+ updateDonateorgan(organData).then(response3 => {
this.$modal.msgSuccess("淇敼鍣ㄥ畼淇℃伅鎴愬姛");
this.GetDonortedList();
this.showDistributionForm = false;
});
});
- }
- else {
+ } else {
//淇濆瓨鏃跺厛淇濆瓨鍒版崘鐚櫒瀹樿〃
//鏂板鍒板櫒瀹樼鐞嗚〃
this.loading = false;
@@ -741,36 +903,39 @@
organstate: this.form.organstate,
transplanthospitalno: this.form.transplanthospitalno,
transplanthospitalname: null,
- transplantdoct: this.form.transplantdoct,
+ transplantdoct: this.form.transplantdoct
};
try {
- organaManageForm.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organaManageForm.transplanthospitalno).organizationname;
+ organaManageForm.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(
+ organaManageForm.transplanthospitalno
+ ).organizationname;
} catch {
- organaManageForm.transplanthospitalname = organaManageForm.transplanthospitalno;
+ organaManageForm.transplanthospitalname =
+ organaManageForm.transplanthospitalno;
}
- addDonateorgan(organaManageForm).then((response) => {
+ addDonateorgan(organaManageForm).then(response => {
this.loading = false;
if (response.code === 200) {
//鏌ヨ鑾峰彇鏂板鐨勫櫒瀹樿〃id
let organSearchParam = {
infoid: this.curInfoid,
// donorno: this.curdonorno,
- organno: this.form.organnumber,
+ organno: this.form.organnumber
//donorname: this.curdonorname,
//organname: this.$refs.organNameSelect.label,
};
- listDonateorgan(organSearchParam).then((response2) => {
+ listDonateorgan(organSearchParam).then(response2 => {
if (response2.code == 200 && response2.rows.length > 0) {
for (let i = 0; i < response2.rows.length; i++) {
- if (response2.rows[i].organstate == '2') {
+ if (response2.rows[i].organstate == "2") {
this.form.organid = response2.rows[i].id;
// this.form.residenceprovincename = this.defultAddress.sheng;
// this.form.residencecityname = this.defultAddress.shi;
// this.form.residencetownname = this.defultAddress.qu;
- addOrganallocation(this.form).then((response) => {
+ addOrganallocation(this.form).then(response => {
this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
});
}
@@ -826,7 +991,7 @@
updateTime: null,
//绉绘鍖婚櫌
transplanthospitalno: null,
- transplanthospitalname: null,
+ transplanthospitalname: null
};
this.distributionForm.donorno = this.curdonorno;
},
@@ -868,7 +1033,7 @@
updateBy: null,
updateTime: null,
transplanthospitalno: null,
- organstate: null,
+ organstate: null
};
this.resetForm("form");
},
@@ -876,7 +1041,7 @@
changeorganState(value) {
//organalTableData
let organIndex = this.organalTableData.findIndex(
- (item) => item.organno == value
+ item => item.organno == value
);
//鍒ゆ柇褰撳墠閫変腑鍊兼槸鍚﹀湪鏁扮粍涓�
if (organIndex == -1) {
@@ -895,14 +1060,14 @@
id: null,
transplanthospitalname: null,
transplanthospitalno: null,
- organstate: '2',
+ organstate: "2"
});
}
} else {
this.$confirm("鏄惁纭鍒犻櫎鍣ㄥ畼鍒嗛厤璁板綍", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
if (organIndex != -1) {
@@ -915,7 +1080,7 @@
if (tempOrgan.id > 0) {
//鏌ユ壘鍣ㄥ畼琛ㄨ褰曪紝鍒ゆ柇鍣ㄥ畼鐘舵��
this.loading = true;
- delDonateorgan(tempOrgan.id).then((delLocationRes) => {
+ delDonateorgan(tempOrgan.id).then(delLocationRes => {
//璋冪敤鍒犻櫎鍣ㄥ畼璁板綍api
// delDonateorgan(searchedOrganData.id).then(
// (delOrganRes) => {
@@ -935,13 +1100,13 @@
this.selectDonotor(this.selectedRow);
});
}
- },
+ }
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
this.getBaseInfoList();
this.resetForm();
- },
+ }
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
// mounted() {},
// beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
@@ -953,6 +1118,6 @@
// activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
//@import url(); 寮曞叆鍏叡css绫�
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue
index 1250766..4b60609 100644
--- a/src/views/project/relativesconfirmation/index.vue
+++ b/src/views/project/relativesconfirmation/index.vue
@@ -162,7 +162,7 @@
:value="scope.row.workflow"
/>
</div>
- <div v-else>浠诲姟涓</div>
+ <div v-else>浠诲姟缁堟</div>
</template>
</el-table-column>
diff --git a/src/views/project/statistics/caseStatistics/index.vue b/src/views/project/statistics/caseStatistics/index.vue
index 8dfbedf..314de6d 100644
--- a/src/views/project/statistics/caseStatistics/index.vue
+++ b/src/views/project/statistics/caseStatistics/index.vue
@@ -170,7 +170,7 @@
reportervalue: "",
reportlist: [
{ label: "姝ｅ父", value: "0" },
- { label: "涓", value: "1" }
+ { label: "缁堟", value: "1" }
],
//鐪佸競鍖�
//榛樿鍊艰缃紝鍙负绌�
diff --git a/src/views/project/statistics/chargeStatistics/index.vue b/src/views/project/statistics/chargeStatistics/index.vue
index d2223e6..fbfd775 100644
--- a/src/views/project/statistics/chargeStatistics/index.vue
+++ b/src/views/project/statistics/chargeStatistics/index.vue
@@ -88,8 +88,7 @@
size="mini"
type="text"
icon="el-icon-edit"
- @click="handleAdd(scope.row)"
- >鍖诲璇勪及</el-button
+ >璇存槑</el-button
>
</template>
</el-table-column>
diff --git a/src/views/project/unitCost/particulars.vue b/src/views/project/tallage/computingBill/index.vue
similarity index 86%
rename from src/views/project/unitCost/particulars.vue
rename to src/views/project/tallage/computingBill/index.vue
index 160e216..0427c66 100644
--- a/src/views/project/unitCost/particulars.vue
+++ b/src/views/project/tallage/computingBill/index.vue
@@ -4,29 +4,7 @@
<div class="top-text">{{ title }}</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
- <el-col :span="5">
- <el-form-item label="缁忓姙浜�" prop="name">
- <el-input
- v-model="form.createby"
- placeholder="璇疯緭鍏ュ鍚�"
- :disabled="true"
- />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏀舵鐘舵��" prop="sex">
- <el-select v-model="form.paystatus" placeholder="璇烽�夋嫨鐘舵��">
- <el-option
- v-for="dict in gatheringlist"
- :key="dict.label"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="7">
+ <el-col :span="6">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker
v-model="form.createTime"
@@ -38,35 +16,76 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="7"
- ><el-form-item label="鏀舵鍗曞彿" prop="donateno">
- <el-input v-model="form.paymentno" placeholder="璇疯緭鍏ユ敹娆惧崟鍙�" />
- </el-form-item>
- </el-col> </el-row
- ><el-row
- ><el-col :span="5"
- ><el-form-item label="鏀舵鍗曚綅" prop="donateno">
+ <el-col :span="6">
+ <el-form-item label="缁忓姙浜�" prop="name">
<el-input
- v-model="form.beneficiary"
- placeholder="璇疯緭鍏ユ敹娆惧崟浣�"
+ v-model="form.username"
+ placeholder="璇疯緭鍏ュ鍚�"
+ :disabled="true"
/>
</el-form-item>
</el-col>
- <el-col :span="12"
- ><el-form-item label="鏀舵閾惰" prop="donateno">
+ <el-col :span="6">
+ <el-form-item label="绠楃◣鐘舵��" prop="sex">
+ <el-select v-model="form.istax" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="dict in gatheringlist"
+ :key="dict.label"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="6"
+ ><el-form-item label="绠楃◣鏃堕棿" prop="donateno">
+ <el-date-picker
+ v-model="form.taxedtime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ type="datetime"
+ :disabled="true"
+ placeholder="閫夋嫨鏃堕棿"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col> </el-row
+ ><el-row
+ ><el-col :span="6"
+ ><el-form-item label="绋庡墠閲戦" prop="donateno">
<el-input
- v-model="form.beneficiarybank"
- placeholder="璇疯緭鍏ユ敹娆鹃摱琛�"
+ v-model="form.pretaxamount"
+ placeholder="璇疯緭鍏ョ◣鍓嶉噾棰�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6"
+ ><el-form-item label="鎵ｇ◣閲戦" prop="donateno">
+ <el-input
+ v-model="form.taxMoney"
+ placeholder="璇疯緭鍏ユ墸绋庨噾棰�"
/>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鏀舵琛屽彿" prop="donationcategory">
+ <el-col :span="6">
+ <el-form-item label="绋庡悗閲戦" prop="donationcategory">
<el-input
- v-model="form.beneficiaryaccount"
+ v-model="form.taxedamount"
placeholder="璇疯緭鍏ユ敹娆捐鍙�"
/>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="浠樻鐘舵��" prop="sex">
+ <el-select v-model="form.isdistribute" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="dict in gatheringlist"
+ :key="dict.label"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -77,50 +96,9 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="浠樻鍖婚櫌" prop="sex">
- <el-input
- v-model="form.hospitalname"
- placeholder="璇疯緭鍏ヤ粯娆惧尰闄�"
- :disabled="true"
- />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="搴旀敹閲戦" prop="receivableamount">
- <el-input
- v-model="form.receivableamount"
- placeholder="璇疯緭鍏ュ簲鏀堕噾棰�"
- :disabled="true"
- />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="瀹炴敹閲戦" prop="receivedamount">
- <el-input
- @blur="chargeSumall"
- v-model="form.receivedamount"
- placeholder="璇疯緭鍏ュ疄鏀堕噾棰�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鏀舵鏃ユ湡" prop="receivedtime">
- <el-date-picker
- clearable
- size="small"
- v-model="form.receivedtime"
- value-format="yyyy-MM-dd HH:mm:ss"
- type="datetime"
- placeholder="閫夋嫨鏀舵鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
+
<div class="headlines">
- <div>鏀舵鏄庣粏</div>
+ <div>涓撳璐逛粯娆剧敵璇峰崟</div>
<el-button type="primary" @click="handleAddpatient">鏂板</el-button>
</div>
<el-row style="margin-top: 10px">
@@ -137,34 +115,20 @@
prop="organno"
align="center"
fixed
- label="鍣ㄥ畼缂栧彿"
+ label="妗堜緥鎹愮尞鑰�"
width="90"
>
<template slot-scope="scope">
<el-input
v-model="scope.row.organno"
- placeholder="鍣ㄥ畼缂栧彿"
+ placeholder="妗堜緥鎹愮尞鑰�"
:disabled="true"
/>
</template>
</el-table-column>
+
<el-table-column
- prop="organname"
- fixed
- align="center"
- label="鍣ㄥ畼鍚嶇О"
- width="120"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.organname"
- :disabled="true"
- placeholder="鍣ㄥ畼鍚嶇О"
- />
- </template>
- </el-table-column>
- <el-table-column
- label="鍥藉缂栧彿"
+ label="鐢宠浜�"
align="center"
width="120"
prop="caseno"
@@ -173,50 +137,35 @@
<el-input
v-model="scope.row.caseno"
:disabled="true"
- placeholder="鍥藉缂栧彿"
+ placeholder="鐢宠浜�"
/>
</template>
</el-table-column>
<el-table-column
prop="hospitalno"
align="center"
- label="鎺ユ敹鍖婚櫌"
+ label="鎵�灞炵粍鍒�"
width="280"
>
<template slot-scope="scope">
<!-- <el-input
- v-model="scope.row.hospitalname"
- :disabled="true"
- placeholder="鎺ユ敹鍖婚櫌"
- /> -->
+ v-model="scope.row.hospitalname"
+ :disabled="true"
+ placeholder="鎺ユ敹鍖婚櫌"
+ /> -->
<org-selecter
- ref="tranHosSelect"
- :org-type="'4'"
+ ref="tranHosSelect"
+ :org-type="'4'"
:disabled="true"
-
- v-model="scope.row.hospitalno"
- style="width: 100%"
- />
- </template>
- </el-table-column>
- <el-table-column
- label="鍙椾綋濮撴皬"
- align="center"
- width="120"
- prop="name"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.name"
- :disabled="true"
- placeholder="鍙椾綋濮撴皬"
+ v-model="scope.row.hospitalno"
+ style="width: 100%"
/>
</template>
</el-table-column>
<el-table-column
prop="receiveTime"
align="center"
- label="鎺ユ敹鏃ユ湡"
+ label="鐢宠鏃ユ湡"
width="200"
>
<template slot-scope="scope">
@@ -228,58 +177,53 @@
:disabled="true"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鎺ユ敹鏃ユ湡"
+ placeholder="鐢宠鏃ユ湡"
>
</el-date-picker>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="organname"
+ fixed
+ align="center"
+ label="绋庡墠閲戦"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.organname"
+ :disabled="true"
+ placeholder="绋庡墠閲戦"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎵ｇ◣閲戦"
+ align="center"
+ width="120"
+ prop="name"
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.name"
+ :disabled="true"
+ placeholder="鎵ｇ◣閲戦"
+ />
</template>
</el-table-column>
<el-table-column
prop="organcharge"
align="center"
- label="搴旀敹閲戦"
+ label="绋庡悗閲戦"
width="150"
>
<template slot-scope="scope">
<el-input
@blur="chargeSum"
v-model="scope.row.organcharge"
- placeholder="搴旀敹閲戦"
+ placeholder="绋庡悗閲戦"
/>
- </template>
- </el-table-column>
- <el-table-column
- prop="amount"
- align="center"
- label="瀹炴敹閲戦"
- width="150"
- >
- <template slot-scope="scope">
- <el-input
- @blur="chargeSum"
- v-model="scope.row.amount"
- placeholder="瀹炴敹閲戦"
- />
- </template>
- </el-table-column>
-
- <el-table-column
- prop="amounttime"
- align="center"
- label="鏀舵鏃ユ湡"
- width="200"
- >
- <template slot-scope="scope">
- <el-date-picker
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.amounttime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鏀舵鏃ユ湡"
- >
- </el-date-picker>
</template>
</el-table-column>
<el-table-column
@@ -312,13 +256,13 @@
><i class="el-icon-delete"></i>鍒犻櫎</span
></el-button
>
- <el-button
+ <!-- <el-button
type="text"
icon="el-icon-folder-opened"
@click="Filepopup(scope.$index, scope.row)"
v-hasPermi="['system:donorcharge:edit']"
>闄勪欢</el-button
- >
+ > -->
</template>
</el-table-column>
</el-table>
@@ -335,7 +279,7 @@
</div>
<!-- 娣诲姞鎮ｈ�� -->
<el-dialog
- title="閫夋嫨鍣ㄥ畼鍜岀粍缁�"
+ title="涓撳璐逛粯娆剧敵璇峰崟閫夋嫨"
:visible.sync="dialogVisiblepatient"
width="70%"
:before-close="handleClosehz"
@@ -351,14 +295,7 @@
:inline="true"
label-width="98px"
>
- <el-form-item label="鎺ユ敹鍖婚櫌" prop="status">
- <el-input
- v-model="form.hospitalname"
- placeholder="璇疯緭鍏ヤ粯娆惧尰闄�"
- :disabled="true"
- />
- </el-form-item>
- <el-form-item label="鎹愮尞鑰�" prop="status">
+ <el-form-item label="鎹愮尞妗堜緥" prop="status">
<el-select
v-model="patientqueryParams.donorchargeid"
filterable
@@ -399,7 +336,7 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"> </el-table-column>
- <el-table-column label="鎹愮尞鑰�" width="120">
+ <el-table-column label="妗堜緥鎹愮尞鑰�" width="120">
<template slot-scope="scope">{{
scope.row.donorname
}}</template>
@@ -407,33 +344,33 @@
<el-table-column
prop="organname"
- label="鍣ㄥ畼鍚嶇О"
+ label="鎵�灞炵粍鍒�"
show-overflow-tooltip
>
</el-table-column>
- <el-table-column prop="organno" label="鍣ㄥ畼缂栧彿" width="120">
+ <el-table-column prop="organno" label="鐢宠浜�" width="120">
</el-table-column>
<el-table-column
prop="caseno"
- label="鍥藉鍒嗛厤缂栧彿"
+ label="鐢宠鏃ユ湡"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="name"
- label="鍙椾綋濮撴皬"
+ label="绋庡墠閲戦"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="hospitalname"
- label="鎺ユ敹鍖婚櫌"
+ label="鎵ｇ◣閲戦"
show-overflow-tooltip
>
</el-table-column>
<el-table-column
prop="receiveTime"
- label="鎺ユ敹鏃ユ湡"
+ label="绋庡悗閲戦"
show-overflow-tooltip
>
</el-table-column>
@@ -563,8 +500,8 @@
:preview-src-list="pdfimgsrcList"
>
<!-- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div> -->
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
@@ -600,7 +537,13 @@
import Li_area_select from "@/components/Address";
import { getUserProfile } from "@/api/system/user";
import { getToken } from "@/utils/auth";
-import debounce from "lodash/debounce";
+import {
+ addFundTax,
+ getExpertfeeList,
+ getFundtax,
+ getMaxFundTaxId,
+ listbxiaostatistics
+} from "@/api/project/tallage";
export default {
components: {
Treeselect,
@@ -636,9 +579,8 @@
}
],
gatheringlist: [
- { label: "鏂板缓", value: "1" },
- { label: "寰呮敹娆�", value: "2" },
- { label: "宸叉敹娆�", value: "3" }
+ { label: "鏈畻绋�", value: "0" },
+ { label: "宸茬畻绋�", value: "1" }
],
multipleSelection: [],
patientqueryParams: {
@@ -953,15 +895,9 @@
handleUpdate() {
this.reset();
this.title = "鏀舵缁撶畻鐢宠鍗曠紪杈�";
-
- listDonorpayment({ id: this.curId }).then(response => {
- this.form = response.rows[0];
- //鍣ㄥ畼璐圭敤淇℃伅
- listDonorchargeorgan(this.patientqueryParams).then(res => {
- console.log("listDonorchargeorgan", res);
- this.donorchargeorgans = res.rows;
- console.log(this.donorchargeorgans, "donorchargeorgans");
- });
+ getFundtax(this.curId ).then(response => {
+ this.form = response.data;
+
});
},
@@ -1439,6 +1375,12 @@
}
}
}
+::v-deep .el-input.is-disabled .el-input__inner {
+ background-color: #f5f7fa;
+ border-color: #dfe4ed;
+ color: #000000;
+ cursor: not-allowed;
+}
::v-deep .el-input--medium .el-input__inner {
height: 36px;
diff --git a/src/views/project/tallage/index.vue b/src/views/project/tallage/index.vue
new file mode 100644
index 0000000..fe266c1
--- /dev/null
+++ b/src/views/project/tallage/index.vue
@@ -0,0 +1,446 @@
+<template>
+ <div class="app-container">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="120px"
+ >
+ <el-form-item label="鐢宠鍗曞彿" prop="applyno">
+ <el-input
+ v-model="queryParams.applyno"
+ placeholder="璇疯緭鍏ュ崟鍙�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-form-item label="鏄惁绠楃◣" prop="donationcategory">
+ <el-select v-model="queryParams.istax" placeholder="璇烽�夋嫨鐘舵��">
+ <el-option
+ v-for="item in deptList"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </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-form-item>
+ </el-form>
+
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['system:donorcharge:add']"
+ >鏂板</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="danger"
+ plain
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['system:donorcharge:remove']"
+ >鍒犻櫎</el-button
+ >
+ </el-col>
+
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
+ </el-row>
+
+ <el-table
+ v-loading="loading"
+ :data="donorchargeList"
+ @selection-change="handleSelectionChange"
+ >
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ align="center"
+ prop="createTime"
+ width="180"
+ >
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" />
+ <el-table-column
+ label="鐢宠鍗曞彿"
+ width="180"
+ align="center"
+ prop="applyno"
+ />
+
+ <el-table-column label="绋庡墠閲戦" align="center" prop="pretaxamount">
+ </el-table-column>
+ <el-table-column
+ label="鎵ｇ◣閲戦"
+ align="center"
+ prop="taxMoney"
+ />
+ <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" />
+ <el-table-column
+ label="鏄惁绠楃◣"
+ width="180"
+ align="center"
+ prop="istax"
+ >
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_calculate" :value="scope.row.istax"/>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎬婚噾棰�" align="center" prop="taxamount" />
+
+ <el-table-column label="绠楃◣鏃堕棿" align="center" prop="taxedtime" />
+ <el-table-column label="浠樻鐘舵��" align="center" prop="isdistribute" />
+ <el-table-column label="浠樻鏃ユ湡" align="center" prop="riqi" />
+ <el-table-column label="鎿嶄綔" width="280" align="center">
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['system:donorcharge:edit']"
+ >淇敼</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleDetail(scope.row)"
+ v-hasPermi="['system:donorcharge:edit']"
+ >璇︽儏</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['system:donorcharge:remove']"
+ ><span class="button-delete"
+ ><i class="el-icon-delete"></i>鍒犻櫎</span
+ ></el-button
+ >
+ <el-button
+ size="mini"
+ type="primary"
+ @click="download(scope.row)"
+ icon="el-icon-download"
+ circle
+ ></el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getList"
+ />
+
+ <el-dialog
+ :visible.sync="showSelectionDialog"
+ :close-on-click-modal="false"
+ :title="'璇烽�夋嫨鎹愮尞妗堜緥'"
+ width="500px"
+ style="text-align: center"
+ v-loading="loading"
+ >
+ <el-form ref="selectionForm" :model="selectionForm">
+ <el-row>
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalno"
+ >
+ <org-selecter
+ ref="addOrgSelect"
+ :org-type="'4'"
+ v-model="selectionForm.donorid"
+ />
+ </el-form-item>
+ </el-row>
+ </el-form>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="confirmSelection()">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
+ </div>
+</template>
+
+<script>
+import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
+import {
+ listDonorcharge,
+ getDonorcharge,
+ delDonorpayment,
+ addDonorcharge,
+ updateDonorcharge,
+ exportDonorcharge,
+ listDonorpayment,
+ dyDonorpayment
+} from "@/api/project/donorcharge";
+import { listOrganization } from "@/api/project/organization";
+import {
+ addFundTax,
+ getExpertfeeList,
+ delFundtax,
+ getMaxFundTaxId,
+ listbxiaostatistics
+} from "@/api/project/tallage";
+
+import OrgSelecter from "@/views/project/components/orgselect";
+
+export default {
+ name: "Donorcharge",
+ dicts: ["sys_gathering",'sys_calculate'],
+ components: {
+ OrgSelecter
+ },
+ data() {
+ return {
+ // 閬僵灞�
+ loading: true,
+ // 瀵煎嚭閬僵灞�
+ exportLoading: false,
+ // 閫変腑鏁扮粍
+ ids: [],
+ // 闈炲崟涓鐢�
+ single: true,
+ // 闈炲涓鐢�
+ multiple: true,
+ // 鏄剧ず鎼滅储鏉′欢
+ showSearch: true,
+ // 鎬绘潯鏁�
+ total: 0,
+ //褰撳墠妗堜緥id
+ curInfoId: 0,
+ // 鎹愮尞妗堜緥鍣ㄥ畼鍒楄〃鏍兼暟鎹�
+ donorchargeList: [],
+ donorchargerogans: [],
+
+ //鎹愮尞妗堜緥閫夋嫨
+ showSelectionDialog: false,
+ donorlist: [],
+ donorinfolist: [],
+ selectionForm: {
+ index: null,
+ donorid: null,
+ donorname: null
+ },
+ loadingdonorlist: false,
+ deptList: [
+ {
+ value: "0",
+ label: "鏈畻绋�"
+ },
+ {
+ value: "1",
+ label: "宸茬畻绋�"
+ }
+ ],
+ // 寮瑰嚭灞傛爣棰�
+ title: "",
+ // 鏄惁鏄剧ず寮瑰嚭灞�
+ // 鏌ヨ璐圭敤琛ㄥ弬鏁�
+ queryParams: {
+ pageNum: 1,
+ pageSize: 10
+ },
+ //鏌ヨ妗堜緥鍙傛暟
+ donorParams: {
+ pageNum: 1,
+ pageSize: 1000
+ },
+ // 鏌ヨ璐圭敤鍣ㄥ畼琛ㄥ弬鏁�
+ organParams: {
+ pageNum: 1,
+ pageSize: 10,
+ donorchargeid: null
+ },
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ // 琛ㄥ崟鏍￠獙
+ rules: {}
+ };
+ },
+ created() {
+ this.getList();
+ },
+
+ methods: {
+ //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
+ confirmSelection() {
+ var curdonorinfo = null;
+ console.log(this.selectionForm.donorid, "donorid");
+ //浠庢渚嬪垪琛ㄨ幏鍙栦俊鎭�
+ this.donorinfolist.map(item => {
+ if (this.selectionForm.donorid == item.id) {
+ curdonorinfo = item;
+ }
+ });
+ let searchData = {
+ organizationid: this.selectionForm.donorid //浼犲叆鐨勭被鍨�
+ }; //鎼滅储鏉′欢
+ listOrganization(searchData).then(res => {
+ if (res.code == 200) {
+ curdonorinfo = res.rows[0];
+ this.$router.push({
+ path: "/cost/computingBill",
+ query: { id: 0, operation: "add", data: curdonorinfo }
+ });
+ } else {
+ this.$message.error(res.msg);
+ }
+ });
+ this.showSelectionDialog = false;
+ },
+
+ /** 鏌ヨ鎹愮尞妗堜緥鍣ㄥ畼鍒楀垪琛� */
+ getList() {
+ this.loading = true;
+
+ getExpertfeeList(this.queryParams).then(response => {
+ console.log(response);
+ this.donorchargeList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ infoid: null,
+ donateno: null,
+ donatetime: null,
+ name: null,
+ borthdate: null,
+ sex: null,
+ age: null,
+ donationcategory: null,
+ donateorgan: null,
+ chargeamount: null,
+ chargeamounted: null,
+ remark: null,
+ delFlag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null
+ };
+ this.resetForm("form");
+ },
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.queryParams.paApplyType = "1";
+ this.getList();
+ },
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map(item => item.id);
+ this.single = selection.length !== 1;
+ this.multiple = !selection.length;
+ },
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.$router.push({
+ path: "/cost/computingBill",
+ query: { id: 0, operation: "add" }
+ });
+ },
+
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.$router.push({
+ path: "/cost/computingBill",
+ query: { id: row.id, operation: "update", data: row }
+ });
+ },
+
+ /** 璇︽儏鏌ョ湅鎸夐挳鎿嶄綔 */
+ handleDetail(row) {
+ this.$router.push({
+ path: "/cost/computingBill",
+ query: { id: row.id, operation: "detail", data: row }
+ });
+ },
+ // 鎵撳嵃
+ download(row) {
+ dyDonorpayment(row.id).then(res => {});
+ },
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎鎹愮尞妗堜緥鍣ㄥ畼鍒楃紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�')
+ .then(function() {
+ return delFundtax(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => {});
+ },
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ const queryParams = this.queryParams;
+ this.$modal
+ .confirm("鏄惁纭瀵煎嚭鎵�鏈夋崘鐚渚嬪櫒瀹樺垪鏁版嵁椤癸紵")
+ .then(() => {
+ this.exportLoading = true;
+ return exportDonorcharge(queryParams);
+ })
+ .then(response => {
+ this.$download.name(response.msg);
+ this.exportLoading = false;
+ })
+ .catch(() => {});
+ }
+ }
+};
+</script>
+<style scoped>
+/* @import url(); 寮曞叆鍏叡css绫� */
+.button-delete {
+ color: rgb(236, 69, 69);
+}
+</style>
diff --git a/src/views/project/unitCost/index.vue b/src/views/project/unitCost/index.vue
index ed51192..291cb22 100644
--- a/src/views/project/unitCost/index.vue
+++ b/src/views/project/unitCost/index.vue
@@ -165,7 +165,7 @@
<el-button
size="mini"
type="primary"
- @click="download(scope.row)"
+ @click="download(scope.row.id)"
icon="el-icon-download"
circle
></el-button>
@@ -184,7 +184,7 @@
<el-dialog
:visible.sync="showSelectionDialog"
:close-on-click-modal="false"
- :title="'璇烽�夋嫨鎹愮尞妗堜緥'"
+ :title="'浠樻鍖荤枟鏈烘瀯閫夋嫨'"
width="500px"
style="text-align: center"
v-loading="loading"
@@ -431,8 +431,39 @@
});
},
// 鎵撳嵃
- download(row) {
- dyDonorpayment(row.id).then(res => {});
+ download(id) {
+ // const id =this.row.id
+ dyDonorpayment(id).then(res => {
+ var fileUrl = res;
+ //鑾峰彇褰撳墠缃戝潃
+ var urlBase = process.env.VUE_APP_BASE_API;
+ var curWWWPath = window.document.location.href;
+ var pos = curWWWPath.indexOf(window.document.location.pathname);
+ // 鍒涘缓a鏍囩
+ var aEle = document.createElement("a");
+ aEle.href =
+ curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
+ console.log(aEle.href);
+ // 娣诲姞Authorization澶撮儴
+ fetch(aEle.href, {
+ headers: this.headers
+ })
+ .then(response => {
+ // 灏嗘枃浠朵笅杞介摼鎺ヤ綔涓篵lob瀵硅薄杩涜涓嬭浇
+ return response.blob();
+ })
+ .then(blob => {
+ const url = window.URL.createObjectURL(new Blob([blob]));
+ console.log(url);
+ const link = document.createElement("a");
+ link.href = url;
+ const name = fileUrl["downloadName"];
+ link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
+ document.body.appendChild(link);
+ link.click();
+ link.parentNode.removeChild(link);
+ });
+ });
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3