From d85c168ade991c13f68727d544ccb7107b4a48ad Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 24 十一月 2023 09:14:20 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 390 ++++++++++++++++++++++++++-----------------------------
src/views/project/fund/applyDetail/index.vue | 22 +-
2 files changed, 196 insertions(+), 216 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 8780e32..c363abf 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -71,16 +71,16 @@
>
<template
slot="description"
- v-if="Processdata.ethicalreviewopinions.createtime"
+ v-if="Processdata.donateflowcharts.createtime"
>
<p>
鎻愪氦鏃堕棿锛�<span>{{
- parseTime(Processdata.ethicalreviewopinions.createtime)
+ parseTime(Processdata.donateflowcharts.createtime)
}}</span>
</p>
<p>
鏇存柊鏃堕棿锛�<span>{{
- parseTime(Processdata.ethicalreviewopinions.updatetime)
+ parseTime(Processdata.donateflowcharts.updatetime)
}}</span>
</p>
</template>
@@ -205,31 +205,34 @@
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="姘戞棌" prop="nation">
- <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
<el-option
- v-for="dict in dict.type.sys_nation"
- :key="dict.value"
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.label"
:label="dict.label"
- :value="dict.value"
+ :value="parseInt(dict.value)"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="绫嶈疮" prop="nativeplace">
- <el-input
- v-model="form.nativeplace"
- placeholder="璇疯緭鍏ュ浗绫�"
- />
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
</el-form-item>
</el-col>
<el-col :span="6">
- <el-form-item label="鍥界睄" prop="nationality">
- <el-input
- v-model="form.nationality"
- placeholder="璇疯緭鍏ュ浗绫�"
- />
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.birthday"
+ type="date"
+ style="width: 174px"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鍑虹敓鏃ユ湡"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -261,101 +264,46 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+ </el-row>
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="鎶ュ憡浜�" prop="reporterno">
+ <el-select
+ ref="getReportname"
+ v-model="form.reporterno"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.label"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ v-for="item in reporters"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportNo"
+ >
+ </el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ <el-col :span="8">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
+ <el-input
+ v-model="form.reporterphone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
</el-col>
- </el-row>
- <el-row>
- <el-col :span="6">
- <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+ <el-col :span="8">
+ <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
<el-date-picker
clearable
size="small"
- v-model="form.birthday"
- type="date"
- style="width: 174px"
+ style="width: 190px"
+ v-model="form.reporttime"
+ type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鍑虹敓鏃ユ湡"
+ placeholder="閫夋嫨鎶ュ憡鏃堕棿"
>
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鑱屼笟" prop="occupation">
- <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
- <el-option
- v-for="dict in dict.type.sys_occupation"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="瀛﹀巻" prop="education">
- <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
- <el-option
- v-for="dict in dict.type.sys_education"
- :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="12">
- <el-form-item label="浣忓潃" prop="residenceaddress">
- <div>
- <li_area_select
- ref="residenceSelect"
- v-model="residenceAddresss"
- ></li_area_select>
- <!-- <div>{{defultAddress}}</div> -->
- </div>
- </el-form-item>
- </el-col>
- <el-col :span="11" :push="1">
- <el-input
- v-model="form.residenceaddress"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
- </el-col>
- </el-row>
-
- <el-row>
- <el-col :span="12">
- <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
- <div>
- <li_area_select
- ref="registerSelect"
- v-model="registerAddresss"
- ></li_area_select>
- <!-- <div>{{defultAddress}}</div> -->
- </div>
- </el-form-item>
- </el-col>
- <el-col :span="11" :push="1">
- <el-input
- v-model="form.registeraddress"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
</el-col>
</el-row>
</div>
@@ -429,6 +377,95 @@
placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
/>
</el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="姘戞棌" prop="nation">
+ <el-select v-model="form.nation" 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-col :span="6">
+ <el-form-item label="绫嶈疮" prop="nativeplace">
+ <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥界睄" prop="nationality">
+ <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鑱屼笟" prop="occupation">
+ <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
+ <el-option
+ v-for="dict in dict.type.sys_occupation"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀛﹀巻" prop="education">
+ <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
+ <el-option
+ v-for="dict in dict.type.sys_education"
+ :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="12">
+ <el-form-item label="浣忓潃" prop="residenceaddress">
+ <div>
+ <li_area_select
+ ref="residenceSelect"
+ v-model="residenceAddresss"
+ ></li_area_select>
+ <!-- <div>{{defultAddress}}</div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :push="1">
+ <el-input
+ v-model="form.residenceaddress"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
+ </el-col>
+ </el-row>
+
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
+ <div>
+ <li_area_select
+ ref="registerSelect"
+ v-model="registerAddresss"
+ ></li_area_select>
+ <!-- <div>{{defultAddress}}</div> -->
+ </div>
+ </el-form-item>
+ </el-col>
+ <el-col :span="11" :push="1">
+ <el-input
+ v-model="form.registeraddress"
+ placeholder="璇疯緭鍏ュ唴瀹�"
+ />
</el-col>
</el-row>
<el-row>
@@ -623,6 +660,20 @@
</el-col>
</el-row>
<el-row>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="鑾峰彇缁勭粐"
+ prop="acquisitiontissuename"
+ >
+ <org-selecter
+ style="width: 260px"
+ ref="orgSelecter"
+ :org-type="'1'"
+ v-model="form.acquisitiontissueno"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="8">
<el-form-item label="淇℃伅鍛�" prop="infoname">
<el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
@@ -662,63 +713,6 @@
size="small"
style="width: 190px"
v-model="form.contacttime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
- >
- </el-date-picker>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="24">
- <el-form-item
- align="left"
- label="鑾峰彇缁勭粐"
- prop="acquisitiontissuename"
- >
- <org-selecter
- style="width: 260px"
- ref="orgSelecter"
- :org-type="'1'"
- v-model="form.acquisitiontissueno"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
- <el-form-item label="鎶ュ憡浜�" prop="reporterno">
- <el-select
- ref="getReportname"
- v-model="form.reporterno"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in reporters"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportNo"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
- <el-input
- v-model="form.reporterphone"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
- <el-date-picker
- clearable
- size="small"
- style="width: 190px"
- v-model="form.reporttime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="閫夋嫨鎶ュ憡鏃堕棿"
@@ -2314,30 +2308,6 @@
AnnexUpload,
ReportName
},
- // dicts: [
- // "sys_nation",
- // "sys_occupation",
- // "sys_education",
- // "sys_Organ",
- // "sys_user_sex",
- // "sys_IDType",
- // "sys_BloodType",
- // "sys_0_1",
- // "sys_patientstate",
- // "sys_DonationCategory",
- // "sys_Kinship",
- // "sys_Infectious",
- // "sys_bloodtype_rhd",
- // "sys_InfoSources",
- // "sys_OtherCases",
- // "sys_DiseaseType",
- // "sys_SelfWill",
- // "sys_FamilyRelation",
- // "sys_OrganDecision",
- // "sys_CoreAssessConclusion",
- // "sys_BaseAssessConclusion",
- // "sys_EthicalReview"
- // ],
data() {
return {
infoid: 736,
@@ -2349,24 +2319,6 @@
address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�",
tag: "涓浗涓�绫�(DBD)",
type: "success"
- },
- {
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�",
- tag: "涓浗浜岀被(DCD)",
- type: "danger"
- },
- {
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�",
- tag: "涓浗涓夌被(DBCD)",
- type: "warning"
- },
- {
- name: "鐜嬪皬铏�",
- address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
- tag: "涓浗涓夌被(DBCD)",
- type: "warning"
}
],
medicineform: {
@@ -2511,7 +2463,32 @@
},
// 鍚勭骇鏄庣粏鏁堥獙
medicinerules: {},
- affirmrules: {},
+ affirmrules: {
+ name: [
+ { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ phone: [
+ { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+ ],
+ signfamilyrelations: [
+ { required: true, message: "涓庢崘鐚�呭叧绯�", trigger: "blur" }
+ ],
+ idcardno: [
+ { required: true, message: "璇佷欢鍙蜂笉鑳戒负绌�", trigger: "blur" }
+ ],
+ organdecision: [
+ { required: true, message: "鎹愮尞鍐冲畾涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ responsibleuserid: [
+ { required: true, message: "璐熻矗浜轰笉鑳戒负绌�", trigger: "blur" }
+ ],
+ coordinateduserido: [
+ { required: true, message: "鍗忚皟鍛�1涓嶈兘涓虹┖", trigger: "blur" }
+ ],
+ coordinateduseridt: [
+ { required: true, message: "鍗忚皟鍛�2涓嶈兘涓虹┖", trigger: "blur" }
+ ]
+ },
ethicrules: {},
allocationrules: {},
witnessrules: {},
@@ -2596,9 +2573,9 @@
this.residenceAddresss.shi = response.data.residencecityname;
this.residenceAddresss.qu = response.data.residencetownname;
this.registerAddresss.qu = response.data.registertownname;
+ // 鑾峰彇浜岀骇琛�
+ this.GetAttacheddata();
});
- // 鑾峰彇浜岀骇琛�
- this.GetAttacheddata();
},
// 鑾峰彇浜岀骇琛ㄦ暟鎹�
GetAttacheddata() {
@@ -3079,7 +3056,7 @@
Modifydonationattachment(this.donatelist).then(res => {
console.log(res);
});
- this.listDonateannex()
+ this.listDonateannex();
this.GetAttacheddata();
} else {
this.submitForm();
@@ -3316,16 +3293,17 @@
<style lang="scss" scoped>
.particularsdiv {
- display: flex;
+ display: -webkit-box;
background-color: #f5f7fa;
height: 100%;
.left-course {
background: #fff;
- width: 20vw;
+ width: 17vw;
text-align: center;
margin: 20px 10px;
padding: 10px;
margin-top: 0;
+ min-height: 888px;
.postfilx {
width: 15vw;
@@ -3394,7 +3372,7 @@
padding-right: 66px;
}
.boxdiv {
- max-width: 80vw;
+ max-width: 85vw;
font-size: 18px;
padding: 0 30px;
padding-bottom: 10px;
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 02d0d38..7dc23bb 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -150,7 +150,8 @@
<div
style="margin-bottom: 15px;"
v-if="
- userprofile.nickName == '闄堟厱鍗�'&&(businessType=='1'||businessType=='2')
+ userprofile.nickName == '闄堟厱鍗�' &&
+ (businessType == '1' || businessType == '2')
"
>
<el-button
@@ -558,7 +559,9 @@
"
type="text"
size="small"
- v-if="businessType == 3 || businessType == 4"
+ v-if="
+ businessType == 3 || businessType == 2 || businessType == 4
+ "
>绁ㄦ嵁</el-button
>
</template>
@@ -1152,9 +1155,8 @@
label="鍚嶇О"
>
<template slot-scope="scope">
- <i style="color:#409EFF" class=" el-icon-s-order" />{{
- scope.row.name
- }}
+ <i style="color:#409EFF" class=" el-icon-s-order" />
+ <a :href="pdfimg">{{ scope.row.name }}</a>
</template>
</el-table-column>
@@ -1249,9 +1251,8 @@
label="鍚嶇О"
>
<template slot-scope="scope">
- <i style="color:#409EFF" class=" el-icon-s-order" />{{
- scope.row.name
- }}
+ <i style="color:#409EFF" class=" el-icon-s-order" />
+ <a :href="invoicepdfimg">{{ scope.row.name }}</a>
</template>
</el-table-column>
@@ -2122,7 +2123,7 @@
);
return;
}
-
+
/*
if (
tempDetail.idcardno == null &&
@@ -2299,6 +2300,7 @@
}
});
}
+ this.form.id = response.data;
} else {
this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
}
@@ -2900,7 +2902,7 @@
// }
// });
this.$modal.msgSuccess("璁＄畻鎴愬姛");
- this.handleCheck()
+ this.handleCheck();
} else {
this.$message({
type: "error",
--
Gitblit v1.9.3