From 51da1652ed49184ee29cb7bcbea6a7187c5b51b7 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 18 一月 2024 13:56:36 +0800
Subject: [PATCH] yxh
---
src/views/project/donationdetails/index.vue | 23 +++++++++++++++--------
src/views/project/fund/applyDetail/index.vue | 4 ++--
src/views/project/donatebaseinfo/index.vue | 8 ++++----
3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index a582e79..653f5fc 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -88,12 +88,12 @@
</el-row>
<el-table v-loading="loading" :data="donatebaseinfoList" @selection-change="handleSelectionChange" border
- :default-sort="{ prop: 'reporttime', order: 'descending' }">
+ :default-sort="{ prop: 'donatetime', order: 'descending' }">
<!-- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="id" /> -->
<!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column label="鏃堕棿" align="center" prop="reporttime" width="100">
+ <el-table-column label="妗堜緥鏃堕棿" align="center" prop="donatetime" width="100">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.donatetime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" width="200" />
@@ -1298,7 +1298,6 @@
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
- console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
if (valid) {
this.form.birthday = this.$moment(this.form.birthday).format(
"YYYY-MM-DD HH:mm:ss"
@@ -1329,6 +1328,7 @@
this.form.registertownname = this.registerAddresss.qu;
this.form.reportername = this.$refs.getReportname.$data.selectedLabel;
+ this.form.donatetime = this.form.reporttime;
try {
this.form.treatmenthospitalname = this.$refs.addOrgSelect.getOptionByValue(
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index badd229..70b1b64 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -618,9 +618,8 @@
<el-col :span="12">
<el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
<el-checkbox-group v-model="organdecision">
- <el-checkbox v-for="item in kinshiplist" :label="item">
- {{ item == "瀛愬コ" ? item + "(浜�)" : item }}
- </el-checkbox>
+ <el-checkbox v-for="item in kinshiplist" :key="item" :label="item"> {{ item == "瀛愬コ" ? item + "(浜�)" :
+ item }} </el-checkbox>
</el-checkbox-group>
</el-form-item>
</el-col>
@@ -638,11 +637,10 @@
<el-row>
<el-form-item label-width="100px" label="鎹愮尞鍐冲畾">
<el-checkbox-group v-model="organdecision">
- <el-checkbox v-for="item in organselection" :label="item">
- {{ item }}
- </el-checkbox>
+ <el-checkbox v-for="item in organselection" :key="item" :label="item">{{ item }} </el-checkbox>
</el-checkbox-group>
- </el-form-item></el-row>
+ </el-form-item>
+ </el-row>
<el-row>
<!-- <el-col :span="18">
<el-form-item align="left" label="鎹愮尞鍐冲畾">
@@ -1774,7 +1772,7 @@
listDonationwitnessorgan(searchParam).then(res => {
if (res.code == 200) {
if (res.rows[0]) {
- this.procureddata = res.rows;
+ this.procureddata = res.rows;
this.procureddata.infoid = this.infoid;
}
this.organList.organprocured = [];
@@ -1894,6 +1892,15 @@
this.form.redorganname = this.form.redorganno;
}
+ //妗堜緥鏃堕棿鏇存柊鎴愯幏鍙栨椂闂�
+ if (this.actives == 5) {
+ this.$refs["witnessform"].validate(valid1 => {
+ this.$refs["form"].validate(valid2 => {
+ this.form.donatetime = this.witnessform.operationbegtime;
+ });
+ });
+ }
+
if (this.form.id != null) {
if (this.form.workflow == 0) {
this.form.workflow = 1;
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 9310d30..62c8afc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -1635,14 +1635,14 @@
else if (this.checkObj.flowlevelone == 1) {
if (this.userprofile.nickName == "闄堟厱鍗�") {
//妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
- if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
+ if (this.form.checkstatus != 3) {
this.$modal.msgError("璇峰厛纭鎶ラ攢鐨勭焊璐ㄦ潗鏂欐槸鍚﹀凡缁忔敹鍒帮紒");
return;
}
//妫�鏌ヤ釜绋庤绠�
if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
- this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�");
+ this.$modal.msgError("璇峰厛瀹屾垚涓撳璐圭敤鐨勪釜绋庤绠楀悗锛屽啀鎻愪氦瀹℃牳閫氳繃锛�");
return;
}
}
--
Gitblit v1.9.3