From c7c376e151fd91c6b94b72b691e9b158755723a8 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 11 九月 2023 15:23:48 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 32 +++++++++++++++++++-------------
src/views/project/fundcheck/medicalCostCheck/index.vue | 6 +++---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 4 ++--
src/views/project/donatebaseinfo/index.vue | 3 +++
src/views/project/fundcheck/expertFeeCheck/index.vue | 4 ++--
src/views/project/fundcheck/officeExpenseCheck/index.vue | 4 ++--
6 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 7abbde0..9c67e7f 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -647,6 +647,9 @@
name: [
{ required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" },
],
+ birthday: [
+ { required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" },
+ ],
idcardtype: [
{ required: true, message: "璇烽�夋嫨璇佷欢绫诲瀷", trigger: "blur" },
],
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c9a45de..36f8615 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -164,7 +164,7 @@
>
</el-alert>
</el-row>
- <el-row>
+ <el-row v-if="businessType == 2">
<div style="margin-bottom: 15px;">
<el-button
type="success"
@@ -416,11 +416,7 @@
type="primary"
plain
@click="ShowDetailDialog(scope, 'expert')"
- >{{
- experthear == "expert"
- ? scope.row.unitname
- : scope.row.beneficiaryname
- }}</el-button
+ >{{ scope.row.beneficiaryname }}</el-button
>
<!-- <el-select
v-model="scope.row.unitno"
@@ -873,7 +869,7 @@
ref="beneficiaryname"
default-first-option
@change="bbaaccss"
- v-model="funddetailForm.beneficiaryname"
+ v-model="Personnelforname"
placeholder="璇烽�夋嫨"
style="width: 100%"
>
@@ -890,7 +886,7 @@
<el-col :span="24" v-if="experthear == 'expert'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
<el-select
- v-model="funddetailForm.unitname"
+ v-model="unitforname"
placeholder="鍗曚綅鍚嶇О"
@change="bbaaccss"
clearable
@@ -1119,7 +1115,7 @@
</div> -->
</div>
- <div v-if="this.previewpdf" class="pdfimgmin">
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
<el-image
style="width: 95%; height: 90%"
@@ -1327,7 +1323,8 @@
cityOptions: [],
checkAll: false,
checkedCities: [],
-
+ Personnelforname: "璇烽�夋嫨",
+ unitforname: "璇烽�夋嫨",
isIndeterminate: true,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
@@ -1483,7 +1480,7 @@
pdfimgsrcList: [],
pdfVisible: false,
previewpdf: false,
- hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+ hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
atpresent: "",
Savereminder: false, //鎻愰啋淇濆瓨寮规
Reminderquantity: 0, //鎻愰啋鏁伴噺
@@ -3220,7 +3217,15 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
- console.log(this.funddetailForm.tempExpertName);
+ console.log(this.unitforname);
+ console.log(this.Personnelforname);
+ if (this.experthear == "expert") {
+ this.funddetailForm.beneficiaryname = this.unitforname;
+ } else {
+ console.log(11);
+ this.funddetailForm.beneficiaryname = this.Personnelforname;
+ console.log(this.funddetailForm.beneficiaryname);
+ }
console.log(this.funddetailForm);
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
@@ -3348,8 +3353,9 @@
// singleDetail.unitname = "";
// }
if (this.businessType == 4) {
- singleDetail.unitname = this.funddetailForm.unitname;
+ singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
}
+ console.log(singleDetail);
console.log(this.funddetailForm);
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 9e7c574..61a79b5 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -6,14 +6,14 @@
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery">
+ @keyup.enter.native="flowconclusion">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
<el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ @keyup.enter.native="flowconclusion" />
</el-form-item>
</el-col>
<el-col :span="5">
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index bb82d7b..1b16d95 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -19,7 +19,7 @@
range-separator="鑷�"
start-placeholder="鐢宠寮�濮嬫棩鏈�"
end-placeholder="鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery"
+ @keyup.enter.native="flowconclusion"
>
</el-date-picker>
</el-form-item>
@@ -31,7 +31,7 @@
placeholder="璇疯緭鍏ョ粡鍔炰汉"
clearable
size="small"
- @keyup.enter.native="handleQuery"
+ @keyup.enter.native="flowconclusion"
/>
</el-form-item>
</el-col>
@@ -42,7 +42,7 @@
placeholder="璇疯緭鍏ユ崘鐚汉"
clearable
size="small"
- @keyup.enter.native="handleQuery"
+ @keyup.enter.native="flowconclusion"
/>
</el-form-item>
</el-col>
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 04d41c5..314465e 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -6,14 +6,14 @@
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery">
+ @keyup.enter.native="flowconclusion">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
<el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ @keyup.enter.native="flowconclusion" />
</el-form-item>
</el-col>
<el-col :span="5">
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 00431e3..19f6b8a 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -1019,8 +1019,8 @@
</div>
</div>
- <div v-if="this.previewpdf" class="pdfimgmin">
- <!-- <img :src="pdfimg" /> -->
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
+ <!-- <img :src="pdfimg" /> -->
<el-image
style="width: 95%; height: 90%"
:src="pdfimg"
--
Gitblit v1.9.3