From 24112d26079c0010f0baff217d9ddcd9dfb595b4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 05 十一月 2023 17:31:05 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 103 ++++-
src/views/project/ethicalReview/index.vue | 93 +++--
src/views/project/relativesconfirmation/index.vue | 182 ++++++------
src/views/project/donatebaseinfo/index.vue | 99 +++--
src/views/project/organallocation/index.vue | 52 ++
src/views/project/donatefinish/index.vue | 111 +++---
src/views/project/medicalevaluation/index.vue | 90 +++--
src/views/project/donationwitness/index.vue | 123 ++++---
8 files changed, 483 insertions(+), 370 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 3fe23f0..ea365c8 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -124,15 +124,15 @@
<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="handleUpdate(scope.row)"
- v-hasPermi="['project:donatebaseinfo:edit']">淇敼</el-button>
+ v-hasPermi="['project:donatebaseinfo:edit']">璇︽儏</el-button>
- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
+ <!-- <el-button v-if="scope.row.recordstate == 0" size="mini" type="text" icon="el-icon-delete"
@click="handleDelete(scope.row)" v-hasPermi="['project:donatebaseinfo:remove']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handletermination(scope.row)"
v-hasPermi="['project:donatebaseinfo:edit']">缁堟</el-button>
<el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button>
<el-button v-if="scope.row.recordstate == 0 || scope.row.recordstate == 3" size="mini" type="text"
- icon="el-icon-thumb" @click="handleapproval(scope.row)">涓婃姤瀹℃牳</el-button>
+ icon="el-icon-thumb" @click="handleapproval(scope.row)">涓婃姤瀹℃牳</el-button> -->
<!-- 鎾ら攢鐢宠 -->
</template>
</el-table-column>
@@ -1179,53 +1179,66 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- this.reset();
- //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
- this.form.reporterno = this.currentuser.userName;
- this.form.reportername = this.currentuser.nickName;
- this.form.deptid = this.currentuser.deptid;
-
- this.showSaveBtn = true;
- //this.$refs.annex.getAnnexList();
- this.open = true;
- this.$nextTick(function () {
- this.$refs.annex.getAnnexList();
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ organType: "add",
+ }
});
+ // this.reset();
+ // //璁剧疆鎶ュ憡浜哄拰閮ㄩ棬/缁�
+ // this.form.reporterno = this.currentuser.userName;
+ // this.form.reportername = this.currentuser.nickName;
+ // this.form.deptid = this.currentuser.deptid;
- this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
+ // this.showSaveBtn = true;
+ // //this.$refs.annex.getAnnexList();
+ // this.open = true;
+ // this.$nextTick(function () {
+ // this.$refs.annex.getAnnexList();
+ // });
+
+ // this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
- this.showSaveBtn = true;
- const id = row.id || this.ids;
- //this.$refs.annex.getAnnexList();
-
- getDonatebaseinfo(id).then((response) => {
- this.reset();
-
- this.$nextTick(function () {
- this.$refs.annex.getAnnexList();
- });
- this.form = response.data;
- response.data.sex = parseInt(response.data.sex);
- this.form.id = response.data.id;
- this.form.diseasetype = this.form.diseasetype.split(",");
- this.form.infectious = this.form.infectious.split(",");
- this.form.selfwill = this.form.selfwill.split(",");
- this.form.othercases = this.form.othercases.split(",");
- this.form.infosources = this.form.infosources.split(",");
- this.form.kinship = this.form.kinship.split(",");
- this.form.patientstate = this.form.patientstate.split(",");
- this.open = true;
- this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
- this.registerAddresss.sheng = response.data.registerprovincename;
- this.residenceAddresss.sheng = response.data.residenceprovincename;
- this.registerAddresss.shi = response.data.registercityname;
- this.residenceAddresss.shi = response.data.residencecityname;
- this.residenceAddresss.qu = response.data.residencetownname;
- this.registerAddresss.qu = response.data.registertownname;
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
+ }
});
+ // this.showSaveBtn = true;
+ // const id = row.id || this.ids;
+ // //this.$refs.annex.getAnnexList();
+
+ // getDonatebaseinfo(id).then((response) => {
+ // this.reset();
+
+ // this.$nextTick(function () {
+ // this.$refs.annex.getAnnexList();
+ // });
+ // this.form = response.data;
+ // response.data.sex = parseInt(response.data.sex);
+ // this.form.id = response.data.id;
+ // this.form.diseasetype = this.form.diseasetype.split(",");
+ // this.form.infectious = this.form.infectious.split(",");
+ // this.form.selfwill = this.form.selfwill.split(",");
+ // this.form.othercases = this.form.othercases.split(",");
+ // this.form.infosources = this.form.infosources.split(",");
+ // this.form.kinship = this.form.kinship.split(",");
+ // this.form.patientstate = this.form.patientstate.split(",");
+ // this.open = true;
+ // this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
+ // this.registerAddresss.sheng = response.data.registerprovincename;
+ // this.residenceAddresss.sheng = response.data.residenceprovincename;
+ // this.registerAddresss.shi = response.data.registercityname;
+ // this.residenceAddresss.shi = response.data.residencecityname;
+ // this.residenceAddresss.qu = response.data.residencetownname;
+ // this.registerAddresss.qu = response.data.registertownname;
+ // });
},
// 缁堟妗堜緥
handletermination(row) {
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index cbeed87..e8e379f 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -222,7 +222,7 @@
size="mini"
type="text"
icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
+ @click="handleAdd(scope.row)"
v-hasPermi="['project:donatebaseinfo:edit']"
>淇敼</el-button
>
@@ -1053,63 +1053,70 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
- this.reset();
-
- //璇诲彇妗堜緥鍩烘湰淇℃伅
- //this.curCase = row;
- this.curCase = {
- id: row.id,
- recordstate: null,
- donorno: row.donorno,
- };
- this.form.coordinateduserido = row.coordinateduserido;
- this.form.coordinateduseridt = row.coordinateduseridt;
- this.form.coordinatedusernameo = row.coordinatedusernameo;
- this.form.coordinatedusernamet = row.coordinatedusernamet;
- this.form.responsibleuserid = row.responsibleuserid;
- this.form.responsibleusername = row.responsibleusername;
-
- this.form.receivingunit = row.receivingunit;
- this.form.responsibleusername = row.responsibleusername;
- this.registerAddresss.sheng = row.residenceprovincename;
- this.registerAddresss.shi = row.residencecityname;
- this.registerAddresss.qu = row.residencetownname;
-
- //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- let searchParam = {
- id: row.id,
- };
- listDonatecompletioninfo(searchParam).then((response) => {
- if (response.code == 200 && response.rows.length == 1) {
- this.form = response.rows[0];
- this.form.donateorganList = JSON.parse(this.form.donateorgan);
- this.title = "淇敼鎹愮尞瀹屾垚鐧昏琛�";
- } else {
- this.curdonotor = row;
- this.open = true;
- this.title = "鏂板鎹愮尞瀹屾垚鐧昏琛�";
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
}
});
+ // this.reset();
- //鑾峰彇鍣ㄥ畼淇℃伅
- let oraganqueryParam = {
- infoid: row.id,
- };
- listDonateorgan(oraganqueryParam).then((response) => {
- if (response.code == 200) {
- this.tableData = response.rows;
- } else {
- this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触锛�" + response.msg);
- }
- });
+ // //璇诲彇妗堜緥鍩烘湰淇℃伅
+ // //this.curCase = row;
+ // this.curCase = {
+ // id: row.id,
+ // recordstate: null,
+ // donorno: row.donorno,
+ // };
+ // this.form.coordinateduserido = row.coordinateduserido;
+ // this.form.coordinateduseridt = row.coordinateduseridt;
+ // this.form.coordinatedusernameo = row.coordinatedusernameo;
+ // this.form.coordinatedusernamet = row.coordinatedusernamet;
+ // this.form.responsibleuserid = row.responsibleuserid;
+ // this.form.responsibleusername = row.responsibleusername;
- //鑾峰彇闄勪欢淇℃伅
- // this.$nextTick(function () {
- // this.$refs.finishannex.getAnnexList();
+ // this.form.receivingunit = row.receivingunit;
+ // this.form.responsibleusername = row.responsibleusername;
+ // this.registerAddresss.sheng = row.residenceprovincename;
+ // this.registerAddresss.shi = row.residencecityname;
+ // this.registerAddresss.qu = row.residencetownname;
+
+ // //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
+ // let searchParam = {
+ // id: row.id,
+ // };
+ // listDonatecompletioninfo(searchParam).then((response) => {
+ // if (response.code == 200 && response.rows.length == 1) {
+ // this.form = response.rows[0];
+ // this.form.donateorganList = JSON.parse(this.form.donateorgan);
+ // this.title = "淇敼鎹愮尞瀹屾垚鐧昏琛�";
+ // } else {
+ // this.curdonotor = row;
+ // this.open = true;
+ // this.title = "鏂板鎹愮尞瀹屾垚鐧昏琛�";
+ // }
// });
- this.loading = false;
- this.open = true;
+ // //鑾峰彇鍣ㄥ畼淇℃伅
+ // let oraganqueryParam = {
+ // infoid: row.id,
+ // };
+ // listDonateorgan(oraganqueryParam).then((response) => {
+ // if (response.code == 200) {
+ // this.tableData = response.rows;
+ // } else {
+ // this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触锛�" + response.msg);
+ // }
+ // });
+
+ // //鑾峰彇闄勪欢淇℃伅
+ // // this.$nextTick(function () {
+ // // this.$refs.finishannex.getAnnexList();
+ // // });
+
+ // this.loading = false;
+ // this.open = true;
},
/** 淇敼鎸夐挳鎿嶄綔 */
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index c421180..0930948 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1892,6 +1892,10 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
+ <!-- 瀹岀粨娴佺▼ -->
+ <div class="boxdiv" v-show="actives > 6">
+ <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
+ </div>
</div>
<!-- 闄勪欢寮圭獥 -->
<el-dialog
@@ -1908,11 +1912,11 @@
type="card"
@tab-click="handleClick"
>
- <el-tab-pane label="娼滃湪鎹愮尞" :name="1"> </el-tab-pane>
- <el-tab-pane label="鍖诲璇勪及" :name="2"> </el-tab-pane>
+ <el-tab-pane :label="activetele" :name="1"> </el-tab-pane>
+ <!-- <el-tab-pane label="鍖诲璇勪及" :name="2"> </el-tab-pane>
<el-tab-pane label="鎹愮尞纭" :name="3"> </el-tab-pane>
<el-tab-pane label="浼︾悊瀹℃煡" :name="4"> </el-tab-pane>
- <el-tab-pane label="瀹屾垚鐧昏" :name="7"> </el-tab-pane>
+ <el-tab-pane label="瀹屾垚鐧昏" :name="7"> </el-tab-pane> -->
</el-tabs>
<div class="pdfimg">
<div class="box-pdf">
@@ -2248,6 +2252,8 @@
registerlist: [], //瀹屾垚闄勪欢
fileList: [],
fileListto: [],
+ donatelist: [], //鎬�
+ activetele:'娼滃湪鎹愮尞',
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -2267,6 +2273,9 @@
};
},
+ created() {
+ this.infoid = this.$route.query.id;
+ },
mounted() {
// this.id = this.$route.query.id;
this.Getbasicinformation();
@@ -2274,7 +2283,7 @@
},
methods: {
- // 鑾峰彇涓昏〃鏁版嵁
+ // 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
Getbasicinformation() {
// 宸︿晶娴佺▼鏁版嵁
getDonatebaseinfoflow(this.infoid).then(res => {
@@ -2314,14 +2323,17 @@
this.residenceAddresss.qu = response.data.residencetownname;
this.registerAddresss.qu = response.data.registertownname;
});
+ // 鑾峰彇浜岀骇琛�
+ this.GetAttacheddata();
},
// 鑾峰彇浜岀骇琛ㄦ暟鎹�
GetAttacheddata() {
let searchParam = {
- infoid: this.form.id
+ infoid: this.infoid
};
if (this.actives == 1) {
this.annexfilesList = this.medicinelist;
+ this.activetele="鍖诲璇勪及";
listMedicalevaluation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.medicineform = response.rows[0];
@@ -2333,6 +2345,7 @@
});
} else if (this.actives == 2) {
this.annexfilesList = this.affirmlist;
+ this.activetele="鎹愮尞纭";
listRelativesconfirmation(searchParam).then(response => {
if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
@@ -2361,6 +2374,7 @@
});
} else if (this.actives == 3) {
this.annexfilesList = this.ethiclist;
+ this.activetele="浼︾悊瀹℃煡";
listDonateflowchart(searchParam).then(response => {
if (response.code == 200 && response.rows.length == 1) {
@@ -2391,7 +2405,7 @@
if (response.code == 200) {
if (response.data) {
this.witnessform = response.data;
- this.witnessform.infoid = this.form.id;
+ this.witnessform.infoid = this.infoid;
}
} else {
this.$modal.msgError(
@@ -2401,19 +2415,23 @@
});
} else if (this.actives == 6) {
this.annexfilesList = this.registerlist;
+ this.activetele="瀹屾垚鐧昏";
+
let accpre = {
id: searchParam.infoid
};
listnewDonatecompletioninfo(accpre).then(response => {
if (response.code == 200 && response.rows.length) {
this.accomplishform = response.rows[0];
- this.accomplishform.infoid = this.form.id;
+ this.accomplishform.infoid = this.infoid;
} else {
this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
}
});
} else if (this.actives == 0) {
this.annexfilesList = this.registerlist;
+ this.activetele="娼滃湪鎹愮尞";
+
}
},
/** 淇濆瓨涓昏〃鎸夐挳 */
@@ -2469,10 +2487,16 @@
}
if (this.form.id != null) {
+ if (this.form.workflow == 0) {
+ this.form.workflow = 1;
+ }
updateDonatebaseinfo(this.form).then(response => {
this.$modal.msgSuccess("淇濆瓨鎴愬姛");
+ Modifydonationattachment(this.donatelist).then(res => {
+ console.log(res);
+ });
this.Getbasicinformation();
- this.Processvalidation();
+ // this.Processvalidation();
this.open = false;
});
} else {
@@ -2481,8 +2505,11 @@
addDonatebaseinfo(this.form).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
+ Modifydonationattachment(this.donatelist).then(res => {
+ console.log(res);
+ });
this.Getbasicinformation();
- this.Processvalidation();
+ // this.Processvalidation();
this.open = false;
} else {
this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
@@ -2496,7 +2523,7 @@
Savethedetails() {
console.log(this.actives);
if (this.actives == 1) {
- this.medicineform.infoid = this.form.id;
+ this.medicineform.infoid = this.infoid;
this.$refs["medicineform"].validate(valid => {
if (valid) {
if (this.medicineform.id != null) {
@@ -2508,11 +2535,11 @@
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 2) {
- this.affirmform.infoid = this.form.id;
+ this.affirmform.infoid = this.infoid;
this.$refs["affirmform"].validate(valid => {
if (valid) {
if (this.affirmform.id != null) {
@@ -2527,11 +2554,11 @@
this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 3) {
- this.ethicform.infoid = this.form.id;
+ this.ethicform.infoid = this.infoid;
this.$refs["ethicform"].validate(valid => {
if (valid) {
if (this.ethicform.id != null) {
@@ -2543,11 +2570,11 @@
this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 4) {
- this.allocationform.infoid = this.form.id;
+ this.allocationform.infoid = this.infoid;
this.$refs["allocationform"].validate(valid => {
if (valid) {
let arrallo = [];
@@ -2565,11 +2592,11 @@
this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 5) {
- this.witnessform.infoid = this.form.id;
+ this.witnessform.infoid = this.infoid;
this.$refs["witnessform"].validate(valid => {
let coordinatedusernameIndex = this.coordinatorlist1.findIndex(
item => this.witnessform.coordinateduserido == item.reportNo
@@ -2603,11 +2630,11 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
} else if (this.actives == 6) {
- this.accomplishform.infoid = this.form.id;
+ this.accomplishform.infoid = this.infoid;
this.$refs["accomplishform"].validate(valid => {
if (valid) {
if (this.accomplishform.id) {
@@ -2620,7 +2647,7 @@
this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
});
}
- this.submitForm();
+ this.Processvalidation();
}
});
}
@@ -2629,9 +2656,13 @@
on_click(e) {
console.log(e);
// if (e != "" || e != null) {
- this.actives = e;
+ if (this.form.workflow >= e) {
+ this.actives = e;
+ this.Processvalidation(e);
+ } else {
+ this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+ }
// }
- this.Processvalidation();
},
// 鍣ㄥ畼鍒嗛厤鏍忕洰鎺у埗
changeorganState(value) {
@@ -2652,7 +2683,7 @@
organname: temporganname,
organno: value,
id: null,
- infoid: this.form.id,
+ infoid: this.infoid,
donorno: this.form.donorno,
transplanthospitalname: null,
transplanthospitalno: null,
@@ -2682,7 +2713,7 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
});
} else {
- this.allocationform.splice(deleteIndex, 1);
+ this.allocationform.splice(organIndex, 1);
}
}
})
@@ -2705,8 +2736,10 @@
console.log(this.actives);
if (this.form.workflow == this.actives) {
this.form.workflow++;
- this.GetAttacheddata();
+ this.submitForm();
+ // this.GetAttacheddata();
} else if (this.form.workflow > this.actives) {
+ // this.submitForm();
this.GetAttacheddata();
} else {
this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
@@ -2780,12 +2813,16 @@
this.registerlist = arr;
}
// 鍒犻櫎鏃朵慨鏀逛富鍒梔elFlag
+ console.log(delvalue);
const index = this.donatelist.indexOf(delvalue);
+ console.log(index);
if (index !== -1) {
if (delvalue.id) {
this.donatelist[index].delFlag = 1;
+ console.log("淇敼鑰佹暟鎹悗", this.donatelist);
} else {
this.donatelist.splice(index, 1);
+ console.log("鍒犻櫎鏂版暟鎹悗", this.donatelist);
}
} else {
console.log("鏌ヨ涓嶅埌鍙兘鏄柊鏁版嵁鏃爄d");
@@ -2793,6 +2830,7 @@
// 鏂板鏃朵慨鏀逛富鍒�
if (addvalue.annexurl) {
this.donatelist.push(addvalue);
+ console.log("鏂板鍚�", this.donatelist);
}
},
//鏂囦欢涓婁紶
@@ -2809,10 +2847,15 @@
// this.form.filename = file.raw.name;
this.previewpdf = true;
this.$modal.msgSuccess(response.msg);
- this.fileListto.push({
+ let addvalue = {
annexname: file.name,
- annexurl: response.fileName
- });
+ annexurl: response.fileName,
+ delFlag: 0,
+ infoid: this.infoid,
+ annexfilestype: this.actives
+ };
+ this.fileListto.push(addvalue);
+ this.Newconversion(this.fileListto, "", addvalue);
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
@@ -2882,7 +2925,9 @@
);
this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
+ this.Newconversion(this.fileListto, this.fileListto[index], "");
this.fileListto.splice(index, 1);
+ console.log(index);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index 529e9c2..f364c1c 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -1344,66 +1344,73 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
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
- };
-
- getDonatebaseinfo(id).then(res => {
- console.log("鎹愮尞鍩虹琛ㄦ暟鎹�", res);
- this.curCase.nation = res.data.nation;
- this.curCase.education = res.data.education;
- 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;
- this.form.treatmenthospitalname = row.treatmenthospitalname;
- this.form.dosex = row.sex;
- this.form.doidcardtype = row.idcardtype;
- this.form.doidcardno = row.idcardno;
- this.form.doeducation = row.education;
- this.form.donationality = row.nationality;
- this.form.dooccupation = row.occupation;
- this.form.dobirthday = row.birthday;
-
- //鍒ゆ柇鏄惁瀛樺湪瑙佽瘉璁板綍
- let searchParam = {
- infoid: row.id
- };
- this.GetDonortedList();
- const infoid = this.form.infoid;
- getByInfoId(infoid).then(response => {
- if (response.code == 200) {
- //鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅
-
- if (response.data != null) {
- // this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触1锛�" + response.msg);
- this.open = true;
- this.form = response.data;
- this.form.organdonation = this.form.organdonation.split(",");
- this.title = "淇敼浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�";
- } else {
- this.open = true;
- this.title = "鏂板浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�";
- }
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
}
});
+ // 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
+ // };
+
+ // getDonatebaseinfo(id).then(res => {
+ // console.log("鎹愮尞鍩虹琛ㄦ暟鎹�", res);
+ // this.curCase.nation = res.data.nation;
+ // this.curCase.education = res.data.education;
+ // 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;
+ // this.form.treatmenthospitalname = row.treatmenthospitalname;
+ // this.form.dosex = row.sex;
+ // this.form.doidcardtype = row.idcardtype;
+ // this.form.doidcardno = row.idcardno;
+ // this.form.doeducation = row.education;
+ // this.form.donationality = row.nationality;
+ // this.form.dooccupation = row.occupation;
+ // this.form.dobirthday = row.birthday;
+
+ // //鍒ゆ柇鏄惁瀛樺湪瑙佽瘉璁板綍
+ // let searchParam = {
+ // infoid: row.id
+ // };
+ // this.GetDonortedList();
+ // const infoid = this.form.infoid;
+ // getByInfoId(infoid).then(response => {
+ // if (response.code == 200) {
+ // //鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅
+
+ // if (response.data != null) {
+ // // this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触1锛�" + response.msg);
+ // this.open = true;
+ // this.form = response.data;
+ // this.form.organdonation = this.form.organdonation.split(",");
+ // this.title = "淇敼浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�";
+ // } else {
+ // this.open = true;
+ // this.title = "鏂板浜轰綋鍣ㄥ畼鎹愮尞鑾峰彇瑙佽瘉鐧昏琛�";
+ // }
+ // }
+ // });
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index 358e328..7b1e9ca 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -683,52 +683,59 @@
},
/** 浼︾悊瀹℃煡寮圭獥 */
showDonationEvaluationDialog(dontateInfo) {
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
+ }
+ });
//鏌ユ壘鏄惁瀛樺湪浼︾悊瀹℃煡璁板綍
//this.curCase = dontateInfo;
- this.curCase = {
- id: dontateInfo.id,
- donorno: dontateInfo.donorno,
- name: dontateInfo.name,
- recordstate: null,
- };
+ // this.curCase = {
+ // id: dontateInfo.id,
+ // donorno: dontateInfo.donorno,
+ // name: dontateInfo.name,
+ // recordstate: null,
+ // };
- this.reset();
- this.form.donorno = dontateInfo.donorno;
- this.form.infoid = dontateInfo.id;
- this.expertAdviceQueryParam.infoid = dontateInfo.id;
- this.expertAdviceQueryParam.donorno = dontateInfo.donorno;
- // this.listnews.ConclusionTime = this.expertAdviceForm.conclusiontime;
- // this.getExpertList();
- this.form.flowname = "浼︾悊瀹℃煡";
- if (dontateInfo.fcid) {
- let queryParam = {
- id: dontateInfo.fcid,
- flowname: "浼︾悊瀹℃煡",
- };
- // flowname: "浼︾悊瀹℃煡",
- listDonateflowchart(queryParam).then((response) => {
- let evaluationList = response.rows;
- console.log("浼︾悊瀹℃煡", response.rows);
- if (evaluationList.length == 1) {
- this.form = evaluationList[0];
- this.open = true;
- this.$nextTick(function () {
- this.$refs.ethicalannex.getAnnexList();
- });
- this.title = "淇敼浼︾悊瀹℃煡";
- } else if (evaluationList.length == 0) {
- this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�");
- } else {
- this.$modal.msgError("鏁版嵁閲嶅");
- }
- });
- } else {
- this.title = "鏂板浼︾悊瀹℃煡";
- this.open = true;
- this.$nextTick(function () {
- this.$refs.ethicalannex.getAnnexList();
- });
- }
+ // this.reset();
+ // this.form.donorno = dontateInfo.donorno;
+ // this.form.infoid = dontateInfo.id;
+ // this.expertAdviceQueryParam.infoid = dontateInfo.id;
+ // this.expertAdviceQueryParam.donorno = dontateInfo.donorno;
+ // // this.listnews.ConclusionTime = this.expertAdviceForm.conclusiontime;
+ // // this.getExpertList();
+ // this.form.flowname = "浼︾悊瀹℃煡";
+ // if (dontateInfo.fcid) {
+ // let queryParam = {
+ // id: dontateInfo.fcid,
+ // flowname: "浼︾悊瀹℃煡",
+ // };
+ // // flowname: "浼︾悊瀹℃煡",
+ // listDonateflowchart(queryParam).then((response) => {
+ // let evaluationList = response.rows;
+ // console.log("浼︾悊瀹℃煡", response.rows);
+ // if (evaluationList.length == 1) {
+ // this.form = evaluationList[0];
+ // this.open = true;
+ // this.$nextTick(function () {
+ // this.$refs.ethicalannex.getAnnexList();
+ // });
+ // this.title = "淇敼浼︾悊瀹℃煡";
+ // } else if (evaluationList.length == 0) {
+ // this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�");
+ // } else {
+ // this.$modal.msgError("鏁版嵁閲嶅");
+ // }
+ // });
+ // } else {
+ // this.title = "鏂板浼︾悊瀹℃煡";
+ // this.open = true;
+ // this.$nextTick(function () {
+ // this.$refs.ethicalannex.getAnnexList();
+ // });
+ // }
},
/** 淇濆瓨鎹愮尞璇勪及 */
submitForm() {
diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue
index 157fda8..c9f1365 100644
--- a/src/views/project/medicalevaluation/index.vue
+++ b/src/views/project/medicalevaluation/index.vue
@@ -1015,53 +1015,61 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(data) {
console.log("datadata", data);
+
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: data.id,
+ organType: "edit"
+ }
+ });
// if(data.recordstate != 2 && data.recordstate != 4 && data.recordstate != 5 && data.recordstate != 13){
// this.$modal.msgError("褰撳墠鎹愮尞妗堜緥涓嶈兘杩涜鍖诲鎹愮尞璇勪及");
// return
// }
- this.flowname = "鎹愮尞鍖诲璇勪及";
- this.annexno = "";
- this.reset();
- //this.curCase = data;
- this.curCase = {
- id: data.id,
- recordstate: null,
- donorno: data.donorno
- };
- //鑾峰彇鍖诲鎹愮尞璇勪及璁板綍
- this.loading = true;
- if (data.meid) {
- let searchParam = {
- id: data.meid
- };
- //listDonatebaseinfo(searchParam).then((response) => {
- listMedicalevaluation(searchParam).then(response => {
- if (response.code == 200 && response.rows.length == 1) {
- this.title = "淇敼鎹愮尞鍖诲璇勪及";
- this.form = response.rows[0];
- this.form.infoid = data.id;
- this.open = true;
- this.$nextTick(function() {
- this.$refs.evaluationannex.getAnnexList();
- });
- } else {
- this.$modal.msgError(
- "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
- );
- }
- });
- } else {
- this.title = "鏂板鎹愮尞鍖诲璇勪及";
- this.form.infoid = data.id;
- this.form.donorno = data.donorno;
+ // this.flowname = "鎹愮尞鍖诲璇勪及";
+ // this.annexno = "";
+ // this.reset();
+ // //this.curCase = data;
+ // this.curCase = {
+ // id: data.id,
+ // recordstate: null,
+ // donorno: data.donorno
+ // };
+ // //鑾峰彇鍖诲鎹愮尞璇勪及璁板綍
+ // this.loading = true;
+ // if (data.meid) {
+ // let searchParam = {
+ // id: data.meid
+ // };
+ // //listDonatebaseinfo(searchParam).then((response) => {
+ // listMedicalevaluation(searchParam).then(response => {
+ // if (response.code == 200 && response.rows.length == 1) {
+ // this.title = "淇敼鎹愮尞鍖诲璇勪及";
+ // this.form = response.rows[0];
+ // this.form.infoid = data.id;
+ // this.open = true;
+ // this.$nextTick(function() {
+ // this.$refs.evaluationannex.getAnnexList();
+ // });
+ // } else {
+ // this.$modal.msgError(
+ // "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+ // );
+ // }
+ // });
+ // } else {
+ // this.title = "鏂板鎹愮尞鍖诲璇勪及";
+ // this.form.infoid = data.id;
+ // this.form.donorno = data.donorno;
- this.open = true;
- this.$nextTick(function() {
- this.$refs.evaluationannex.getAnnexList();
- });
- }
- this.loading = false;
+ // this.open = true;
+ // this.$nextTick(function() {
+ // this.$refs.evaluationannex.getAnnexList();
+ // });
+ // }
+ // this.loading = false;
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index b0c50f8..0a37df7 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -64,10 +64,10 @@
</el-form>
<el-row :gutter="20">
- <el-col :span="8">
+ <el-col :span="24">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
- <el-table v-loading="loading" border :data="donationCaseTableData" @row-click="selectDonotor">
+ <el-table v-loading="loading" border :data="donationCaseTableData" >
<el-table-column label="濮撳悕" align="center" prop="name" />
<el-table-column label="鎬у埆" align="center" prop="sex">
@@ -75,16 +75,34 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
</template>
</el-table-column>
+ <el-table-column label="妗堜緥褰掑睘" align="center" prop="deptname" />
+
<el-table-column label="鍖荤枟鏈烘瀯" width="200px" 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
+ >
+ </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" />
</el-card>
</el-col>
- <el-col :span="16">
- <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
- </div> -->
+ <!-- <el-col :span="16">
<el-card shadow="never">
<el-form ref="infoForm" :model="organalForm" label-width="80px">
<el-row>
@@ -135,7 +153,7 @@
</el-form-item>
</el-form>
</el-card>
- </el-col>
+ </el-col> -->
</el-row>
<!-- 娣诲姞鎴栦慨鏀瑰櫒瀹樺垎閰嶅璇濇 -->
@@ -538,6 +556,7 @@
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
listDonatebaseinfo(this.queryParams).then((response) => {
this.donationCaseTableData = response.rows;
+ console.log(this.donationCaseTableData,"Donation");
this.total = response.total;
this.loading = false;
});
@@ -641,13 +660,20 @@
},
//鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
selectDonotor(row, column, event) {
- this.selectedRow = row;
- this.curdonorno = row.donorno;
- this.curdonorname = row.name;
- this.curage = row.age;
- this.curInfoid = row.id;
- this.distributionForm.donorno = row.donorno;
- this.GetDonortedList();
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
+ }
+ });
+ // this.selectedRow = row;
+ // this.curdonorno = row.donorno;
+ // this.curdonorname = row.name;
+ // this.curage = row.age;
+ // this.curInfoid = row.id;
+ // this.distributionForm.donorno = row.donorno;
+ // this.GetDonortedList();
},
//鑾峰彇鐥呬汉宸叉崘鐚殑鍣ㄥ畼鍒楄〃
GetDonortedList() {
diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue
index 8de8f71..842b251 100644
--- a/src/views/project/relativesconfirmation/index.vue
+++ b/src/views/project/relativesconfirmation/index.vue
@@ -172,14 +172,7 @@
fixed="right"
>
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handletermination(scope.row)"
- v-hasPermi="['project:donatebaseinfo:edit']"
- >缁堟</el-button
- >
+
<el-button
size="mini"
type="text"
@@ -1161,7 +1154,7 @@
this.getTimeList();
this.getList();
},
- mounted() {
+ mounted() {
this.LoadReportList();
// if(this.tempRecordState != undefined && this.tempRecordState != null){
@@ -1580,90 +1573,97 @@
},
/** 瀹跺睘纭鎿嶄綔 */
handleAdd(row) {
- console.log("ppppppp", row);
- this.showSaveBtn = false;
- this.flowname = "瀹跺睘纭鐧昏";
- this.annexno = "";
- //鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍
- let searchparam = {
- infoid: row.id,
- };
- this.loading = true;
- this.curCase = {
- id: row.id,
- recordstate: null,
- donorno: row.donorno,
- };
- console.log("32323232323", searchparam);
- listRelativesconfirmation(searchparam).then((response) => {
- console.log("wdadwadawdawd", response);
- this.loading = false;
- if (response.code == 200) {
- if (response.rows.length == 0) {
- this.form.infoid = row.id;
- this.form.donorno = row.donorno;
- this.form.doname = row.name;
- this.form.dosex = row.sex;
- this.form.dobirthday = row.birthday;
- this.form.donationality = row.nationality;
- this.form.doeducation = row.education;
- this.form.dooccupation = row.occupation;
- this.form.donation = row.nation;
- this.form.doidcardtype = row.idcardtype;
- this.form.doidcardno = row.idcardno;
- this.form.donativeplace = row.nativeplace;
- this.open = true;
- this.title = "鏂板浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
- this.$nextTick(function () {
- this.$refs.confirmannex.getAnnexList();
- });
- } else if (response.rows.length == 1) {
- this.form = response.rows[0];
- console.log("2222222", this.form);
- console.log("缂栬緫瀹跺睘纭form", this.form);
- this.form.donorno = row.donorno;
- this.form.doname = row.name;
- this.form.dosex = row.sex;
- // 鍑虹敓鏃ユ湡
- this.form.dobirthday = row.birthday;
- // 姘戞棌
- this.form.donationality = row.nationality;
- // 瀛﹀巻
- this.form.doeducation = row.education;
- // 鑱屼笟
- this.form.dooccupation = row.occupation;
- this.form.donation = row.nation;
- this.form.doidcardtype = row.idcardtype;
- this.form.doidcardno = row.idcardno;
- this.form.donativeplace = row.nativeplace;
- // this.form.donativeplace =
- // row.residenceProvinceName +
- // row.residenceCityName +
- // row.residenceTownName;
- this.defultAddresss.sheng = this.form.residenceprovincename;
- this.defultAddresss.shi = this.form.residencecityname;
- this.defultAddresss.qu = this.form.residencetownname;
- console.log("9999999", this.form.organdecision);
- if (this.form.kinship) {
- this.form.kinship = this.form.kinship.split(",");
- }
- if (this.form.organdecision) {
- this.form.organdecision = this.form.organdecision.split(",");
- }
- this.open = true;
- this.title = "淇敼浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
- this.$nextTick(function () {
- this.$refs.confirmannex.getAnnexList();
- });
- } else {
- this.$modal.msgError(
- "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" +
- JSON.stringify(JSON.stringify(response))
- );
- }
+ this.$router.push({
+ path: "/organ/donationdetails/",
+ query: {
+ id: row.id,
+ organType: "edit",
}
});
- this.reset();
+ // console.log("ppppppp", row);
+ // this.showSaveBtn = false;
+ // this.flowname = "瀹跺睘纭鐧昏";
+ // this.annexno = "";
+ // //鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍
+ // let searchparam = {
+ // infoid: row.id,
+ // };
+ // this.loading = true;
+ // this.curCase = {
+ // id: row.id,
+ // recordstate: null,
+ // donorno: row.donorno,
+ // };
+ // console.log("32323232323", searchparam);
+ // listRelativesconfirmation(searchparam).then((response) => {
+ // console.log("wdadwadawdawd", response);
+ // this.loading = false;
+ // if (response.code == 200) {
+ // if (response.rows.length == 0) {
+ // this.form.infoid = row.id;
+ // this.form.donorno = row.donorno;
+ // this.form.doname = row.name;
+ // this.form.dosex = row.sex;
+ // this.form.dobirthday = row.birthday;
+ // this.form.donationality = row.nationality;
+ // this.form.doeducation = row.education;
+ // this.form.dooccupation = row.occupation;
+ // this.form.donation = row.nation;
+ // this.form.doidcardtype = row.idcardtype;
+ // this.form.doidcardno = row.idcardno;
+ // this.form.donativeplace = row.nativeplace;
+ // this.open = true;
+ // this.title = "鏂板浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
+ // this.$nextTick(function () {
+ // this.$refs.confirmannex.getAnnexList();
+ // });
+ // } else if (response.rows.length == 1) {
+ // this.form = response.rows[0];
+ // console.log("2222222", this.form);
+ // console.log("缂栬緫瀹跺睘纭form", this.form);
+ // this.form.donorno = row.donorno;
+ // this.form.doname = row.name;
+ // this.form.dosex = row.sex;
+ // // 鍑虹敓鏃ユ湡
+ // this.form.dobirthday = row.birthday;
+ // // 姘戞棌
+ // this.form.donationality = row.nationality;
+ // // 瀛﹀巻
+ // this.form.doeducation = row.education;
+ // // 鑱屼笟
+ // this.form.dooccupation = row.occupation;
+ // this.form.donation = row.nation;
+ // this.form.doidcardtype = row.idcardtype;
+ // this.form.doidcardno = row.idcardno;
+ // this.form.donativeplace = row.nativeplace;
+ // // this.form.donativeplace =
+ // // row.residenceProvinceName +
+ // // row.residenceCityName +
+ // // row.residenceTownName;
+ // this.defultAddresss.sheng = this.form.residenceprovincename;
+ // this.defultAddresss.shi = this.form.residencecityname;
+ // this.defultAddresss.qu = this.form.residencetownname;
+ // console.log("9999999", this.form.organdecision);
+ // if (this.form.kinship) {
+ // this.form.kinship = this.form.kinship.split(",");
+ // }
+ // if (this.form.organdecision) {
+ // this.form.organdecision = this.form.organdecision.split(",");
+ // }
+ // this.open = true;
+ // this.title = "淇敼浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
+ // this.$nextTick(function () {
+ // this.$refs.confirmannex.getAnnexList();
+ // });
+ // } else {
+ // this.$modal.msgError(
+ // "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" +
+ // JSON.stringify(JSON.stringify(response))
+ // );
+ // }
+ // }
+ // });
+ // this.reset();
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
--
Gitblit v1.9.3