From 7c428310f2ee232db42b37543059b671ab723eda Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 03 十一月 2023 18:30:22 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 792 +++++++++++++++++++-------------------------------------
src/views/project/fund/applyDetail/index.vue | 32 +-
src/main.js | 1
package.json | 2
src/api/project/organallocation.js | 2
dist.7z | 0
6 files changed, 292 insertions(+), 537 deletions(-)
diff --git a/dist.7z b/dist.7z
new file mode 100644
index 0000000..7b4ce78
--- /dev/null
+++ b/dist.7z
Binary files differ
diff --git a/package.json b/package.json
index 3ac9e75..bfd74fa 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
"js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
"lodash": "^4.17.21",
- "moment": "^2.29.3",
+ "moment": "^2.29.4",
"nprogress": "0.2.0",
"prettier": "^1.8.1",
"quill": "1.3.7",
diff --git a/src/api/project/organallocation.js b/src/api/project/organallocation.js
index 5822eb9..8c1051d 100644
--- a/src/api/project/organallocation.js
+++ b/src/api/project/organallocation.js
@@ -20,7 +20,7 @@
// 鏂板鍣ㄥ畼鍒嗛厤
export function addOrganallocation(data) {
return request({
- url: '/project/organallocation/add',
+ url: '/project/donateorgan/addData',
method: 'post',
data: data
})
diff --git a/src/main.js b/src/main.js
index 6900a03..d800d22 100644
--- a/src/main.js
+++ b/src/main.js
@@ -20,6 +20,7 @@
import directive from './directive' //directive
import plugins from './plugins' // plugins
+
import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 7f5a746..c421180 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1067,9 +1067,17 @@
/>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="鍏朵粬" prop="organdecisionOther">
+ <el-input
+ v-model="affirmform.organdecisionOther"
+ placeholder="璇疯緭鍏ュ叾浠�"
+ />
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
- <el-col :span="18">
+ <!-- <el-col :span="18">
<el-form-item align="left" label="鎹愮尞鍐冲畾">
<el-checkbox-group v-model="affirmform.organdecision">
<el-checkbox
@@ -1081,15 +1089,7 @@
</el-checkbox>
</el-checkbox-group>
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍏朵粬" prop="organdecisionOther">
- <el-input
- v-model="affirmform.organdecisionOther"
- placeholder="璇疯緭鍏ュ叾浠�"
- />
- </el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-col :span="6">
@@ -1232,7 +1232,7 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞淇℃伅</el-button
+ >淇濆瓨浼︾悊淇℃伅</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@@ -1400,7 +1400,7 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞淇℃伅</el-button
+ >淇濆瓨鍣ㄥ畼鍒嗛厤淇℃伅</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@@ -1425,22 +1425,6 @@
label-width="100px"
label-position="right"
>
- <el-row>
- <el-col :span="24">
- <el-form-item align="left" label="鎹愮尞鍐冲畾">
- <el-checkbox-group v-model="witnessform.organdonation">
- <el-checkbox
- v-for="dict in dict.type.sys_Organ"
- :key="dict.value"
- :label="dict.value"
- disabled
- >
- {{ dict.label }}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </el-col>
- </el-row>
<el-row>
<el-col :span="24">
<el-form-item
@@ -1691,84 +1675,6 @@
</el-form-item>
</el-col>
</el-row>
-
- <el-table :data="tableData" border>
- <el-table-column
- align="center"
- width="80px"
- prop="organname"
- label="鍣ㄥ畼鍚嶇О"
- >
- </el-table-column>
- <el-table-column
- align="center"
- width="220px"
- prop="gainhospitalno"
- label="鑾峰彇缁勭粐"
- >
- <template slot-scope="scope">
- <org-selecter
- ref="gainhosselect"
- :org-type="'4'"
- v-model="scope.row.gainhospitalno"
- />
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- width="140px"
- prop="organgetdoct"
- label="鑾峰彇鍖诲笀"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.organgetdoct"
- placeholder="璇疯緭鍏ヨ幏鍙栧尰甯�"
- ></el-input>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- width="210px"
- prop="organgettime"
- label="鑾峰彇鏃ユ湡"
- >
- <template slot-scope="scope">
- <el-row>
- <el-date-picker
- clearable
- size="small"
- style="width: 100%"
- v-model="scope.row.organgettime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
- >
- </el-date-picker>
- </el-row>
- </template>
- </el-table-column>
- <el-table-column
- label="鍣ㄥ畼鐘舵��"
- align="center"
- prop="organstate"
- width="180"
- >
- <template slot-scope="scope">
- <el-select
- v-model="scope.row.organstate"
- placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
- >
- <el-option
- v-for="dict in dict.type.sys_organstate"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
- </el-table>
<el-row>
<el-col :span="12">
<el-form-item align="left" label="榛樺搥缂呮��浠紡">
@@ -1795,9 +1701,7 @@
</el-form-item></el-col
>
</el-row>
- <!-- <el-form-item align="left" label="姝讳骸璇佹槑闄勪欢璺緞">
- <fileUpload v-model="witnessform.deathjudgeannex" />
- </el-form-item> -->
+
<el-row>
<el-col :span="8">
<el-form-item
@@ -1851,7 +1755,7 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞淇℃伅</el-button
+ >淇濆瓨瑙佽瘉淇℃伅</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@@ -1891,120 +1795,6 @@
</el-date-picker>
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-form-item label="鍣ㄥ畼缁勭粐">
- <el-checkbox-group
- align="left"
- v-model="accomplishform.donateorganList"
- >
- <el-checkbox
- v-for="dict in dict.type.sys_Organ"
- :key="dict.value"
- :label="dict.value"
- disabled
- >
- {{ dict.label }}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
- </el-row>
- <el-row style="margin-bottom: 22px">
- <el-table v-loading="loading" border :data="tableData">
- <el-table-column
- label="鍣ㄥ畼鍚嶇О"
- align="center"
- prop="organname"
- width="80"
- />
- <el-table-column
- label="绉绘鍖婚櫌锛堟帴鏀跺崟浣嶏級"
- align="center"
- prop="transplanthospitalno"
- width="240"
- >
- <template slot-scope="scope">
- <org-selecter
- ref="transplanthosselect"
- :org-type="'4'"
- v-model="scope.row.transplanthospitalno"
- />
- </template>
- </el-table-column>
- <el-table-column
- label="绉绘璐熻矗浜�"
- align="center"
- prop="transplantdoct"
- width="120"
- >
- <template slot-scope="scope">
- <el-input
- v-model="scope.row.transplantdoct"
- placeholder="璇疯緭鍏ヨ礋璐ｄ汉"
- ></el-input>
- </template>
- </el-table-column>
- <el-table-column
- label="绉绘鏃ユ湡"
- align="center"
- prop="transplanttime"
- width="230"
- >
- <template slot-scope="scope">
- <el-row>
- <el-date-picker
- clearable
- size="small"
- style="width: 90%"
- v-model="scope.row.transplanttime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍣ㄥ畼绉绘鏃堕棿"
- >
- </el-date-picker>
- </el-row>
- </template>
- </el-table-column>
- <el-table-column
- prop="abandonreason"
- label="寮冪敤鍘熷洜"
- align="center"
- width="260"
- >
- <template slot-scope="scope">
- <el-row>
- <el-input
- clearable
- v-model="scope.row.abandonreason"
- placeholder="璇疯緭鍏ュ純鐢ㄥ師鍥�"
- />
- </el-row>
- </template>
- </el-table-column>
-
- <el-table-column
- label="鍣ㄥ畼鐘舵��"
- align="center"
- prop="organstate"
- width="130"
- >
- <template slot-scope="scope">
- <el-select
- v-model="scope.row.organstate"
- placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
- value-key="value"
- @change="selectOrganstate(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_organstate"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
- </el-table>
</el-row>
<el-row>
@@ -2086,7 +1876,7 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
+ >瀹屾垚鐧昏</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@@ -2131,7 +1921,7 @@
size="mini"
class="upload-demo"
:action="uploadFileUrl"
- :file-list="invoicefileList"
+ :file-list="fileList"
:show-file-list="false"
multiple
drag
@@ -2160,19 +1950,19 @@
</div>
</el-upload>
<el-table
- :data="invoicefileListto"
+ :data="fileListto"
@row-click="downFile"
style="width: 100%"
height="400"
>
<el-table-column
- prop="name"
+ prop="annexname"
:show-overflow-tooltip="true"
label="鍚嶇О"
>
<template slot-scope="scope">
<i style="color:#409EFF" class=" el-icon-s-order" />{{
- scope.row.name
+ scope.row.annexname
}}
</template>
</el-table-column>
@@ -2202,19 +1992,13 @@
</div>
</div>
- <div
- v-if="this.previewpdf && invoicepdfimgsrcList.length"
- class="pdfimgmin"
- >
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
<el-image
style="width: 95%; height: 90%"
- :src="invoicepdfimg"
- :preview-src-list="invoicepdfimgsrcList"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
>
- <!-- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div> -->
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
@@ -2229,6 +2013,15 @@
listDonateannex,
Modifydonationattachment
} from "@/api/project/donateannex";
+import { listReportname } from "@/api/project/organization";
+import {
+ getDonatecompletioninfo,
+ listnewDonatecompletioninfo,
+ addDonatecompletioninfo,
+ updateDonatecompletioninfo,
+ listDonatecompletioninfo,
+ downloadcompletioninfo
+} from "@/api/project/donatecompletioninfo";
import {
getDonatebaseinfo,
addDonatebaseinfo,
@@ -2257,6 +2050,12 @@
updateDonateorgan
} from "@/api/project/donateorgan";
import {
+ addDonationwitness,
+ updateDonationwitness,
+ getDonationwitness,
+ getByInfoId
+} from "@/api/project/donationwitness";
+import {
listRelativesconfirmation,
getRelativesconfirmation,
addRelativesconfirmation,
@@ -2267,6 +2066,7 @@
import AnnexUpload from "@/views/project/components/annexupload";
import ReportName from "@/views/project/components/organizationUser";
import { getToken } from "@/utils/auth";
+import { formatDate } from "@/utils/index";
export default {
name: "donationdetails",
@@ -2303,19 +2103,30 @@
],
data() {
return {
- infoid: 734,
+ infoid: 736,
form: {},
- medicineform: {},
+ medicineform: {
+ infoid: null
+ },
affirmform: {
+ infoid: null,
organdecision: []
},
- ethicform: {},
- allocationform: {},
- witnessform: {},
- accomplishform: {},
+ ethicform: {
+ infoid: null
+ },
+ allocationform: [],
+ witnessform: {
+ infoid: null
+ },
+ accomplishform: {
+ infoid: null
+ },
tableData: [],
+ coordinatorlist1: [],
+ leaderlist: [],
actives: 0, //杩涚▼
- workflow:0,
+ workflow: 0,
loading: false,
// 淇濆瓨銆佺粓姝㈡寜閽‘璁�
showSaveBtn: true,
@@ -2428,7 +2239,8 @@
witnessrules: {},
accomplishrules: {},
//闄勪欢鍒楄〃
- donatelist: [], //闄勪欢鎬荤粍
+
+ annexfilesList: [], //闄勪欢灞曠ず鍒�
potentiallist: [], //娼滃湪闄勪欢
medicinelist: [], //鍖诲闄勪欢
affirmlist: [], //纭闄勪欢
@@ -2436,12 +2248,6 @@
registerlist: [], //瀹屾垚闄勪欢
fileList: [],
fileListto: [],
- invoicefileList: [],
- invoicefileListto: [],
- invoicepdfimg: "",
- invoicepdfimgsrcList: [],
- invoDatatop: [],
- activeName: 1, //鏂囦欢绫诲瀷
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -2476,12 +2282,20 @@
this.Processdata = res.data;
});
+ //鑾峰彇鍗忚皟鍛樺垪
+ listReportname("xty1").then(res => {
+ this.coordinatorlist1 = res.data;
+ });
+ //鑾峰彇璐熻矗浜哄垪
+ listReportname("fzr").then(res => {
+ this.leaderlist = res.data;
+ });
// 琛ㄥ崟鏁版嵁
getDonatebaseinfo(this.infoid).then(response => {
this.form = response.data;
this.showTerminationBtn = response.data.terminationCase;
this.actives = response.data.workflow;
- this.workflow=response.data.workflow;
+ this.workflow = response.data.workflow;
response.data.sex = parseInt(response.data.sex);
this.form.id = response.data.id;
this.form.diseasetype = this.form.diseasetype.split(",");
@@ -2507,8 +2321,9 @@
infoid: this.form.id
};
if (this.actives == 1) {
+ this.annexfilesList = this.medicinelist;
listMedicalevaluation(searchParam).then(response => {
- if (response.code == 200) {
+ if (response.code == 200 && response.rows[0]) {
this.medicineform = response.rows[0];
} else {
this.$modal.msgError(
@@ -2517,8 +2332,9 @@
}
});
} else if (this.actives == 2) {
+ this.annexfilesList = this.affirmlist;
listRelativesconfirmation(searchParam).then(response => {
- if (response.code == 200) {
+ if (response.code == 200 && response.rows[0]) {
this.affirmform = response.rows[0];
if (!this.affirmform) {
this.affirmform = {};
@@ -2544,6 +2360,8 @@
}
});
} else if (this.actives == 3) {
+ this.annexfilesList = this.ethiclist;
+
listDonateflowchart(searchParam).then(response => {
if (response.code == 200 && response.rows.length == 1) {
this.ethicform = response.rows[0];
@@ -2554,8 +2372,10 @@
} else if (this.actives == 4) {
listDonateorgan(searchParam).then(response => {
if (response.code == 200) {
- this.allocationform = response.rows;
- this.allocationform.infoid = this.form.id;
+ if (response.rows[0]) {
+ this.allocationform = response.rows;
+ // this.allocationform[0].infoid = this.form.id;
+ }
this.organalForm.organname = [];
for (let i = 0; i < response.rows.length; i++) {
this.organalForm.organname.push(response.rows[i].organno);
@@ -2567,65 +2387,37 @@
}
});
} else if (this.actives == 5) {
- listMedicalevaluation(searchParam).then(response => {
+ getByInfoId(searchParam.infoid).then(response => {
if (response.code == 200) {
- this.witnessform = response.rows[0];
- this.witnessform.infoid = this.form.id;
+ if (response.data) {
+ this.witnessform = response.data;
+ this.witnessform.infoid = this.form.id;
+ }
} else {
this.$modal.msgError(
- "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+ "鑾峰彇瑙佽瘉淇℃伅鎷垮彇澶辫触锛�" + JSON.stringify(response)
);
}
});
} else if (this.actives == 6) {
- listMedicalevaluation(searchParam).then(response => {
- if (response.code == 200) {
+ this.annexfilesList = this.registerlist;
+ 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.open = true;
} else {
- this.$modal.msgError(
- "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
- );
+ this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
}
});
+ } else if (this.actives == 0) {
+ this.annexfilesList = this.registerlist;
}
},
- // 鑾峰彇闄勪欢鏁版嵁骞跺垎绫讳簩绾у垪
- listDonateannex() {
- let parmi = {};
- parmi.infoid = this.infoid.toString();
- listDonateannex(parmi).then(res => {
- this.donatelist = res.rows;
- });
-// 娴嬭瘯鏁版嵁
- const arr = [
- { type: "type1", name: "saaada" },
- { type: "type2", name: "ssssda" },
- { type: "type3", name: "sdddda" },
- { type: "type4", name: "sdddda" },
- { type: "type5", name: "sdddda" }
- ];
- const groupedArr = arr.reduce((accumulator, currentValue) => {
- const key = currentValue.type;
- if (key == "type1") {
- this.potentiallist.push(currentValue);
- } else if (key == "type2") {
- this.medicinelist.push(currentValue);
- } else if (key == "type3") {
- this.affirmlist.push(currentValue);
- } else if (key == "type4") {
- this.ethiclist.push(currentValue);
- } else if (key == "type5") {
- this.registerlist.push(currentValue);
- }
- return accumulator;
- }, {});
- console.log(this.potentiallist);
- console.log(this.medicinelist);
- },
-
/** 淇濆瓨涓昏〃鎸夐挳 */
+
submitForm() {
this.$refs["form"].validate(valid => {
console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
@@ -2680,7 +2472,7 @@
updateDonatebaseinfo(this.form).then(response => {
this.$modal.msgSuccess("淇濆瓨鎴愬姛");
this.Getbasicinformation();
- this.GetAttacheddata();
+ this.Processvalidation();
this.open = false;
});
} else {
@@ -2690,7 +2482,7 @@
if (response.code == 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.Getbasicinformation();
- this.GetAttacheddata();
+ this.Processvalidation();
this.open = false;
} else {
this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
@@ -2702,13 +2494,15 @@
},
// 淇濆瓨浜岀骇琛ㄦ寜閽�
Savethedetails() {
+ console.log(this.actives);
if (this.actives == 1) {
- this.Processvalidation();
this.medicineform.infoid = this.form.id;
this.$refs["medicineform"].validate(valid => {
if (valid) {
if (this.medicineform.id != null) {
- updateMedicalevaluation(this.medicineform).then(response => {});
+ updateMedicalevaluation(this.medicineform).then(response => {
+ this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
+ });
} else {
addMedicalevaluation(this.medicineform).then(response => {
this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
@@ -2718,12 +2512,16 @@
}
});
} else if (this.actives == 2) {
- this.Processvalidation();
this.affirmform.infoid = this.form.id;
this.$refs["affirmform"].validate(valid => {
if (valid) {
if (this.affirmform.id != null) {
- updateRelativesconfirmation(this.affirmform).then(response => {});
+ this.affirmform.residenceprovincename = this.defultAddresss.sheng;
+ this.affirmform.residencecityname = this.defultAddresss.shi;
+ this.affirmform.residencetownname = this.defultAddresss.qu;
+ updateRelativesconfirmation(this.affirmform).then(response => {
+ this.$modal.msgSuccess("鎹愮尞纭淇℃伅淇敼鎴愬姛");
+ });
} else {
addRelativesconfirmation(this.affirmform).then(response => {
this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
@@ -2733,12 +2531,13 @@
}
});
} else if (this.actives == 3) {
- this.Processvalidation();
this.ethicform.infoid = this.form.id;
this.$refs["ethicform"].validate(valid => {
if (valid) {
if (this.ethicform.id != null) {
- updateDonateflowchart(this.ethicform).then(response => {});
+ updateDonateflowchart(this.ethicform).then(response => {
+ this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
+ });
} else {
addDonateflowchart(this.ethicform).then(response => {
this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
@@ -2748,82 +2547,77 @@
}
});
} else if (this.actives == 4) {
- this.Processvalidation();
this.allocationform.infoid = this.form.id;
this.$refs["allocationform"].validate(valid => {
if (valid) {
- if (this.allocationform[0].id != null) {
- updateOrganallocation(this.allocationform).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- });
- } else {
- addOrganallocation(this.allocationform).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
+ let arrallo = [];
+ this.allocationform.map(item => {
+ if (item.id) {
+ console.log(formatDate(item.applicanttime));
+ item.applicanttime = formatDate(item.applicanttime);
+ updateDonateorgan(item).then(response => {});
+ } else {
+ arrallo.push(item);
+ }
+ });
+ if (arrallo.length) {
+ addOrganallocation(arrallo).then(response => {
+ this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞淇℃伅鏂板鎴愬姛");
});
}
this.submitForm();
}
});
} else if (this.actives == 5) {
- this.Processvalidation();
this.witnessform.infoid = this.form.id;
this.$refs["witnessform"].validate(valid => {
+ let coordinatedusernameIndex = this.coordinatorlist1.findIndex(
+ item => this.witnessform.coordinateduserido == item.reportNo
+ );
+ if (coordinatedusernameIndex > -1) {
+ this.witnessform.coordinatedusernameo = this.coordinatorlist1[
+ coordinatedusernameIndex
+ ].reportName;
+ }
+ //鍗忚皟鍛�2
+ let coordinatedusernametIndex = this.coordinatorlist1.findIndex(
+ item => this.witnessform.coordinateduseridt == item.reportNo
+ );
+ if (coordinatedusernametIndex > -1) {
+ this.witnessform.coordinatedusernamet = this.coordinatorlist1[
+ coordinatedusernametIndex
+ ].reportName;
+ }
+ console.log("juanxian");
if (valid) {
+ console.log("juanxian");
+
if (this.witnessform.id != null) {
- // 鑾峰彇鎹愮尞鍣ㄥ畼鍒楄〃
- listDonateorgan(oraganqueryParam).then(response => {
- this.loading = false;
- if (response.code == 200) {
- this.organdonation = [];
- this.tableData = response.rows;
- //鑾峰彇鍖婚櫌榛樿鏄Щ妞嶅尰闄�
- for (let i = 0; i < this.tableData.length; i++) {
- if (
- this.tableData[i].gainhospitalname == null ||
- this.tableData[i].gainhospitalname == ""
- ) {
- this.tableData[i].gainhospitalname = this.tableData[
- i
- ].transplanthospitalname;
- }
- if (
- this.tableData[i].gainhospitalno == null ||
- this.tableData[i].gainhospitalno == ""
- ) {
- this.tableData[i].gainhospitalno = this.tableData[
- i
- ].transplanthospitalno;
- }
- }
- //this.organalForm.organname = [];
- for (let i = 0; i < response.rows.length; i++) {
- this.form.organdonation.push(response.rows[i].organno);
- }
- } else {
- this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触锛�" + response.msg);
- }
+ console.log(456);
+ updateDonationwitness(this.witnessform).then(response => {
+ this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
});
- // 鑾峰彇淇℃伅
} else {
- addMedicalevaluation(this.witnessform).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
+ console.log(123);
+ addDonationwitness(this.witnessform).then(response => {
+ this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
});
}
this.submitForm();
}
});
} else if (this.actives == 6) {
- this.Processvalidation();
this.accomplishform.infoid = this.form.id;
this.$refs["accomplishform"].validate(valid => {
if (valid) {
- if (this.accomplishform.id != null) {
- updateMedicalevaluation(this.accomplishform).then(response => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
+ if (this.accomplishform.id) {
+ console.log(this.accomplishform);
+ updateDonatecompletioninfo(this.accomplishform).then(response => {
+ this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
});
} else {
- addMedicalevaluation(this.accomplishform).then(response => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
+ addDonatecompletioninfo(this.accomplishform).then(response => {
+ this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
});
}
this.submitForm();
@@ -2837,7 +2631,7 @@
// if (e != "" || e != null) {
this.actives = e;
// }
- this.GetAttacheddata();
+ this.Processvalidation();
},
// 鍣ㄥ畼鍒嗛厤鏍忕洰鎺у埗
changeorganState(value) {
@@ -2858,6 +2652,8 @@
organname: temporganname,
organno: value,
id: null,
+ infoid: this.form.id,
+ donorno: this.form.donorno,
transplanthospitalname: null,
transplanthospitalno: null,
organstate: "2"
@@ -2909,7 +2705,9 @@
console.log(this.actives);
if (this.form.workflow == this.actives) {
this.form.workflow++;
+ this.GetAttacheddata();
} else if (this.form.workflow > this.actives) {
+ this.GetAttacheddata();
} else {
this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
return;
@@ -2939,206 +2737,158 @@
this.Networkheader = string.slice(0, index + 4); // 鎴彇8032鍙婂叾鍓嶉儴瀛楃
}
},
+
+ // 鑾峰彇闄勪欢鏁版嵁骞跺垎绫讳簩绾у垪
+ listDonateannex() {
+ let parmi = {};
+ parmi.infoid = this.infoid.toString();
+ listDonateannex(parmi).then(res => {
+ this.donatelist = res.rows;
+ const groupedArr = this.donatelist.reduce(
+ (accumulator, currentValue) => {
+ const key = currentValue.annexfilestype;
+ if (key == 0) {
+ this.potentiallist.push(currentValue);
+ } else if (key == 1) {
+ this.medicinelist.push(currentValue);
+ } else if (key == 2) {
+ this.affirmlist.push(currentValue);
+ } else if (key == 3) {
+ this.ethiclist.push(currentValue);
+ } else if (key == 6) {
+ this.registerlist.push(currentValue);
+ }
+ return accumulator;
+ },
+ {}
+ );
+ console.log(groupedArr);
+ });
+ },
+ // 闄勪欢淇敼鏁版嵁杞瓨灏佽
+ Newconversion(arr, delvalue, addvalue) {
+ // 鍜屽悇閮ㄤ繚瀛樺悓姝�
+ if (this.actives == 0) {
+ this.potentiallist = arr;
+ } else if (this.actives == 1) {
+ this.medicinelist = arr;
+ } else if (this.actives == 2) {
+ this.affirmlist = arr;
+ } else if (this.actives == 3) {
+ this.ethiclist = arr;
+ } else if (this.actives == 6) {
+ this.registerlist = arr;
+ }
+ // 鍒犻櫎鏃朵慨鏀逛富鍒梔elFlag
+ const index = this.donatelist.indexOf(delvalue);
+ if (index !== -1) {
+ if (delvalue.id) {
+ this.donatelist[index].delFlag = 1;
+ } else {
+ this.donatelist.splice(index, 1);
+ }
+ } else {
+ console.log("鏌ヨ涓嶅埌鍙兘鏄柊鏁版嵁鏃爄d");
+ }
+ // 鏂板鏃朵慨鏀逛富鍒�
+ if (addvalue.annexurl) {
+ this.donatelist.push(addvalue);
+ }
+ },
//鏂囦欢涓婁紶
handleUploadError() {},
remove(file, fileList) {
- const rbDetails = [...this.rbDetails];
- if (this.activeName == 1) {
- this.fileListto.splice(this.fileListto.indexOf(file), 1);
- rbDetails[this.atpresent].annexfilesList = this.fileListto;
- } else {
- this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1);
- rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto;
- }
+ this.fileListto.splice(this.fileListto.indexOf(file), 1);
+ this.annexfilesList = this.fileListto;
},
-
+ // 涓婁紶鎴愬姛
uploadSccess(response, file, fileList) {
this.rbDetails;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- if (this.activeName == 1) {
- if (response.code == 200) {
- // this.form.filename = file.raw.name;
- this.previewpdf = true;
- this.$modal.msgSuccess(response.msg);
- this.fileListto.push({
- name: file.name,
- url: response.fileName
- });
- this.pdfimgsrcList.push(
- this.Networkheader + "/prod-api" + response.fileName
- );
- console.log(this.pdfimgsrcList);
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
- this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
- } else {
- console.log(response.msg);
- }
+ if (response.code == 200) {
+ // this.form.filename = file.raw.name;
+ this.previewpdf = true;
+ this.$modal.msgSuccess(response.msg);
+ this.fileListto.push({
+ annexname: file.name,
+ annexurl: response.fileName
+ });
+ this.pdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+ console.log(this.pdfimgsrcList);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+ this.annexfilesList = this.fileListto;
} else {
- if (response.code == 200) {
- // this.form.filename = file.raw.name;
- this.previewpdf = true;
- this.$modal.msgSuccess(response.msg);
- this.invoicefileListto.push({
- name: file.name,
- url: response.fileName
- });
- this.invoicepdfimgsrcList.push(
- this.Networkheader + "/prod-api" + response.fileName
- );
- console.log(this.invoicepdfimgsrcList);
- this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
- this.rbDetails[
- this.atpresent
- ].invoicefilesList = this.invoicefileListto;
- console.log(this.rbDetails[this.atpresent]);
- } else {
- console.log(response.msg);
- }
+ console.log(response.msg);
}
},
-
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
- this.activeName = this.actives + 1;
- console.log(this.activeName);
this.pdfimgsrcList = [];
- this.invoicepdfimgsrcList = [];
- this.atpresent = index;
this.pdfVisible = true;
- console.log(this.rbDetails[index]);
- if (this.rbDetails[index].annexfilesList) {
+ if (this.annexfilesList.length) {
this.previewpdf = true;
- this.fileListto = this.rbDetails[index].annexfilesList;
+ this.fileListto = this.annexfilesList;
console.log(this.fileListto);
- this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
+ this.pdfimg =
+ this.Networkheader + "/prod-api" + this.fileListto[0].annexurl;
this.fileListto.forEach(item => {
- this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
+ this.pdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + item.annexurl
+ );
});
} else {
this.fileListto = [];
this.pdfimg = "";
this.pdftitle = "";
}
- // -鍙戠エ鏂囦欢
- if (this.rbDetails[index].invoicefilesList) {
- this.previewpdf = true;
- this.invoicefileListto = this.rbDetails[index].invoicefilesList;
- console.log(this.invoicefileListto);
- this.invoicepdfimg =
- this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
- this.invoicefileListto.forEach(item => {
- this.invoicepdfimgsrcList.push(
- this.Networkheader + "/prod-api" + item.url
- );
- });
- console.log(this.invoicepdfimgsrcList);
- console.log(this.invoicepdfimg);
- } else {
- this.invoicefileListto = [];
- this.invoicepdfimg = "";
- this.pdftitle = "";
- }
-
- if (this.activeName == 1) {
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
- } else {
- this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
- }
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
},
-
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- if (this.activeName == 1) {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
- this.pdftitle =
- "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
- let name = item.name.split(".");
- if (name[1] == "pdf") {
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- } else if (name[1] == "jpg" || "png") {
- this.previewpdf = true;
- if (item.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
- } else {
- this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
- }
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.annexurl) {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.annexurl;
} else {
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
+ this.pdfimg =
+ this.Networkheader + "/prod-api" + item.response.annexurl;
}
} else {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
- this.pdftitle =
- "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
- let name = item.name.split(".");
- if (name[1] == "pdf") {
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- } else if (name[1] == "jpg" || "png") {
- this.previewpdf = true;
- if (item.url) {
- this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
- console.log(this.invoicepdfimg, "pdfimg");
- console.log(this.invoicepdfimgsrcList, "imglist");
- } else {
- this.invoicepdfimg =
- this.Networkheader + "/prod-api" + item.response.url;
- }
- } else {
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- }
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
}
},
+ // 鏌ヨ绱㈠紩灏佽
getIndexInArray(arr, obj) {
return arr.indexOf(obj);
},
- // 鍙戠エ鍒囨崲
- handleClick(tab, event) {
- if (this.activeName == 1) {
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
- } else {
- this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
- }
- },
// 鐐瑰嚮鍒犻櫎
deletedowfile(row) {
- if (this.activeName == 1) {
- const indexlist = this.getIndexInArray(
- this.pdfimgsrcList,
- this.Networkheader + "/prod-api" + row.url
- );
- this.pdfimgsrcList.splice(indexlist, 1);
- const index = this.getIndexInArray(this.fileListto, row);
- this.fileListto.splice(index, 1);
- } else {
- const indexlist = this.getIndexInArray(
- this.invoicepdfimgsrcList,
- this.Networkheader + "/prod-api" + row.url
- );
- this.invoicepdfimgsrcList.splice(indexlist, 1);
- const index = this.getIndexInArray(this.invoicefileListto, row);
- this.invoicefileListto.splice(index, 1);
- }
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.annexurl
+ );
+ this.pdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.fileListto, row);
+ this.fileListto.splice(index, 1);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
- if (this.activeName == 1) {
- const index = this.getIndexInArray(this.fileListto, row);
- const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
- this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
- } else {
- const index = this.getIndexInArray(this.invoicefileListto, row);
- const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
- this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
- }
+ const index = this.getIndexInArray(this.fileListto, row);
+ const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
},
// 淇濆瓨
saveattachment(stype) {}
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 2ae752b..f339d54 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -150,7 +150,7 @@
<div
style="margin-bottom: 15px;"
v-if="
- userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'
+ userprofile.nickName == '闄堟厱鍗�'
"
>
<el-button
@@ -2887,20 +2887,22 @@
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
// this.$router.go(0);
- this.$router.push({
- path: "/finance/applyDetail/",
- query: {
- id: this.curId,
- businessType: this.businessType,
- operationType: this.operationType,
- curCase: this.curCase
- }
- });
- } else {
- // this.$message({
- // type: "error",
- // message: "鐢宠澶辫触"
+ // this.$router.push({
+ // path: "/finance/applyDetail/",
+ // query: {
+ // id: this.curId,
+ // businessType: this.businessType,
+ // operationType: this.operationType,
+ // curCase: this.curCase
+ // }
// });
+ this.$modal.msgSuccess("璁＄畻鎴愬姛");
+ this.handleCheck()
+ } else {
+ this.$message({
+ type: "error",
+ message: "璁＄畻閿欒"
+ });
}
});
},
@@ -3188,6 +3190,8 @@
uploadSccess(response, file, fileList) {
this.rbDetails;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
+ console.log(response);
+ console.log(file);
if (this.activeName == 1) {
if (response.code == 200) {
// this.form.filename = file.raw.name;
--
Gitblit v1.9.3