From df1103bf5ba31714f7828bb9b1cba585223abdf3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 28 八月 2023 11:04:06 +0800
Subject: [PATCH] yxh
---
src/views/project/ethicalReview/index.vue | 124 ++++++++++++++++--------------
src/views/project/fund/applyDetail/index.vue | 43 +++++++---
src/views/project/donationwitness/index.vue | 48 ++++++++----
3 files changed, 129 insertions(+), 86 deletions(-)
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index 633cbcb..6592a4b 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -161,24 +161,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
+ <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
+ <el-row>
+ <el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
<el-select v-model="curCase.nation" disabled placeholder="璇烽�夋嫨姘戞棌">
<el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
- </el-form-item>
- </el-col> </el-row><el-row>
- <el-col :span="6">
- <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select v-model="curCase.idcardtype" disabled 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="6">
- <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -197,8 +192,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+ <el-select v-model="curCase.idcardtype" disabled 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-row>
-
+ -->
<el-row>
<el-col :span="24">
<el-form-item align="left" label="鎹愮尞鍐冲畾">
@@ -988,13 +991,24 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
+ this.reset();
+
+ const id = row.id;
this.curCase = {
id: row.id,
recordstate: null,
donorno: row.donorno,
+ name: row.name,
+ treatmenthospitalname: row.treatmenthospitalname,
+ sex: row.sex,
+ idcardtype: row.idcardtype,
+ idcardno: row.idcardno,
+ education: row.education,
+ nationality: row.nationality,
+ occupation: row.occupation,
+ birthday: row.birthday,
};
- this.reset();
- const id = row.id;
+
getDonatebaseinfo(id).then((res) => {
console.log("鎹愮尞鍩虹琛ㄦ暟鎹�", res);
this.curCase.nation = res.data.nation;
@@ -1002,6 +1016,7 @@
this.curCase.occupation = res.data.occupation;
});
// this.open = true;
+ console.log("row", row);
this.form.infoid = row.id;
this.form.donorno = row.donorno;
this.form.name = row.name;
@@ -1161,6 +1176,7 @@
console.log(
"璋冪敤鍣ㄥ畼鍒楄〃鎺ュ彛锛屽弬鏁帮細" + JSON.stringify(oraganqueryParam)
);
+
listDonateorgan(oraganqueryParam).then((response) => {
this.loading = false;
if (response.code == 200) {
diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index efdf86e..32467cd 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -61,36 +61,34 @@
</el-form>
<el-table :default-sort="{ prop: 'createTime' }" v-loading="loading" :data="listnews" border>
- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.reporttime, "{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="age" width="100" />
<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)" />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
<el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
- <el-table-column label="瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
+ <el-table-column label="浼︾悊瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_EthicalReview" :value="scope.row.flowconclusion" />
</template>
</el-table-column>
+ <el-table-column label="瀹℃煡鎰忚" align="center" prop="flowcontent" />
<el-table-column label="瀹℃煡鏃堕棿" align="center" prop="createTime" width="160" />
<!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="200" /> -->
<el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
-
+ <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
+ </template>
+ </el-table-column>
+ <!--
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鎿嶄綔" align="center" width="150px" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
@@ -113,7 +111,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="濮撳悕">
+ <el-form-item label="鎹愮尞鑰呭鍚�">
<el-input v-model="curCase.name" placeholder="璇疯緭鍏ュ鍚�" disabled />
</el-form-item>
</el-col>
@@ -216,7 +214,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button type="primary" :loading="loading" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -685,14 +683,15 @@
},
/** 浼︾悊瀹℃煡寮圭獥 */
showDonationEvaluationDialog(dontateInfo) {
- console.log("浼︾悊瀹℃煡11", dontateInfo);
//鏌ユ壘鏄惁瀛樺湪浼︾悊瀹℃煡璁板綍
//this.curCase = dontateInfo;
this.curCase = {
id: dontateInfo.id,
- recordstate: null,
donorno: dontateInfo.donorno,
+ name: dontateInfo.name,
+ recordstate: null,
};
+
this.reset();
this.form.donorno = dontateInfo.donorno;
this.form.infoid = dontateInfo.id;
@@ -733,51 +732,56 @@
},
/** 淇濆瓨鎹愮尞璇勪及 */
submitForm() {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- //鍒ゆ柇瀹℃煡鎰忚褰曞叆
- if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
- var exp = this.form.flowcontent;
- if (typeof exp == "undefined" || exp == null || exp == "") {
- this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
- return;
+ this.loading = true;
+ this.$nextTick(() => {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ //鍒ゆ柇瀹℃煡鎰忚褰曞叆
+ if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
+ var exp = this.form.flowcontent;
+ if (typeof exp == "undefined" || exp == null || exp == "") {
+ this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
+ return;
+ }
+ }
+
+ //鍒ゆ柇鏄惁鏄柊绾綍
+ if (this.form.id != null) {
+ // updateEthicalreviewopinions娌℃湁鏉冮檺
+ updateDonateflowchart(this.form).then((response) => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ //鏇存柊鎹愮尞鐘舵��
+ if (this.form.flowconclusion == 1) {
+ this.curCase.recordstate = 8;
+ } else {
+ this.curCase.recordstate = 9;
+ }
+ updateDonatebaseinfo(this.curCase).then((response) => {
+ this.open = false;
+ this.getList();
+ });
+ });
+ } else {
+ addDonateflowchart(this.form).then((response) => {
+ //鏇存柊鎹愮尞鐘舵��
+ if (this.form.flowconclusion == 1) {
+ this.curCase.recordstate = 8;
+ } else {
+ this.curCase.recordstate = 9;
+ }
+ updateDonatebaseinfo(this.curCase).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
+ });
+ });
}
}
-
- //鍒ゆ柇鏄惁鏄柊绾綍
- if (this.form.id != null) {
- // updateEthicalreviewopinions娌℃湁鏉冮檺
- updateDonateflowchart(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- //鏇存柊鎹愮尞鐘舵��
- if (this.form.flowconclusion == 1) {
- this.curCase.recordstate = 8;
- } else {
- this.curCase.recordstate = 9;
- }
- updateDonatebaseinfo(this.curCase).then((response) => {
- this.open = false;
- this.getList();
- });
- });
- } else {
- addDonateflowchart(this.form).then((response) => {
- //鏇存柊鎹愮尞鐘舵��
- if (this.form.flowconclusion == 1) {
- this.curCase.recordstate = 8;
- } else {
- this.curCase.recordstate = 9;
- }
- updateDonatebaseinfo(this.curCase).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- });
- }
- }
- });
+ });
+
+ this.loading = false;
+ })
},
+
/** 鑾峰彇鎹愮尞璇勪及 */
getDonationEvaluation(dontateInfo) {
//this.loading = true;
@@ -800,6 +804,7 @@
}
});
},
+
/** 鍒ゆ柇鏂板鎴栨槸缂栬緫 */
checkEditOrAdd(dontateInfo) {
if (dontateInfo.recordstate == 4) {
@@ -813,6 +818,7 @@
handlePreview(file) {
console.log(file);
},
+
//鏄剧ず涓撳鎰忚寮圭獥
showExpertAdviceDialog() {
this.resetExperAdviceForm();
@@ -820,6 +826,7 @@
this.expertAdviceForm.donorno = this.curCase.donorno;
this.isShowExpertAdviceDialog = true;
},
+
//淇濆瓨涓撳鎰忚
saveExpertAdvice() {
this.$refs["expertAdviceForm"].validate((valid) => {
@@ -869,6 +876,7 @@
})
.catch(() => { });
},
+
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdateExpert(row) {
this.reset();
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 8eb3fcd..23a9bce 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -1177,7 +1177,7 @@
// this.form.annexfiles = list.map(item => item.url).join(",");
// }
- //澶勭悊鏄庣粏
+ //澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
let tempDetail = this.rbDetails[i];
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
@@ -1195,15 +1195,9 @@
item => tempDetail.applytype == item.value
);
if (applytypeIndex > -1) {
- tempDetail.applytypename = this.rowfeeItemTypes[
- applytypeIndex
- ].label;
- tempDetail.subjecttype = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttype;
- tempDetail.subjecttypename = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttypename;
+ tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
}
this.rbDetails[i] = tempDetail;
/*
@@ -1228,7 +1222,7 @@
});
}
- // 璁＄畻绋庡墠閲戦
+ // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1244,7 +1238,32 @@
});
}
*/
+
}
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ if (this.businessType == '2') {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (j + 1).toString() + "琛岀殑閲戦涓鸿緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+ }
+ } else if (this.businessType == '3' || this.businessType == '4') {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (j + 1).toString() + "琛岀殑閲戦涓鸿緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+ if (isNaN(parseFloat(tempDetail.amount)) || parseFloat(tempDetail.amount) == 0) {
+ tempDetail.taxedamount = tempDetail.amount
+ } else {
+ tempDetail.taxedamount = tempDetail.amount + tempDetail.taxamount
+ }
+ }
+ }
+
//璐圭敤鍚堣
// this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
// this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
@@ -1296,7 +1315,7 @@
});
//鍏抽棴绐楀彛
- // this.loading = false;
+ this.loading = false;
// this.getfundList();
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1);
--
Gitblit v1.9.3