From cc7c660a4d4bcdbdf1514e5ddb3e663899f096d4 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 07 九月 2023 14:13:52 +0800
Subject: [PATCH] 11
---
src/api/system/user.js | 4
src/views/project/fund/applyDetail/index.vue | 356 +++++++++++++---
src/api/project/funddetail.js | 2
src/views/project/fundcheck/medicalCostCheck/index.vue | 872 +++++++++++++++++++++++++++++----------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 62 +
src/views/project/expertexpense/index.vue | 2
6 files changed, 980 insertions(+), 318 deletions(-)
diff --git a/src/api/project/funddetail.js b/src/api/project/funddetail.js
index 73e26fe..9018030 100644
--- a/src/api/project/funddetail.js
+++ b/src/api/project/funddetail.js
@@ -75,7 +75,7 @@
export function delFunddetail(id) {
return request({
url: '/project/funddetail/deleteDetail/' + id,
- method: 'delete'
+ method: 'get'
})
}
diff --git a/src/api/system/user.js b/src/api/system/user.js
index 37f4eb3..1965476 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -104,8 +104,8 @@
}
return request({
url: '/system/user/profile/updatePwd',
- method: 'put',
- params: data
+ method: 'post',
+ data: data
})
}
diff --git a/src/views/project/expertexpense/index.vue b/src/views/project/expertexpense/index.vue
index 446d6dc..de35c88 100644
--- a/src/views/project/expertexpense/index.vue
+++ b/src/views/project/expertexpense/index.vue
@@ -38,7 +38,7 @@
align="center"
prop="casedescribe"
/>
- -->
+
<el-table-column
label="鎿嶄綔"
width="130"
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 1986acc..e06d0bc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -72,7 +72,7 @@
}}</el-radio>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <!-- <el-col :span="5">
<el-form-item label="閾惰鍚嶇О" prop="bankname">
<el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
</el-form-item> </el-col
@@ -83,10 +83,28 @@
placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
/>
</el-form-item>
- </el-col>
+ </el-col> -->
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鐢宠閲戦" prop="pretaxcost">
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -98,15 +116,7 @@
</el-form-item>
</el-col>
-->
- <el-col :span="5">
- <el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
@@ -123,15 +133,7 @@
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- :disabled="true"
- v-model="form.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
@@ -153,6 +155,16 @@
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
+ </el-row>
+ <el-row v-if="jurisdiction">
+ <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+ </el-alert> -->
+ <el-alert
+ title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
+ type="warning"
+ show-icon
+ >
+ </el-alert>
</el-row>
<el-row>
<el-table
@@ -184,7 +196,7 @@
>
<template slot-scope="scope">
<el-select
- v-model="scope.row.applytypename"
+ v-model="scope.row.applytype"
placeholder="鏈嶅姟绫诲瀷"
@change="verifyFeeItemType(scope.row)"
>
@@ -205,7 +217,7 @@
>
<template slot-scope="scope">
<el-select
- v-model="scope.row.itemname"
+ v-model="scope.row.itemid"
placeholder="鏈嶅姟椤圭洰"
filterable
@change="verifyFeeItem(scope.row)"
@@ -373,6 +385,7 @@
align="center"
label="鍗曚綅鍚嶇О"
width="250"
+ v-if="form.applytype != '4'"
>
<template slot-scope="scope">
<el-button
@@ -380,6 +393,40 @@
plain
@click="ShowDetailDialog(scope, 'unit')"
>{{ scope.row.unitname }}</el-button
+ >
+ <!-- <el-select
+ v-model="scope.row.unitno"
+ placeholder="鍗曚綅"
+ clearable
+ filterable
+ allow-create
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select> -->
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4'"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{
+ scope.row.unitname
+ ? scope.row.unitname
+ : scope.row.beneficiaryname
+ }}</el-button
>
<!-- <el-select
v-model="scope.row.unitno"
@@ -424,8 +471,8 @@
align="center"
label="寮�鎴烽摱琛�"
width="200"
- v-if="form.applytype != '4'"
>
+ <!-- v-if="form.applytype != '4'" -->
<template slot-scope="scope">
<el-input
v-model="scope.row.depositbank"
@@ -438,7 +485,6 @@
align="center"
label="閾惰甯愬彿"
width="210"
- v-if="form.applytype != '4'"
>
<template slot-scope="scope">
<el-input
@@ -447,9 +493,19 @@
/>
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞">
+ <el-table-column
+ prop="remark"
+ align="center"
+ width="330"
+ label="澶囨敞"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.remark"
+ placeholder="澶囨敞"
+ />
</template>
</el-table-column>
<el-table-column
@@ -550,9 +606,10 @@
size="mini"
class="upload-demo"
:action="uploadFileUrl"
- :file-list="fileList"
+ :file-list="fileListto"
+ :show-file-list="false"
multiple
- :limit="20"
+ drag
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -561,21 +618,72 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
- <el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶绁ㄦ嵁</el-button
- >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗙エ鎹嫋鍒版澶勶紝鎴�
+ <em
+ ><el-button
+ :disabled="operationType == 'detail'"
+ size="small"
+ type="primary"
+ >鐐瑰嚮涓婁紶</el-button
+ ></em
+ >
+ </div>
</el-upload>
+ <el-table
+ :data="fileListto"
+ @row-click="downFile"
+ style="width: 100%"
+ height="400"
+ >
+ <el-table-column
+ prop="name"
+ :show-overflow-tooltip="true"
+ label="鍚嶇О"
+ >
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />{{
+ scope.row.name
+ }}
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="name"
+ width="180"
+ :show-overflow-tooltip="true"
+ label="鍔熻兘"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
+ >鍒犻櫎</el-button
+ >
+ <el-button
+ type="primary"
+ size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
+ >涓婄Щ</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="operationType == 'detail' || operationType == 'check'">
+ <el-row
+ v-if="
+ operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ "
+ >
<el-table :data="fundflowList" border>
<el-table-column
label="瀹℃牳鏃ユ湡"
@@ -652,14 +760,17 @@
<el-dialog
:visible.sync="showSelectionDialog"
:close-on-click-modal="false"
- :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'"
+ :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
width="500px"
style="text-align: center"
v-loading="loading"
>
<el-form ref="funddetailForm" :model="funddetailForm">
- <el-row>
- <el-col :span="24" v-if="selectionType == 'expert'">
+ <el-row v-if="businessType != 4">
+ <el-col
+ :span="24"
+ v-if="selectionType == 'expert' && businessType != 4"
+ >
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
<el-radio-group v-model="expertfrom" style="margin-bottom: 0">
<el-radio label="1">涓撳搴�</el-radio>
@@ -722,7 +833,7 @@
label="鍙戠エ鍗曚綅鍚嶇О"
prop="unitno"
label-width="120px"
- v-if="businessType == 3 || businessType == 4"
+ v-if="businessType == 3"
>
<el-select
v-model="funddetailForm.unitno"
@@ -742,7 +853,68 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+
+ <el-row v-if="businessType == 4">
+ <el-col :span="24">
+ <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
+ <el-radio-group
+ @change="ShowDetailDialog(spocewl)"
+ v-model="experthear"
+ style="margin-bottom: 0"
+ >
+ <el-radio label="unit">浜哄憳閫夐」</el-radio>
+ <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="experthear == 'unit'">
+ <el-form-item
+ label="浜哄憳濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ @change="bbaaccss"
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in expertlist"
+ :key="item.expertNo"
+ :label="item.exportName"
+ :value="item.exportName"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="experthear == 'expert'">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
+ <el-select
+ v-model="funddetailForm.unitno"
+ placeholder="鍗曚綅鍚嶇О"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row v-if="businessType != 4">
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
<el-input
@@ -771,7 +943,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="韬唤璇佸彿"
@@ -797,7 +969,7 @@
</el-col>
</el-row>
-->
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="鍗曚綅鍚嶇О"
@@ -821,7 +993,7 @@
</el-select> </el-form-item
></el-col>
</el-row>
- <el-row>
+ <el-row v-if="businessType != 4">
<el-col :span="24" v-if="expertfrom == '2'">
<el-form-item
label="寮�鎴烽摱琛�"
@@ -874,7 +1046,6 @@
:show-file-list="false"
multiple
drag
- :limit="20"
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -883,7 +1054,6 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
@@ -907,6 +1077,7 @@
:data="fileListto"
@row-click="downFile"
style="width: 100%"
+ height="400"
>
<el-table-column
prop="name"
@@ -930,13 +1101,13 @@
<el-button
type="primary"
size="mini"
- @click.native.prevent="deletedowfile(scope.row)"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
>鍒犻櫎</el-button
>
<el-button
type="primary"
size="mini"
- @click.native.prevent="moveupdowfile(scope.row)"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
>涓婄Щ</el-button
>
</template>
@@ -1060,7 +1231,6 @@
Li_area_select,
OrgSelecter
},
-
name: "fundApply",
dicts: [
@@ -1087,9 +1257,12 @@
// 瀵煎嚭閬僵灞�
exportLoading: false,
usernamedata: "",
+ jurisdiction: false,
+
// 琛ㄥ崟鍙傛暟
form: {},
-
+ experthear: "",
+ spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
//鐢宠鍗曠被鍨�
@@ -1290,6 +1463,10 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
+ bbaaccss(val) {
+ console.log(val);
+ console.log(this.funddetailForm);
+ },
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
@@ -1395,6 +1572,7 @@
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.getUnitList();
// this.getBaseInfoList();
}
@@ -1411,6 +1589,7 @@
this.handleUpdate();
} else if (this.operationType == "detail") {
this.title = this.businessName + "鏌ョ湅";
+ this.jurisdiction = true;
this.handleDetail();
} else if (this.operationType == "check") {
this.title = this.businessName + "瀹℃牳";
@@ -1500,6 +1679,14 @@
this.addRow(0);
}
});
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+ console.log(this.fundflowList);
});
},
@@ -1550,7 +1737,7 @@
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleCheck() {
this.isopen = 0;
this.reset();
@@ -1835,10 +2022,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -2028,13 +2216,16 @@
//鑾峰彇璐圭敤鏈烘瀯鍒楄〃
getFeeUnitList() {
+ console.log("鍗曚綅");
listReportname("org").then(res => {
this.feeUnitList = res.data;
});
+ console.log(this.feeUnitList);
},
//鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
getUnitList() {
+ console.log("鍖荤枟鏈烘瀯");
listOrganization(3).then(response => {
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
@@ -2042,6 +2233,7 @@
organizationid: response.rows[i].id,
organizationname: response.rows[i].organizationname
});
+ console.log(this.unitList);
}
});
},
@@ -2494,10 +2686,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -2806,14 +2999,14 @@
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
-
+ this.previewpdf = true;
this.$modal.msgSuccess(response.msg);
this.fileListto.push({ name: file.name, url: response.fileName });
// this.fileListto.push({ name: file.name, url: response.url });
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
- // this.pdfimgsrcList.push(response.url);
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
@@ -2826,6 +3019,7 @@
this.atpresent = index;
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
+ this.previewpdf = true;
this.fileListto = this.rbDetails[index].annexfilesList;
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
// this.pdfimg = this.fileListto[0].url;
@@ -2855,14 +3049,13 @@
this.previewpdf = true;
if (item.url) {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
- // this.pdfimg = item.url;
- // this.pdfimgsrcList = [];
- // this.pdfimgsrcList.push(this.pdfimg);
- if (!this.pdfimgsrcList.includes(this.pdfimg)) {
- this.pdfimgsrcList.push(this.pdfimg);
- console.log("鍔犲叆");
- }
+
+ // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ // this.pdfimgsrcList.push(this.pdfimg);
+ // console.log("鍔犲叆");
+ // }
console.log(this.pdfimg);
+ console.log(this.pdfimgsrcList, "imglist");
} else {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
}
@@ -2879,9 +3072,16 @@
deletedowfile(row) {
console.log(this.fileListto);
console.log(row);
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ console.log(indexlist);
+ this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
- this.fileList = this.fileListto.splice(index, 1);
+ this.fileListto.splice(index, 1);
console.log(index);
+ console.log(this.pdfimgsrcList);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
@@ -2891,7 +3091,17 @@
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ShowDetailDialog(spoce, showType) {
+ this.spocewl = spoce;
+ console.log(spoce);
this.selectionType = showType;
+ if (this.businessType == 4 || !showType) {
+ this.selectionType = this.experthear;
+ console.log(this.selectionType);
+ }
+ // if (!showType) {
+ // this.selectionType = this.experthear;
+
+ // }
this.expertfrom = "1";
this.funddetailForm.index = spoce.$index;
@@ -2912,13 +3122,16 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
+ console.log(this.funddetailForm.tempExpertName);
+ console.log(this.funddetailForm);
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
+ console.log(tempExpertName);
- if (this.selectionType == "expert") {
- if (this.expertfrom == "1") {
+ if (this.selectionType == "expert" || this.businessType == 4) {
+ if (this.expertfrom == "1" || this.experthear == "unit") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
if (tempExpertName == res.username) {
@@ -3033,6 +3246,10 @@
}
}
+ if (this.experthear == "unit") {
+ singleDetail.unitname = "";
+ }
+ console.log(this.funddetailForm);
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
}
@@ -3044,6 +3261,7 @@
this.Getnetworkheader();
this.getroute();
this.getExternalList();
+ this.getFeeUnitList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
@@ -3143,4 +3361,8 @@
line-height: 36px;
text-align: center;
}
+::v-deep .el-alert__title {
+ font-size: 20px;
+ line-height: 20px;
+}
</style>
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 13d61fe..9905c98 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -1,37 +1,90 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="120px"
+ >
<el-row align="left">
<el-col :span="8">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
- type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="handleQuery">
+ <el-date-picker
+ format="yyyy-MM-dd"
+ @change="selectapplication"
+ value-format="yyyy-MM-dd"
+ v-model="createTime"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="鐢宠寮�濮嬫棩鏈�"
+ end-placeholder="鐢宠缁撴潫鏃ユ湡"
+ @keyup.enter.native="handleQuery"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
- <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.APPLICANT"
+ placeholder="璇疯緭鍏ョ粡鍔炰汉"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞浜�" prop="APPLICANT" style="float: left">
+ <el-input
+ v-model="queryParams.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚汉"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
- <el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value">
+ <el-select
+ v-model="queryParams.CHECKFLAG"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkFlagOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
- <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="flowconclusion"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-col>
- </el-row></el-form>
+ </el-row></el-form
+ >
<el-form ref="infoform" label-width="100px">
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <el-table
+ v-loading="loading"
+ border
+ :data="donateconsolationfundList"
+ @selection-change="handleSelectionChange"
+ >
<!--
<el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
<template slot-scope="scope">
@@ -41,15 +94,40 @@
</template>
</el-table-column>
-->
- <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ width="180"
+ align="center"
+ prop="createTime"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
+ <el-table-column
+ label="缁忓姙浜�"
+ align="center"
+ prop="username"
+ width="150px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="200px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="150px"
+ />
<!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />-->
<!--
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
@@ -62,20 +140,57 @@
</el-table-column>
<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-->
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" />
- <el-table-column label="瀹℃壒鐘舵��" align="center" prop="recordstatus" width="180">
+ <el-table-column
+ label="鎹愮尞鑰�"
+ align="center"
+ prop="donorname"
+ width="150px"
+ />
+ <el-table-column
+ label="瀹℃壒鐘舵��"
+ align="center"
+ prop="recordstatus"
+ width="180"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ <dict-tag
+ :options="dict.type.sys_recordstatus"
+ :value="scope.row.recordstatus"
+ />
</template>
</el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
+ <el-table-column
+ label="鎿嶄綔"
+ fixed="right"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="260px"
+ >
<template slot-scope="scope">
- <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
- @click="handleCheck(scope.row)">瀹℃牳</el-button>
+ <el-button
+ v-if="scope.row.checkFlag == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleCheck(scope.row)"
+ >瀹℃牳</el-button
+ >
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">璇︽儏</el-button>
- <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleDetail(scope.row)"
+ >璇︽儏</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-download"
+ @click="totaldayin(scope.row.id)"
+ >涓嬭浇</el-button
+ >
<!-- v-hasPermi="['project:donateconsolationfund:download']" -->
<!-- 鏂板瀹℃牳椤甸潰 -->
@@ -91,61 +206,113 @@
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getlistbypower" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getlistbypower"
+ />
</el-row>
</el-form>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center">
+ <el-dialog
+ :visible.sync="dialogOpen"
+ width="1400px"
+ :title="title"
+ style="text-align: center"
+ >
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> -->
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> -->
- <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
+ 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="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
+ 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 :disabled="true" />
+ <el-input
+ v-model="form.deptmentname"
+ placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
+ clearable
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
- <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable :disabled="true" />
+ <el-input
+ v-model="form.managername"
+ placeholder="璇疯緭鍏ョ粍闀�"
+ clearable
+ :disabled="true"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="5"><el-form-item label="鐢宠绫诲瀷">
- <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
+ <el-col :span="5"
+ ><el-form-item label="鐢宠绫诲瀷">
+ <el-radio-group
+ v-model="form.applytype"
+ @change="LoadItemTypeArr"
+ >
<!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
:disabled="form.id != null">{{ dict.label }}</el-radio>-->
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label="3"
+ >鍖诲鎴愭湰璐圭敤鐢宠</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable :disabled="true" />
+ <el-input
+ v-model="form.remark"
+ placeholder="璇疯緭鍏ョ敵璇疯鏄�"
+ clearable
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname">
- <el-input v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable :disabled="true" />
+ <el-input
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ clearable
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<!--
@@ -169,9 +336,13 @@
<el-row>
<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-input
+ v-model="form.amountrequested"
+ placeholder="鐢宠閲戦"
+ :disabled="true"
+ />
+ </el-form-item> </el-col
+ ><!--
<el-col :span="5">
<el-form-item label="绋庡墠閲戦" prop="amountrequested">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
@@ -193,37 +364,92 @@
</el-row>
<el-row>
<el-col :span="4">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow"
- :disabled="true">鏂板涓撳璐�</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="addRow"
+ :disabled="true"
+ >鏂板涓撳璐�</el-button
+ >
</el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
- <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80">
+ <el-table
+ :data="fundDetailArr"
+ :summary-method="getSummaries"
+ border
+ highlight-current-row
+ >
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="鎺掑簭"
+ width="80"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="鎺掑簭" />
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="璐圭敤绫诲瀷"
+ width="220"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
- <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="scope.row.applytype"
+ placeholder="璐圭敤绫诲瀷"
+ @change="LoadItemTypeArr(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundtypeArr"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="鏈嶅姟椤圭洰"
+ width="260"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create
- @change="select(scope.row)" :filter-method="(val) => SearchItem(val, scope)">
- <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName"
- :value="dict.id"></el-option>
+ <el-select
+ v-model="scope.row.itemid"
+ placeholder="鏈嶅姟椤圭洰"
+ clearable
+ filterable
+ allow-create
+ @change="select(scope.row)"
+ :filter-method="val => SearchItem(val, scope)"
+ >
+ <el-option
+ v-for="dict in scope.row.itemArr"
+ :key="dict.id"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
+ <el-table-column
+ prop="beneficiaryno"
+ align="center"
+ label="濮撳悕"
+ width="120"
+ v-if="form.applytype != 3"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" />
+ <el-input
+ v-model="scope.row.beneficiaryname"
+ placeholder="濮撳悕"
+ />
</template>
</el-table-column>
<!--
@@ -236,99 +462,234 @@
</el-select>
</template>
</el-table-column>-->
- <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
+ <el-table-column
+ prop="amount"
+ align="center"
+ label="绋庡墠閲戦"
+ width="120"
+ v-if="form.applytype != 3"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
- @change="selectamount(scope.row)">
- <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense"
- :value="dict.expense"></el-option>
+ <el-select
+ v-model="scope.row.amount"
+ placeholder="绋庡墠閲戦"
+ clearable
+ filterable
+ allow-create
+ @change="selectamount(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundblock"
+ :key="dict.expensedescribe"
+ :label="dict.expense"
+ :value="dict.expense"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="taxamount"
+ align="center"
+ label="鎵ｇ◣"
+ width="120"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
+ <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="绋庡悗閲戦" />
+ <el-input
+ v-model="scope.row.taxedamount"
+ placeholder="绋庡悗閲戦"
+ />
</template>
</el-table-column>
- <el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
+ <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(scope.row);
- }
- " />
+ <el-input
+ v-model="scope.row.price"
+ placeholder="浠锋牸"
+ @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ "
+ />
</template>
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'">
+ <el-table-column
+ prop="quantity"
+ align="center"
+ label="鏁伴噺"
+ width="80"
+ v-if="form.applytype == '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input
+ v-model="scope.row.quantity"
+ placeholder="鏁伴噺"
+ @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ "
+ />
</template>
</el-table-column>
- <el-table-column prop="amount" align="center" label="閲戦" width="120" v-if="form.applytype == '3'">
+ <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="浠锋牸" />
</template>
</el-table-column>
- <el-table-column prop="unitname" align="center" label="鍗曚綅" width="220">
+ <el-table-column
+ prop="unitname"
+ align="center"
+ label="鍗曚綅"
+ width="220"
+ >
<template slot-scope="scope">
- <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" />
+ <org-selecter
+ :ref="'unitSel' + scope.$index"
+ :org-type="'3'"
+ v-model="scope.row.unitno"
+ />
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="210"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞"
+ width="210"
+ v-if="form.applytype == '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="210"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="120"
+ >
<template slot-scope="scope">
- <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1">
+ <el-button
+ @click="saveRows(scope.row, scope.$index)"
+ type="text"
+ size="small"
+ v-if="show === 1"
+ >
淇濆瓨
</el-button>
- <el-button @click.native.prevent="
- deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small" v-hasPermi="['project:costFeeCheck:delete']">
+ <el-button
+ @click.native.prevent="
+ deleteRows(scope.row, scope.$index, fundDetailArr)
+ "
+ type="text"
+ size="small"
+ v-hasPermi="['project:costFeeCheck:delete']"
+ >
鍒犻櫎
</el-button>
</template>
@@ -338,13 +699,36 @@
<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="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-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>
</el-form-item>
</el-col>
@@ -352,17 +736,39 @@
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" />
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" prop="flowconclusion"><template slot-scope="scope"><span
- v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ prop="flowconclusion"
+ ><template slot-scope="scope"
+ ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
+ ><span v-if="scope.row.flowconclusion == 2"
+ >涓嶉�氳繃</span
+ ></template
+ >
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-column
+ label="瀹℃牳澶囨敞"
+ align="center"
+ prop="flowcontent"
+ />
</el-table>
</el-row>
- <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'edit'">
+ <el-row
+ style="margin-top: 25px; margin-bottom: 5px"
+ v-if="dialogType == 'edit'"
+ >
<el-col :span="7">
<el-form-item label="瀹℃牳" align="left">
<el-radio-group v-model="newobj.flowlevelone" align="left">
@@ -373,13 +779,18 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀹℃牳澶囨敞">
- <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" />
+ <el-input
+ v-model="newobj.flowconclusion"
+ placeholder="鐢虫姤璐圭敤"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">纭</el-button>
+ <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'"
+ >纭</el-button
+ >
<el-button @click="cancel">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -402,7 +813,8 @@
getdownloadBX,
checkfund,
listbypower,
- getdetailsByItemId, addFundSharedInfo
+ getdetailsByItemId,
+ addFundSharedInfo
} from "@/api/project/fund";
import {
onelistFunds,
@@ -423,7 +835,7 @@
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
import {
listFundflow,
@@ -431,7 +843,7 @@
delFundflow,
addFundflow,
updateFundflow,
- exportFundflow,
+ exportFundflow
} from "@/api/project/fundflow";
import {
@@ -441,11 +853,11 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -455,7 +867,7 @@
export default {
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "Donateconsolationfund",
dicts: [
@@ -482,7 +894,7 @@
newobj: {
flowlevelone: null,
flowconclusion: null,
- fundid: null,
+ fundid: null
},
showFirstapprovelevel: false,
showSecondapprovelevel: false,
@@ -491,7 +903,7 @@
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
},
openbtn: true,
isopen: 0,
@@ -533,15 +945,16 @@
checkFlagOptions: [
{
value: 0,
- label: "宸插鎵�",
+ label: "宸插鎵�"
},
{
value: 1,
- label: "寰呭鎵�",
- }, {
- value: 2,
- label: "鍏ㄩ儴",
+ label: "寰呭鎵�"
},
+ {
+ value: 2,
+ label: "鍏ㄩ儴"
+ }
],
// 鏌ヨ鍙傛暟
queryParams: {
@@ -552,20 +965,21 @@
APPLICATIONENDTIME: null,
CHECKFLAG: 1,
APPLYTYPE: 3,
+ donorname: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
username: [
- { required: true, message: "璇疯緭鍏ョ敵璇蜂汉濮撳悕", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇蜂汉濮撳悕", trigger: "blur" }
],
createTime: [
- { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
amountrequested: [
- { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" }
+ ]
},
//褰撳墠閫変腑鎹愮尞妗堜緥
curCase: {},
@@ -591,8 +1005,8 @@
hsfbx: null,
hsfbz: null,
total: null,
- title: null,
- },
+ title: null
+ }
],
fundDetailArr: [],
fundflowList: [],
@@ -612,7 +1026,7 @@
{ name: "鎹愮尞鑰呭尰瀛︽垚鏈�" },
{ name: "鎹愮尞鑰呭杽鍚庢垚鏈�" },
{ name: "鎹愮尞浼︾悊濮斿憳浼氬姵鍔″彂鏀捐〃" },
- { name: "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂" },
+ { name: "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂" }
],
itemArr: [],
allnum: [],
@@ -626,9 +1040,8 @@
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
- Authorization: "Bearer " + getToken(),
- },
-
+ Authorization: "Bearer " + getToken()
+ }
};
},
watch: {},
@@ -651,7 +1064,7 @@
getlistbypower() {
this.loading = true;
// this.queryParams.params = {};
- listbypower(this.queryParams).then((res) => {
+ listbypower(this.queryParams).then(res => {
this.loading = false;
let list = res.rows;
let arr = [];
@@ -665,9 +1078,9 @@
let checkfundobj = {
flowconclusion: this.newobj.flowlevelone,
flowcontent: this.newobj.flowconclusion,
- fundid: this.newobj.fundid,
+ fundid: this.newobj.fundid
};
- checkfund(checkfundobj).then((res) => {
+ checkfund(checkfundobj).then(res => {
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
this.getlistbypower();
@@ -675,7 +1088,7 @@
},
getlistUser() {
this.queryParams = {};
- listUser(this.queryParams).then((res) => {
+ listUser(this.queryParams).then(res => {
this.userlist = res.data;
});
},
@@ -687,7 +1100,7 @@
sums[index] = "鍚堣";
return;
}
- const values = data.map((item) => Number(item[column.property]));
+ const values = data.map(item => Number(item[column.property]));
if (
column.property == "amount" //闇�瑕佹樉绀哄拰鍚堣绾靛垪
) {
@@ -707,12 +1120,12 @@
},
getlistOrganization() {
- listOrganization().then((res) => { });
+ listOrganization().then(res => {});
},
totaldayin(e) {
// const id =this.row.id
- getdownloadBX(e).then((res) => {
+ getdownloadBX(e).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -726,7 +1139,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -738,12 +1151,12 @@
tojust(e) {
let username = "111";
- getFund(e).then((res) => {
+ getFund(e).then(res => {
username = res.data.username;
this.$modal
.confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵')
- .then(function () {
- getFund(e).then((res) => {
+ .then(function() {
+ getFund(e).then(res => {
let data = res.data;
let financechecher = "宸插鏍�";
data.financechecher = financechecher;
@@ -761,12 +1174,12 @@
},
selectReporters() {
//涓撳浜哄憳鍒楄〃
- listReportname("expert").then((res) => {
+ listReportname("expert").then(res => {
this.reporters = res.data;
});
},
getmessages(val) {
- getInfoBytheUserNo(val.beneficiaryno).then((res) => {
+ getInfoBytheUserNo(val.beneficiaryno).then(res => {
if (res.data) {
this.$set(val, res.data);
val.beneficiaryname = res.data.username;
@@ -793,17 +1206,17 @@
getBaseInfoList() {
this.loading = true;
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//鍔ㄦ�佽绠楃◣鍓嶉噾棰�
- change(scope) { },
+ change(scope) {},
autodonorno() {
- listDonatebaseinfo().then((res) => {
- res.rows.forEach((data) => {
+ listDonatebaseinfo().then(res => {
+ res.rows.forEach(data => {
if (this.form.doname === data.name) {
this.form.donorno = data.donorno;
} else {
@@ -862,12 +1275,12 @@
annexbankcard: null,
annexregistform: null,
consolationmoney: null,
- applytype: "3",
+ applytype: "3"
};
this.resetForm("form");
//娓呯┖闄勪欢
- this.fileList = []
+ this.fileList = [];
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -883,7 +1296,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -907,7 +1320,7 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")])
});
}
},
@@ -935,13 +1348,17 @@
const id = row.id || this.ids;
this.loading = true;
this.newobj.fundid = row.id;
- getFund(id).then((response) => {
+ 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 })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- getownFundDetail(id).then((res) => {
+ getownFundDetail(id).then(res => {
this.loading = false;
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -975,18 +1392,22 @@
//鍔犺浇瀹℃牳璁板綍
let listFundflowparams = {
fundid: row.id,
- fundtype: 2,
+ fundtype: 2
};
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
- getFund(row.id).then((response) => {
+ getFund(row.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 })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- getownFundDetail(row.id).then((res) => {
+ getownFundDetail(row.id).then(res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -997,30 +1418,30 @@
},
select(row) {
- row.itemArr.map((res) => {
+ row.itemArr.map(res => {
if (row.itemid === res.id) {
row.remark = res.itemdescribe;
}
});
- this.fundDetailArr.map((res) => {
+ this.fundDetailArr.map(res => {
if (res.itemid === row.id) {
this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃鏈嶅姟椤圭洰");
}
});
- listcountItem(this.form.infoid, row.itemid).then((res) => {
+ listcountItem(this.form.infoid, row.itemid).then(res => {
if (res.data > 0) {
this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔￠」鐩�");
}
});
- getdetailsByItemId(row.itemid).then((res) => {
+ getdetailsByItemId(row.itemid).then(res => {
let fundmsg = res.data;
let fundblock = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
fundblock.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servivesscope: item.id,
+ servivesscope: item.id
});
});
@@ -1032,9 +1453,9 @@
const infoid = this.curCase.id;
const aaa = {
infoid: infoid,
- count: this.idss,
+ count: this.idss
};
- listFunddetails(aaa).then((res) => { });
+ listFunddetails(aaa).then(res => {});
},
//鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈�
@@ -1076,8 +1497,8 @@
updateBy: null,
updateTime: null,
uploadflag: null,
- uploadtime: null,
- },
+ uploadtime: null
+ }
];
},
@@ -1122,7 +1543,7 @@
updateTime: null,
uploadflag: null,
uploadtime: null,
- itemArr: [],
+ itemArr: []
};
this.fundDetailArr.push(rowData);
},
@@ -1134,9 +1555,9 @@
row.fundid = this.form.id;
row.donorname = this.form.donorname;
row.donorno = this.form.donorno;
- addFunddetail(row).then((res) => {
- getownFundDetail(this.form.id).then((res) => {
- getownFundDetail(this.form.id).then((res) => {
+ addFunddetail(row).then(res => {
+ getownFundDetail(this.form.id).then(res => {
+ getownFundDetail(this.form.id).then(res => {
let ress = res.data;
this.form.amountrequested = 0;
ress.forEach((ele, i) => {
@@ -1159,8 +1580,8 @@
// rows[index].quantity = row.quantity;
// rows[index].price = row.price;
// rows[index].remark = row.remark;
- updateFunddetail(rows[index]).then((res) => {
- getownFundDetail(this.form.id).then((res) => {
+ updateFunddetail(rows[index]).then(res => {
+ getownFundDetail(this.form.id).then(res => {
let ress = res.data;
this.form.amountrequested = 0;
ress.forEach((ele, i) => {
@@ -1176,19 +1597,19 @@
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
})
.then(() => {
if (row.id !== null) {
- delFunddetail(row.id).then((res) => {
+ delFunddetail(row.id).then(res => {
if (res.code === 200) {
this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
}).then(() => {
this.$set(rows, rows.splice(index, 1));
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
@@ -1204,7 +1625,6 @@
rows.splice(index, 1);
this.sumTotalFee();
}
-
})
.catch(() => {
//鍑犵偣鍙栨秷鐨勬彁绀�
@@ -1215,23 +1635,21 @@
this.$confirm("鏄惁纭淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
let formData = this.form;
let tempItemArr = rows.itemArr;
rows.fundid = formData.id;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- let itemIndex = tempItemArr.findIndex(
- (item) => rows.itemid == item.id
- );
+ let itemIndex = tempItemArr.findIndex(item => rows.itemid == item.id);
if (itemIndex > -1) {
rows.itemname = tempItemArr[itemIndex].itemname;
rows.itemid = tempItemArr[itemIndex].id;
}
//鑾峰彇applytypename
let applytypeIndex = this.fundtypeArr.findIndex(
- (item) => rows.applytype == item.value
+ item => rows.applytype == item.value
);
if (applytypeIndex > -1) {
rows.applytypename = this.fundtypeArr[applytypeIndex].label;
@@ -1244,10 +1662,10 @@
rows.unitname = rows.unitno;
}
if (rows.id > 0) {
- updateFunddetail(rows).then((res) => {
+ updateFunddetail(rows).then(res => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.loading = true;
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -1257,8 +1675,8 @@
});
});
} else {
- addFunddetail(rows).then((response2) => {
- getownFundDetail(this.form.id).then((res) => {
+ addFunddetail(rows).then(response2 => {
+ getownFundDetail(this.form.id).then(res => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -1279,11 +1697,10 @@
this.$confirm("鏄惁纭淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
- updateFunddetail(this.fundDetailArr).then((res) => {
- });
+ updateFunddetail(this.fundDetailArr).then(res => {});
})
.catch(() => {
//鍑犵偣鍙栨秷鐨勬彁绀�
@@ -1296,7 +1713,7 @@
let detailDataCorrect = true;
for (let i = 0; i < this.applicationDetailArr.length; i++) {
let tempData = this.applicationDetailArr[i];
- Object.keys(tempData).forEach(function (key) {
+ Object.keys(tempData).forEach(function(key) {
if (
tempData[key] == null ||
tempData[key] == undefined ||
@@ -1371,14 +1788,14 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(3).then((res) => {
+ getFundTypeAll(3).then(res => {
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
for (let m = 0; m < dataList.length; m++) {
this.fundtypeArr.push({
value: dataList[m].itemType,
- label: dataList[m].itemTypeName,
+ label: dataList[m].itemTypeName
});
}
});
@@ -1402,7 +1819,7 @@
let arrreportlist = [];
for (let i = 0; i < arr.length; i++) {
this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
+ listReportname(arr[i]).then(res => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
});
@@ -1410,7 +1827,7 @@
},
selectpersonmsg(row) {
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
row.beneficiaryname = res.username;
@@ -1430,13 +1847,13 @@
},
getlistExternalperson() {
- listExternalperson().then((res) => {
+ listExternalperson().then(res => {
this.personlist = res.rows;
});
},
getUsermsg() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
@@ -1481,7 +1898,7 @@
dayin() {
if (this.form.id) {
const id = this.form.id;
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1495,14 +1912,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1510,7 +1927,7 @@
dayin1() {
if (this.form.id) {
const id = this.form.id;
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1524,14 +1941,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1539,7 +1956,7 @@
dayin2() {
if (this.form.id) {
const id = this.form.id;
- getdownloadYX(id).then((res) => {
+ getdownloadYX(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1553,14 +1970,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1568,7 +1985,7 @@
dayin3() {
if (this.form.id) {
const id = this.form.id;
- getdownloadSH(id).then((res) => {
+ getdownloadSH(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1582,14 +1999,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1602,7 +2019,7 @@
dayin5() {
if (this.form.id) {
const id = this.form.id;
- getdownloadSS(id).then((res) => {
+ getdownloadSS(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1616,22 +2033,22 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
remove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
+ this.fileList.splice(this.fileList.indexOf(file), 1);
},
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
@@ -1644,19 +2061,18 @@
this.$modal.msgSuccess(response.msg);
this.fileList.push({ name: response.fileName, url: response.fileName });
} else {
- console.log(response.msg);;
+ console.log(response.msg);
}
},
// 涓嬭浇鏂囦欢
downFile(item) {
- const url = process.env.VUE_APP_BASE_API + item.url
- var a = document.createElement('a');
- var event = new MouseEvent('click');
+ 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);
- },
-
- },
+ }
+ }
};
</script>
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 2a21e36..3dcc3da 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -208,6 +208,16 @@
</el-col>
</el-row>
-->
+ <el-row v-if="jurisdiction">
+ <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+ </el-alert> -->
+ <el-alert
+ title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
+ type="warning"
+ show-icon
+ >
+ </el-alert>
+ </el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏</el-col>
</el-row>
@@ -413,7 +423,12 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="days" label="澶╂暟" width="65" align="center">
+ <el-table-column
+ prop="days"
+ label="澶╂暟"
+ width="100"
+ align="center"
+ >
<template slot-scope="scope">
<el-input
v-model="scope.row.days"
@@ -937,7 +952,6 @@
:show-file-list="false"
multiple
drag
- :limit="20"
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -946,7 +960,6 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
@@ -967,6 +980,7 @@
:data="fileListto"
@row-click="downFile"
style="width: 100%"
+ height="400"
>
<el-table-column
prop="name"
@@ -990,13 +1004,13 @@
<el-button
type="primary"
size="mini"
- @click.native.prevent="deletedowfile(scope.row)"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
>鍒犻櫎</el-button
>
<el-button
type="primary"
size="mini"
- @click.native.prevent="moveupdowfile(scope.row)"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
>涓婄Щ</el-button
>
</template>
@@ -1230,6 +1244,7 @@
flowconclusion: null,
fundid: null
},
+ jurisdiction: false,
//淇濆瓨鎸夐挳鎺у埗
idisabled: false
@@ -1326,7 +1341,7 @@
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
-
+ this.previewpdf = true;
this.$modal.msgSuccess(response.msg);
this.fileListto.push({
name: file.name,
@@ -1335,11 +1350,8 @@
this.pdfimgsrcList.push(
this.Networkheader + "/prod-api" + response.fileName
);
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
- // this.fileListto.push({
- // name: file.name,
- // url: response.url
- // });
this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
console.log(response.msg);
@@ -1351,6 +1363,7 @@
this.pdfVisible = true;
console.log(this.rbDetails[index]);
if (this.rbDetails[index].annexfilesList) {
+ this.previewpdf = true;
this.fileListto = this.rbDetails[index].annexfilesList;
console.log(this.fileListto);
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
@@ -1380,12 +1393,11 @@
this.previewpdf = true;
if (item.url) {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
- // this.pdfimgsrcList = [];
- // this.pdfimgsrcList.push(this.pdfimg);
- if (!this.pdfimgsrcList.includes(this.pdfimg)) {
- this.pdfimgsrcList.push(this.pdfimg);
- console.log("鍔犲叆");
- }
+
+ // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ // this.pdfimgsrcList.push(this.pdfimg);
+ // console.log("鍔犲叆");
+ // }
console.log(this.pdfimg, "pdfimg");
console.log(this.pdfimgsrcList, "imglist");
} else {
@@ -1404,9 +1416,16 @@
deletedowfile(row) {
console.log(this.fileListto);
console.log(row);
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ console.log(indexlist);
+ this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
- this.fileList = this.fileListto.splice(index, 1);
+ this.fileListto.splice(index, 1);
console.log(index);
+ console.log(this.pdfimgsrcList);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
@@ -1892,6 +1911,7 @@
handleDetail(ids) {
this.operationType = "detail";
this.title = "鎶ラ攢鐢宠璇︽儏";
+ this.jurisdiction = true;
this.reset();
this.open = true;
@@ -2534,7 +2554,7 @@
if (!isNaN(parseFloat(row.otherfeeamount))) {
totalFee += parseFloat(row.otherfeeamount);
}
- row.total = totalFee;
+ row.total = totalFee.toFixed(2);
/*
if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
@@ -2756,7 +2776,7 @@
return prev;
}
}, 0);
- sums[index] += "";
+ sums[index] = sums[index].toFixed(2); // 淇濈暀2浣嶅皬鏁帮紝瑙ｅ喅灏忔暟鍚堣鍒�;
} else {
sums[index] = "";
}
@@ -2841,4 +2861,8 @@
line-height: 36px;
text-align: center;
}
+::v-deep .el-alert__title {
+ font-size: 20px;
+ line-height: 20px;
+}
</style>
--
Gitblit v1.9.3