From 037a98ac21771bfc0d23392266f65a7837676bc3 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 04 九月 2023 16:27:02 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 710 ++++++++++++++++------
src/views/project/fund/expertFeeApply/index.vue | 1101 ++++++++++++++++++++++++++---------
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 35
3 files changed, 1,352 insertions(+), 494 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 2811fe1..1986acc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,28 +7,53 @@
<el-row>
<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
+ 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%"
- @change="getUserAccount">
- <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%"
+ @change="getUserAccount"
+ >
+ <el-option
+ v-for="dict in userlist"
+ :key="dict.index"
+ :label="dict.nickname"
+ :value="dict.nickname"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ <el-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-input
+ v-model="form.managername"
+ placeholder="璇疯緭鍏ョ粍闀�"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
@@ -50,9 +75,13 @@
<el-col :span="5">
<el-form-item label="閾惰鍚嶇О" prop="bankname">
<el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
- </el-form-item> </el-col><el-col :span="5">
+ </el-form-item> </el-col
+ ><el-col :span="5">
<el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
+ <el-input
+ v-model="form.bankcardno"
+ placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -71,7 +100,11 @@
-->
<el-col :span="5">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<!--
@@ -92,7 +125,11 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ />
</el-form-item>
</el-col>
<!--
@@ -108,7 +145,11 @@
<el-row style="margin-top: 5px; margin-bottom: 5px" />
<el-row style="margin-bottom: 10px" v-if="businessType == '1'">
<el-col :span="4">
- <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
+ <el-button
+ @click.native.prevent="importFeeItems"
+ type="primary"
+ size="small"
+ >
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
@@ -117,7 +158,7 @@
<el-table
:data="rbDetails"
v-loading="loading"
- max-height="400"
+ max-height="800"
border
highlight-current-row
>
@@ -125,7 +166,7 @@
prop="orderno"
align="center"
label="搴忓彿"
- width="65"
+ width="88"
>
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
@@ -135,7 +176,12 @@
<el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
v-if="form.applytype == '1'">
</el-table-column>-->
- <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
+ <el-table-column
+ prop="applytype"
+ align="center"
+ label="鏈嶅姟绫诲瀷"
+ width="200"
+ >
<template slot-scope="scope">
<el-select
v-model="scope.row.applytypename"
@@ -151,7 +197,12 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
+ <el-table-column
+ prop="itemid"
+ align="center"
+ label="鏈嶅姟椤圭洰"
+ width="260"
+ >
<template slot-scope="scope">
<el-select
v-model="scope.row.itemname"
@@ -169,36 +220,80 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
+ <el-table-column
+ prop="servicesscope"
+ align="center"
+ label="鏈嶅姟璇存槑"
+ v-if="form.applytype == '1'"
+ width="180"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create
- @change="verifyFeeRemark(scope.row)">
- <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
- :value="dict.servicesscope"></el-option>
+ <el-select
+ v-model="scope.row.servicesscope"
+ placeholder="鏈嶅姟璇存槑"
+ clearable
+ allow-create
+ @change="verifyFeeRemark(scope.row)"
+ >
+ <el-option
+ v-for="dict in scope.row.rowfeeblocks"
+ :key="dict.servicesscope"
+ :label="dict.remark"
+ :value="dict.servicesscope"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
+ <el-table-column
+ prop="price"
+ align="center"
+ label="鍗曚环"
+ width="120"
+ v-if="businessType == 4"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
- sumTotalFee(scope.row);
- }
- " />
+ <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="120" v-if="businessType == 4">
+ <el-table-column
+ prop="quantity"
+ align="center"
+ label="鏁伴噺"
+ width="120"
+ v-if="businessType == 4"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input
+ v-model="scope.row.quantity"
+ placeholder="鏁伴噺"
+ @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ "
+ />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- ismanager == true
- " prop="amount" align="center" :label="amountLabel" width="120">
+ <el-table-column
+ v-if="
+ businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ ismanager == true
+ "
+ prop="amount"
+ align="center"
+ :label="amountLabel"
+ width="120"
+ >
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -207,22 +302,53 @@
:value="dict.expense"></el-option>
</el-select>
-->
- <el-input v-model="scope.row.amount" placeholder="閲戦" @blur="val => { calculateTax(scope.row, 'A'); }" />
+ <el-input
+ v-model="scope.row.amount"
+ placeholder="閲戦"
+ @blur="
+ val => {
+ calculateTax(scope.row, 'A');
+ }
+ "
+ />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- ">
+ <el-table-column
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ width="120"
+ v-if="
+ (this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ "
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦"
- @blur="val => { calculateTax(scope.row, 'B'); }" />
+ <el-input
+ v-model="scope.row.taxedamount"
+ placeholder="绋庡悗閲戦"
+ @blur="
+ val => {
+ calculateTax(scope.row, 'B');
+ }
+ "
+ />
</template>
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"
- v-if="form.applytype == '1' || form.applytype == '2'">
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="濮撳悕"
+ width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{ scope.row.beneficiaryname }}</el-button
+ >
<!-- <el-select
filterable
allow-create
@@ -242,10 +368,19 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250">
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅鍚嶇О"
+ width="250"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'unit')"
+ >{{ scope.row.unitname }}</el-button
+ >
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -262,26 +397,54 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="title" align="center" label="鑱岀О" width="120"
- v-if="form.applytype == '1' || form.applytype == '2'">
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
<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 == '1' || form.applytype == '2'">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
<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 != '4'">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ v-if="form.applytype != '4'"
+ >
<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 != '4'">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰甯愬彿"
+ width="210"
+ v-if="form.applytype != '4'"
+ >
<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="澶囨敞">
@@ -289,23 +452,47 @@
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="180"
+ >
<template slot-scope="scope">
- <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- ">鏂板</el-button>
- <el-button @click.native.prevent="
- deleteRows(scope.row, scope.$index, rbDetails)
- " type="text" size="small" v-if="operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- ">
+ <el-button
+ type="text"
+ size="mini"
+ @click="addRow(scope.$index)"
+ v-if="
+ operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ "
+ >鏂板</el-button
+ >
+ <el-button
+ @click.native.prevent="
+ deleteRows(scope.row, scope.$index, rbDetails)
+ "
+ type="text"
+ size="small"
+ v-if="
+ operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ "
+ >
鍒犻櫎
</el-button>
- <el-button @click.native.prevent="
- Filepopup(scope.$index, rbDetails, scope.row)
- " type="text" size="small" v-if="businessType == 3 || businessType == 4">绁ㄦ嵁</el-button>
+ <el-button
+ @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ "
+ type="text"
+ size="small"
+ v-if="businessType == 3 || businessType == 4"
+ >绁ㄦ嵁</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -353,31 +540,77 @@
-->
<el-row>
<el-col :span="12">
- <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-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
- <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶绁ㄦ嵁</el-button>
+ <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-exceed="handleExceed"
+ :on-remove="remove"
+ accept="image/*,.pdf"
+ >
+ <el-button
+ :disabled="operationType == 'detail'"
+ size="small"
+ type="primary"
+ >涓婁紶绁ㄦ嵁</el-button
+ >
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="operationType == 'detail' || operationType == 'check'">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
- <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ width="160"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ width="120"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ width="200"
+ prop="flowconclusion"
+ >
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-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">
@@ -416,8 +649,14 @@
</div>
</div>
- <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
- style="text-align: center" v-loading="loading">
+ <el-dialog
+ :visible.sync="showSelectionDialog"
+ :close-on-click-modal="false"
+ :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'"
+ width="500px"
+ style="text-align: center"
+ v-loading="loading"
+ >
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
<el-col :span="24" v-if="selectionType == 'expert'">
@@ -428,29 +667,77 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="selectionType == 'expert' && expertfrom == '1'">
- <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
- <el-select filterable allow-create ref="beneficiaryname" default-first-option
- v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in expertlist" :key="item.expertNo" :label="item.exportName"
- :value="item.exportName">
+ <el-col
+ :span="24"
+ v-if="selectionType == 'expert' && expertfrom == '1'"
+ >
+ <el-form-item
+ label="涓撳濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in expertlist"
+ :key="item.expertNo"
+ :label="item.exportName"
+ :value="item.exportName"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="selectionType == 'unit'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2">
- <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
+ <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-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>
@@ -458,22 +745,43 @@
<el-row>
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
- <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
+ <el-input
+ v-model="funddetailForm.expertname"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
<el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px">
- <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
- <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
- :value="dict.label"></el-option>
+ <el-form-item
+ label="鑱� 绉�"
+ prop="experttitle"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.experttitle"
+ placeholder="蹇呭～椤�"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_professionaltitle"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.label"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
- <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="韬唤璇佸彿"
+ prop="expertidcardno"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertidcardno"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -491,29 +799,60 @@
-->
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
- <el-select v-model="funddetailForm.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
- </el-select> </el-form-item></el-col>
+ <el-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="expertunitno"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.expertunitno"
+ placeholder="鍗曚綅鍚嶇О"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select> </el-form-item
+ ></el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
- <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="寮�鎴烽摱琛�"
+ prop="expertdepositbank"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertdepositbank"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
- <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="閾惰鍗″彿"
+ prop="expertbankcardno"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertbankcardno"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="ConfirmDetailDialog()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
<el-dialog
@@ -616,17 +955,25 @@
<div v-if="this.previewpdf" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList">
+ <el-image
+ style="width: 95%; height: 90%"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
+ >
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
- <el-alert :title="'鎮ㄥ凡娣诲姞' +
- totalquantity +
- '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
- " type="warning">
+ <el-alert
+ :title="
+ '鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ "
+ type="warning"
+ >
</el-alert>
<span slot="footer" class="dialog-footer">
<el-button @click="unsave">鍙� 娑�</el-button>
@@ -936,36 +1283,7 @@
Modifyornot: 0 //鏄惁淇敼
};
},
- // vue璺敱鎺у埗椤甸潰鍏抽棴鎻愮ず
- beforeRouteLeave(to, from, next) {
- if (
- JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
- JSON.stringify(this.rbDetails) == sessionStorage.getItem("apifunddetail")
- ) {
- console.log("cg1");
- sessionStorage.removeItem("apiform");
- sessionStorage.removeItem("apifunddetail");
- //灏辨槸涓婇潰鐨勭姸鎬� 濡傛灉鏄痶rue , 鍒欎笉璇㈤棶鏄惁淇濆瓨, 褰撶劧杩欎釜鏂规硶姣旇緝绗�, 澶у鍙互浣跨敤鏇翠紭闆呯殑鏂瑰紡
- next();
- } else {
- console.log("cg2");
- this.$confirm("绂诲紑椤甸潰 , 鏇存柊鏁版嵁灏嗕笉鍋氫繚瀛�, 璇风‘璁ゅ凡缁忎繚瀛�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- sessionStorage.removeItem("apiform");
- sessionStorage.removeItem("apifunddetail");
- this.$router.go(-1);
- next();
- })
- .catch(() => {
- // alert("router")
- });
- }
- },
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
computed: {},
//鐩戞帶data涓殑鏁版嵁鍙樺寲
@@ -1282,7 +1600,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(this.curId);
})
.then(() => {
@@ -1297,7 +1615,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1365,8 +1683,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1375,8 +1693,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1387,8 +1705,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1493,8 +1811,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1508,8 +1826,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1794,7 +2112,6 @@
//璁＄畻绋庡墠閲戦
this.calculateTax(row, "B");
-
} else {
row.amount = item.expense;
row.taxamount = 0.0;
@@ -1903,7 +2220,6 @@
});
},
-
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
//if (isNaN(parseFloat(tempDetail.taxedamount)))
@@ -1911,20 +2227,19 @@
this.taxParam.beneficiaryNo = row.beneficiaryno;
this.taxParam.startTime = this.form.createTime.substring(0, 10);
- if (type == 'A') {
+ if (type == "A") {
// 璁＄畻涓◣銆佺◣鍚庨噾棰�
this.taxParam.money = row.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
+ getTaxByBeneFiciaryNo(this.taxParam).then(res => {
if (res.code == 200) {
row.taxamount = res.data;
row.taxedamount = row.amount - row.taxamount;
- this.rbDetails[k] = row;
}
});
} else {
// 璁＄畻绋庡墠銆佷釜绋庨噾棰�
this.taxParam.money = row.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
+ getTaxBeforeByAfterMoney(this.taxParam).then(res => {
if (res.code == 200) {
row.taxamount = res.data.nowTax;
row.amount = parseFloat(res.data.nowTaxBeforeMoney);
@@ -2027,8 +2342,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2037,8 +2352,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2049,8 +2364,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2155,8 +2470,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2170,8 +2485,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2449,7 +2764,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
/** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
// downFile(item) {
@@ -2495,6 +2810,9 @@
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.rbDetails[this.atpresent].annexfilesList = this.fileListto;
@@ -2516,7 +2834,6 @@
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
});
console.log(this.pdfimgsrcList);
-
console.log(this.pdfimg);
} else {
this.fileListto = [];
@@ -2524,29 +2841,30 @@
this.pdftitle = "";
}
},
- fnrowclick(row) {
- console.log(row);
- },
- // 鐐瑰嚮宸蹭笂浼犳枃浠�
- downFile(row) {
- console.log(row);
- this.pdftitle = row.name;
- let name = row.name.split(".");
+ // 鐐瑰嚮宸蹭笂浼犳枃浠�
+ downFile(item) {
+ console.log(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 (row.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + row.url;
- // this.pdfimg = row.url;
+ 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("鍔犲叆");
+ }
console.log(this.pdfimg);
} else {
- this.pdfimg = this.Networkheader + "/prod-api" + row.url;
+ this.pdfimg = this.Networkheader + "/prod-api" + item.url;
}
} else {
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 8fd5b0e..d0624fa 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -1,25 +1,63 @@
<!-- -->
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
<el-row align="left">
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @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">
- <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</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-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input
+ v-model="queryParams.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </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>
@@ -33,18 +71,33 @@
</el-row>
</el-col>
</el-row>
- <el-table v-loading="loading" highlight-current-row :data="donatebaseinfoList" @row-click="selectDonotor">
+ <el-table
+ v-loading="loading"
+ highlight-current-row
+ :data="donatebaseinfoList"
+ @row-click="selectDonotor"
+ >
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" :key="dict.value" />
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="scope.row.recordstate"
+ :key="dict.value"
+ />
<!-- :label="dict.label" -->
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" />
</el-table>
- <pagination v-show="total > 0" :total="total" small :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ small
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getBaseInfoList"
+ />
</el-card>
</el-col>
<el-col :span="18">
@@ -53,7 +106,10 @@
<el-row :gutter="4" align="right" class="mb8">
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" :disabled="true"></el-input>
+ <el-input
+ v-model="curCase.donorno"
+ :disabled="true"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
@@ -61,31 +117,73 @@
<el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
- <el-col>
- </el-col>
+ <el-col> </el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
- v-hasPermi="['project:expretfund:add']">鏂板鐢宠鍗�</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['project:expretfund:add']"
+ >鏂板鐢宠鍗�</el-button
+ >
</el-col>
</el-row>
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
+ <el-table
+ v-loading="loading"
+ border
+ :data="donateconsolationfundList"
+ >
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ align="center"
+ prop="createTime"
+ width="180px"
+ >
<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="120px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
+ <el-table-column
+ label="鐢宠浜�"
+ align="center"
+ prop="username"
+ width="120px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="200px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="120px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ />
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ align="center"
+ prop="recordstatus"
+ >
<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>
<!--
@@ -93,20 +191,55 @@
<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">
+ <el-table-column
+ label="鎿嶄綔"
+ fixed="right"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="280px"
+ >
<template slot-scope="scope">
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleUp(scope.row)">涓婃姤</el-button>
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(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="handleUp(scope.row)"
+ >涓婃姤</el-button
+ >
+ <el-button
+ v-if="
+ scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ "
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ >淇敼</el-button
+ >
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleDetail(scope.row)"
+ >鏌ョ湅</el-button
+ >
<!-- v-hasPermi="['project:expretfund:edit']" -->
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ <el-button
+ v-if="
+ scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ "
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ >鍒犻櫎</el-button
+ >
<!-- v-hasPermi="['project:expretfund:delete']" -->
<!-- <el-button
size="mini"
@@ -126,34 +259,70 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
- style="text-align: center" v-loading="loading">
- <el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px"
- :rules="rules">
+ <el-dialog
+ :visible.sync="dialogOpen"
+ :close-on-click-modal="false"
+ width="1400px"
+ :title="title"
+ style="text-align: center"
+ v-loading="loading"
+ >
+ <el-form
+ style="height: 550px; overflow-y: auto; overflow-x: hidden"
+ ref="form"
+ :model="form"
+ label-width="120px"
+ :rules="rules"
+ >
<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
+ 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 />
+ <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-input
+ v-model="form.managername"
+ placeholder="璇疯緭鍏ョ粍闀�"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
@@ -172,7 +341,9 @@
-->
<el-col :span="5">
<el-form-item label="璐圭敤绫诲瀷">
- <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label="1"
+ >涓撳璐圭敤鐢宠</el-radio
+ >
</el-form-item>
</el-col>
<el-col :span="10">
@@ -185,7 +356,6 @@
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
-
</el-row>
<el-row style="text-align: left">
<!--
@@ -197,14 +367,22 @@
-->
<el-col :span="5">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="搴旂即绋�" prop="taxcost">
- <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
- </el-form-item>
- </el-col><!--
+ <el-input
+ v-model="form.taxcost"
+ placeholder="搴旂即绋庨噾棰濆悎璁�"
+ :disabled="true"
+ />
+ </el-form-item> </el-col
+ ><!--
<el-col :span="5">
<el-form-item label="绋庡悗閲戦" prop="pretaxcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
@@ -212,15 +390,29 @@
</el-col>-->
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ <el-input
+ :disabled="true"
+ v-model="form.name"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ />
</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
+ 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>
@@ -228,64 +420,161 @@
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-row style="margin-bottom: 10px">
<el-col :span="4">
- <el-button @click.native.prevent="addAllItems" type="primary" size="small">
+ <el-button
+ @click.native.prevent="addAllItems"
+ type="primary"
+ size="small"
+ >
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
- <el-table :data="fundDetails" v-loading="loading" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="搴忓彿" width="65">
+ <el-table
+ :data="fundDetails"
+ v-loading="loading"
+ border
+ highlight-current-row
+ >
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="搴忓彿"
+ width="65"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="applytype" align="center" label="鏈嶅姟璐圭敤绫诲瀷" width="200">
+ <el-table-column
+ prop="applytype"
+ align="center"
+ label="鏈嶅姟璐圭敤绫诲瀷"
+ width="200"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟璐圭敤绫诲瀷" @change="loadItemType(scope.row)">
- <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="scope.row.applytype"
+ placeholder="鏈嶅姟璐圭敤绫诲瀷"
+ @change="loadItemType(scope.row)"
+ >
+ <el-option
+ v-for="dict in rowfeeItemTypes"
+ :key="dict.index"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰鍚嶇О" width="260">
+ <el-table-column
+ prop="itemid"
+ align="center"
+ label="鏈嶅姟椤圭洰鍚嶇О"
+ width="260"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰鍚嶇О" filterable @change="verifyFeeItem(scope.row)"
- :filter-method="(val) => searchItemType(val, scope)">
- <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
- :value="dict.id"></el-option>
+ <el-select
+ v-model="scope.row.itemid"
+ placeholder="鏈嶅姟椤圭洰鍚嶇О"
+ filterable
+ @change="verifyFeeItem(scope.row)"
+ :filter-method="val => searchItemType(val, scope)"
+ >
+ <el-option
+ v-for="dict in scope.row.itemArr"
+ :key="dict.index"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="false">
+ <el-table-column
+ prop="itemcode"
+ align="center"
+ label="椤圭洰缂栧彿"
+ show-overflow-tooltip=""
+ v-if="false"
+ >
</el-table-column>
- <el-table-column prop="servicesscope" align="center" label="璐圭敤璇存槑" width="180">
+ <el-table-column
+ prop="servicesscope"
+ align="center"
+ label="璐圭敤璇存槑"
+ width="180"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.servicesscope" placeholder="璐圭敤璇存槑" clearable allow-create filterable
- @change="selectedRemark(scope.row)">
- <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
- :value="dict.servicesscope"></el-option>
+ <el-select
+ v-model="scope.row.servicesscope"
+ placeholder="璐圭敤璇存槑"
+ clearable
+ allow-create
+ filterable
+ @change="selectedRemark(scope.row)"
+ >
+ <el-option
+ v-for="dict in scope.row.rowfeeblocks"
+ :key="dict.servicesscope"
+ :label="dict.remark"
+ :value="dict.servicesscope"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120">
+ <el-table-column
+ v-if="this.ismanager == true"
+ prop="amount"
+ align="center"
+ label="绋庡墠閲戦"
+ width="120"
+ >
<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 scope.row.rowfeeblocks" :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 scope.row.rowfeeblocks"
+ :key="dict.expensedescribe"
+ :label="dict.expense"
+ :value="dict.expense"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="this.ismanager == true">
+ <el-table-column
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ width="120"
+ v-if="this.ismanager == true"
+ >
<!-- 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="beneficiaryname" align="center" label="濮撳悕" width="100" v-if="form.applytype != 3">
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="濮撳悕"
+ width="100"
+ v-if="form.applytype != 3"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'name')"
+ >{{ scope.row.beneficiaryname }}</el-button
+ >
<!-- <el-select
filterable
allow-create
@@ -305,10 +594,19 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="220">
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅鍚嶇О"
+ width="220"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'unit')"
+ >{{ scope.row.unitname }}</el-button
+ >
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -325,54 +623,124 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
+ <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(scope.row);
- }
- " />
+ <el-input
+ v-model="scope.row.quantity"
+ placeholder="鏁伴噺"
+ @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ "
+ />
</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="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="180" v-if="dialogType == 'edit'">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="180"
+ v-if="dialogType == 'edit'"
+ >
<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)"
+ >鏂板</el-button
+ >
+ <el-button
+ @click.native.prevent="
+ deleteRows(scope.row, scope.$index, fundDetails)
+ "
+ type="text"
+ size="small"
+ >
鍒犻櫎
</el-button>
</template>
@@ -422,38 +790,94 @@
-->
<el-row>
<el-col :span="12">
- <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>
</el-row>
<el-row v-if="dialogType == 'detail'">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
- slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ width="120"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ width="160"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ width="200"
+ prop="flowconclusion"
+ ><template slot-scope="scope"
+ ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
+ ><span v-if="scope.row.flowconclusion == 2"
+ >涓嶉�氳繃</span
+ ></template
+ >
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-column
+ label="瀹℃牳澶囨敞"
+ align="center"
+ prop="flowcontent"
+ />
</el-table>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
+ <el-button
+ type="primary"
+ @click="submitForm"
+ v-if="dialogType == 'edit'"
+ >淇� 瀛�</el-button
+ >
<!-- <el-button type="success" @click="print">鎵� 鍗�</el-button> -->
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'瀵煎叆淇℃伅'" width="500px"
- style="text-align: center" v-loading="loading">
+ <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="showDetailInfoDialogType == 'name'">
@@ -464,22 +888,50 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="showDetailInfoDialogType == 'name' && expertfrom == '1'">
- <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
- <el-select filterable allow-create ref="beneficiaryname" default-first-option
- v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName"
- :value="item.reportName">
+ <el-col
+ :span="24"
+ v-if="showDetailInfoDialogType == 'name' && expertfrom == '1'"
+ >
+ <el-form-item
+ label="涓撳濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in expertlist"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="showDetailInfoDialogType == 'unit'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
- <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
+ <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>
@@ -487,22 +939,43 @@
<el-row>
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
- <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
+ <el-input
+ v-model="funddetailForm.expertname"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
<el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px">
- <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
- <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
- :value="dict.label"></el-option>
+ <el-form-item
+ label="鑱� 绉�"
+ prop="experttitle"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.experttitle"
+ placeholder="蹇呭～椤�"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_professionaltitle"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.label"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
- <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="韬唤璇佸彿"
+ prop="expertidcardno"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertidcardno"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -520,30 +993,60 @@
-->
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
- <el-select v-model="funddetailForm.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
- </el-select>
- </el-form-item></el-col>
+ <el-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="expertunitno"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.expertunitno"
+ placeholder="鍗曚綅鍚嶇О"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
+ </el-select> </el-form-item
+ ></el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
- <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="寮�鎴烽摱琛�"
+ prop="expertdepositbank"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertdepositbank"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
- <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
+ <el-form-item
+ label="閾惰鍗″彿"
+ prop="expertbankcardno"
+ label-width="80px"
+ >
+ <el-input
+ v-model="funddetailForm.expertbankcardno"
+ placeholder="蹇呭～椤�"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="ConfirmDetailDialog()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
</div>
@@ -624,7 +1127,7 @@
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "fundApply",
@@ -667,13 +1170,14 @@
donorno: null,
reportername: null,
reporttime: null,
+ donorname: null
},
fundQueryParam: {
pageNum: 1,
pageSize: 100,
infoid: null,
applytype: "1",
- createBy: null,
+ createBy: null
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -684,11 +1188,11 @@
pageSize: 10000,
userno: null,
username: null,
- usertype: null,
+ usertype: null
},
//
- amount: 0.00,
+ amount: 0.0,
//鐢宠鍗曠被鍨�
currentApplyType: "1",
@@ -698,21 +1202,21 @@
expertfrom: "1",
//璁＄畻涓◣鍙傛暟
taxParam: {
- beneficiaryNo: '',
- money: '0',
- startTime: '',
+ beneficiaryNo: "",
+ money: "0",
+ startTime: ""
},
// 琛ㄥ崟鏍￠獙
rules: {
username: [
- { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
createTime: [
- { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ]
// amountrequested: [
// { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
// ],
@@ -772,7 +1276,7 @@
expertunitname: null,
experttitle: null,
expertdepositbank: null,
- expertbankcardno: null,
+ expertbankcardno: null
},
expertform: {
id: null,
@@ -799,7 +1303,7 @@
userno: null,
userstatus: 1,
usertype: null,
- wbm: null,
+ wbm: null
},
//闄勪欢鍒楄〃
@@ -808,23 +1312,21 @@
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
- Authorization: "Bearer " + getToken(),
- },
-
+ Authorization: "Bearer " + getToken()
+ }
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
computed: {},
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
- //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
+ //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
this.getList();
this.getBaseInfoList();
this.getCurFundType();
this.getUserList();
this.getUnitList();
-
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
@@ -834,17 +1336,16 @@
this.getExternalpersonList();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
//鏂规硶闆嗗悎
methods: {
-
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -873,7 +1374,9 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+ message: h("p", null, [
+ h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")
+ ])
});
}
return;
@@ -904,7 +1407,7 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")])
});
}
},
@@ -921,7 +1424,7 @@
}
});
return;
-
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
@@ -930,13 +1433,17 @@
this.dialogType = "edit";
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
// this.form.recordstate =-1;
// this.form.recordstatus = response.data.recordstatus + "";
//闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
- getownFundDetail(id).then((res) => {
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
+ getownFundDetail(id).then(res => {
this.fundDetails = res.data;
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemArr = [];
@@ -949,7 +1456,7 @@
servicesscope: this.fundDetails[m].servicesscope,
expensedescribe: this.fundDetails[m].servicesscopename,
expense: this.fundDetails[m].expense,
- remark: this.fundDetails[m].servicesscopename,
+ remark: this.fundDetails[m].servicesscopename
});
// getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
// let fundmsg = res.data;
@@ -992,19 +1499,23 @@
this.dialogType = "detail";
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
let listFundflowparams = {
fundid: row.id,
- fundtype: 2,
+ fundtype: 2
};
//闄勪欢澶勭悊
- 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 }))
+ : [];
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
- getownFundDetail(id).then((res) => {
+ getownFundDetail(id).then(res => {
this.fundDetails = res.data;
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemArr = [];
@@ -1014,7 +1525,7 @@
expense: this.fundDetails[m].expense,
expensedescribe: this.fundDetails[m].servicesscopename,
remark: this.fundDetails[m].servicesscope,
- servicesscope: this.fundDetails[m].servicesscope,
+ servicesscope: this.fundDetails[m].servicesscope
});
}
@@ -1029,11 +1540,11 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(ids);
})
.then(() => {
- getownFundDetail(ids).then((res) => {
+ getownFundDetail(ids).then(res => {
let listdetails = res.data;
for (let i = 0; i < listdetails.length; i++) {
delFunddetail(listdetails[i].id);
@@ -1043,7 +1554,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1051,22 +1562,22 @@
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;
- updateFund(row).then((response) => {
+ updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
type: "success",
- message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�",
+ message: "鎻愪氦涓撳璐圭敤鐢宠瀹℃壒鎴愬姛锛�"
});
} else {
this.$message({
type: "error",
- message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�",
+ message: "鎻愪氦涓撳璐圭敤鐢宠澶辫触锛�"
});
}
this.loading = false;
@@ -1075,14 +1586,14 @@
.catch(() => {
this.$message({
type: "info",
- message: "宸插彇娑堢敵璇�",
+ message: "宸插彇娑堢敵璇�"
});
});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
// let totalPreTaxAmount = 0.0;
@@ -1093,17 +1604,29 @@
for (let k = 0; k < this.fundDetails.length; k++) {
let tempDetail = this.fundDetails[k];
if (tempDetail.itemid == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
return;
}
if (tempDetail.servicesscope == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
return;
}
if (tempDetail.beneficiaryno == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
return;
}
@@ -1134,7 +1657,7 @@
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let tempItemArr = tempDetail.itemArr;
let itemIndex = tempItemArr.findIndex(
- (item) => tempDetail.itemid == item.id
+ item => tempDetail.itemid == item.id
);
if (itemIndex > -1) {
tempDetail.itemname = tempItemArr[itemIndex].itemName;
@@ -1143,12 +1666,18 @@
//鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫�
let applytypeIndex = this.rowfeeItemTypes.findIndex(
- (item) => tempDetail.applytype == item.value
+ item => tempDetail.applytype == item.value
);
if (applytypeIndex > -1) {
- tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
- tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
- tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
+ tempDetail.applytypename = this.rowfeeItemTypes[
+ applytypeIndex
+ ].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[
+ applytypeIndex
+ ].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[
+ applytypeIndex
+ ].subjecttypename;
}
this.fundDetails[i] = tempDetail;
/*
@@ -1198,7 +1727,7 @@
//淇濆瓨鏁版嵁
this.loading = true;
this.form.serviceFunddetails = 0;
- this.fundDetails.map((item) => {
+ this.fundDetails.map(item => {
this.form.serviceFunddetails += item.amount;
});
this.form.serviceFunddetails = this.fundDetails;
@@ -1219,7 +1748,6 @@
// this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
// }
// });
-
} else {
this.form.recordstatus = -1;
@@ -1232,7 +1760,7 @@
// });
}
- addorupdateFund(this.form).then((response) => {
+ addorupdateFund(this.form).then(response => {
if (response.code === 200) {
this.selectDonotor(this.curCase);
this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
@@ -1247,7 +1775,6 @@
// this.getfundList();
this.getList();
this.selectDonotor(this.curCase);
-
}
});
},
@@ -1298,11 +1825,11 @@
applytype: "1",
servicetypename: null,
servicesscope: null,
- servicesscopename: null,
+ servicesscopename: null
};
this.resetForm("form");
//娓呯┖闄勪欢
- this.fileList = []
+ this.fileList = [];
},
ShowDetailDialog(spoce, showType) {
@@ -1331,10 +1858,9 @@
let singleDetail = this.fundDetails[tempIndex];
if (this.showDetailInfoDialogType == "name") {
-
if (this.expertfrom == "1") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (tempName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -1351,7 +1877,8 @@
} else {
//淇濆瓨鏂板涓撳
this.expertform.id = null;
- this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1;
+ this.expertform.userno =
+ this.personlist[this.personlist.length - 1].id + 1;
this.expertform.usertype = "expert";
this.expertform.username = this.funddetailForm.expertname;
this.expertform.idcardno = this.funddetailForm.expertidcardno;
@@ -1364,10 +1891,12 @@
this.expertform.unitno = this.funddetailForm.expertunitno;
try {
let unitIndex = this.unitList.findIndex(
- (item) => this.expertform.unitno == item.organizationid
+ item => this.expertform.unitno == item.organizationid
);
if (unitIndex > -1) {
- this.expertform.unitname = this.unitList[unitIndex].organizationname;
+ this.expertform.unitname = this.unitList[
+ unitIndex
+ ].organizationname;
} else {
this.expertform.unitname = this.expertform.unitno;
}
@@ -1383,14 +1912,14 @@
this.expertform.remark = null;
this.expertform.del_flag = "0";
- addExternalperson(this.expertform).then((response) => {
+ addExternalperson(this.expertform).then(response => {
if (response.code == 200) {
this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
- listExternalperson().then((res) => {
+ listExternalperson().then(res => {
this.personlist = res.rows;
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (res.username == this.funddetailForm.expertname) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -1408,12 +1937,11 @@
}
});
}
-
} else if (this.showDetailInfoDialogType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
try {
let unitIndex = this.unitList.findIndex(
- (item) => singleDetail.unitno == item.organizationid
+ item => singleDetail.unitno == item.organizationid
);
if (unitIndex > -1) {
singleDetail.unitname = this.unitList[unitIndex].organizationname;
@@ -1431,10 +1959,14 @@
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUsermsg() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
- if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
+ if (
+ this.defaultperson.createBy == "admin" ||
+ this.defaultperson.createBy == "001" ||
+ this.defaultperson.createBy == "002"
+ ) {
this.ismanager = true;
} else {
this.ismanager = false;
@@ -1458,7 +1990,7 @@
}
this.form.serviceFunddetails = 0;
- this.fundDetails.map((item) => {
+ this.fundDetails.map(item => {
this.form.serviceFunddetails += item.amount;
});
}
@@ -1467,15 +1999,15 @@
//鏍￠獙鏀惰垂椤圭洰鏄惁閲嶅
verifyFeeItem(row) {
- row.itemArr.map((res) => {
+ row.itemArr.map(res => {
if (row.itemid === res.id) {
row.remark = res.itemDescribe;
row.itemcode = res.itemCode;
}
});
- if (this.businessType == '1') {
+ if (this.businessType == "1") {
var repeatNum = 0;
- this.fundDetails.map((res) => {
+ this.fundDetails.map(res => {
if (res.applytype === row.applytype && res.itemid == row.itemid) {
repeatNum++;
}
@@ -1486,15 +2018,15 @@
}
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
- getdetailsByItemId(row.itemid).then((res) => {
+ getdetailsByItemId(row.itemid).then(res => {
let fundmsg = res.data;
let rowfeeblocks = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
rowfeeblocks.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servicesscope: item.id,
+ servicesscope: item.id
});
});
@@ -1502,7 +2034,6 @@
row.servicesscope = null;
row.servicesscopename = "";
});
-
},
//
@@ -1519,13 +2050,14 @@
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
- this.queryParams.params["beginReporttime"] =
- this.daterangeReporttime[0];
+ 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) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -1533,12 +2065,12 @@
},
getUnitList() {
- listOrganization(3).then((response) => {
+ 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,
+ organizationname: response.rows[i].organizationname
});
}
});
@@ -1546,7 +2078,7 @@
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;
@@ -1563,7 +2095,7 @@
this.loading = true;
this.reset();
this.fundQueryParam.infoid = this.curCase.id;
- listFund(this.fundQueryParam).then((response) => {
+ listFund(this.fundQueryParam).then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
});
@@ -1573,14 +2105,14 @@
addAllItems() {
this.loading = true;
this.fundDetails = this.fundDetails.filter(
- (r) => r.applytype != "" && r.applytype != null
+ r => r.applytype != "" && r.applytype != null
);
let listAdd = [];
//let listAdd = this.fundDetails;
for (let i = 0; i < this.feeItemTypes.length; i++) {
for (let j = 0; j < this.feeItemTypes[i].itemDetails.length; j++) {
let list = this.fundDetails.filter(
- (r) =>
+ r =>
r.applytype == this.feeItemTypes[i].itemType &&
r.itemid == this.feeItemTypes[i].itemDetails[j].id
);
@@ -1602,15 +2134,15 @@
};
//鑾峰彇鏀惰垂椤圭洰鐨勮鏄庝俊鎭�
- getdetailsByItemId(rowData.itemid).then((res) => {
+ getdetailsByItemId(rowData.itemid).then(res => {
let fundmsg = res.data;
let rowfeeblocks = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
rowfeeblocks.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servicesscope: item.id,
+ servicesscope: item.id
});
});
@@ -1638,7 +2170,7 @@
},
addAll(row, i, arr) {
- row.itemArr.map((res) => {
+ row.itemArr.map(res => {
if (res.id !== row.itemid) {
let a = arr.length;
this.addRow();
@@ -1646,15 +2178,15 @@
arr[a].applytype = row.applytype;
arr[a].itemid = res.id;
- getdetailsByItemId(arr[a].itemid).then((res) => {
+ getdetailsByItemId(arr[a].itemid).then(res => {
let fundmsg = res.data;
let rowfeeblocks = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
rowfeeblocks.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servicesscope: item.id,
+ servicesscope: item.id
});
});
row.rowfeeblocks = rowfeeblocks;
@@ -1706,7 +2238,7 @@
uploadtime: null,
itemArr: [],
servicesscope: null,
- rowfeeblocks: [],
+ rowfeeblocks: []
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.fundDetails.push(rowData);
@@ -1720,7 +2252,7 @@
//鍔犺浇鏈嶅姟椤圭洰
loadItemType(row) {
- let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
+ let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
row.itemid = null;
this.$forceUpdate();
@@ -1735,7 +2267,7 @@
//鑾峰彇涓撳鍒楄〃
getExternalpersonList() {
- listExternalperson().then((res) => {
+ listExternalperson().then(res => {
this.personlist = res.rows;
});
},
@@ -1746,11 +2278,11 @@
let templist = [];
for (let i = 0; i < types.length; i++) {
templist = [];
- listReportname(types[i]).then((res) => {
+ 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,
+ reportNo: res.data[j].reportNo
});
}
this.expertlist = this.expertlist.concat(templist);
@@ -1760,7 +2292,7 @@
selectpersonmsg(row) {
// if(row.beneficiaryname)
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
row.beneficiaryname = res.username;
@@ -1779,7 +2311,7 @@
},
getUserList() {
- listUser().then((res) => {
+ listUser().then(res => {
this.userlist = res.data;
});
},
@@ -1799,7 +2331,7 @@
}
scope.row.itemArr = result;
} else {
- getItemNames(scope.row.applytype).then((res) => {
+ getItemNames(scope.row.applytype).then(res => {
scope.row.itemArr = res.data;
//this.$set(this.fundDetails, rowindex, row);
});
@@ -1810,19 +2342,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.fundDetails, res.data);
this.sumTotalFee();
// this.fundDetails = res.data
@@ -1845,7 +2377,7 @@
},
//璁＄畻涓◣
- calculateTax() { },
+ calculateTax() {},
//璁＄畻鎬婚噾棰�
sumTotalFee(row) {
@@ -1889,7 +2421,7 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(this.currentApplyType).then((res) => {
+ getFundTypeAll(this.currentApplyType).then(res => {
let dataList = res.data;
this.feeItemTypes = dataList;
this.rowfeeItemTypes = [];
@@ -1898,14 +2430,14 @@
value: dataList[m].itemType,
label: dataList[m].itemTypeName,
subjecttype: dataList[m].subjecttype,
- subjecttypename: dataList[m].subjecttypename,
+ subjecttypename: dataList[m].subjecttypename
});
}
});
},
getItemArr(rowindex, row) {
- let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
+ let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
this.$set(this.fundDetails, rowindex, row);
//this.loading = true;
@@ -1923,7 +2455,7 @@
//涓撳璐瑰姵鍔℃墦鍗�
dayin(id) {
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1937,7 +2469,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1946,7 +2478,7 @@
//姹囨�绘墦鍗�
totaldayin(e) {
// const id =this.row.id
- getdownloadBX(e).then((res) => {
+ getdownloadBX(e).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1960,29 +2492,27 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
},
-
-
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
/** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
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);
},
remove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
+ this.fileList.splice(this.fileList.indexOf(file), 1);
},
handleExceed() {
@@ -1997,14 +2527,11 @@
this.$modal.msgSuccess(response.msg);
this.fileList.push({ name: response.fileName, url: response.fileName });
} else {
- console.log(response.msg);;
+ console.log(response.msg);
}
- },
-
- },
-
+ }
+ }
};
-
</script>
<style scoped>
/* @import url(); 寮曞叆鍏叡css绫� */
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 95d53df..2a21e36 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -216,7 +216,7 @@
:data="rbDetails"
ref="table"
border
- max-height="400"
+ max-height="800"
highlight-current-row
:summary-method="getSummaries"
show-summary
@@ -227,7 +227,7 @@
label="搴忓彿"
align="center"
fixed
- width="65"
+ width="88"
>
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
@@ -466,7 +466,7 @@
prop="trafficexpense"
label="浜ら�氳垂"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -484,7 +484,7 @@
prop="cityfee"
label="甯傚唴浜ら�氳垂"
align="center"
- width="100"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -503,7 +503,7 @@
prop="hotelexpense"
label="浣忓璐�"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -522,7 +522,7 @@
prop="foodexpenses"
label="椁愯垂鎶ラ攢"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -540,7 +540,7 @@
prop="foodallowance"
label="浼欓琛ュ姪"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -558,7 +558,7 @@
prop="otherexpense"
label="鍏潅璐硅ˉ鍔�"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -577,7 +577,7 @@
prop="otherfeeamount"
label="鍏朵粬璐圭敤"
align="center"
- width="90"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -1332,6 +1332,10 @@
name: file.name,
url: response.fileName
});
+ this.pdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+
// this.fileListto.push({
// name: file.name,
// url: response.url
@@ -1365,7 +1369,7 @@
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- console.log(item);
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
this.pdftitle = item.name;
let name = item.name.split(".");
if (name[1] == "pdf") {
@@ -1378,7 +1382,12 @@
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
// this.pdfimgsrcList = [];
// this.pdfimgsrcList.push(this.pdfimg);
- console.log(this.pdfimg);
+ if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ this.pdfimgsrcList.push(this.pdfimg);
+ console.log("鍔犲叆");
+ }
+ console.log(this.pdfimg, "pdfimg");
+ console.log(this.pdfimgsrcList, "imglist");
} else {
this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
}
@@ -2728,6 +2737,10 @@
sums[index] = "鍚堣";
return;
}
+ if (index === 18) {
+ sums[index] = this.form.amountrequested;
+ return;
+ }
//鍘婚櫎閮ㄥ垎瀛楁璁＄畻
if (columnnames.indexOf(column.property) > -1) {
return;
--
Gitblit v1.9.3