From 9fb9cd1ce924b6d0833ee9ca03581ff04352707b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 24 八月 2023 10:14:05 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 533 +++++++++++++++++++++++++++++------------------------------
1 files changed, 261 insertions(+), 272 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f640a34..e2f8645 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -14,7 +14,8 @@
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
+ <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"
+ @change="getUserAccount">
<el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
:value="dict.nickname"></el-option>
</el-select>
@@ -46,9 +47,13 @@
}}</el-radio>
</el-form-item>
</el-col>
- <el-col :span="10">
- <el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ <el-col :span="5">
+ <el-form-item label="閾惰鍚嶇О" prop="bankname">
+ <el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
+ </el-form-item>
+ </el-col><el-col :span="5">
+ <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
+ <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -81,6 +86,11 @@
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>-->
+ <el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <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.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
@@ -99,7 +109,7 @@
<el-row style="margin-top: 5px; margin-bottom: 5px" />
<el-row style="margin-bottom: 10px" v-if="businessType == '1'">
<el-col :span="4">
- <el-button @click.native.prevent="addAllItems" type="primary" size="small">
+ <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
@@ -111,36 +121,37 @@
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="200">
+ <!--
+ <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
+ v-if="form.applytype == '1'">
+ </el-table-column>-->
+ <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="loadItemType(scope.row)">
+ <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
<el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemid" align="center" label="璐圭敤椤圭洰" width="260">
+ <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="璐圭敤椤圭洰" filterable @change="verifyFeeItem(scope.row)"
+ <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
:filter-method="val => searchItemType(val, scope)">
<el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
:value="dict.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
- v-if="form.applytype == '1'">
- </el-table-column>
- <el-table-column prop="servicesscope" align="center" label="璐圭敤璇存槑" v-if="form.applytype == '1'" width="180">
+ <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
<template slot-scope="scope">
- <el-select v-model="scope.row.servicesscope" placeholder="璐圭敤璇存槑" clearable allow-create filterable
- @change="selectedRemark(scope.row)">
+ <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create filterable
+ @change="verifyFeeRemark(scope.row)">
<el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
:value="dict.servicesscope"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="0">
+ <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
sumTotalFee(scope.row);
@@ -148,7 +159,7 @@
" />
</template>
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="0">
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
sumTotalFee(scope.row);
@@ -157,7 +168,7 @@
</template>
</el-table-column>
<el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
- align="center" label="绋庡墠閲戦" width="120">
+ align="center" :label=amountLabel width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -166,7 +177,7 @@
:value="dict.expense"></el-option>
</el-select>
-->
- <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" />
+ <el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
@@ -176,17 +187,17 @@
<el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
</template>
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="100"
+ <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"
v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
}}</el-button>
<!-- <el-select
filterable
allow-create
ref="getReportname"
default-first-option
- @change="selectpersonmsg(scope.row)"
+ @change="selectExpert(scope.row)"
v-model="scope.row.beneficiaryname"
placeholder="璇烽�夋嫨"
>
@@ -200,7 +211,7 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" v-if="form.applytype != '4'">
+ <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
}}</el-button>
@@ -242,7 +253,7 @@
<el-input v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞" v-if="form.applytype == '4'">
+ <el-table-column prop="remark" align="center" label="澶囨敞">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
@@ -258,7 +269,7 @@
</el-button>
<el-button @click.native.prevent="
Filepopup(scope.$index, rbDetails, scope.row)
- " type="text" size="small">绁ㄦ嵁</el-button>
+ " type="text" size="small" v-if="businessType == 3 || businessType == 4">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -312,18 +323,20 @@
uploadSccess(response, file, fileList)
" :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>
+ <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶绁ㄦ嵁</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="operationType == 'detail' || operationType == 'check'">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
<el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
- slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
+ <template slot-scope="scope">
+ <span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
+ <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
+ </template>
</el-table-column>
<el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
@@ -347,18 +360,18 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="operationType == 'add' || operationType == 'update'">淇�
- 瀛�</el-button>
- <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">淇� 瀛�</el-button>
- <el-button @click="cancel" v-if="operationType == 'detail'">閫� 鍑�</el-button>
+ <el-button type="primary" @click="submitForm"
+ v-if="operationType == 'add' || operationType == 'update'">鎻愪氦淇濆瓨</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
+ <el-button @click="cancel">鍏� 闂�</el-button>
</div>
</div>
- <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
+ <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
style="text-align: center" v-loading="loading">
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
- <el-col :span="24" v-if="showDetailInfoType == 'name'">
+ <el-col :span="24" v-if="selectionType == 'expert'">
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
<el-radio-group v-model="expertfrom" style="margin-bottom: 0">
<el-radio label="1">涓撳搴�</el-radio>
@@ -366,17 +379,17 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="showDetailInfoType == 'name' && expertfrom == '1'">
+ <el-col :span="24" v-if="selectionType == 'expert' && expertfrom == '1'">
<el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
<el-select filterable allow-create ref="beneficiaryname" default-first-option
v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName"
- :value="item.reportName">
+ <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="showDetailInfoType == 'unit'">
+ <el-col :span="24" v-if="selectionType == 'unit'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2">
<el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
@@ -450,7 +463,7 @@
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
+ <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -463,7 +476,7 @@
uploadSccess(response, file, fileList)
" :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>
+ <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶绁ㄦ嵁</el-button>
</el-upload>
</div>
<!-- <div
@@ -627,11 +640,9 @@
//涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
expertfrom: "1",
- //鎹愮尞妗堜緥鍒楄〃鏁版嵁
- donatebaseinfoList: [],
+ //鎹愮尞妗堜緥鍒楄〃
+ donateList: [],
- // 鎹愮尞浜洪亾鎱伴棶閲戣〃鏍兼暟鎹�
- donateconsolationfundList: [],
//璐圭敤鏄庣粏鍒楄〃
rbDetails: [],
formData: {},
@@ -640,17 +651,23 @@
totalAfterTaxAmount: 0.0,
totalAmount: 0.0,
- //琛岃褰曠殑璐圭敤绫诲瀷鏁扮粍
- rowfeeItemTypes: [],
+
//璐圭敤绫诲瀷鏁扮粍
feeItemTypes: [],
+
+ //琛岃褰曠殑璐圭敤绫诲瀷鏁扮粍
+ rowfeeItemTypes: [],
+
//璐圭敤璇存槑
rowfeeblocks: [],
fundflowList: [],
- showDetailInfoDialog: false,
- showDetailInfoType: "",
+ //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
+ selectionType: "",
+ showSelectionDialog: false,
+ //绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
+ amountLabel:"绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -777,30 +794,6 @@
computed: {},
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
- //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
-
- created() {
- //鑾峰彇璺敱鍙傛暟
- this.getroute();
- this.getUserProfile();
- this.getFeeUnitList();
- },
-
- //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
- mounted() {
- this.getUserList();
- this.getBaseInfoList();
- this.getExternalList();
- },
-
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
-
//鏂规硶闆嗗悎
methods: {
// 琛ㄥ崟閲嶇疆
@@ -858,35 +851,50 @@
this.curId = this.$route.query.id;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
- console.log(this.businessType, this.operationType);
//鑾峰彇璐圭敤椤圭洰绫诲瀷
- this.getFundType();
+ this.getFeeTypes();
// if (!this.businessType && !this.operationType) {
if (this.businessType == "1") {
this.curCase = this.$route.query.curCase;
- this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
- } else if (this.businessType == "2") {
+ this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"
+ this.amountLabel="绋庡墠閲戦"
+ this.getUnitList();
+ }
+ else if (this.businessType == "2") {
this.curCase = this.$route.query.curCase;
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
- } else if (this.businessType == "3") {
- if (this.operationType != "check") { this.curCase = this.$route.query.curCase; }
+ this.amountLabel="绋庡墠閲戦"
+ this.getUnitList();
+ }
+ else if (this.businessType == "3") {
+ if (this.operationType != "check") {
+ this.curCase = this.$route.query.curCase;
+ }
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
- } else if (this.businessType == "4") {
- this.businessName = "鏉傞」璐圭敤鎶ラ攢鍗�";
+ this.amountLabel="閲戦"
+ }
+ else if (this.businessType == "4") {
+ this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
+ this.amountLabel="閲戦"
+
+ // this.getBaseInfoList();
}
if (this.operationType == "add") {
this.title = this.businessName + "鏂板缓";
this.handleAdd();
- } else if (this.operationType == "update") {
+ }
+ else if (this.operationType == "update") {
this.title = this.businessName + "淇敼";
this.handleUpdate();
- } else if (this.operationType == "detail") {
+ }
+ else if (this.operationType == "detail") {
this.title = this.businessName + "鏌ョ湅";
this.handleDetail();
- } else if (this.operationType == "check") {
+ }
+ else if (this.operationType == "check") {
this.title = this.businessName + "瀹℃牳";
this.handleCheck();
}
@@ -902,14 +910,13 @@
this.istrue += 2;
this.reset();
- /** businessType锛�1锛氫笓瀹惰垂锛�2锛氫鸡鐞嗕笓瀹惰垂锛�3锛氬尰瀛︽垚鏈紱4锛氭潅椤硅垂鐢�*/
+ /** businessType锛�1锛氫笓瀹惰垂锛�2锛氫鸡鐞嗕笓瀹惰垂锛�3锛氬尰瀛︽垚鏈紱4锛氬姙鍏垂鐢�*/
this.form.applytype = this.businessType;
if (
this.businessType == "1" ||
this.businessType == "2" ||
this.businessType == "3"
) {
- console.log("", this.curCase);
this.form.infoid = this.curCase.id;
this.form.donorname = this.curCase.name;
this.form.donorno = this.curCase.donorno;
@@ -935,13 +942,10 @@
//鏄庣粏澶勭悊
getownFundDetail(this.curId).then(res => {
this.rbDetails = res.data;
- console.log(res);
-
- console.log(this.curId, res.data);
if (this.rbDetails.length > 0) {
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
- this.getitemlist(m, this.rbDetails[m]);
+ this.getFeeItems(m, this.rbDetails[m]);
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
this.rbDetails[m].rowfeeblocks = [];
@@ -969,44 +973,6 @@
});
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleCheck() {
- this.isopen = 0;
- this.reset();
-
- getFund(this.curId).then(response => {
- this.form = response.data;
- //闄勪欢澶勭悊
- // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
- //涓氬姟鏄庣粏
- getownFundDetail(this.curId).then(res => {
- console.log(res);
- this.rbDetails = res.data;
- for (let m = 0; m < this.rbDetails.length; m++) {
- this.rbDetails[m].itemlist = [];
- this.getitemlist(m, this.rbDetails[m]);
- this.rbDetails[m].rowfeeblocks = [];
- this.rbDetails[m].rowfeeblocks.push({
- expense: this.rbDetails[m].expense,
- expensedescribe: this.rbDetails[m].servicesscopename,
- remark: this.rbDetails[m].servicesscope,
- servicesscope: this.rbDetails[m].servicesscope
- });
- }
- });
-
- //涓氬姟娴佺▼
- let listFundflowparams = {
- fundid: this.curId,
- fundtype: 2
- };
- listFundflow(listFundflowparams).then(res => {
- this.fundflowList = res.rows;
- });
- });
-
- },
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail() {
@@ -1020,17 +986,17 @@
//涓氬姟鏄庣粏
getownFundDetail(this.curId).then(res => {
- console.log(res);
this.rbDetails = res.data;
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
- this.getitemlist(m, this.rbDetails[m]);
+ this.getFeeItems(m, this.rbDetails[m]);
+
this.rbDetails[m].rowfeeblocks = [];
this.rbDetails[m].rowfeeblocks.push({
- expense: this.rbDetails[m].expense,
+ servicesscope: this.rbDetails[m].servicesscope,
expensedescribe: this.rbDetails[m].servicesscopename,
- remark: this.rbDetails[m].servicesscope,
- servicesscope: this.rbDetails[m].servicesscope
+ expense: this.rbDetails[m].expense,
+ remark: this.rbDetails[m].servicesscopename
});
}
@@ -1050,6 +1016,45 @@
});
},
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleCheck() {
+ this.isopen = 0;
+ this.reset();
+
+ getFund(this.curId).then(response => {
+ this.form = response.data;
+ //闄勪欢澶勭悊
+ // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+ //涓氬姟鏄庣粏
+ getownFundDetail(this.curId).then(res => {
+ this.rbDetails = res.data;
+ for (let m = 0; m < this.rbDetails.length; m++) {
+ this.rbDetails[m].itemlist = [];
+ this.getFeeItems(m, this.rbDetails[m]);
+ this.rbDetails[m].rowfeeblocks = [];
+ this.rbDetails[m].rowfeeblocks.push({
+ expense: this.rbDetails[m].expense,
+ expensedescribe: this.rbDetails[m].servicesscopename,
+ remark: this.rbDetails[m].servicesscope,
+ servicesscope: this.rbDetails[m].servicesscope
+ });
+ }
+ });
+
+ //涓氬姟娴佺▼
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+ });
+
+ },
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
@@ -1127,7 +1132,7 @@
return;
}
- if (this.businessType == "1" || this.businessType == "2") {
+ if (this.businessType == "1") {
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
@@ -1137,7 +1142,7 @@
return;
}
- if (tempDetail.beneficiaryno == null) {
+ if (tempDetail.beneficiaryno == null || tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨") {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
(k + 1).toString() +
@@ -1146,6 +1151,7 @@
return;
}
}
+
// //鍒ゆ柇鍗曚綅 unitSel
// try {
// let unitIndex = this.unitList.findIndex(
@@ -1163,7 +1169,6 @@
//闄勪欢澶勭悊
let list = this.fileList;
- console.log(list);
// if (list.length > 0) {
// this.form.annexfiles = list.map(item => item.url).join(",");
// }
@@ -1280,7 +1285,6 @@
addorupdateFund(this.form).then(response => {
if (response.code === 200) {
- this.selectDonotor(this.curCase);
this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
} else {
this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
@@ -1290,7 +1294,6 @@
//鍏抽棴绐楀彛
// this.loading = false;
// this.getfundList();
- // this.selectDonotor(this.curCase);
this.$router.go(-1);
}
});
@@ -1330,23 +1333,19 @@
} else {
this.ismanager = false;
}
- // this.form.applytype = this.businessType;
- // this.form.createTime = new Date();
this.form.username = this.userprofile.nickName;
this.form.userno = this.userprofile.userName;
- this.form.phone = this.userprofile.phonenumber;
this.form.deptmentname = this.userprofile.dept.deptName;
this.form.deptmentno = this.userprofile.dept.deptId;
this.form.managername = this.userprofile.dept.leader;
+ this.form.phone = this.userprofile.phonenumber;
+ // this.form.applytype = this.businessType;
+ // this.form.createTime = new Date();
+ this.getUserAccount();
});
},
//鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
- getUserList() {
- listUser().then(res => {
- this.userlist = res.data;
- });
- }, //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
getUserList() {
listUser().then(res => {
this.userlist = res.data;
@@ -1376,6 +1375,17 @@
exportName: this.personlist[j].username
});
}
+ }
+ });
+ },
+
+ //鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭�
+ getUserAccount() {
+ this.personlist.map(res => {
+ if (res.username == this.form.username) {
+ this.form.bankname = res.depositbank;//res.branchbankname銆乺es.depositbank;
+ this.form.bankcardno = res.bankcardno;
+ this.form.phone = res.telephone;
}
});
},
@@ -1418,8 +1428,18 @@
});
},
+ //鑾峰彇鎹愮尞妗堜緥鍒楄〃
+ getBaseInfoList() {
+ this.loading = true;
+ listDonatebaseinfo(this.queryParams).then(response => {
+ this.donateList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+
//鑾峰彇璐圭敤绫诲瀷
- getFundType() {
+ getFeeTypes() {
getFundTypeAll(this.businessType).then(res => {
let dataList = res.data;
this.feeItemTypes = dataList;
@@ -1435,7 +1455,7 @@
});
},
- getitemlist(rowindex, row) {
+ getFeeItems(rowindex, row) {
let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
row.itemlist = list[0].itemDetails;
this.$set(this.rbDetails, rowindex, row);
@@ -1447,28 +1467,23 @@
// });
},
- //鑾峰彇鎹愮尞妗堜緥鍒楄〃
- getBaseInfoList() {
- this.loading = true;
- listDonatebaseinfo(this.queryParams).then(response => {
- this.donatebaseinfoList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
- //鑾峰彇鐢宠鍗曚俊鎭�
- getfundList() {
- this.loading = true;
- this.reset();
- this.fundQueryParam.infoid = this.curCase.id;
- listFund(this.fundQueryParam).then(response => {
- this.loading = false;
- this.donateconsolationfundList = response.rows;
- });
+ //鍔犺浇鏈嶅姟椤圭洰
+ verifyFeeItemType(row) {
+ let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
+ row.itemlist = list[0].itemDetails;
+ row.itemid = null;
+ this.$forceUpdate();
+ //this.loading = true;
+ // getItemNames(row.applytype).then((res) => {
+ // this.loading = false;
+ // row.itemid = null;
+ // row.itemlist = res.data;
+ // this.$forceUpdate();
+ // });
},
//鑾峰彇璐圭敤椤圭洰鐨勫娉ㄤ俊鎭�
- selectedRemark(row) {
+ verifyFeeRemark(row) {
row.rowfeeblocks.forEach((item, i) => {
if (item.servicesscope === row.servicesscope) {
row.servicesscopename = item.expensedescribe;
@@ -1527,6 +1542,27 @@
});
},
+ //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
+ searchItemType(val, scope) {
+ let result = [];
+ if (val != "") {
+ let tempitemlist = scope.row.itemlist;
+ for (let i = 0; i < tempitemlist.length; i++) {
+ let pym = tempitemlist[i].itempinyin;
+ if (pym != null && pym != undefined && pym != "") {
+ if (pym.indexOf(val) != -1) {
+ result.push(tempitemlist[i]);
+ }
+ }
+ }
+ scope.row.itemlist = result;
+ } else {
+ getItemNames(scope.row.applytype).then(res => {
+ scope.row.itemlist = res.data;
+ //this.$set(this.rbDetails, rowindex, row);
+ });
+ }
+ },
//鍚堣璐圭敤
selectamount(row) {
this.rowfeeblocks.forEach((item, i) => {
@@ -1536,14 +1572,28 @@
});
},
- //鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
- selectDonotor(row, column, event) {
- this.curCase = row;
- this.getfundList();
+ selectExpert(row) {
+ // if(row.beneficiaryname)
+ this.personlist.map(res => {
+ if (row.beneficiaryname == res.username) {
+ row.beneficiaryno = res.userno;
+ row.beneficiaryname = res.username;
+ row.bankcardno = res.bankcardno;
+ row.branchbankname = res.branchbankname;
+ row.depositbank = res.depositbank;
+ row.idcardno = res.idcardno;
+ row.phone = res.phonenumber;
+ row.title = res.title;
+ row.unitname = res.unitname;
+ row.unitno = res.unitno;
+ } else {
+ row.beneficiaryno = row.beneficiaryname;
+ }
+ });
},
//瀵煎叆鎵�鏈夐」鐩�
- addAllItems() {
+ importFeeItems() {
this.loading = true;
this.rbDetails = this.rbDetails.filter(
r => r.applytype != "" && r.applytype != null
@@ -1610,32 +1660,6 @@
// });
},
- addAll(row, i, arr) {
- row.itemlist.map(res => {
- if (res.id !== row.itemid) {
- let a = arr.length;
- this.addRow();
- arr[a].itemlist = row.itemlist;
- arr[a].applytype = row.applytype;
- arr[a].itemid = res.id;
-
- getdetailsByItemId(arr[a].itemid).then(res => {
- let fundmsg = res.data;
- let rowfeeblocks = [];
- fundmsg.forEach(item => {
- rowfeeblocks.push({
- expense: item.expense,
- expensedescribe: item.expensedescribe,
- remark: item.expensedescribe,
- servicesscope: item.id
- });
- });
- row.rowfeeblocks = rowfeeblocks;
- });
- }
- });
- },
-
//鏂板涓�琛�
addRow(rowIndex) {
let rowData = {
@@ -1689,63 +1713,6 @@
}
for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].orderno = i + 1;
- }
- },
-
- //鍔犺浇鏈嶅姟椤圭洰
- loadItemType(row) {
- let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
- row.itemlist = list[0].itemDetails;
- row.itemid = null;
- this.$forceUpdate();
- //this.loading = true;
- // getItemNames(row.applytype).then((res) => {
- // this.loading = false;
- // row.itemid = null;
- // row.itemlist = res.data;
- // this.$forceUpdate();
- // });
- },
-
- selectpersonmsg(row) {
- // if(row.beneficiaryname)
- this.personlist.map(res => {
- if (row.beneficiaryname == res.username) {
- row.beneficiaryno = res.userno;
- row.beneficiaryname = res.username;
- row.bankcardno = res.bankcardno;
- row.branchbankname = res.branchbankname;
- row.depositbank = res.depositbank;
- row.idcardno = res.idcardno;
- row.phone = res.phonenumber;
- row.title = res.title;
- row.unitname = res.unitname;
- row.unitno = res.unitno;
- } else {
- row.beneficiaryno = row.beneficiaryname;
- }
- });
- },
-
- //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
- searchItemType(val, scope) {
- let result = [];
- if (val != "") {
- let tempitemlist = scope.row.itemlist;
- for (let i = 0; i < tempitemlist.length; i++) {
- let pym = tempitemlist[i].itempinyin;
- if (pym != null && pym != undefined && pym != "") {
- if (pym.indexOf(val) != -1) {
- result.push(tempitemlist[i]);
- }
- }
- }
- scope.row.itemlist = result;
- } else {
- getItemNames(scope.row.applytype).then(res => {
- scope.row.itemlist = res.data;
- //this.$set(this.rbDetails, rowindex, row);
- });
}
},
@@ -1840,12 +1807,12 @@
},
mixExport(scope) {
- this.dayin(scope.row.id);
- //this.totaldayin(id);
+ this.print(scope.row.id);
+ //this.totalprint(id);
},
//涓撳璐瑰姵鍔℃墦鍗�
- dayin(id) {
+ print(id) {
getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
@@ -1867,7 +1834,7 @@
},
//姹囨�绘墦鍗�
- totaldayin(e) {
+ totalprint(e) {
// const id =this.row.id
getdownloadBX(e).then(res => {
if (res.downloadUrl) {
@@ -1977,10 +1944,12 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ShowDetailDialog(spoce, showType) {
+ this.selectionType = showType;
this.expertfrom = "1";
+
this.funddetailForm.index = spoce.$index;
- this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
+ this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
this.funddetailForm.unitno = spoce.row.unitno;
this.funddetailForm.unitname = spoce.row.unitname;
this.funddetailForm.expertname = "";
@@ -1991,22 +1960,21 @@
this.funddetailForm.expertdepositbank = "";
this.funddetailForm.expertbankcardno = "";
- this.showDetailInfoDialog = true;
- this.showDetailInfoType = showType;
+ this.showSelectionDialog = true;
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
let tempIndex = this.funddetailForm.index;
- let tempName = this.funddetailForm.beneficiaryname;
+ let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
- if (this.showDetailInfoType == "name") {
+ if (this.selectionType == "expert") {
if (this.expertfrom == "1") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
- if (tempName == res.username) {
+ if (tempExpertName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
singleDetail.bankcardno = res.bankcardno;
@@ -2022,8 +1990,7 @@
} else {
//淇濆瓨鏂板涓撳
this.expertform.id = null;
- this.expertform.userno =
- this.personlist[this.personlist.length - 1].id + 1;
+ this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1;
this.expertform.usertype = "expert";
this.expertform.username = this.funddetailForm.expertname;
this.expertform.idcardno = this.funddetailForm.expertidcardno;
@@ -2082,7 +2049,7 @@
}
});
}
- } else if (this.showDetailInfoType == "unit") {
+ } else if (this.selectionType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
if (this.businessType == 1 || this.businessType == 2) {
try {
@@ -2119,9 +2086,31 @@
}
this.rbDetails[tempIndex] = singleDetail;
- this.showDetailInfoDialog = false;
- }
- }
+ this.showSelectionDialog = false;
+ },
+ },
+
+ //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+ created() {
+ //鑾峰彇璺敱鍙傛暟
+ this.getroute();
+ this.getExternalList();
+ },
+
+ //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
+ mounted() {
+ this.getUserList();
+ this.getUserProfile();
+ // this.getFeeUnitList();
+ },
+
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
--
Gitblit v1.9.3