From 733457daf115deb6088984c3c55dc5bcc906d28c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 09 八月 2023 23:53:58 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/expertFeeFundApply/index.vue | 18
src/views/project/fund/fundcontext/index.vue | 1063 +++++++++++++++++++++----------------
src/views/project/fund/fundApply/index.vue | 24
src/views/project/fund/overheadcosts/index.vue | 6
src/views/project/travelexpenseslist/Modifydetails/index.vue | 10
src/views/project/fund/medicalCostFundApply/index.vue | 546 +++++++++++--------
src/api/project/fund.js | 7
7 files changed, 934 insertions(+), 740 deletions(-)
diff --git a/src/api/project/fund.js b/src/api/project/fund.js
index abef398..75f4e3e 100644
--- a/src/api/project/fund.js
+++ b/src/api/project/fund.js
@@ -49,6 +49,13 @@
}
// 淇敼璐圭敤鐢宠涓�
+// export function updateFund(data) {
+// return request({
+// url: '/project/fund',
+// method: 'put',
+// data: data
+// })
+// }
export function updateFund(data) {
return request({
url: '/project/fund/fundEdit',
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index be82940..cfeb349 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -24,7 +24,7 @@
</el-row>
</el-form>
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
<el-row>
@@ -47,7 +47,7 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
<el-row :gutter="4" align="right" class="mb8">
@@ -626,7 +626,6 @@
},
name: "fundApply",
-
dicts: [
//"sys_consolationfundlevel",
//"sys_OrganizationType",
@@ -863,9 +862,9 @@
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.donorno = this.curCase.donorno;
+ this.form.donorname = this.curCase.name;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
@@ -895,8 +894,6 @@
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";
@@ -906,7 +903,6 @@
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) => {
@@ -949,8 +945,6 @@
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";
@@ -958,7 +952,6 @@
getFund(id).then((response) => {
this.form = response.data;
- this.form.name = this.curCase.name;
let listFundflowparams = {
fundid: row.id,
fundtype: 2,
@@ -1171,9 +1164,6 @@
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;
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index b96886a..aa4e074 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -24,7 +24,7 @@
</el-row>
</el-form>
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
<el-row>
@@ -47,7 +47,7 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
<el-row :gutter="4" align="right" class="mb8">
@@ -746,10 +746,14 @@
if (this.curCase.id) {
this.istrue += 2;
this.reset();
+ this.dialogOpen = true;
+ this.title = "娣诲姞璐圭敤鐢宠";
+ this.dialogType = "edit";
this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.name = this.curCase.name;
+
this.form.infoid = this.curCase.id;
+ this.form.donorno = this.curCase.donorno;
+ this.form.donorname = this.curCase.name;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
@@ -762,9 +766,6 @@
this.fundDetailArr = [];
this.fundflowList = [];
this.addRow();
- this.dialogOpen = true;
- this.title = "娣诲姞璐圭敤鐢宠";
- this.dialogType = "edit";
} else {
const h = this.$createElement;
this.$message({
@@ -997,8 +998,7 @@
if (list.length > 0) {
this.form.annexbankcard = list.map(item => item.url).join(",");
}
-
- this.form.donorname = this.curCase.name;
+
if (this.form.id != null) {
updateFund(this.form).then((response) => {
this.getfundList();
@@ -1106,8 +1106,6 @@
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";
@@ -1115,7 +1113,6 @@
const id = row.id || this.ids;
getFund(id).then((response) => {
this.form = response.data;
- this.form.name = this.curCase.name;
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -1134,8 +1131,6 @@
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";
@@ -1143,7 +1138,6 @@
getFund(id).then((response) => {
this.form = response.data;
- this.form.name = this.curCase.name;
let listFundflowparams = {
fundid: row.id,
fundtype: 2,
diff --git a/src/views/project/fund/fundcontext/index.vue b/src/views/project/fund/fundcontext/index.vue
index d40bbc0..67f06de 100644
--- a/src/views/project/fund/fundcontext/index.vue
+++ b/src/views/project/fund/fundcontext/index.vue
@@ -41,7 +41,7 @@
-->
<el-col :span="5">
<el-form-item label="鐢宠鍗曠被鍨�">
- <el-radio v-model="form.applytype" label="4">鏉傞」璐圭敤鐢宠鍗�</el-radio>
+ <el-radio v-model="form.applytype" :label="businessType">{{ businessName }}</el-radio>
</el-form-item>
</el-col>
<el-col :span="10">
@@ -96,7 +96,7 @@
</el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
- <el-row style="margin-bottom: 10px" v-if="businesstype == '1'">
+ <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
<el-col :span="4">
<el-button @click.native.prevent="addAllItems" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
@@ -198,7 +198,7 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="220" v-if="form.applytype != '4'">
+ <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" v-if="form.applytype != '4'">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
}}</el-button>
@@ -245,15 +245,16 @@
<el-input v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180"
- v-if="operationtype == 'add' || operationtype == 'edit'">
+ <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
<template slot-scope="scope">
- <el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
- <el-button @click.native.prevent="
- deleteRows(scope.row, scope.$index, fundDetails)
- " type="text" size="small">
+ <el-button type="text" size="mini" @click="addRow(scope.$index)"
+ v-if="operationType == 'add' || operationType == 'update'">鏂板</el-button>
+ <el-button @click.native.prevent="deleteRows(scope.row, scope.$index, fundDetails)" type="text"
+ size="small" v-if="operationType == 'add' || operationType == 'update'">
鍒犻櫎
</el-button>
+ <el-button @click.native.prevent="Filepopup(scope.$index, fundDetails, scope.row)" type="text"
+ size="small">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -301,18 +302,18 @@
-->
<el-row>
<el-col :span="12">
- <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
+ <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
:limit="20" :headers="headers" :on-success="(response, file, fileList) =>
uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled='operationtype == "detail"' :on-error="handleUploadError"
+ " :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-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" />
@@ -323,7 +324,7 @@
<el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationtype == 'check'">
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -333,7 +334,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="operationtype == 'check'">
+ <el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
<el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" />
@@ -342,18 +343,18 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="operationtype == 'add' || operationtype == 'edit'">淇�
+ <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="checksubmit" v-if="operationType == 'check'">淇� 瀛�</el-button>
+ <el-button @click="cancel" v-if="operationType == 'detail'">閫� 鍑�</el-button>
</div>
</div>
- <el-dialog :visible.sync="showDetailInfoDialog" :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="showDetailInfooperationtype == 'name'">
+ <el-col :span="24" v-if="showDetailInfoType == 'name'">
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
<el-radio-group v-model="expertfrom" style="margin-bottom: 0">
<el-radio label="1">涓撳搴�</el-radio>
@@ -361,7 +362,7 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="showDetailInfooperationtype == 'name' && expertfrom == '1'">
+ <el-col :span="24" v-if="showDetailInfoType == '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%">
@@ -371,12 +372,19 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="showDetailInfooperationtype == 'unit'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
+ <el-col :span="24" v-if="showDetailInfoType == '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%">
<el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
:value="spec.organizationid"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍙戠エ鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 3 || businessType == 4">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(item, index) in feeUnitList" :key="index" :label="item.reportName"
+ :value="item.reportNo"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -442,6 +450,34 @@
<el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
+ </el-dialog>
+ <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple
+ :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
+ 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-upload>
+ </div>
+ <!-- <div
+ class="pdftit"
+ @click="pdffn(item)"
+ v-for="item in fileList"
+ :key="item.name"
+ >
+ {{ item.name }}
+ </div> -->
+ </div>
+
+ <div v-if="this.previewpdf" class="pdfimgmin">
+ <img :src="pdfimg" />
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div>
</el-dialog>
</div>
</template>
@@ -548,89 +584,48 @@
loading: false,
// 瀵煎嚭閬僵灞�
exportLoading: false,
- usernamedata: '',
- // 鏌ヨ鍙傛暟
- queryParams: {
- organizationname: null,
- organizationtype: null,
- pageNum: 1,
- pageSize: 10,
- name: null,
- idcardno: null,
- residenceprovince: null,
- residencecity: null,
- residencetown: null,
- recordstate: null,
- treatmenthospitalname: null,
- donorno: null,
- reportername: null,
- reporttime: null,
- },
-
- fundQueryParam: {
- pageNum: 1,
- pageSize: 100,
- infoid: null,
- applytype: "4",
- createBy: null,
- },
-
- expertQueryParam: {
- pageNum: 1,
- pageSize: 10000,
- userno: null,
- username: null,
- usertype: null,
- },
-
- //璁＄畻涓◣鍙傛暟
- taxParam: {
- beneficiaryNo: '',
- money: '0',
- startTime: '',
- },
-
+ usernamedata: "",
// 琛ㄥ崟鍙傛暟
form: {},
//璐圭敤鐢宠琛ㄥ崟title
title: "",
+ //鐢宠鍗曠被鍨�
+ businessType: "0",
+ businessName: "",
+ //鎿嶄綔绫诲瀷
+ operationType: "",
+
+ //褰撳墠鍗曟嵁id
+ curId: 0,
+ //褰撳墠閫変腑鎹愮尞妗堜緥
+ curCase: {},
+
total: 0,
- //鐢宠鍗曠被鍨�
- businesstype: '4',
- //鎿嶄綔绫诲瀷
- operationtype: "edit",
// 褰撳墠鐢ㄦ埛淇℃伅
userprofile: {},
//绯荤粺鐢ㄦ埛鍒楄〃
userlist: [],
//鎵�鏈変汉鍛樿〃
personlist: [],
- reporters: [],
- itemlist: [],
//涓撳鍒楄〃
expertlist: [],
+ //鍖荤枟鏈烘瀯鍒楄〃
+ unitList: [],
+ //璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
+ feeUnitList: [],
+
+ itemlist: [],
+
+ //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
+ ismanager: false,
//涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
expertfrom: "1",
- // 琛ㄥ崟鏍￠獙
- rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
- reason: [
- { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
- ],
- deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
- ]
- },
-
//鎹愮尞妗堜緥鍒楄〃鏁版嵁
donatebaseinfoList: [],
- //褰撳墠閫変腑鎹愮尞妗堜緥
- curCase: {},
+
// 鎹愮尞浜洪亾鎱伴棶閲戣〃鏍兼暟鎹�
donateconsolationfundList: [],
//璐圭敤鏄庣粏鍒楄〃
@@ -648,13 +643,23 @@
//璐圭敤璇存槑
rowfeeblocks: [],
- //鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
- ismanager: false,
fundflowList: [],
- unitList: [],
showDetailInfoDialog: false,
- showDetailInfooperationtype: "",
+ showDetailInfoType: "",
+
+ // 琛ㄥ崟鏍￠獙
+ rules: {
+ createTime: [
+ { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
+ ],
+ reason: [
+ { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
+ ],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ]
+ },
funddetailForm: {
index: null,
@@ -699,14 +704,63 @@
wbm: null,
},
+ // 鏌ヨ鍙傛暟
+ queryParams: {
+ organizationname: null,
+ organizationtype: null,
+ pageNum: 1,
+ pageSize: 10,
+ name: null,
+ idcardno: null,
+ residenceprovince: null,
+ residencecity: null,
+ residencetown: null,
+ recordstate: null,
+ treatmenthospitalname: null,
+ donorno: null,
+ reportername: null,
+ reporttime: null,
+ },
+
+ fundQueryParam: {
+ pageNum: 1,
+ pageSize: 100,
+ infoid: null,
+ applytype: "0",
+ createBy: null,
+ },
+
+ expertQueryParam: {
+ pageNum: 1,
+ pageSize: 10000,
+ userno: null,
+ username: null,
+ usertype: null,
+ },
+
+ //璁＄畻涓◣鍙傛暟
+ taxParam: {
+ beneficiaryNo: '',
+ money: '0',
+ startTime: '',
+ },
+
//闄勪欢鍒楄〃
fileList: [],
+ fileListto: [],
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
headers: {
Authorization: "Bearer " + getToken(),
},
+ //绁ㄦ嵁鏂囦欢
+ pdftitle: "",
+ pdfimg: "",
+ pdfVisible: false,
+ previewpdf: false,
+ hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+ atpresent: "",
};
},
@@ -715,20 +769,19 @@
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+
created() {
- //鑾峰彇鍗曟嵁绫诲瀷鍜屾搷浣滆姹�
- this.getCurFundType();
+ //鑾峰彇璺敱鍙傛暟
this.getroute();
this.getUserProfile();
+ this.getFeeUnitList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
this.getUserList();
- this.getUnitList();
- this.selectReporters();
- this.getExternalpersonList();
this.getBaseInfoList();
+ this.getExternalList();
},
beforeCreate() {
@@ -742,103 +795,144 @@
//鏂规硶闆嗗悎
methods: {
+ // 琛ㄥ崟閲嶇疆
+ reset() {
+ this.form = {
+ id: null,
+ applytype: "0",
+ recordstate: -1,
+ userno: null,
+ username: null,
+ deptmentname: null,
+ deptmentno: null,
+ managername: 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,
+ servicetypename: null,
+ servicesscope: null,
+ servicesscopename: null,
+ };
+ this.resetForm("form");
+ //娓呯┖闄勪欢
+ this.fileList = []
+ },
/** 閫氳繃鍙傛暟鑾峰彇涓氬姟绫诲瀷 */
getroute() {
//閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
- let ids = this.$route.query.id;
- let tempbusinesstype = this.$route.query.businesstype;
- let tempoperationtype = this.$route.query.operationtype;
- // this.userprofile = this.$route.query.routerparam;
+ this.curId = this.$route.query.id;
+ this.businessType = this.$route.query.businessType;
+ this.operationType = this.$route.query.operationType;
- if (!tempbusinesstype) { this.businesstype = tempbusinesstype; }
- if (tempbusinesstype == "1") {
- this.title = '涓撳鍔冲姟璐圭敵璇峰崟';
- } else if (tempbusinesstype == "2") {
- this.title = '浼︾悊涓撳鍔冲姟璐圭敵璇峰崟';
+ //鑾峰彇璐圭敤椤圭洰绫诲瀷
+ this.getFundType();
+
+ // if (!this.businessType && !this.operationType) {
+ if (this.businessType == "1") {
+ this.curCase = this.$route.query.curCase;
+ this.businessName = '涓撳鍔冲姟璐圭敵璇峰崟';
+ } else if (this.businessType == "2") {
+ this.curCase = this.$route.query.curCase;
+ this.businessName = '浼︾悊涓撳鍔冲姟璐圭敵璇峰崟';
}
- else if (tempbusinesstype == "3") {
- this.title = '鍖诲鎴愭湰鎶ラ攢鍗�';
+ else if (this.businessType == "3") {
+ this.curCase = this.$route.query.curCase;
+ this.businessName = '鍖诲鎴愭湰鎶ラ攢鍗�';
}
- else if (tempbusinesstype == "4") {
- this.title = '鏉傞」璐圭敤鎶ラ攢鍗�';
+ else if (this.businessType == "4") {
+ this.businessName = '鏉傞」璐圭敤鎶ラ攢鍗�';
}
- this.operationtype = tempoperationtype;
- if (tempoperationtype == 'add') {
- this.title += '鏂板缓'
+ if (this.operationType == 'add') {
+ this.title = this.businessName + '鏂板缓'
this.handleAdd();
- } else if (tempoperationtype == 'update') {
- this.title += '淇敼'
- this.handleUpdate(ids);
+ } else if (this.operationType == 'update') {
+ this.title = this.businessName + '淇敼'
+ this.handleUpdate();
}
- else if (tempoperationtype == 'detail') {
- this.title += '鏌ョ湅'
- this.handleDetail(ids);
- } else if (tempoperationtype == 'check') {
- this.title += '瀹℃牳'
- this.handleCheck(ids);
+ else if (this.operationType == 'detail') {
+ this.title = this.businessName + '鏌ョ湅'
+ this.handleDetail();
+ } else if (this.operationType == 'check') {
+ this.title = this.businessName + '瀹℃牳'
+ this.handleCheck();
}
+ // } else {
+ // this.$modal.msgWarning("寮�鎵撳尰瀛﹁垂鐢ㄧ敵璇峰崟鍙戠幇鍙傛暟涓氬姟绫诲瀷鎴栨搷浣滅被鍨嬮敊璇紝璇疯仈绯荤郴缁熺鐞嗗憳锛�");
+ // return;
+ // }
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- /** businesstype锛�1:涓撳璐癸紱2锛氫鸡鐞嗕笓瀹惰垂 */
- if (this.businesstype == "1" || this.businesstype == "2" || this.businesstype == "3") {
- if (this.curCase.id) {
- this.istrue += 2;
- this.reset();
- this.queryParams.params = {};
+ //鍒濆鍖�
+ this.istrue += 2;
+ this.reset();
- this.form.infoid = this.curCase.id;
- this.form.donorno = this.curCase.donorno;
- this.form.name = this.curCase.name;
-
- //this.initFundApplyForm();
- } else {
- const h = this.$createElement;
- this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
- });
- return;
- }
+ /** 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;
}
- //鍒濆鍖�
- this.reset();
+ //鍒濆鍖栨槑缁�
this.fundDetails = [];
this.addRow(0);
-
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
+ handleUpdate() {
this.isopen = 0;
this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
- // this.title = "淇敼璐圭敤鐢宠";
- // this.operationtype = "edit";
- const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(this.curId).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) => {
+
+ //鏄庣粏澶勭悊
+ getownFundDetail(this.curId).then((res) => {
this.fundDetails = res.data;
- if (this.fundDetails.length == 0) {
+ console.log(this.curId,res.data);
+ if (this.fundDetails.length > 0) {
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemlist = [];
this.getitemlist(m, this.fundDetails[m]);
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
this.fundDetails[m].rowfeeblocks = [];
-
this.fundDetails[m].rowfeeblocks.push({
servicesscope: this.fundDetails[m].servicesscope,
expensedescribe: this.fundDetails[m].servicesscopename,
@@ -857,39 +951,27 @@
// });
// });
}
-
-
} else { this.addRow(0); }
-
});
});
},
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
- handleDetail(row) {
+ handleDetail() {
this.isopen = 0;
this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
- this.title = "鏌ョ湅璐圭敤鐢宠";
- this.operationtype = "detail";
- const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(this.curId).then((response) => {
this.form = response.data;
- this.form.name = this.curCase.name;
let listFundflowparams = {
- fundid: row.id,
- fundtype: 2,
+ fundid: this.curId,
+ fundtype: this.businessType,
};
//闄勪欢澶勭悊
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) => {
+ //涓氬姟鏄庣粏
+ getownFundDetail(this.curId).then((res) => {
this.fundDetails = res.data;
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemlist = [];
@@ -904,21 +986,25 @@
}
if (this.fundDetails.length == 0) {
- this.addRow();
+ this.addRow(0);
}
+ });
+
+ //涓氬姟娴佺▼
+ listFundflow(listFundflowparams).then((res) => {
+ this.fundflowList = res.rows;
});
});
},
- handleDelete(row) {
- const ids = row.id || this.ids;
+ handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
.then(function () {
- return delFund(ids);
+ return delFund(this.curId);
})
.then(() => {
- getownFundDetail(ids).then((res) => {
+ getownFundDetail(this.curId).then((res) => {
let listdetails = res.data;
for (let i = 0; i < listdetails.length; i++) {
delFunddetail(listdetails[i].id);
@@ -931,7 +1017,7 @@
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
- handleUp(row) {
+ handleUp() {
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -940,9 +1026,9 @@
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
- row.recordstatus = 0;
+ this.form.recordstatus = 0;
- updateFund(row).then((response) => {
+ updateFund(this.form).then((response) => {
if (response.code == 200) {
this.$message({
type: "success",
@@ -982,7 +1068,7 @@
return;
}
- if (businesstype == '1' || businesstype == '2') {
+ if (this.businessType == '1' || this.businessType == '2') {
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
return;
@@ -1071,7 +1157,6 @@
this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
this.totalAmount += parseFloat(tempDetail.amount);
- console.log("1", this.amount);
}
});
}
@@ -1091,9 +1176,6 @@
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;
@@ -1147,183 +1229,6 @@
this.$router.go(-1);
},
- // 琛ㄥ崟閲嶇疆
- reset() {
- this.form = {
- id: null,
- applytype: "4",
- recordstate: -1,
- userno: null,
- username: null,
- deptmentname: null,
- deptmentno: null,
- managername: 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,
- 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.funddetailForm.expertname = "";
- this.funddetailForm.expertidcardno = "";
- this.funddetailForm.expertunitno = "";
- this.funddetailForm.expertunitname = "";
- this.funddetailForm.experttitle = "";
- this.funddetailForm.expertdepositbank = "";
- this.funddetailForm.expertbankcardno = "";
-
- this.showDetailInfoDialog = true;
- this.showDetailInfooperationtype = showType;
- },
-
- ConfirmDetailDialog() {
- let tempIndex = this.funddetailForm.index;
- let tempName = this.funddetailForm.beneficiaryname;
- let tempUnitname = this.funddetailForm.unitname;
- let singleDetail = this.fundDetails[tempIndex];
-
- if (this.showDetailInfooperationtype == "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.showDetailInfooperationtype == "unit") {
- singleDetail.unitno = this.funddetailForm.unitno;
- try {
- let unitIndex = this.unitList.findIndex(
- (item) => singleDetail.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.unitList[unitIndex].organizationname;
- } else {
- singleDetail.unitname = singleDetail.unitno;
- }
- } catch {
- singleDetail.unitname = singleDetail.unitno;
- }
- }
-
- this.fundDetails[tempIndex] = singleDetail;
- this.showDetailInfoDialog = false;
- },
-
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUserProfile() {
getUserProfile().then((res) => {
@@ -1334,14 +1239,140 @@
} else {
this.ismanager = false;
}
- // this.form.applytype = this.businesstype;
- this.form.createTime = new Date();
+ // 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;
+ });
+ },
+
+ //鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
+ getUserList() {
+ listUser().then((res) => {
+ this.userlist = res.data;
+ });
+ },//鑾峰彇绯荤粺鐢ㄦ埛鍒楄〃
+ getUserList() {
+ listUser().then((res) => {
+ this.userlist = res.data;
+ });
+ },
+
+ //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
+ getExternalList() {
+ listExternalperson().then((res) => {
+ this.personlist = res.rows;
+ for (let j = 0; j < this.personlist.length; j++) {
+ //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
+ if (this.personlist[j].usertype == "org") {
+ this.feeUnitList.push({
+ id: this.personlist[j].id,
+ reportNo: this.personlist[j].userno,
+ reportName: this.personlist[j].username,
+ depositbank: this.personlist[j].depositbank,
+ branchbankname: this.personlist[j].branchbankname,
+ bankcardno: this.personlist[j].bankcardno,
+ });
+ }
+ //涓撳浜哄憳鍒楄〃
+ else if (res.rows[j].usertype == "expert") {
+ this.expertlist.push({
+ expertNo: this.personlist[j].id,
+ exportName: this.personlist[j].username,
+ });
+ }
+ }
+ });
+ },
+
+ //鑾峰彇涓撳浜哄憳鍒楄〃
+ getExpertList() {
+ 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++) {
+ templist.push({
+ reportName: res.data[j].reportName,
+ reportNo: res.data[j].reportNo,
+ });
+ }
+ this.expertlist = this.expertlist.concat(templist);
+ });
+ }
+ },
+
+ //鑾峰彇璐圭敤鏈烘瀯鍒楄〃
+ getFeeUnitList() {
+ listReportname("org").then((res) => {
+ this.feeUnitList = res.data;
+ });
+ },
+
+ //鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
+ getUnitList() {
+ listOrganization(3).then((response) => {
+ for (let i = 0; i < response.rows.length; i++) {
+ this.unitList.push({
+ //organizationid: response.rows[i].organizationid,
+ organizationid: response.rows[i].id,
+ organizationname: response.rows[i].organizationname,
+ });
+ }
+ });
+ },
+
+ //鑾峰彇璐圭敤绫诲瀷
+ getFundType() {
+ getFundTypeAll(this.businessType).then((res) => {
+ let dataList = res.data;
+ this.feeItemTypes = dataList;
+ this.rowfeeItemTypes = [];
+ for (let m = 0; m < dataList.length; m++) {
+ this.rowfeeItemTypes.push({
+ value: dataList[m].itemType,
+ label: dataList[m].itemTypeName,
+ subjecttype: dataList[m].subjecttype,
+ subjecttypename: dataList[m].subjecttypename,
+ });
+ }
+ });
+ },
+
+ getitemlist(rowindex, row) {
+ let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
+ row.itemlist = list[0].itemDetails;
+ this.$set(this.fundDetails, rowindex, row);
+ //this.loading = true;
+ // getItemNames(row.applytype).then((res) => {
+ // this.loading = false;
+ // row.itemlist = res.data;
+ // this.$set(this.fundDetails, rowindex, row);
+ // });
+ },
+
+ //鑾峰彇鎹愮尞妗堜緥鍒楄〃
+ 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;
});
},
@@ -1406,7 +1437,7 @@
},
- //
+ //鍚堣璐圭敤
selectamount(row) {
this.rowfeeblocks.forEach((item, i) => {
if (item.expense === row.amount) {
@@ -1415,41 +1446,10 @@
});
},
- getUnitList() {
- listOrganization(3).then((response) => {
- for (let i = 0; i < response.rows.length; i++) {
- this.unitList.push({
- //organizationid: response.rows[i].organizationid,
- organizationid: response.rows[i].id,
- organizationname: response.rows[i].organizationname,
- });
- }
- });
- },
-
- getBaseInfoList() {
- this.loading = true;
- listDonatebaseinfo(this.queryParams).then((response) => {
- this.donatebaseinfoList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
-
//鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
selectDonotor(row, column, event) {
this.curCase = row;
this.getfundList();
- },
-
- getfundList() {
- this.loading = true;
- this.reset();
- this.fundQueryParam.infoid = this.curCase.id;
- listFund(this.fundQueryParam).then((response) => {
- this.loading = false;
- this.donateconsolationfundList = response.rows;
- });
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -1590,6 +1590,7 @@
itemlist: [],
servicesscope: null,
rowfeeblocks: [],
+ annexfiles: null,
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.fundDetails.push(rowData);
@@ -1616,31 +1617,6 @@
// });
},
- //鑾峰彇涓撳鍒楄〃
- getExternalpersonList() {
- listExternalperson().then((res) => {
- this.personlist = res.rows;
- });
- },
-
- //涓撳浜哄憳鍒楄〃
- selectReporters() {
- 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++) {
- templist.push({
- reportName: res.data[j].reportName,
- reportNo: res.data[j].reportNo,
- });
- }
- this.expertlist = this.expertlist.concat(templist);
- });
- }
- },
-
selectpersonmsg(row) {
// if(row.beneficiaryname)
this.personlist.map((res) => {
@@ -1658,12 +1634,6 @@
} else {
row.beneficiaryno = row.beneficiaryname;
}
- });
- },
-
- getUserList() {
- listUser().then((res) => {
- this.userlist = res.data;
});
},
@@ -1727,7 +1697,6 @@
});
//鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
- console.log("this.fundDetails.length", this.fundDetails.length);
if (this.fundDetails.length == 1) {
this.addRow(0);
}
@@ -1780,36 +1749,6 @@
// this.$forceUpdate();
},
- //鑾峰彇璐圭敤绫诲瀷
- getCurFundType() {
- getFundTypeAll(this.businesstype).then((res) => {
- console.log("rowfeeItemTypes", res);
- let dataList = res.data;
- this.feeItemTypes = dataList;
- this.rowfeeItemTypes = [];
- for (let m = 0; m < dataList.length; m++) {
- this.rowfeeItemTypes.push({
- value: dataList[m].itemType,
- label: dataList[m].itemTypeName,
- subjecttype: dataList[m].subjecttype,
- subjecttypename: dataList[m].subjecttypename,
- });
- }
- });
- },
-
- getitemlist(rowindex, row) {
- let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
- row.itemlist = list[0].itemDetails;
- this.$set(this.fundDetails, rowindex, row);
- //this.loading = true;
- // getItemNames(row.applytype).then((res) => {
- // this.loading = false;
- // row.itemlist = res.data;
- // this.$set(this.fundDetails, rowindex, row);
- // });
- },
-
mixExport(scope) {
this.dayin(scope.row.id);
//this.totaldayin(id);
@@ -1860,8 +1799,6 @@
});
},
-
-
//鏂囦欢涓婁紶
handleUploadError() { },
@@ -1875,8 +1812,13 @@
a.dispatchEvent(event);
},
- remove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
+ // remove(file) {
+ // this.fileList.splice(this.fileList.indexOf(file), 1)
+ // },
+ remove(file, fileList) {
+ const rbDetails = [...this.rbDetails];
+ this.fileListto.splice(this.fileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].annexfilesList = this.fileListto;
},
handleExceed() {
@@ -1884,17 +1826,208 @@
},
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
+ // 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);
+ // }
+ // },
uploadSccess(response, file, fileList) {
- //鑾峰彇闄勪欢淇℃伅浣嶇疆
+ this.rbDetails;
+
+ //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
+
this.$modal.msgSuccess(response.msg);
- this.fileList.push({ name: response.fileName, url: response.fileName });
+ this.fileListto.push({ name: file.name, url: response.url });
+ this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
- console.log(response.msg);;
+ console.log(response.msg);
}
},
+ // 鐐瑰嚮鏂囦欢
+ Filepopup(index, rows, row) {
+ this.atpresent = index;
+ this.pdfVisible = true;
+ if (this.fundDetails[index].annexfilesList) {
+ this.fileListto = this.rbDetails[index].annexfilesList;
+ } else {
+ this.fileListto = [];
+ this.pdfimg = "";
+ this.pdftitle = "";
+ }
+ },
+ // 鐐瑰嚮宸蹭笂浼犳枃浠�
+ downFile(item) {
+ this.pdftitle = item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.pdfimg = item.url;
+ } else {
+ this.pdfimg = item.response.url;
+ }
+ } else {
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ }
+ },
+
+ //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
+ 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.funddetailForm.expertname = "";
+ this.funddetailForm.expertidcardno = "";
+ this.funddetailForm.expertunitno = "";
+ this.funddetailForm.expertunitname = "";
+ this.funddetailForm.experttitle = "";
+ this.funddetailForm.expertdepositbank = "";
+ this.funddetailForm.expertbankcardno = "";
+
+ this.showDetailInfoDialog = true;
+ this.showDetailInfoType = showType;
+ },
+
+ //涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
+ ConfirmDetailDialog() {
+ let tempIndex = this.funddetailForm.index;
+ let tempName = this.funddetailForm.beneficiaryname;
+ let tempUnitname = this.funddetailForm.unitname;
+ let singleDetail = this.fundDetails[tempIndex];
+
+ if (this.showDetailInfoType == "name") {
+ if (this.expertfrom == "1") {
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ 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 {
+ //淇濆瓨鏂板涓撳
+ 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;
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map((res) => {
+ if (res.username == this.funddetailForm.expertname) {
+ 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.showDetailInfoType == "unit") {
+ singleDetail.unitno = this.funddetailForm.unitno;
+ if (this.businessType == 1 || this.businessType == 2) {
+ try {
+ let unitIndex = this.unitList.findIndex(
+ (item) => singleDetail.unitno == item.organizationid
+ );
+ if (unitIndex > -1) {
+ singleDetail.unitname = this.unitList[unitIndex].organizationname;
+ } else {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ } catch {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ } else if (this.businessType == 3 || this.businessType == 4) {
+ try {
+ let unitIndex = this.feeUnitList.findIndex(
+ (item) => singleDetail.unitno == item.reportNo
+ );
+
+ if (unitIndex > -1) {
+ singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
+ singleDetail.depositbank = this.feeUnitList[unitIndex].depositbank;
+ singleDetail.bankcardno = this.feeUnitList[unitIndex].bankcardno;
+ } else {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ } catch {
+ singleDetail.unitname = singleDetail.unitno;
+ }
+ }
+ }
+
+ this.fundDetails[tempIndex] = singleDetail;
+ this.showDetailInfoDialog = false;
+ },
+
},
};
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue
index 4f1dd9c..efff279 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostFundApply/index.vue
@@ -24,7 +24,7 @@
</el-row>
</el-form>
<el-row>
- <el-col :span="8">
+ <el-col :span="6">
<el-card shadow="never">
<!-- 鎹愮尞妗堜緥鍒楄〃 -->
<el-row>
@@ -47,7 +47,7 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
- <el-col :span="16">
+ <el-col :span="18">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
<el-row :gutter="4" align="right" class="mb8">
@@ -149,7 +149,7 @@
<el-row style="text-align: left">
<el-col :span="5">
<el-form-item label="鐢宠绫诲瀷">
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label='3'>鍖诲鎴愭湰鐢宠</el-radio>
</el-form-item>
</el-col>
<el-col :span="10">
@@ -487,6 +487,35 @@
<el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+ <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple
+ :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError"
+ :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+ <el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button>
+ </el-upload>
+ </div>
+ <!-- <div
+ class="pdftit"
+ @click="pdffn(item)"
+ v-for="item in fileList"
+ :key="item.name"
+ >
+ {{ item.name }}
+ </div> -->
+ </div>
+
+ <div v-if="this.previewpdf" class="pdfimgmin">
+ <img :src="pdfimg" />
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div>
+ </el-dialog>
</div>
</template>
@@ -650,6 +679,7 @@
fundtypeArrAll: [],
dialogType: "edit",
+
detailInfoDialogShow: false,
detailInfoDialogShowType: "",
funddetailForm: {
@@ -662,20 +692,256 @@
//闄勪欢鍒楄〃
fileList: [],
+ fileListto: [],
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
Authorization: "Bearer " + getToken(),
},
-
+ //绁ㄦ嵁鏂囦欢
+ pdftitle: "",
+ pdfimg: "",
+ pdfVisible: false,
+ previewpdf: false,
+ hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+ atpresent: "",
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
computed: {},
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
+ //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+ created() {
+ this.getList();
+ this.getBaseInfoList();
+ this.getCurFundType();
+ this.getlistUser();
+ // this.getUnitList();
+ },
+
+ //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
+ mounted() {
+ this.getBankAccount();
+ this.getUsermsg();
+ },
+
+ 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();
+ },
+
+ /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
+ getList() {
+ this.loading = true;
+ this.queryParams.params = {};
+ if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
+ this.queryParams.params["beginReporttime"] =
+ this.daterangeReporttime[0];
+ this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
+ }
+ // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
+ listDonatebaseinfo(this.queryParams).then((response) => {
+ this.donatebaseinfoList = response.rows;
+ this.total = response.total;
+ this.loading = false;
+ });
+ },
+
+ /** 鏂板鎸夐挳鎿嶄綔 */
+ handleAdd() {
+ this.$router.push({
+ path: "/finance/fundcontext/",
+ query: { id: 0, businessType: "3", operationType: "add", curCase: this.curCase }
+ });
+ return;
+
+ 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.title = "娣诲姞璐圭敤鐢宠";
+ this.dialogType = "edit";
+ } else {
+ const h = this.$createElement;
+ this.$message({
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ });
+ }
+ },
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleUpdate(row) {
+ this.$router.push({
+ path: "/finance/fundcontext/",
+ query: { id: row.id, businessType: "3", operationType: "update", curCase: this.curCase }
+ });
+ return;
+
+ this.isopen = 0;
+ this.reset();
+ this.queryParams.params = {};
+ this.form.donorno = this.curCase.donorno;
+ this.form.infoid = this.curCase.id;
+ this.dialogType = "edit";
+ this.dialogOpen = true;
+ this.title = "淇敼璐圭敤鐢宠";
+
+
+ const id = row.id || this.ids;
+ getFund(id).then((response) => {
+ this.form = response.data;
+ this.form.name = this.curCase.name;
+ //闄勪欢澶勭悊
+ this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+ getownFundDetail(id).then(async (res) => {
+ this.fundDetails = res.data;
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ this.fundDetails[m].itemArr = [];
+ this.getItemArr(m, this.fundDetails[m]);
+ }
+ });
+ });
+ },
+
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/fundcontext/",
+ query: { id: row.id, businessType: "3", operationType: "detail", curCase: this.curCase }
+ });
+ return;
+
+ 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].fundblock = [];
+ this.fundDetails[m].fundblock.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);
+ }
+ });
+ // 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: "宸插彇娑堢敵璇�",
+ });
+ });
+ },
+
ShowDetailDialog(spoce, showType) {
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
@@ -711,13 +977,11 @@
});
} else if (this.detailInfoDialogShowType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
- console.log("this.funddetailForm", this.funddetailForm);
try {
let unitIndex = this.bankaccountlist.findIndex(
(item) => singleDetail.unitno == item.reportNo
);
- console.log("this.bankaccountlist[unitIndex]", this.bankaccountlist[unitIndex]);
if (unitIndex > -1) {
singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
@@ -729,10 +993,11 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- console.log("singleDetail", singleDetail);
+
this.fundDetails[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
+
selectremark(row) {
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
@@ -742,43 +1007,10 @@
this.fundDetails.map((item) => {
this.form.serviceFunddetails += item.amount;
});
- // row.remark
}
});
},
- 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: "宸插彇娑堢敵璇�",
- });
- });
- },
select(row) {
row.itemArr.map((res) => {
if (row.itemid === res.id) {
@@ -825,34 +1057,6 @@
this.standardlevel = response.data.standardlevel;
});
},
- /** 鎼滅储鎸夐挳鎿嶄綔 */
- handleQuery() {
- this.queryParams.pageNum = 1;
- this.getList();
- },
- /** 閲嶇疆鎸夐挳鎿嶄綔 */
- resetQuery() {
- this.daterangeReporttime = [];
-
- this.resetForm("queryForm");
- this.handleQuery();
- },
- /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
- getList() {
- this.loading = true;
- this.queryParams.params = {};
- if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
- this.queryParams.params["beginReporttime"] =
- this.daterangeReporttime[0];
- this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
- }
- // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
- listDonatebaseinfo(this.queryParams).then((response) => {
- this.donatebaseinfoList = response.rows;
- this.total = response.total;
- this.loading = false;
- });
- },
getBaseInfoList() {
this.loading = true;
@@ -863,36 +1067,7 @@
});
},
- /** 鏂板鎸夐挳鎿嶄綔 */
- 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.title = "娣诲姞璐圭敤鐢宠";
- this.dialogType = "edit";
- } else {
- const h = this.$createElement;
- this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
- });
- }
- },
//鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
selectDonotor(row, column, event) {
this.curCase = row;
@@ -1147,8 +1322,6 @@
this.getList();
this.selectDonotor(this.curCase);
}
-
-
}
});
},
@@ -1157,7 +1330,6 @@
//鑾峰彇閾惰璐﹀彿鍒楄〃锛岀被鍨嬫槸鏈烘瀯
listReportname("org").then((res) => {
this.bankaccountlist = res.data;
- console.log("this.bankaccountlist", this.bankaccountlist);
});
},
@@ -1167,97 +1339,7 @@
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
- this.isopen = 0;
- this.reset();
- this.queryParams.params = {};
- this.form.donorno = this.curCase.donorno;
- this.form.infoid = this.curCase.id;
- this.dialogType = "edit";
- this.dialogOpen = true;
- this.title = "淇敼璐圭敤鐢宠";
-
- const id = row.id || this.ids;
- getFund(id).then((response) => {
- this.form = response.data;
- this.form.name = this.curCase.name;
- //闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
- getownFundDetail(id).then(async (res) => {
- this.fundDetails = res.data;
- for (let m = 0; m < this.fundDetails.length; m++) {
- this.fundDetails[m].itemArr = [];
- this.getItemArr(m, this.fundDetails[m]);
- }
- });
- });
- },
-
- /** 鏌ョ湅鎸夐挳鎿嶄綔 */
- 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].fundblock = [];
- this.fundDetails[m].fundblock.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);
- }
- });
- // this.getList();
- this.getfundList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- })
- .catch(() => { });
- },
deleteRows(row, index, rows) {
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
@@ -1404,7 +1486,6 @@
getUnitList() {
listOrganization(3).then((res) => {
- console.log("listOrganization", res);
for (let i = 0; i < res.rows.length; i++) {
this.unitList.push({
organizationid: res.rows[i].organizationid,
@@ -1489,17 +1570,17 @@
//鏂囦欢涓婁紶
handleUploadError() { },
+
handleremove(file) {
this.fileList.splice(this.fileList.indexOf(file), 1)
},
+
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
},
+
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
- console.log("response", response);
- console.log("file", file);
- console.log("fileList", fileList);
//鑾峰彇闄勪欢淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
@@ -1518,46 +1599,45 @@
a.href = url;
a.dispatchEvent(event);
},
+
+ remove(file) {
+ this.fileList.splice(this.fileList.indexOf(file), 1)
+ },
+
+ // 鐐瑰嚮鏂囦欢
+ Filepopup(index, rows, row) {
+ this.atpresent = index;
+ this.pdfVisible = true;
+ if (this.fundDetails[index].annexfilesList) {
+ this.fileListto = this.rbDetails[index].annexfilesList;
+ } else {
+ this.fileListto = [];
+ this.pdfimg = "";
+ this.pdftitle = "";
+ }
+ },
+ // 鐐瑰嚮宸蹭笂浼犳枃浠�
+ downFile(item) {
+ this.pdftitle = item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.pdfimg = item.url;
+ } else {
+ this.pdfimg = item.response.url;
+ }
+ } else {
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ }
+ },
},
-
- // 鐐瑰嚮鏂囦欢
- Filepopup(index, rows, row) {
- console.log(index, rows, row);
- this.atpresent = index;
- console.log(this.atpresent);
- this.pdfVisible = true;
- if (this.fundDetails[index].annexfilesList) {
- this.fileListto = this.rbDetails[index].annexfilesList;
- } else {
- this.fileListto = [];
- this.pdfimg = "";
- this.pdftitle = "";
- }
- },
-
- //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
- created() {
- this.getList();
- this.getBaseInfoList();
-
- this.getCurFundType();
- this.getlistUser();
- // this.getUnitList();
- },
-
- //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
- mounted() {
- this.getBankAccount();
- this.getUsermsg();
- },
-
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/fund/overheadcosts/index.vue b/src/views/project/fund/overheadcosts/index.vue
index 8ff4f78..a070cfc 100644
--- a/src/views/project/fund/overheadcosts/index.vue
+++ b/src/views/project/fund/overheadcosts/index.vue
@@ -791,7 +791,7 @@
handleAdd() {
this.$router.push({
path: "/finance/fundcontext/",
- query: { id: 0, businesstype: "4", operationtype: "add" }
+ query: { id: 0, businessType: "4", operationtype: "add" }
});
this.istrue += 2;
@@ -816,7 +816,7 @@
handleUpdate(row) {
this.$router.push({
path: "/finance/fundcontext/",
- query: { id: row.id, businesstype: 4, operationtype: "edit" }
+ query: { id: row.id, businessType: "4", operationtype: "edit" }
});
this.isopen = 0;
@@ -847,7 +847,7 @@
handleDetail(row) {
this.$router.push({
path: "/finance/fundcontext/",
- query: { id: row.id, businesstype: 4, operationtype: "detail" }
+ query: { id: row.id, businessType: "4", operationtype: "detail" }
});
this.isopen = 0;
diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseslist/Modifydetails/index.vue
index aa25c05..9080a9c 100644
--- a/src/views/project/travelexpenseslist/Modifydetails/index.vue
+++ b/src/views/project/travelexpenseslist/Modifydetails/index.vue
@@ -756,8 +756,6 @@
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
this.fileListto.splice(this.fileListto.indexOf(file), 1);
- console.log(file);
- console.log(this.fileListto);
rbDetails[this.atpresent].annexfilesList = this.fileListto;
},
@@ -767,30 +765,22 @@
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
- console.log(response);
- console.log(file);
- console.log(fileList);
this.rbDetails;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
- console.log(this.fileList);
this.$modal.msgSuccess(response.msg);
this.fileListto.push({ name: file.name, url: response.url });
- console.log(this.fileListto);
this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
- console.log(response.msg);;
console.log(response.msg);
}
},
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
- console.log(index, rows, row);
this.atpresent = index;
- console.log(this.atpresent);
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
this.fileListto = this.rbDetails[index].annexfilesList;
--
Gitblit v1.9.3