From 267862835e0a095eae9537dcc35cfcbdf5fece78 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 20 十二月 2023 17:49:54 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 225 ++++++++++++++++++++++++++++---------------------------
1 files changed, 114 insertions(+), 111 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index f43ff28..d179f61 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -153,7 +153,7 @@
</div>
</div>
<!-- 鍙充晶鏁版嵁 -->
- <div style="background: #fff;">
+ <div style="background: #fff; width: 80%;">
<!-- 椤堕儴鏁版嵁 -->
<div class="boxdiv">
<div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
@@ -171,30 +171,47 @@
"
>
<el-row style="margin-top: 10px">
- <el-col :span="8">
+ <el-col :span="6">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
<el-input v-model="form.donorno" disabled />
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item
- align="left"
- label="鍖荤枟鏈烘瀯"
- prop="treatmenthospitalno"
- >
- <org-selecter
- ref="addOrgSelect"
- :org-type="'3'"
- v-model="form.treatmenthospitalno"
+ <el-col :span="6">
+ <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="6">
+ <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="绉戝" prop="treatmentdeptno">
- <el-input
- v-model="form.treatmentdeptname"
- placeholder="璇疯緭鍏ョ瀹�"
- />
+ <el-col :span="6">
+ <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+ <el-date-picker
+ clearable
+ size="small"
+ v-model="form.reporttime"
+ type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ >
+ </el-date-picker>
</el-form-item>
</el-col>
</el-row>
@@ -204,39 +221,6 @@
<el-input v-model="form.name" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
- <el-option
- v-for="dict in dict.type.sys_user_sex"
- :key="dict.label"
- :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="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <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>
- <el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
<el-select
@@ -255,7 +239,6 @@
<el-col :span="6">
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
<el-input
- style="width: 174px"
ref="updateBSvalue"
class="sfzcode"
v-model="form.idcardno"
@@ -264,45 +247,57 @@
/>
</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-col :span="6">
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
<el-date-picker
clearable
size="small"
- style="width: 190px"
- v-model="form.reporttime"
- type="datetime"
+ v-model="form.birthday"
+ type="date"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+ placeholder="閫夋嫨鍑虹敓鏃ユ湡"
>
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+ <el-option
+ v-for="dict in dict.type.sys_user_sex"
+ :key="dict.label"
+ :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="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item
+ align="left"
+ label="鍖荤枟鏈烘瀯"
+ prop="treatmenthospitalno"
+ >
+ <org-selecter
+ ref="addOrgSelect"
+ :org-type="'3'"
+ v-model="form.treatmenthospitalno"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="绉戝" prop="treatmentdeptno">
+ <el-input
+ v-model="form.treatmentdeptname"
+ placeholder="璇疯緭鍏ョ瀹�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -727,22 +722,19 @@
v-show="!showTerminationBtn"
type="primary"
@click="submitForm"
- >淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
- <el-button
+ <!-- <el-button
v-show="Reportforreview"
type="primary"
@click="Reportforreview"
- >涓婃姤瀹℃牳</el-button
- >
-
- <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
- <!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
+ >鎻愪氦</el-button
+ > -->
</div>
</div>
<!-- 鍖诲璇勪及 -->
@@ -953,12 +945,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨璇勪及淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1160,12 +1152,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鎹愮尞淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1228,12 +1220,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨浼︾悊淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1606,12 +1598,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨鍣ㄥ畼鍒嗛厤淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -1961,12 +1953,12 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >淇濆瓨瑙佽瘉淇℃伅</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<!-- <el-button
v-show="makeastepforward"
@@ -2083,25 +2075,35 @@
v-show="!showTerminationBtn"
type="primary"
@click="Savethedetails"
- >瀹屾垚鐧昏</el-button
+ >淇濆瓨</el-button
>
<el-button
:type="showTerminationBtn == 0 ? 'warning' : 'success'"
@click="Terminationcase"
- >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+ >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
>
<el-button
v-show="Reportforreview"
type="primary"
@click="Reportforreview"
- >涓婃姤瀹℃牳</el-button
+ >鎻愪氦</el-button
>
<!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
</div>
</div>
<!-- 瀹岀粨娴佺▼ -->
- <div class="boxdiv" v-show="actives > 6">
- <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
+ <div class="boxdiv" v-show="actives > 6">
+ <div style="display:flex; line-height: 100px; justify-content: center;">
+ <!-- <el-image
+ style="width: 100px; height: 100px"
+ :src="require('@/assets/images/wanc.png')"
+ ></el-image> -->
+ <div style="padding: 20px 0; margin: 0 30px">
+ <img style="width: 60px; height: 60px" src="@/assets/images/wanc.png" class="user-avatar" />
+ </div>
+ <div style="font-size: 28px;">鍏ㄩ儴娴佺▼宸插畬缁擄紒</div>
+ <img style="width: 100px; height: 100px" src="@/assets/images/zhan.png" class="user-avatar" />
+ </div>
</div>
</div>
<!-- 闄勪欢寮圭獥 -->
@@ -2671,7 +2673,7 @@
console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
}
});
- } else if (this.actives == 4 && !this.medicineform[0]) {
+ } else if (this.actives == 4 && !this.allocationform[0]) {
listDonateorgan(searchParam).then(response => {
if (response.code == 200) {
if (response.rows[0]) {
@@ -2957,6 +2959,7 @@
this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
});
}
+ this.form.donationcategory = this.witnessform.donationcategory;
this.Processvalidation();
}
});
@@ -2975,7 +2978,7 @@
}
});
// 淇濆瓨纭淇℃伅
- if (this.accomplishform.id) {
+ if (this.accomplishform.dcid) {
console.log(this.accomplishform);
updateDonatecompletioninfo(this.accomplishform).then(response => {
this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
@@ -3074,7 +3077,7 @@
Processvalidation() {
console.log(this.form.workflow);
console.log(this.actives);
- if (this.form.workflow + 1 == this.actives) {
+ if (this.form.workflow + 1 == this.actives || this.actives == 6) {
if (this.form.workflow <= 6) {
this.form.workflow++;
} else {
--
Gitblit v1.9.3