From cc7c660a4d4bcdbdf1514e5ddb3e663899f096d4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 07 九月 2023 14:13:52 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 356 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 289 insertions(+), 67 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 1986acc..e06d0bc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -72,7 +72,7 @@
}}</el-radio>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <!-- <el-col :span="5">
<el-form-item label="閾惰鍚嶇О" prop="bankname">
<el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
</el-form-item> </el-col
@@ -83,10 +83,28 @@
placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
/>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鐢宠閲戦" prop="pretaxcost">
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -98,15 +116,7 @@
</el-form-item>
</el-col>
-->
- <el-col :span="5">
- <el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
@@ -123,15 +133,7 @@
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- :disabled="true"
- v-model="form.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
@@ -153,6 +155,16 @@
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
+ </el-row>
+ <el-row v-if="jurisdiction">
+ <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+ </el-alert> -->
+ <el-alert
+ title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
+ type="warning"
+ show-icon
+ >
+ </el-alert>
</el-row>
<el-row>
<el-table
@@ -184,7 +196,7 @@
>
<template slot-scope="scope">
<el-select
- v-model="scope.row.applytypename"
+ v-model="scope.row.applytype"
placeholder="鏈嶅姟绫诲瀷"
@change="verifyFeeItemType(scope.row)"
>
@@ -205,7 +217,7 @@
>
<template slot-scope="scope">
<el-select
- v-model="scope.row.itemname"
+ v-model="scope.row.itemid"
placeholder="鏈嶅姟椤圭洰"
filterable
@change="verifyFeeItem(scope.row)"
@@ -373,6 +385,7 @@
align="center"
label="鍗曚綅鍚嶇О"
width="250"
+ v-if="form.applytype != '4'"
>
<template slot-scope="scope">
<el-button
@@ -380,6 +393,40 @@
plain
@click="ShowDetailDialog(scope, 'unit')"
>{{ scope.row.unitname }}</el-button
+ >
+ <!-- <el-select
+ v-model="scope.row.unitno"
+ placeholder="鍗曚綅"
+ clearable
+ filterable
+ allow-create
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select> -->
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4'"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{
+ scope.row.unitname
+ ? scope.row.unitname
+ : scope.row.beneficiaryname
+ }}</el-button
>
<!-- <el-select
v-model="scope.row.unitno"
@@ -424,8 +471,8 @@
align="center"
label="寮�鎴烽摱琛�"
width="200"
- v-if="form.applytype != '4'"
>
+ <!-- v-if="form.applytype != '4'" -->
<template slot-scope="scope">
<el-input
v-model="scope.row.depositbank"
@@ -438,7 +485,6 @@
align="center"
label="閾惰甯愬彿"
width="210"
- v-if="form.applytype != '4'"
>
<template slot-scope="scope">
<el-input
@@ -447,9 +493,19 @@
/>
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞">
+ <el-table-column
+ prop="remark"
+ align="center"
+ width="330"
+ label="澶囨敞"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.remark"
+ placeholder="澶囨敞"
+ />
</template>
</el-table-column>
<el-table-column
@@ -550,9 +606,10 @@
size="mini"
class="upload-demo"
:action="uploadFileUrl"
- :file-list="fileList"
+ :file-list="fileListto"
+ :show-file-list="false"
multiple
- :limit="20"
+ drag
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -561,21 +618,72 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
- <el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶绁ㄦ嵁</el-button
- >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗙エ鎹嫋鍒版澶勶紝鎴�
+ <em
+ ><el-button
+ :disabled="operationType == 'detail'"
+ size="small"
+ type="primary"
+ >鐐瑰嚮涓婁紶</el-button
+ ></em
+ >
+ </div>
</el-upload>
+ <el-table
+ :data="fileListto"
+ @row-click="downFile"
+ style="width: 100%"
+ height="400"
+ >
+ <el-table-column
+ prop="name"
+ :show-overflow-tooltip="true"
+ label="鍚嶇О"
+ >
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />{{
+ scope.row.name
+ }}
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="name"
+ width="180"
+ :show-overflow-tooltip="true"
+ label="鍔熻兘"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ type="primary"
+ size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
+ >涓婄Щ</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="operationType == 'detail' || operationType == 'check'">
+ <el-row
+ v-if="
+ operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ "
+ >
<el-table :data="fundflowList" border>
<el-table-column
label="瀹℃牳鏃ユ湡"
@@ -652,14 +760,17 @@
<el-dialog
:visible.sync="showSelectionDialog"
:close-on-click-modal="false"
- :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'"
+ :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
width="500px"
style="text-align: center"
v-loading="loading"
>
<el-form ref="funddetailForm" :model="funddetailForm">
- <el-row>
- <el-col :span="24" v-if="selectionType == 'expert'">
+ <el-row v-if="businessType != 4">
+ <el-col
+ :span="24"
+ v-if="selectionType == 'expert' && businessType != 4"
+ >
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
<el-radio-group v-model="expertfrom" style="margin-bottom: 0">
<el-radio label="1">涓撳搴�</el-radio>
@@ -722,7 +833,7 @@
label="鍙戠エ鍗曚綅鍚嶇О"
prop="unitno"
label-width="120px"
- v-if="businessType == 3 || businessType == 4"
+ v-if="businessType == 3"
>
<el-select
v-model="funddetailForm.unitno"
@@ -742,7 +853,68 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+
+ <el-row v-if="businessType == 4">
+ <el-col :span="24">
+ <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
+ <el-radio-group
+ @change="ShowDetailDialog(spocewl)"
+ v-model="experthear"
+ style="margin-bottom: 0"
+ >
+ <el-radio label="unit">浜哄憳閫夐」</el-radio>
+ <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="experthear == 'unit'">
+ <el-form-item
+ label="浜哄憳濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ @change="bbaaccss"
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in expertlist"
+ :key="item.expertNo"
+ :label="item.exportName"
+ :value="item.exportName"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="experthear == 'expert'">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
+ <el-select
+ v-model="funddetailForm.unitno"
+ placeholder="鍗曚綅鍚嶇О"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row v-if="businessType != 4">
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
<el-input
@@ -771,7 +943,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="韬唤璇佸彿"
@@ -797,7 +969,7 @@
</el-col>
</el-row>
-->
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="鍗曚綅鍚嶇О"
@@ -821,7 +993,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="寮�鎴烽摱琛�"
@@ -874,7 +1046,6 @@
:show-file-list="false"
multiple
drag
- :limit="20"
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -883,7 +1054,6 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
@@ -907,6 +1077,7 @@
:data="fileListto"
@row-click="downFile"
style="width: 100%"
+ height="400"
>
<el-table-column
prop="name"
@@ -930,13 +1101,13 @@
<el-button
type="primary"
size="mini"
- @click.native.prevent="deletedowfile(scope.row)"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
>鍒犻櫎</el-button
>
<el-button
type="primary"
size="mini"
- @click.native.prevent="moveupdowfile(scope.row)"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
>涓婄Щ</el-button
>
</template>
@@ -1060,7 +1231,6 @@
Li_area_select,
OrgSelecter
},
-
name: "fundApply",
dicts: [
@@ -1087,9 +1257,12 @@
// 瀵煎嚭閬僵灞�
exportLoading: false,
usernamedata: "",
+ jurisdiction: false,
+
// 琛ㄥ崟鍙傛暟
form: {},
-
+ experthear: "",
+ spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
//鐢宠鍗曠被鍨�
@@ -1290,6 +1463,10 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
+ bbaaccss(val) {
+ console.log(val);
+ console.log(this.funddetailForm);
+ },
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
@@ -1395,6 +1572,7 @@
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.getUnitList();
// this.getBaseInfoList();
}
@@ -1411,6 +1589,7 @@
this.handleUpdate();
} else if (this.operationType == "detail") {
this.title = this.businessName + "鏌ョ湅";
+ this.jurisdiction = true;
this.handleDetail();
} else if (this.operationType == "check") {
this.title = this.businessName + "瀹℃牳";
@@ -1500,6 +1679,14 @@
this.addRow(0);
}
});
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+ console.log(this.fundflowList);
});
},
@@ -1550,7 +1737,7 @@
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleCheck() {
this.isopen = 0;
this.reset();
@@ -1835,10 +2022,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -2028,13 +2216,16 @@
//鑾峰彇璐圭敤鏈烘瀯鍒楄〃
getFeeUnitList() {
+ console.log("鍗曚綅");
listReportname("org").then(res => {
this.feeUnitList = res.data;
});
+ console.log(this.feeUnitList);
},
//鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
getUnitList() {
+ console.log("鍖荤枟鏈烘瀯");
listOrganization(3).then(response => {
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
@@ -2042,6 +2233,7 @@
organizationid: response.rows[i].id,
organizationname: response.rows[i].organizationname
});
+ console.log(this.unitList);
}
});
},
@@ -2494,10 +2686,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -2806,14 +2999,14 @@
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
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.fileListto.push({ name: file.name, url: response.url });
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
- // this.pdfimgsrcList.push(response.url);
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
@@ -2826,6 +3019,7 @@
this.atpresent = index;
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
+ this.previewpdf = true;
this.fileListto = this.rbDetails[index].annexfilesList;
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
// this.pdfimg = this.fileListto[0].url;
@@ -2855,14 +3049,13 @@
this.previewpdf = true;
if (item.url) {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
- // this.pdfimg = item.url;
- // this.pdfimgsrcList = [];
- // this.pdfimgsrcList.push(this.pdfimg);
- if (!this.pdfimgsrcList.includes(this.pdfimg)) {
- this.pdfimgsrcList.push(this.pdfimg);
- console.log("鍔犲叆");
- }
+
+ // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ // this.pdfimgsrcList.push(this.pdfimg);
+ // console.log("鍔犲叆");
+ // }
console.log(this.pdfimg);
+ console.log(this.pdfimgsrcList, "imglist");
} else {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
}
@@ -2879,9 +3072,16 @@
deletedowfile(row) {
console.log(this.fileListto);
console.log(row);
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ console.log(indexlist);
+ this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
- this.fileList = this.fileListto.splice(index, 1);
+ this.fileListto.splice(index, 1);
console.log(index);
+ console.log(this.pdfimgsrcList);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
@@ -2891,7 +3091,17 @@
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ShowDetailDialog(spoce, showType) {
+ this.spocewl = spoce;
+ console.log(spoce);
this.selectionType = showType;
+ if (this.businessType == 4 || !showType) {
+ this.selectionType = this.experthear;
+ console.log(this.selectionType);
+ }
+ // if (!showType) {
+ // this.selectionType = this.experthear;
+
+ // }
this.expertfrom = "1";
this.funddetailForm.index = spoce.$index;
@@ -2912,13 +3122,16 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
+ console.log(this.funddetailForm.tempExpertName);
+ console.log(this.funddetailForm);
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
+ console.log(tempExpertName);
- if (this.selectionType == "expert") {
- if (this.expertfrom == "1") {
+ if (this.selectionType == "expert" || this.businessType == 4) {
+ if (this.expertfrom == "1" || this.experthear == "unit") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
if (tempExpertName == res.username) {
@@ -3033,6 +3246,10 @@
}
}
+ if (this.experthear == "unit") {
+ singleDetail.unitname = "";
+ }
+ console.log(this.funddetailForm);
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
}
@@ -3044,6 +3261,7 @@
this.Getnetworkheader();
this.getroute();
this.getExternalList();
+ this.getFeeUnitList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
@@ -3143,4 +3361,8 @@
line-height: 36px;
text-align: center;
}
+::v-deep .el-alert__title {
+ font-size: 20px;
+ line-height: 20px;
+}
</style>
--
Gitblit v1.9.3