From 935c201bdcf4adde998d46893dd0fa3eddf400bb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 20 七月 2023 17:55:22 +0800
Subject: [PATCH] 1
---
src/views/project/fund/fundApply/index.vue | 255 +++++++++++++++++++++++++-------------------------
1 files changed, 126 insertions(+), 129 deletions(-)
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index 449b165..d79a315 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/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">
@@ -18,14 +17,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -36,7 +33,6 @@
</el-row>
</el-col>
</el-row>
-
<el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
@row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
@@ -51,7 +47,6 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
-
<el-col :span="16">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
@@ -62,12 +57,12 @@
</el-col>
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" disabled></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" disabled></el-input>
+ <el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col> </el-col>
@@ -84,27 +79,26 @@
<el-table-column label="绋庡墠閲戦鍚堣" align="center" prop="pretaxcost" width="120px" />
<el-table-column label="绋庡悗閲戦鍚堣" align="center" prop="taxedcost" width="120px" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="150px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" />
+ <!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
-
<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 ||
+ <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>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ " 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)"
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['project:ethicalfund:delete']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
v-hasPermi="['project:ethicalfund:download']">涓嬭浇</el-button>
@@ -118,65 +112,92 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1600px" :title="title"
+ <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
- <el-row>
- <el-col :span="7">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ <el-row style="text-align: left">
+ <el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
-
- <el-col :span="8">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input
- v-model="form.recordstatus"
- placeholder="瀹℃牳鎰忚"
- /> -->
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
- <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
- <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
+ <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="8">
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <el-col :span="5">
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ </el-form-item>
+ </el-col><el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </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-input v-model="form.pretaxcost" 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="recordstatus">
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚" /> -->
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
+ <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <!--
+ <el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
</el-form-item>
</el-col>
- </el-row>
- <el-row style="text-align: left">
- <el-form-item label="璐圭敤鐢宠">
- <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
- </el-form-item>
+-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
<el-button @click.native.prevent="addAlls" type="primary" size="small">
- 鏈嶅姟椤圭洰瀵煎叆
+ 瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
@@ -209,10 +230,10 @@
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
- <!-- <el-input
+ <!-- <el-input
v-model="scope.row.beneficiaryname"
placeholder="濮撳悕"
- /> -->
+ /> -->
</template>
</el-table-column>
<el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
@@ -226,21 +247,19 @@
</el-table-column>
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
@@ -252,21 +271,19 @@
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
@@ -302,32 +319,17 @@
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
<el-button @click.native.prevent="
deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small">
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
+
+ <!--
<el-row>
- <el-col :span="8">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="绋庡墠閲戦鍚堣" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="绋庡悗閲戦鍚堣" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
</el-form-item>
@@ -352,27 +354,25 @@
<el-input v-model="form.officedirector" placeholder="璇疯緭鍏ュ姙鍏涓讳换" />
</el-form-item>
</el-col>
-
<el-col :span="8">
<el-form-item label="璐㈠姟閮ㄨ礋璐ｄ汉" prop="financedirector">
<el-input v-model="form.financedirector" placeholder="璇疯緭鍏ヨ储鍔￠儴璐熻矗浜�" />
</el-form-item>
</el-col>
-
<el-col :span="8">
<el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
</el-col>
</el-row>
+ -->
<el-row>
<el-col :span="24">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexbankcard">
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
- :headers="headers" :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
+ <el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
+ <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='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>
@@ -555,6 +555,9 @@
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" },
+ ],
amountrequested: [
{ required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
],
@@ -624,14 +627,12 @@
this.detailInfoDialogShowType = showType;
},
ConfirmDetailDialog() {
- debugger;
let tempIndex = this.funddetailForm.index;
let tempName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetailArr[tempIndex];
if (this.detailInfoDialogShowType == "name") {
this.personlist.map((res) => {
- debugger;
if (tempName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -663,13 +664,10 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- debugger;
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -704,7 +702,6 @@
},
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -758,6 +755,10 @@
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();
@@ -807,7 +808,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -818,7 +818,7 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
@@ -833,10 +833,10 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
+ id: null,
recordstatus: "-1",
username: null,
userno: null,
- id: null,
infoid: null,
donorno: null,
delFlag: null,
@@ -1069,7 +1069,6 @@
});
},
selectremark(row) {
- console.log("row", row.amount, this.fundblock);
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
row.servivesscope = item.servivesscope;
@@ -1086,7 +1085,6 @@
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -1116,14 +1114,14 @@
this.dialogOpen = true;
this.title = "淇敼璐圭敤鐢宠";
this.dialogType = "edit";
-
+
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.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -1155,7 +1153,7 @@
};
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
-
+
listFundflow(listFundflowparams).then((res) => {
this.fundflowList = res.rows;
});
@@ -1172,7 +1170,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1218,14 +1215,12 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
// getownFundDetail(this.form.id).then(res=>{
// this.$set(this.fundDetailArr,res.data)
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
// })
});
} else {
@@ -1282,7 +1277,6 @@
this.form.pretaxcost = preTaxSum.toFixed(2);
this.form.taxedcost = taxedSum.toFixed(2);
this.$forceUpdate();
- console.log(this.form);
},
//鑾峰彇璐圭敤绫诲瀷
@@ -1297,7 +1291,6 @@
label: dataList[m].itemTypeName,
});
}
- console.log(this.fundtypeArr);
});
},
@@ -1370,19 +1363,16 @@
listReportname(arr[i]).then((res) => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res.rows);
this.personlist = res.rows;
});
},
selectpersonmsg(row, rowindex) {
- console.log("row", row);
this.personlist.map((res) => {
if (row.beneficiaryno === res.userno) {
row.beneficiaryname = res.username;
@@ -1405,7 +1395,6 @@
for (let i = 0; i < tempItemArr.length; i++) {
let pym = tempItemArr[i].itempinyin;
if (pym != null && pym != undefined && pym != "") {
- console.log(pym);
if (pym.indexOf(val) != -1) {
result.push(tempItemArr[i]);
}
@@ -1422,7 +1411,6 @@
getUnitList() {
listOrganization(3).then((response) => {
- console.log("鏈烘瀯鍒楄〃锛�" + JSON.stringify(response));
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
organizationid: response.rows[i].organizationid,
@@ -1484,7 +1472,16 @@
} else {
this.$modal.msgError(response.msg);
}
- //console.log("涓婁紶鏂囦欢鍚庯細" + JSON.stringify(this.fileList));
+ },
+
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
},
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
--
Gitblit v1.9.3