From cef0ffebad11bf1444be8ff3d54172c83800c78d Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 07 八月 2023 16:39:29 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/expertFeeFundApply/index.vue | 1358 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 805 insertions(+), 553 deletions(-)
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index d4b0c3f..b3f77d6 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -9,7 +9,6 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
@@ -87,20 +86,17 @@
</el-table-column>
<el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
<el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
- <!-- <el-table-column
- label="鐢宠閲戦"
- align="center"
- prop="amountrequested"
- width="120px"
- />
+ <!--
+ <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" /> -->
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
+ -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
<el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUp(scope.row)">涓婃姤</el-button>
<el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
@@ -141,6 +137,14 @@
</el-form-item>
</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-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+ :value="dict.nickname"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
<el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
@@ -148,13 +152,6 @@
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
<el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
- </el-form-item>
- </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-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
- :value="dict.nickname"></el-option>
- </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -182,25 +179,38 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
+
</el-row>
<el-row style="text-align: left">
+ <!--
<el-col :span="5">
<el-form-item label="鍚堣閲戦" prop="amountrequested">
<el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
</el-form-item>
</el-col>
+ -->
<el-col :span="5">
- <el-form-item label="绋庡墠閲戦" prop="pretaxcost">
+ <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">
+ <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
+ </el-form-item>
+ </el-col><!--
+ <el-col :span="5">
<el-form-item label="绋庡悗閲戦" prop="pretaxcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>-->
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -284,7 +294,7 @@
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in arrr3"
+ v-for="item in expertlist"
:key="item.reportNo"
:label="item.reportName"
:value="item.reportName"
@@ -366,7 +376,8 @@
</template>
</el-table-column>
</el-table>
- </el-row> <!--
+ </el-row>
+ <!--
<el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
@@ -406,7 +417,7 @@
</el-form-item>
</el-col>
</el-row>
- -->
+ -->
<el-row>
<el-col :span="12">
<el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
@@ -439,21 +450,29 @@
</div>
</el-dialog>
- <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'淇℃伅淇敼'" width="500px"
+ <el-dialog :visible.sync="showDetailInfoDialog" :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="detailInfoDialogShowType == 'name'">
+ <el-col :span="24" v-if="showDetailInfoDialogType == 'name'">
+ <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
+ <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
+ <el-radio label="1">涓撳搴�</el-radio>
+ <el-radio label="2">鏂板涓撳</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="showDetailInfoDialogType == 'name' && 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 arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
+ <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
</el-option>
</el-select>
</el-form-item>
</el-col>
-
- <el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
+ <el-col :span="24" v-if="showDetailInfoDialogType == 'unit'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
<el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
@@ -463,9 +482,65 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
+ <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px">
+ <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
+ <el-row>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="浜哄憳绫诲埆" prop="usertype" label-width="80px">
+ <el-select v-model="funddetailForm.usertype" placeholder="蹇呭～椤�">
+ <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ -->
+ <el-row>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
+ <el-select v-model="funddetailForm.expertunitno" 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>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
+ <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button>
+ <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -477,8 +552,9 @@
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
+
import {
onelistFund,
listFund,
@@ -492,9 +568,10 @@
getdownloadSS,
getdownloadYX,
getdownloadBX,
- batchUploadFund,
- getdetailsByItemId,
+ addorupdateFund,
+ getdetailsByItemId
} from "@/api/project/fund";
+
import {
onelistFunds,
listFunddetails,
@@ -515,13 +592,16 @@
getTaxationByBeneFiciaryNo,
getTaxBeforeByAfterMoney
} from "@/api/project/funddetail";
+
import { listFundflow } from "@/api/project/fundflow";
+
import {
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
+
import {
listExternalperson,
getExternalperson,
@@ -529,8 +609,9 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
+
import { getUserProfile } from "@/api/system/user";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -543,29 +624,30 @@
Li_area_select,
OrgSelecter,
},
+
name: "fundApply",
+
dicts: [
- "sys_consolationfundlevel",
- "sys_OrganizationType",
+ //"sys_consolationfundlevel",
+ //"sys_OrganizationType",
"sys_DonationStatus",
- "sys_depositbank",
- "sys_FamilyRelation",
- "sys_IDType",
- "sys_ConsolationType",
- "sys_fund_type",
- "sys_finsubject",
- "sys_financeitemtype",
- "sys_expensetype",
+ //"sys_depositbank",
+ //"sys_FamilyRelation",
+ //"sys_IDType",
+ //"sys_ConsolationType",
+ //"sys_fund_type",
+ //"sys_finsubject",
+ //"sys_financeitemtype",
+ //"sys_expensetype",
"sys_recordstatus",
+ "sys_professionaltitle"
],
+
data() {
//杩欓噷瀛樻斁鏁版嵁
return {
- arrr2: [],
- arrr3: [],
- currentApplyType: "1",
// 閬僵灞�
- loading: true,
+ loading: false,
// 瀵煎嚭閬僵灞�
exportLoading: false,
total: 0,
@@ -592,17 +674,33 @@
applytype: "1",
createBy: null,
},
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ //鎵�鏈変汉鍛樿〃
+ personlist: [],
+ expertQueryParam: {
+ pageNum: 1,
+ pageSize: 10000,
+ userno: null,
+ username: null,
+ usertype: null,
+ },
+ //
+ amount: 0.00,
+
+ //鐢宠鍗曠被鍨�
+ currentApplyType: "1",
+ //涓撳鍒楄〃
+ expertlist: [],
+ //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
+ expertfrom: "1",
//璁＄畻涓◣鍙傛暟
taxParam: {
beneficiaryNo: '',
money: '0',
startTime: '',
},
-
- // 琛ㄥ崟鍙傛暟
- form: {},
- personlist: [],
// 琛ㄥ崟鏍￠獙
rules: {
username: [
@@ -634,6 +732,10 @@
donateconsolationfundList: [],
//璐圭敤鏄庣粏鍒楄〃
fundDetails: [],
+ formData: {},
+ totalPreTaxAmount: 0.0,
+ totalAfterTaxAmount: 0.0,
+ totalAmount: 0.0,
// 寮瑰嚭灞傛爣棰�
title: "",
@@ -651,19 +753,52 @@
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
-
unitList: [],
dialogType: "edit",
fundflowList: [],
- detailInfoDialogShow: false,
- detailInfoDialogShowType: "",
+ showDetailInfoDialog: false,
+ showDetailInfoDialogType: "",
funddetailForm: {
+ index: null,
beneficiaryname: null,
beneficiaryno: null,
unitno: null,
unitname: null,
- index: null,
+ expertname: null,
+ expertidcardno: null,
+ expertunitno: null,
+ expertunitname: null,
+ experttitle: null,
+ expertdepositbank: null,
+ expertbankcardno: null,
+ },
+ expertform: {
+ id: null,
+ address: null,
+ bankcardno: null,
+ branchbankname: null,
+ createBy: null,
+ createTime: null,
+ del_flag: null,
+ depositbank: null,
+ idcardno: null,
+ personnelunitno: null,
+ pym: null,
+ remark: null,
+ searchValue: null,
+ sex: null,
+ telephone: null,
+ title: null,
+ unitname: null,
+ unitno: null,
+ updateBy: null,
+ updateTime: null,
+ username: null,
+ userno: null,
+ userstatus: 1,
+ usertype: null,
+ wbm: null,
},
//闄勪欢鍒楄〃
@@ -681,19 +816,482 @@
computed: {},
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
- // mounted(){
- // this.getUsermsg()
- // },
+ //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+ created() {
+ this.getList();
+ this.getBaseInfoList();
+ this.getCurFundType();
+ this.getUserList();
+ this.getUnitList();
+
+ },
+
+ //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
+ mounted() {
+ this.selectReporters();
+ this.getUsermsg();
+ this.getExternalpersonList();
+ },
+
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+
//鏂规硶闆嗗悎
methods: {
+
+ /** 鎼滅储鎸夐挳鎿嶄綔 */
+ handleQuery() {
+ this.queryParams.pageNum = 1;
+ this.getList();
+ },
+
+ /** 閲嶇疆鎸夐挳鎿嶄綔 */
+ resetQuery() {
+ this.daterangeReporttime = [];
+ this.resetForm("queryForm");
+ this.handleQuery();
+ },
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ if (this.curCase.id) {
+ this.istrue += 2;
+ this.reset();
+ this.queryParams.params = {};
+ this.form.donorno = this.curCase.donorno;
+ this.form.name = this.curCase.name;
+ this.form.infoid = this.curCase.id;
+
+ this.form.username = this.defaultperson.nickName;
+ this.form.userno = this.defaultperson.userName;
+ this.form.phone = this.defaultperson.phonenumber;
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
+
+ // this.form.createTime = nowdate;
+ //this.open = true;
+ //this.initFundApplyForm();
+ this.fundDetails = [];
+ this.addRow();
+ this.dialogOpen = true;
+ this.dialogType = "edit";
+ this.title = "璐圭敤鐢宠";
+ } else {
+ const h = this.$createElement;
+ this.$message({
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ });
+ }
+ },
+
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.isopen = 0;
+ this.reset();
+ this.queryParams.params = {};
+ this.form.donorno = this.curCase.donorno;
+ this.form.infoid = this.curCase.id;
+ this.dialogOpen = true;
+ this.title = "淇敼璐圭敤鐢宠";
+ this.dialogType = "edit";
+
+ const id = row.id || this.ids;
+ getFund(id).then((response) => {
+ this.form = response.data;
+ // this.form.recordstate =-1;
+ // this.form.recordstatus = response.data.recordstatus + "";
+ this.form.name = this.curCase.name;
+ //闄勪欢澶勭悊
+ this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+ getownFundDetail(id).then((res) => {
+ this.fundDetails = res.data;
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ this.fundDetails[m].itemArr = [];
+ this.getItemArr(m, this.fundDetails[m]);
+
+ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+ this.fundDetails[m].rowfeeblocks = [];
+
+ this.fundDetails[m].rowfeeblocks.push({
+ servicesscope: this.fundDetails[m].servicesscope,
+ expensedescribe: this.fundDetails[m].servicesscopename,
+ expense: this.fundDetails[m].expense,
+ remark: this.fundDetails[m].servicesscopename,
+ });
+ // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
+ // let fundmsg = res.data;
+ // fundmsg.forEach((item) => {
+ // this.fundDetails[m].rowfeeblocks.push({
+ // servicesscope: item.id,
+ // expensedescribe: item.expensedescribe,
+ // expense: item.expense,
+ // remark: item.expensedescribe,
+ // });
+ // });
+ // });
+ }
+
+ if (this.fundDetails.length == 0) {
+ this.addRow();
+ }
+ });
+ });
+ },
+
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
+ handleDetail(row) {
+ this.isopen = 0;
+ this.reset();
+ this.queryParams.params = {};
+ this.form.donorno = this.curCase.donorno;
+ this.form.infoid = this.curCase.id;
+ this.dialogOpen = true;
+ this.title = "鏌ョ湅璐圭敤鐢宠";
+ this.dialogType = "detail";
+ const id = row.id || this.ids;
+
+ getFund(id).then((response) => {
+ this.form = response.data;
+ this.form.name = this.curCase.name;
+ let listFundflowparams = {
+ fundid: row.id,
+ fundtype: 2,
+ };
+ //闄勪欢澶勭悊
+ this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+ listFundflow(listFundflowparams).then((res) => {
+ this.fundflowList = res.rows;
+ });
+ getownFundDetail(id).then((res) => {
+ this.fundDetails = res.data;
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ this.fundDetails[m].itemArr = [];
+ this.getItemArr(m, this.fundDetails[m]);
+ this.fundDetails[m].rowfeeblocks = [];
+ this.fundDetails[m].rowfeeblocks.push({
+ expense: this.fundDetails[m].expense,
+ expensedescribe: this.fundDetails[m].servicesscopename,
+ remark: this.fundDetails[m].servicesscope,
+ servicesscope: this.fundDetails[m].servicesscope,
+ });
+ }
+
+ if (this.fundDetails.length == 0) {
+ this.addRow();
+ }
+ });
+ });
+ },
+
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal
+ .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
+ .then(function () {
+ return delFund(ids);
+ })
+ .then(() => {
+ getownFundDetail(ids).then((res) => {
+ let listdetails = res.data;
+ for (let i = 0; i < listdetails.length; i++) {
+ delFunddetail(listdetails[i].id);
+ }
+ });
+ // this.getList();
+ this.getfundList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => { });
+ },
+
+ /** 涓婃姤鎸夐挳鎿嶄綔 */
+ handleUp(row) {
+ this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(() => {
+ //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
+ //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
+ row.recordstatus = 0;
+
+ updateFund(row).then((response) => {
+ if (response.code == 200) {
+ this.$message({
+ type: "success",
+ message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�",
+ });
+ } else {
+ this.$message({
+ type: "error",
+ message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�",
+ });
+ }
+ this.loading = false;
+ });
+ })
+ .catch(() => {
+ this.$message({
+ type: "info",
+ message: "宸插彇娑堢敵璇�",
+ });
+ });
+ },
+
+ /** 鎻愪氦鎸夐挳 */
+ submitForm() {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ this.formData = this.form;
+ // let totalPreTaxAmount = 0.0;
+ // let totalAfterTaxAmount = 0.0;
+ // let totalAmount = 0.0;
+
+ //淇濆瓨鍓嶆牎楠屾暟鎹�
+ for (let k = 0; k < this.fundDetails.length; k++) {
+ let tempDetail = this.fundDetails[k];
+ if (tempDetail.itemid == null) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+
+ if (tempDetail.servicesscope == null) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+
+ if (tempDetail.beneficiaryno == null) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+
+ // //鍒ゆ柇鍗曚綅 unitSel
+ // try {
+ // let unitIndex = this.unitList.findIndex(
+ // (item) => tempDetail.unitno == item.organizationid
+ // );
+ // if (unitIndex > -1) {
+ // tempDetail.unitname = this.unitList[unitIndex].organizationname;
+ // } else {
+ // tempDetail.unitname = tempDetail.unitno;
+ // }
+ // } catch {
+ // tempDetail.unitname = tempDetail.unitno;
+ // }
+ }
+
+ //闄勪欢澶勭悊
+ let list = this.fileList;
+ if (list.length > 0) {
+ this.form.annexfiles = list.map(item => item.url).join(",");
+ }
+
+ //澶勭悊鏄庣粏
+ for (let i = 0; i < this.fundDetails.length; i++) {
+ let tempDetail = this.fundDetails[i];
+ //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+ let tempItemArr = tempDetail.itemArr;
+ let itemIndex = tempItemArr.findIndex(
+ (item) => tempDetail.itemid == item.id
+ );
+ if (itemIndex > -1) {
+ tempDetail.itemname = tempItemArr[itemIndex].itemName;
+ tempDetail.itemid = tempItemArr[itemIndex].id;
+ }
+
+ //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫�
+ let applytypeIndex = this.rowfeeItemTypes.findIndex(
+ (item) => tempDetail.applytype == item.value
+ );
+ if (applytypeIndex > -1) {
+ tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
+ }
+ this.fundDetails[i] = tempDetail;
+ /*
+ //璁＄畻涓◣
+ //if (isNaN(parseFloat(tempDetail.taxedamount)))
+ //鑾峰彇鍙傛暟
+ this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
+ this.taxParam.startTime = this.form.createTime.substring(0, 10);
+ // 璁＄畻绋庡悗閲戦
+ if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
+ //鑾峰彇鍙傛暟
+ this.taxParam.money = tempDetail.amount.toString();
+ getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
+ if (res.code == 200) {
+ tempDetail.taxamount = res.data;
+ tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
+ this.fundDetails[k] = tempDetail;
+
+ this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+ this.totalAmount += parseFloat(tempDetail.amount);
+ }
+ });
+ }
+
+ // 璁＄畻绋庡墠閲戦
+ if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
+ //鑾峰彇鍙傛暟
+ this.taxParam.money = tempDetail.taxedamount.toString();
+ getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
+ if (res.code == 200) {
+ tempDetail.taxamount = res.data.nowTax;
+ tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
+ this.fundDetails[k] = tempDetail;
+
+ this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+ this.totalAmount += parseFloat(tempDetail.amount);
+ console.log("1", this.amount);
+ }
+ });
+ }
+ */
+ }
+ //璐圭敤鍚堣
+ // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
+ // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
+ // this.form.amountrequested = this.totalAmount.toFixed(2);
+
+ //淇濆瓨鏁版嵁
+ this.loading = true;
+ this.form.serviceFunddetails = 0;
+ this.fundDetails.map((item) => {
+ this.form.serviceFunddetails += item.amount;
+ });
+ this.form.serviceFunddetails = this.fundDetails;
+
+ if (this.form.id != null) {
+ //鎹愮尞鑰�
+ this.form.donorname = this.curCase.name;
+
+ // updateFund(this.form).then((response) => {
+ // if (response.code === 200) {
+ // this.loading = false;
+ // for (let m = 0; m < this.fundDetails.length; m++) {
+ // if (this.fundDetails[m].id > 0) {
+ // updateFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } });
+ // } else {
+ // addFunddetail(this.fundDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } });
+ // }
+ // }
+ // this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
+ // } else {
+ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ // }
+ // });
+
+ } else {
+ this.form.recordstatus = -1;
+
+ // addorupdateFund(this.form).then((response) => {
+ // if (response.code === 200) {
+ // this.selectDonotor(this.curCase);
+ // } else {
+ // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ // }
+ // });
+ }
+
+ addorupdateFund(this.form).then((response) => {
+ if (response.code === 200) {
+ this.selectDonotor(this.curCase);
+ this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
+ } else {
+ this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
+ }
+ });
+
+ //鍏抽棴绐楀彛
+ this.loading = false;
+ this.dialogOpen = false;
+ // this.getfundList();
+ this.getList();
+ this.selectDonotor(this.curCase);
+
+ }
+ });
+ },
+
+ // 鍙栨秷鎸夐挳
+ cancel() {
+ this.dialogOpen = false;
+ this.reset();
+ },
+
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ recordstate: -1,
+ userno: null,
+ username: null,
+ id: null,
+ infoid: null,
+ donorno: null,
+ delFlag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ familyrelations: null,
+ name: null,
+ remark: null,
+ doname: null,
+ unitname: null,
+ unitno: null,
+ sex: null,
+ idcardtype: null,
+ idcardno: null,
+ phone: null,
+ donorname: null,
+ depositbank: null,
+ bankprovince: null,
+ bankprovincename: null,
+ bankcity: null,
+ bankcityname: null,
+ banktown: null,
+ banktownname: null,
+ branchbankname: null,
+ bankcardno: null,
+ annexbankcard: null,
+ annexregistform: null,
+ consolationmoney: null,
+ applytype: "1",
+ servicetypename: null,
+ servicesscope: null,
+ servicesscopename: null,
+ };
+ this.resetForm("form");
+ //娓呯┖闄勪欢
+ this.fileList = []
+ },
+
ShowDetailDialog(spoce, showType) {
+ this.expertfrom = "1";
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
this.funddetailForm.unitno = spoce.row.unitno;
this.funddetailForm.unitname = spoce.row.unitname;
- this.detailInfoDialogShow = true;
- this.detailInfoDialogShowType = showType;
+ this.funddetailForm.expertname = "";
+ this.funddetailForm.expertidcardno = "";
+ this.funddetailForm.expertunitno = "";
+ this.funddetailForm.expertunitname = "";
+ this.funddetailForm.experttitle = "";
+ this.funddetailForm.expertdepositbank = "";
+ this.funddetailForm.expertbankcardno = "";
+
+ this.showDetailInfoDialog = true;
+ this.showDetailInfoDialogType = showType;
},
ConfirmDetailDialog() {
@@ -701,23 +1299,90 @@
let tempName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetails[tempIndex];
- if (this.detailInfoDialogShowType == "name") {
- this.personlist.map((res) => {
- if (tempName == res.username) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
- });
- } else if (this.detailInfoDialogShowType == "unit") {
+ if (this.showDetailInfoDialogType == "name") {
+
+ if (this.expertfrom == "1") {
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map((res) => {
+ if (tempName == res.username) {
+ console.log("閫夋嫨涓撳", res);
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
+ } else {
+ //淇濆瓨鏂板涓撳
+ this.expertform.id = null;
+ 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;
+ this.expertform.sex = null;
+ this.expertform.telephone = null;
+ this.expertform.address = null;
+ this.expertform.wbm = null;
+ this.expertform.pym = null;
+
+ this.expertform.unitno = this.funddetailForm.expertunitno;
+ try {
+ let unitIndex = this.unitList.findIndex(
+ (item) => this.expertform.unitno == item.organizationid
+ );
+ if (unitIndex > -1) {
+ this.expertform.unitname = this.unitList[unitIndex].organizationname;
+ } else {
+ this.expertform.unitname = this.expertform.unitno;
+ }
+ } catch {
+ this.expertform.unitname = this.expertform.unitno;
+ }
+ this.expertform.title = this.funddetailForm.experttitle;
+ this.expertform.personnelunitno = null;
+
+ this.expertform.depositbank = this.funddetailForm.expertdepositbank;
+ this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
+ this.expertform.branchbankname = null;
+ this.expertform.remark = null;
+ this.expertform.del_flag = "0";
+
+ addExternalperson(this.expertform).then((response) => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
+
+ listExternalperson().then((res) => {
+ this.personlist = res.rows;
+ console.log("new personlist", this.personlist);
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map((res) => {
+ if (res.username == this.funddetailForm.expertname) {
+ console.log("鏂板涓撳", res);
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
+ });
+ }
+ });
+ }
+
+ } else if (this.showDetailInfoDialogType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
try {
let unitIndex = this.unitList.findIndex(
@@ -734,46 +1399,13 @@
}
this.fundDetails[tempIndex] = singleDetail;
- this.detailInfoDialogShow = false;
- },
-
- handleup(row) {
- this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning",
- })
- .then(() => {
- //鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
- //鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- row.recordstatus = 0;
-
- updateFund(row).then((response) => {
- if (response.code == 200) {
- this.$message({
- type: "success",
- message: "鐢宠鎴愬姛",
- });
- } else {
- this.$message({
- type: "error",
- message: "鐢宠澶辫触",
- });
- }
- this.loading = false;
- });
- })
- .catch(() => {
- this.$message({
- type: "info",
- message: "宸插彇娑堢敵璇�",
- });
- });
+ this.showDetailInfoDialog = false;
},
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUsermsg() {
getUserProfile().then((response) => {
+ console.log("getUserProfile", response);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
@@ -791,9 +1423,11 @@
row.servicesscopename = item.expensedescribe;
if (row.servicesscopename.includes("绋庡悗")) {
row.amount = 0.0;
+ row.taxamount = 0.0;
row.taxedamount = item.expense;
} else {
row.amount = item.expense;
+ row.taxamount = 0.0;
row.taxedamount = 0.0;
}
@@ -852,17 +1486,6 @@
});
},
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.daterangeReporttime = [];
- this.resetForm("queryForm");
- this.handleQuery();
- },
/** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
getList() {
this.loading = true;
@@ -873,12 +1496,15 @@
this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
}
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
+
+ console.log("111", this.queryParams);
listDonatebaseinfo(this.queryParams).then((response) => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
+
getUnitList() {
listOrganization(3).then((response) => {
for (let i = 0; i < response.rows.length; i++) {
@@ -890,6 +1516,7 @@
}
});
},
+
getBaseInfoList() {
this.loading = true;
listDonatebaseinfo(this.queryParams).then((response) => {
@@ -899,41 +1526,12 @@
});
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- handleAdd() {
- if (this.curCase.id) {
- this.istrue += 2;
- this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.name = this.curCase.name;
- this.form.infoid = this.curCase.id;
- this.form.username = this.defaultperson.nickName;
- this.form.userno = this.defaultperson.userName;
-
- this.form.deptmentname = this.defaultperson.dept.deptName;
- this.form.deptmentno = this.defaultperson.dept.deptId;
- this.form.managername = this.defaultperson.dept.leader;
- // this.form.createTime = nowdate;
- //this.open = true;
- //this.initFundApplyForm();
- this.fundDetails = [];
- this.addRow();
- this.dialogOpen = true;
- this.dialogType = "edit";
- this.title = "璐圭敤鐢宠";
- } else {
- const h = this.$createElement;
- this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
- });
- }
- },
//鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
selectDonotor(row, column, event) {
this.curCase = row;
this.getfundList();
},
+
getfundList() {
this.loading = true;
this.reset();
@@ -942,59 +1540,6 @@
this.loading = false;
this.donateconsolationfundList = response.rows;
});
- },
-
- // 鍙栨秷鎸夐挳
- cancel() {
- this.dialogOpen = false;
- this.reset();
- },
-
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- recordstate: -1,
- userno: null,
- username: null,
- id: null,
- infoid: null,
- donorno: null,
- delFlag: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null,
- familyrelations: null,
- name: null,
- remark: null,
- doname: null,
- unitname: null,
- unitno: null,
- sex: null,
- idcardtype: null,
- idcardno: null,
- phone: null,
- donorname: null,
- depositbank: null,
- bankprovince: null,
- bankprovincename: null,
- bankcity: null,
- bankcityname: null,
- banktown: null,
- banktownname: null,
- branchbankname: null,
- bankcardno: null,
- annexbankcard: null,
- annexregistform: null,
- consolationmoney: null,
- applytype: "1",
- servicetypename: null,
- servicesscope: null,
- servicesscopename: null,
- };
- this.resetForm("form");
- //娓呯┖闄勪欢
- this.fileList = []
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -1161,176 +1706,8 @@
// });
},
- /** 鎻愪氦鎸夐挳 */
- submitForm() {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- let formData = this.form;
- let totalPreTaxAmount = 0.0;
- let totalAfterTaxAmount = 0.0;
- let totalAmount = 0.0;
-
- //淇濆瓨鍓嶆牎楠屾暟鎹�
- for (let k = 0; k < this.fundDetails.length; k++) {
- let tempDetail = this.fundDetails[k];
- if (tempDetail.itemid == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰鏄繀閫夐」锛岃閫夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
- return;
- }
-
- if (tempDetail.beneficiaryno == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
- return;
- }
-
- // //鍒ゆ柇鍗曚綅 unitSel
- // try {
- // let unitIndex = this.unitList.findIndex(
- // (item) => tempDetail.unitno == item.organizationid
- // );
- // if (unitIndex > -1) {
- // tempDetail.unitname = this.unitList[unitIndex].organizationname;
- // } else {
- // tempDetail.unitname = tempDetail.unitno;
- // }
- // } catch {
- // tempDetail.unitname = tempDetail.unitno;
- // }
-
- //璁＄畻涓◣
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
- this.taxParam.money = tempDetail.amount.toString();
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
- getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data;
- tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
- }
- });
- }
-
- //if (isNaN(parseFloat(tempDetail.amount)))
- if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
- this.taxParam.money = tempDetail.taxedamount.toString();
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
-
- getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
- console.log("",res);
- if (res.code == 200) {
- tempDetail.taxamount = res.data.nowTax;
- tempDetail.amount = res.data.nowTaxBeforeMoney;
- }
- });
- }
-
- totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- totalAmount += parseFloat(tempDetail.amount);
- this.fundDetails[k] = tempDetail;
- }
-
- this.loading = true;
- //闄勪欢澶勭悊
- let list = this.fileList;
- if (list.length > 0) {
- this.form.annexbankcard = list.map(item => item.url).join(",");
- }
-
- this.form.donorname = this.curCase.name;
- this.form.pretaxcost = parseFloat(totalPreTaxAmount).toFixed(2);
- this.form.taxedcost = parseFloat(totalAfterTaxAmount).toFixed(2);
- this.form.amountrequested = totalAmount.toFixed(2);
- if (this.form.id != null) {
- this.form.recordstatus = -1;
- updateFund(this.form).then((response) => {
- this.getfundList();
- this.dialogOpen = false;
- this.getList();
- this.selectDonotor(this.curCase);
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.loading = false;
- for (let m = 0; m < this.fundDetails.length; m++) {
- let tempData = this.fundDetails[m];
- let tempItemArr = tempData.itemArr;
- tempData.fundid = formData.id;
- //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- let itemIndex = tempItemArr.findIndex(
- (item) => tempData.itemid == item.id
- );
- if (itemIndex > -1) {
- tempData.itemname = tempItemArr[itemIndex].itemName;
- tempData.itemid = tempItemArr[itemIndex].id;
- }
-
- //鑾峰彇applytypename
- let applytypeIndex = this.rowfeeItemTypes.findIndex(
- (item) => tempData.applytype == item.value
- );
- if (applytypeIndex > -1) {
- tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
- }
-
- if (tempData.id > 0) {
- updateFunddetail(tempData).then((response2) => { });
- } else {
- addFunddetail(tempData).then((response2) => { });
- }
- }
- });
- } else {
- //淇濆瓨璐圭敤鐢宠
- for (let m = 0; m < this.fundDetails.length; m++) {
- let tempData = this.fundDetails[m];
- let tempUtemArr = tempData.itemArr;
-
- //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- let itemIndex = tempUtemArr.findIndex(
- (item) => tempData.itemid == item.id
- );
- if (itemIndex > -1) {
- tempData.itemname = tempUtemArr[itemIndex].itemName;
- tempData.itemid = tempUtemArr[itemIndex].id;
- }
-
- //鑾峰彇applytypename
- let applytypeIndex = this.rowfeeItemTypes.findIndex(
- (item) => tempData.applytype == item.value
- );
- if (applytypeIndex > -1) {
- tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
- }
- this.fundDetails[m] = tempData;
- }
-
- this.form.serviceFunddetails = 0;
- this.fundDetails.map((item) => {
- this.form.serviceFunddetails += item.amount;
- });
- this.form.serviceFunddetails = this.fundDetails;
- this.form.recordstatus = -1;
-
- batchUploadFund(this.form).then((response) => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.loading = false;
- this.selectDonotor(this.curCase);
- } else {
- this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
- this.loading = false;
- }
- });
- this.dialogOpen = false;
- }
- }
- });
- },
-
//鑾峰彇涓撳鍒楄〃
- getlistExternalperson() {
+ getExternalpersonList() {
listExternalperson().then((res) => {
this.personlist = res.rows;
});
@@ -1338,18 +1715,18 @@
//涓撳浜哄憳鍒楄〃
selectReporters() {
- let arr = ["expert"];
- let arrreportlist = [];
- for (let i = 0; i < arr.length; i++) {
- this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
+ let types = ["expert"];
+ let templist = [];
+ for (let i = 0; i < types.length; i++) {
+ templist = [];
+ listReportname(types[i]).then((res) => {
for (let j = 0; j < res.data.length; j++) {
- this.arrr2.push({
+ templist.push({
reportName: res.data[j].reportName,
reportNo: res.data[j].reportNo,
});
}
- this.arrr3 = this.arrr3.concat(this.arrr2);
+ this.expertlist = this.expertlist.concat(templist);
});
}
},
@@ -1364,7 +1741,7 @@
row.branchbankname = res.branchbankname;
row.depositbank = res.depositbank;
row.idcardno = res.idcardno;
- row.phone = res.telephone;
+ row.phone = res.phonenumber;
row.title = res.title;
row.unitname = res.unitname;
row.unitno = res.unitno;
@@ -1374,123 +1751,33 @@
});
},
- getlistUser() {
+ getUserList() {
listUser().then((res) => {
+ console.log("listUser", res);
this.userlist = res.data;
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.isopen = 0;
- this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
- this.dialogOpen = true;
- this.title = "淇敼璐圭敤鐢宠";
- this.dialogType = "edit";
-
- const id = row.id || this.ids;
- getFund(id).then((response) => {
- this.form = response.data;
- // this.form.recordstate =-1;
- // this.form.recordstatus = response.data.recordstatus + "";
- this.form.name = this.curCase.name;
- //闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
- getownFundDetail(id).then((res) => {
- this.fundDetails = res.data;
- for (let m = 0; m < this.fundDetails.length; m++) {
- this.fundDetails[m].itemArr = [];
- this.getItemArr(m, this.fundDetails[m]);
-
- //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
- this.fundDetails[m].rowfeeblocks = [];
-
- this.fundDetails[m].rowfeeblocks.push({
- servicesscope: this.fundDetails[m].servicesscope,
- expensedescribe: this.fundDetails[m].servicesscopename,
- expense: this.fundDetails[m].expense,
- remark: this.fundDetails[m].servicesscopename,
- });
- // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
- // let fundmsg = res.data;
- // fundmsg.forEach((item) => {
- // this.fundDetails[m].rowfeeblocks.push({
- // servicesscope: item.id,
- // expensedescribe: item.expensedescribe,
- // expense: item.expense,
- // remark: item.expensedescribe,
- // });
- // });
- // });
- }
- });
- });
- },
-
- /** 鏌ョ湅鎸夐挳鎿嶄綔 */
- handleDetail(row) {
- this.isopen = 0;
- this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
- this.dialogOpen = true;
- this.title = "鏌ョ湅璐圭敤鐢宠";
- this.dialogType = "detail";
- const id = row.id || this.ids;
-
- getFund(id).then((response) => {
- this.form = response.data;
- this.form.name = this.curCase.name;
- let listFundflowparams = {
- fundid: row.id,
- fundtype: 2,
- };
- //闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
- listFundflow(listFundflowparams).then((res) => {
- this.fundflowList = res.rows;
- });
- getownFundDetail(id).then((res) => {
- this.fundDetails = res.data;
- for (let m = 0; m < this.fundDetails.length; m++) {
- this.fundDetails[m].itemArr = [];
- this.getItemArr(m, this.fundDetails[m]);
- this.fundDetails[m].rowfeeblocks = [];
- this.fundDetails[m].rowfeeblocks.push({
- expense: this.fundDetails[m].expense,
- expensedescribe: this.fundDetails[m].servicesscopename,
- remark: this.fundDetails[m].servicesscope,
- servicesscope: this.fundDetails[m].servicesscope,
- });
- }
- });
- });
- },
-
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal
- .confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
- return delFund(ids);
- })
- .then(() => {
- getownFundDetail(ids).then((res) => {
- let listdetails = res.data;
- for (let i = 0; i < listdetails.length; i++) {
- delFunddetail(listdetails[i].id);
+ //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
+ searchItemType(val, scope) {
+ let result = [];
+ if (val != "") {
+ let tempItemArr = scope.row.itemArr;
+ for (let i = 0; i < tempItemArr.length; i++) {
+ let pym = tempItemArr[i].itempinyin;
+ if (pym != null && pym != undefined && pym != "") {
+ if (pym.indexOf(val) != -1) {
+ result.push(tempItemArr[i]);
}
- });
- // this.getList();
- this.getfundList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- })
- .catch(() => { });
+ }
+ }
+ scope.row.itemArr = result;
+ } else {
+ getItemNames(scope.row.applytype).then((res) => {
+ scope.row.itemArr = res.data;
+ //this.$set(this.fundDetails, rowindex, row);
+ });
+ }
},
deleteRows(row, index, rows) {
@@ -1584,6 +1871,8 @@
this.rowfeeItemTypes.push({
value: dataList[m].itemType,
label: dataList[m].itemTypeName,
+ subjecttype: dataList[m].subjecttype,
+ subjecttypename: dataList[m].subjecttypename,
});
}
});
@@ -1651,49 +1940,12 @@
});
},
- //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
- searchItemType(val, scope) {
- let result = [];
- if (val != "") {
- let tempItemArr = scope.row.itemArr;
- for (let i = 0; i < tempItemArr.length; i++) {
- let pym = tempItemArr[i].itempinyin;
- if (pym != null && pym != undefined && pym != "") {
- if (pym.indexOf(val) != -1) {
- result.push(tempItemArr[i]);
- }
- }
- }
- scope.row.itemArr = result;
- } else {
- getItemNames(scope.row.applytype).then((res) => {
- scope.row.itemArr = res.data;
- //this.$set(this.fundDetails, rowindex, row);
- });
- }
- },
+
//鏂囦欢涓婁紶
handleUploadError() { },
- remove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
- },
- handleExceed() {
- this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
- },
- //鏂囦欢涓婁紶鎴愬姛鍥炶皟
- uploadSccess(response, file, fileList) {
- //鑾峰彇闄勪欢淇℃伅浣嶇疆
- if (response.code == 200) {
- this.form.filename = file.raw.name;
- this.$modal.msgSuccess(response.msg);
- this.fileList.push({ name: response.fileName, url: response.fileName });
- } else {
- this.$modal.msgError(response.msg);
- }
- },
- // 涓嬭浇鏂囦欢
+ /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
downFile(item) {
const url = process.env.VUE_APP_BASE_API + item.url
var a = document.createElement('a');
@@ -1703,30 +1955,30 @@
a.dispatchEvent(event);
},
+ remove(file) {
+ this.fileList.splice(this.fileList.indexOf(file), 1)
+ },
+
+ handleExceed() {
+ this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
+ },
+
+ //鏂囦欢涓婁紶鎴愬姛鍥炶皟
+ uploadSccess(response, file, fileList) {
+ //鑾峰彇闄勪欢淇℃伅浣嶇疆
+ if (response.code == 200) {
+ this.form.filename = file.raw.name;
+ this.$modal.msgSuccess(response.msg);
+ this.fileList.push({ name: response.fileName, url: response.fileName });
+ } else {
+ console.log(response.msg);;
+ }
+ },
+
},
- //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
- created() {
- this.getUnitList();
- this.getList();
- this.getBaseInfoList();
- this.getlistUser();
- this.getCurFundType();
- },
- //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
- mounted() {
- this.selectReporters();
- this.getUsermsg();
- this.getlistExternalperson();
- },
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
+
</script>
<style scoped>
/* @import url(); 寮曞叆鍏叡css绫� */
--
Gitblit v1.9.3