From 4c0a4f757fe3133ddf43d0519f06c2292bbd8957 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 17 十月 2023 15:51:54 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 1959 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 1,362 insertions(+), 597 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c000504..7b09241 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>
@@ -47,18 +72,7 @@
}}</el-radio>
</el-form-item>
</el-col>
- <!-- <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 label="閾惰璐﹀彿" prop="bankcardno">
- <el-input
- v-model="form.bankcardno"
- placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
- />
- </el-form-item>
- </el-col> -->
+
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -66,36 +80,25 @@
</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>
<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-row>
<el-row style="text-align: left">
- <!--
- <el-col :span="5">
- <el-form-item label="鍚堣閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
- </el-form-item>
- </el-col>
- -->
-
- <!--
- <el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
- <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
- </el-form-item>
- </el-col>-->
- <el-col :span="10">
+ <el-col :span="8">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
@@ -112,27 +115,67 @@
</el-col>-->
</el-row>
<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>
- </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
+ title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
+ type="warning"
+ show-icon
+ >
</el-alert>
</el-row>
- <el-row v-if="businessType == 2">
- <div style="margin-bottom: 15px;">
- <el-button type="success" icon="el-icon-download" @click="Batchentry">鎵归噺褰曞叆</el-button>
- </div>
+ <el-row>
+ <el-col :span="3" v-if="businessType == '1'">
+ <el-button
+ @click.native.prevent="importFeeItems"
+ type="primary"
+ size="small"
+ >
+ 瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
+ </el-col>
+ <el-col :span="3"
+ ><div style="margin-bottom: 15px;" v-if="businessType == 2">
+ <el-button
+ type="success"
+ icon="el-icon-download"
+ @click="Batchentry"
+ >鎵归噺褰曞叆</el-button
+ >
+ </div>
+ </el-col>
+
+ <el-col :span="3">
+ <div
+ style="margin-bottom: 15px;"
+ v-if="
+ userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'
+ "
+ >
+ <el-button
+ type="success"
+ icon="el-icon-edit-outline"
+ @click="Manualcalculationfn"
+ >璁＄畻涓◣</el-button
+ >
+ </div>
+ </el-col>
</el-row>
<el-row>
- <el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="搴忓彿" width="88">
+ <el-table
+ :data="rbDetails"
+ v-loading="loading"
+ max-height="800"
+ border
+ highlight-current-row
+ >
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="搴忓彿"
+ width="88"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
@@ -141,53 +184,124 @@
<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.applytype" placeholder="鏈嶅姟绫诲瀷" @change="verifyFeeItemType(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="verifyFeeItemType(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.itemlist" :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.itemlist"
+ :key="dict.index"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
</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
@@ -196,50 +310,75 @@
: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-select
- filterable
- allow-create
- ref="getReportname"
- default-first-option
- @change="selectExpert(scope.row)"
- v-model="scope.row.beneficiaryname"
- placeholder="璇烽�夋嫨"
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button
>
- <el-option
- v-for="item in expertlist"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
- </el-option>
- </el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'">
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅鍚嶇О"
+ width="250"
+ v-if="form.applytype != '4' && form.applytype != '3'"
+ >
<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 ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
+ }}</el-button
+ >
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -256,13 +395,24 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column prop="unitno" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'">
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4' || form.applytype == '3'"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{
- experthear == "expert"
- ? scope.row.unitname
- : scope.row.beneficiaryname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button
+ >
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -279,112 +429,182 @@
</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">
+ <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">
+ <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" width="330" label="澶囨敞">
+ <el-table-column
+ prop="itemdescribe"
+ align="center"
+ width="330"
+ label="椤圭洰璇存槑"
+ >
<template slot-scope="scope">
- <el-input type="textarea" :rows="2" v-model="scope.row.remark" placeholder="澶囨敞" />
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.itemdescribe"
+ placeholder="椤圭洰璇存槑"
+ />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
+ <el-table-column
+ prop="remark"
+ align="center"
+ width="330"
+ label="澶囨敞"
+ >
<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-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.remark"
+ placeholder="澶囨敞"
+ />
+ </template>
+ </el-table-column>
+ <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>
- <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>
</el-row>
- <!--
- <el-row>
- <el-col :span="7">
- <el-form-item label="棰勬敮閲戦" prop="prepaidamount">
- <el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
- <el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
- <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
- <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鍔炲叕瀹や富浠�" prop="officedirector">
- <el-input v-model="form.officedirector" placeholder="璇疯緭鍏ュ姙鍏涓讳换" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐㈠姟閮ㄨ礋璐ｄ汉" prop="financedirector">
- <el-input v-model="form.financedirector" placeholder="璇疯緭鍏ヨ储鍔￠儴璐熻矗浜�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
- <el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
- </el-form-item>
- </el-col>
- </el-row>
- -->
+
<el-row>
<el-col :span="12">
- <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0">
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
- :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
- uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
- :on-remove="remove" accept="image/*,.pdf">
+ <el-form-item
+ label="璐圭敤鐢宠闄勪欢"
+ align="left"
+ prop="annexbankcard"
+ v-if="businessType == 0"
+ >
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="fileListto"
+ :show-file-list="false"
+ multiple
+ drag
+ :headers="headers"
+ :on-success="
+ (response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ "
+ :on-preview="downFile"
+ :disabled="operationType == 'detail'"
+ :on-error="handleUploadError"
+ :on-remove="remove"
+ accept="image/*,.pdf"
+ >
<i class="el-icon-upload"></i>
<div class="el-upload__text">
灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
+ <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="鍚嶇О">
+ <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
@@ -392,35 +612,92 @@
</template>
</el-table-column>
- <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
+ <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>
+ <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' ||
- operationType == 'update'
- ">
+ <el-row
+ v-if="
+ operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ "
+ >
<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="鐢宠鏉愭枡鐘舵��" prop="infoid">
+ <el-radio-group
+ v-model="form.checkstatus"
+ align="left"
+ :disabled="userprofile.nickName != '闄堟厱鍗�'"
+ >
+ <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
+ <el-radio :label="2">鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡</el-radio>
+ <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row
+ style="margin-top: 5px; 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">
@@ -430,6 +707,7 @@
</el-form-item>
</el-col>
</el-row>
+
<el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
@@ -439,20 +717,46 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="operationType == 'add' ||
- operationType == 'update' ||
- ismanager == true
- ">鎻愪氦淇濆瓨</el-button>
- <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
+ <el-button
+ type="primary"
+ @click="submitForm"
+ v-if="
+ operationType == 'add' ||
+ operationType == 'update' ||
+ ismanager == true
+ "
+ >鎻愪氦淇濆瓨</el-button
+ >
+ <el-button
+ type="success"
+ @click="handleup"
+ v-if="operationType == 'add' || operationType == 'update'"
+ >涓婃姤</el-button
+ >
+ <el-button
+ type="primary"
+ @click="checksubmit"
+ v-if="operationType == 'check'"
+ >鎻愪氦瀹℃牳</el-button
+ >
<el-button @click="cancel">鍏� 闂�</el-button>
</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 v-if="businessType != 4">
- <el-col :span="24" v-if="selectionType == 'expert' && businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
+ <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>
@@ -460,218 +764,543 @@
</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">
- <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"
+ >
+ <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>
</el-row>
- <el-row v-if="businessType == 4">
+ <el-row v-if="businessType == 4 || businessType == 3">
<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-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-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.unitname" placeholder="鍗曚綅鍚嶇О" @change="bbaaccss" clearable filterable
- allow-create style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationname"></el-option>
+ <el-select
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="鍗曚綅鍚嶇О"
+ @change="bbaaccss"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in feeUnitList"
+ :key="index"
+ :label="spec.reportName"
+ :value="spec.reportName"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<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 v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<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>
- <!--
- <el-row>
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="浜哄憳绫诲埆" prop="usertype" label-width="80px">
- <el-select v-model="funddetailForm.usertype" placeholder="蹇呭～椤�">
- <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- -->
- <el-row v-if="businessType != 4">
+
+ <el-row v-if="businessType != 4 && businessType != 3">
<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 v-if="businessType != 4">
+ <el-row v-if="businessType != 4 && businessType != 3">
<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 v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
- width="60%">
+ <el-dialog
+ v-dialogDrags
+ :modal="false"
+ :close-on-click-modal="false"
+ :title="pdftitle"
+ :visible.sync="pdfVisible"
+ width="60%"
+ >
<div>
<el-table :data="tableDatatop" style="width: 100%">
- <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环">
+ <el-table-column
+ v-if="businessType == 4"
+ prop="price"
+ align="center"
+ label="鍗曚环"
+ >
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4">
+ <el-table-column
+ prop="quantity"
+ align="center"
+ label="鏁伴噺"
+ v-if="businessType == 4"
+ >
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountLabel">
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- ">
+ <el-table-column
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ v-if="
+ (this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ "
+ >
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="濮撳悕"
- v-if="form.applytype == '1' || form.applytype == '2'">
- </el-table-column>
+ <!-- <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="濮撳悕"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
+ </el-table-column> -->
- <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250" v-if="form.applytype != '4'">
+ <!-- <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="鍗曚綅鍚嶇О"
+ width="250"
+ v-if="form.applytype != '4'"
+ >
+ </el-table-column> -->
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ >
</el-table-column>
- <el-table-column prop="beneficiaryname" align="center" label="鍗曚綅/涓汉" width="250" v-if="form.applytype == '4'">
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
</el-table-column>
- <el-table-column prop="title" align="center" label="鑱岀О" width="120"
- v-if="form.applytype == '1' || form.applytype == '2'">
- </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'"
+ >
</el-table-column>
<el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰甯愬彿"
+ width="210"
+ >
</el-table-column>
</el-table>
</div>
- <div class="pdfimg">
- <div class="box-pdf">
- <div>
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
- :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
- uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
- :on-remove="remove" accept="image/*,.pdf">
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">
- 灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em><el-button :disabled="operationType == 'detail'" size="small" type="primary">鐐瑰嚮涓婁紶</el-button></em>
+
+ <el-tabs
+ style="margin-top: 20px;"
+ v-model="activeName"
+ type="border-card"
+ @tab-click="handleClick"
+ >
+ <el-tab-pane label="鏅�氶檮浠�" :name="1">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="fileListto"
+ :show-file-list="false"
+ multiple
+ drag
+ :headers="headers"
+ :on-success="
+ (response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ "
+ :on-preview="downFile"
+ :disabled="operationType == 'detail'"
+ :on-error="handleUploadError"
+ :on-remove="remove"
+ accept="image/*,.pdf"
+ >
+ <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>
</div>
- <!-- <div class="el-upload__tip" slot="tip">
- 鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb
- </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>
+ </div>
- <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>
+ <div
+ v-if="this.previewpdf && pdfimgsrcList.length"
+ class="pdfimgmin"
+ >
+ <!-- <img :src="pdfimg" /> -->
+ <el-image
+ style="width: 95%; height: 90%"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
+ >
+ <!-- <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
+ </el-image>
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
- <!-- <div
- class="pdftit"
- @click="pdffn(item)"
- v-for="item in fileList"
- :key="item.name"
- >
- {{ item.name }}
- </div> -->
- </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍙戠エ鏂囦欢" :name="2">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="invoicefileList"
+ :show-file-list="false"
+ multiple
+ drag
+ :headers="headers"
+ :on-success="
+ (response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ "
+ :on-preview="downFile"
+ :disabled="operationType == 'detail'"
+ :on-error="handleUploadError"
+ :on-remove="remove"
+ accept="image/*,.pdf"
+ >
+ <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="invoicefileListto"
+ @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>
- <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
- <!-- <img :src="pdfimg" /> -->
- <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-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>
+ </div>
+ </div>
+
+ <div
+ v-if="this.previewpdf && invoicepdfimgsrcList.length"
+ class="pdfimgmin"
+ >
+ <!-- <img :src="pdfimg" /> -->
+ <el-image
+ style="width: 95%; height: 90%"
+ :src="invoicepdfimg"
+ :preview-src-list="invoicepdfimgsrcList"
+ >
+ <!-- <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
+ </el-image>
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div></el-tab-pane
+ >
+ </el-tabs>
</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>
@@ -680,13 +1309,30 @@
</el-dialog>
<!-- 鎵归噺閫夊彇 -->
- <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%">
+ <el-dialog
+ title="鎵归噺鐢熸垚鏄庣粏淇℃伅"
+ :visible.sync="batchdialogVisible"
+ width="30%"
+ >
<div style="max-height: 300px; overflow-y: auto">
- <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <el-checkbox
+ :indeterminate="isIndeterminate"
+ v-model="checkAll"
+ @change="handleCheckAllChange"
+ >鍏ㄩ��</el-checkbox
+ >
<div style="margin: 15px 0;"></div>
- <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
- <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName
- }}</el-checkbox>
+ <el-checkbox-group
+ v-model="checkedCities"
+ @change="handleCheckedCitiesChange"
+ >
+ <el-checkbox
+ border
+ v-for="city in cityOptions"
+ :label="city"
+ :key="city.reportNo"
+ >{{ city.reportName }}</el-checkbox
+ >
</el-checkbox-group>
</div>
@@ -722,6 +1368,7 @@
checkfund,
getdownloadBX,
addorupdateFund,
+ ManualCalculation,
getdetailsByItemId
} from "@/api/project/fund";
@@ -805,7 +1452,7 @@
exportLoading: false,
usernamedata: "",
jurisdiction: false,
-
+ Routinglevel: 1,
// 琛ㄥ崟鍙傛暟
form: {},
experthear: "",
@@ -844,14 +1491,28 @@
cityOptions: [],
checkAll: false,
checkedCities: [],
- Personnelforname: "璇烽�夋嫨",
- unitforname: "璇烽�夋嫨",
+ Personnelforname: null,
+ unitforname: null,
isIndeterminate: true,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
//涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
expertfrom: "1",
+ baselisttages: [
+ {
+ id: 1,
+ name: "鏉愭枡寰呭鏍�"
+ },
+ {
+ id: 2,
+ name: "瀹℃煡閫氳繃绛夊緟閭瘎绾歌川鏉愭枡"
+ },
+ {
+ id: 3,
+ name: "宸叉敹鍒扮焊璐ㄦ潗鏂�"
+ }
+ ],
//鎹愮尞妗堜緥鍒楄〃
donateList: [],
@@ -986,7 +1647,6 @@
money: "0",
startTime: ""
},
-
//鏈嶅姟璐圭敤鍙傛暟
expenseQueryParams: {
pageNum: 1,
@@ -994,12 +1654,18 @@
itemid: null,
expense: null,
expensedescribe: null,
- usestate: null,
+ usestate: null
},
//闄勪欢鍒楄〃
fileList: [],
fileListto: [],
+ invoicefileList: [],
+ invoicefileListto: [],
+ invoicepdfimg: "",
+ invoicepdfimgsrcList: [],
+ invoDatatop: [],
+ activeName: 1, //鏂囦欢绫诲瀷
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -1027,14 +1693,13 @@
watch: {},
//鏂规硶闆嗗悎
methods: {
- bbaaccss(val) {
- },
+ bbaaccss(val) {},
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1129,6 +1794,7 @@
} else if (this.businessType == "3") {
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.getUnitList();
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
@@ -1189,6 +1855,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -1209,7 +1877,9 @@
this.getRowFeeItems(m, this.rbDetails[m]);
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
- this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
+ this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
+ r => r.itemid == this.rbDetails[m].itemid
+ );
}
sessionStorage.removeItem("apifunddetail");
@@ -1237,6 +1907,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
sessionStorage.setItem("apiform", JSON.stringify(this.form));
@@ -1246,14 +1918,19 @@
//涓氬姟鏄庣粏
getownFundDetail(this.curId).then(res => {
this.rbDetails = res.data;
- console.log("this.feeBlocks",this.feeBlocks);
+ console.log("this.feeBlocks", this.feeBlocks);
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
this.getRowFeeItems(m, this.rbDetails[m]);
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
- this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
- console.log("this.rbDetails[m].rowfeeblocks",this.rbDetails[m].rowfeeblocks);
+ this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
+ r => r.itemid == this.rbDetails[m].itemid
+ );
+ console.log(
+ "this.rbDetails[m].rowfeeblocks",
+ this.rbDetails[m].rowfeeblocks
+ );
}
if (this.rbDetails.length == 0) {
@@ -1278,6 +1955,7 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -1294,7 +1972,9 @@
this.getRowFeeItems(m, this.rbDetails[m]);
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
- this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(r => r.itemid == this.rbDetails[m].itemid);
+ this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
+ r => r.itemid == this.rbDetails[m].itemid
+ );
}
if (this.rbDetails.length == 0) {
@@ -1317,7 +1997,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(this.curId);
})
.then(() => {
@@ -1330,11 +2010,21 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
- handleUp() {
+ handleup() {
+ if (
+ (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
+ JSON.stringify(this.rbDetails) ==
+ sessionStorage.getItem("apifunddetail")) ||
+ !sessionStorage.getItem("apifunddetail")
+ ) {
+ } else {
+ this.$message.error("璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�");
+ return;
+ }
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -1344,6 +2034,9 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
+ if (!this.form.id) {
+ this.form.id = this.$route.query.id;
+ }
updateFund(this.form).then(response => {
if (response.code == 200) {
@@ -1351,6 +2044,7 @@
type: "success",
message: "鐢宠鎴愬姛"
});
+ this.cancel();
} else {
this.$message({
type: "error",
@@ -1379,7 +2073,7 @@
return randomString;
},
/** 鎻愪氦鎸夐挳 */
- submitForm: debounce(function () {
+ submitForm: debounce(function() {
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -1388,9 +2082,6 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
- // let totalPreTaxAmount = 0.0;
- // let totalAfterTaxAmount = 0.0;
- // let totalAmount = 0.0;
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.rbDetails.length; k++) {
@@ -1398,8 +2089,16 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ if (tempDetail.idcardno == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝～鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1408,20 +2107,17 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
- if (
- tempDetail.beneficiaryno == null ||
- tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨"
- ) {
+ if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1443,7 +2139,6 @@
}
//闄勪欢澶勭悊
- let list = this.fileList;
// if (list.length > 0) {
// this.form.annexfiles = list.map(item => item.url).join(",");
// }
@@ -1477,44 +2172,6 @@
].subjecttypename;
}
this.rbDetails[i] = tempDetail;
- /*
- //璁＄畻涓◣
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
- if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data;
- tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
-
- // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
- if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data.nowTax;
- tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
- */
}
//璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
if (this.businessType == "2") {
@@ -1526,8 +2183,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1541,8 +2198,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1600,30 +2257,51 @@
// });
}
- addorupdateFund(this.form).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
- } else {
- this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
- }
- });
sessionStorage.setItem(
"apifunddetail",
JSON.stringify(this.rbDetails)
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
-
+ addorupdateFund(this.form).then(response => {
+ console.log(this.form);
+ console.log(response, "淇濆瓨杩斿弬");
+ if (response.code === 200) {
+ if (this.userprofile.nickName != "闄堟厱鍗�") {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ }
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: response.data,
+ businessType: "2",
+ operationType: "update",
+ curCase: this.curCase
+ }
+ });
+ this.Routinglevel++;
+ } else {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
+ }
+ });
//鍏抽棴绐楀彛
this.loading = false;
// this.getfundList();
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
}
});
}, 500),
//瀹℃壒鎻愪氦
checksubmit() {
+ console.log(this.checkObj.flowlevelone);
+ if (
+ this.form.checkstatus != 3 &&
+ this.userprofile.nickName == "闄堟厱鍗�" &&
+ this.checkObj.flowlevelone == 1
+ ) {
+ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
+ return;
+ }
let checkFundObj = {
// fundid: this.checkObj.fundid,
fundid: this.curId,
@@ -1634,6 +2312,9 @@
//鍏抽棴绐楀彛
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ this.submitForm();
+ }
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
});
@@ -1642,14 +2323,16 @@
// 鍙栨秷鎸夐挳
cancel() {
// this.reset();
+ console.log(-this.Routinglevel);
this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
+ this.$router.go(-this.Routinglevel);
},
//鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUserProfile() {
getUserProfile().then(res => {
this.userprofile = res.data;
+ console.log(this.userprofile);
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
@@ -1745,6 +2428,7 @@
getFeeUnitList() {
listReportname("org").then(res => {
this.feeUnitList = res.data;
+ console.log(this.feeUnitList);
});
},
@@ -1792,7 +2476,7 @@
});
//鑾峰彇鏈嶅姟璐圭敤璇存槑鍒楄〃
- if (this.businessType == '1' || this.businessType == '2') {
+ if (this.businessType == "1" || this.businessType == "2") {
this.loading = true;
listItemexpense(this.expenseQueryParams).then(response => {
response.rows.forEach(item => {
@@ -1812,6 +2496,7 @@
//鑾峰彇鏈嶅姟椤圭洰
getRowFeeItems(rowindex, row) {
let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
+ console.log(list[0]);
row.itemlist = list[0].itemDetails;
this.$set(this.rbDetails, rowindex, row);
},
@@ -1931,52 +2616,17 @@
});
},
- selectExpert(row) {
- // if(row.beneficiaryname)
- this.personlist.map(res => {
- if (row.beneficiaryname == res.username) {
- row.beneficiaryno = res.userno;
- row.beneficiaryname = res.username;
- row.bankcardno = res.bankcardno;
- row.branchbankname = res.branchbankname;
- row.depositbank = res.depositbank;
- row.idcardno = res.idcardno;
- row.phone = res.phonenumber;
- row.title = res.title;
- row.unitname = res.unitname;
- row.unitno = res.unitno;
- } else {
- row.beneficiaryno = row.beneficiaryname;
- }
- });
- },
-
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = row.beneficiaryno;
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
-
- if (type == "A") {
- // 璁＄畻涓◣銆佺◣鍚庨噾棰�
- this.taxParam.money = row.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then(res => {
- if (res.code == 200) {
- row.taxamount = res.data;
- row.taxedamount = row.amount - row.taxamount;
- }
- });
- } else {
- // 璁＄畻绋庡墠銆佷釜绋庨噾棰�
- this.taxParam.money = row.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then(res => {
- if (res.code == 200) {
- row.taxamount = res.data.nowTax;
- row.amount = parseFloat(res.data.nowTaxBeforeMoney);
- }
- });
+ let targetValue = 0;
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ if (!this.rbDetails[i].amount) {
+ this.rbDetails[i].amount = 0;
+ }
+ targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
+ console.log(targetValue, "鍚堣");
+ this.form.pretaxcost = targetValue;
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -2003,8 +2653,8 @@
itemid: this.feeItemTypes[i].itemDetails[j].id,
itemcode: this.feeItemTypes[i].itemDetails[j].itemCode,
recordstatus: "-1",
- beneficiaryname: "鐐瑰嚮閫夋嫨",
- unitname: "鐐瑰嚮閫夋嫨",
+ beneficiaryname: null,
+ unitname: null,
itemlist: this.feeItemTypes[i].itemDetails,
rowfeeblocks: null,
servicesscope: null,
@@ -2018,10 +2668,13 @@
rowData.taxamount = 0.0;
rowData.taxedamount = 0.0;
- rowData.rowfeeblocks = this.feeBlocks.filter(r => r.itemid == rowData.itemid);
+ rowData.rowfeeblocks = this.feeBlocks.filter(
+ r => r.itemid == rowData.itemid
+ );
if (rowData.rowfeeblocks.length == 1) {
rowData.servicesscope = rowData.rowfeeblocks[0].servicesscope;
- rowData.servicesscopename = rowData.rowfeeblocks[0].expensedescribe;
+ rowData.servicesscopename =
+ rowData.rowfeeblocks[0].expensedescribe;
if (rowData.servicesscopename.includes("绋庡悗")) {
rowData.amount = 0.0;
rowData.taxamount = 0.0;
@@ -2057,9 +2710,6 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
- // let totalPreTaxAmount = 0.0;
- // let totalAfterTaxAmount = 0.0;
- // let totalAmount = 0.0;
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.rbDetails.length; k++) {
@@ -2067,8 +2717,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2077,20 +2727,17 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
- if (
- tempDetail.beneficiaryno == null ||
- tempDetail.beneficiaryno == "鐐瑰嚮閫夋嫨"
- ) {
+ if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2110,12 +2757,6 @@
// tempDetail.unitname = tempDetail.unitno;
// }
}
-
- //闄勪欢澶勭悊
- let list = this.fileList;
- // if (list.length > 0) {
- // this.form.annexfiles = list.map(item => item.url).join(",");
- // }
//澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
@@ -2195,8 +2836,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2210,8 +2851,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2298,6 +2939,27 @@
this.isIndeterminate =
checkedCount > 0 && checkedCount < this.cityOptions.length;
},
+ // 鎵嬪姩璁＄畻
+ Manualcalculationfn() {
+ ManualCalculation(this.rbDetails).then(res => {
+ console.log(res);
+ if (res.code == 200) {
+ sessionStorage.removeItem("apiform");
+ sessionStorage.removeItem("apifunddetail");
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
+ this.$router.go(0);
+ } else {
+ // this.$message({
+ // type: "error",
+ // message: "鐢宠澶辫触"
+ // });
+ }
+ });
+ },
// 鎵归噺褰曞叆鐐瑰嚮
Batchentry() {
// ethical
@@ -2331,6 +2993,7 @@
applytype: "7",
applytypename: "浼︾悊瀹℃牳涓撳璐�",
itemid: "27",
+ itemcode: "27",
itemname: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
itemtype: null,
amount: 200,
@@ -2347,6 +3010,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
+ itemdescribe: null,
uploadtime: null,
itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
@@ -2359,6 +3023,7 @@
for (let i = 0; i < this.checkedCities.length + 1; i++) {
this.rbDetails[i].orderno = i + 1;
}
+ this.calculateTax();
this.batchdialogVisible = false;
},
//鏂板涓�琛�
@@ -2367,9 +3032,10 @@
orderno: null,
id: null,
fundid: null,
- beneficiaryname: "鐐瑰嚮閫夋嫨",
+ beneficiaryname: null,
beneficiaryno: null,
- unitname: "鐐瑰嚮閫夋嫨",
+ unitname: null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
@@ -2386,6 +3052,7 @@
applytype: null,
itemid: null,
itemname: null,
+ itemcode: null,
itemtype: null,
amount: null,
prepaidamount: null,
@@ -2443,7 +3110,6 @@
}).then(() => {
this.$set(rows, rows.splice(index, 1));
getownFundDetail(this.form.id).then(res => {
-
this.$set(this.rbDetails, res.data);
for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].orderno = i + 1;
@@ -2563,42 +3229,62 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
- this.fileListto.splice(this.fileListto.indexOf(file), 1);
- rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ if (this.activeName == 1) {
+ this.fileListto.splice(this.fileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ } else {
+ this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto;
+ }
},
- //鏂囦欢涓婁紶鎴愬姛鍥炶皟
- // uploadSccess(response, file, fileList) {
- // //鑾峰彇闄勪欢淇℃伅浣嶇疆
- // if (response.code == 200) {
- // this.form.filename = file.raw.name;
- // this.$modal.msgSuccess(response.msg);
- // this.fileList.push({ name: response.fileName, url: response.fileName });
- // } else {
- // }
- // },
uploadSccess(response, file, fileList) {
this.rbDetails;
-
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- 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.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
-
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
-
- this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ if (this.activeName == 1) {
+ 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.pdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+ console.log(this.pdfimgsrcList);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+ this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ } else {
+ console.log(response.msg);
+ }
} else {
+ if (response.code == 200) {
+ // this.form.filename = file.raw.name;
+ this.previewpdf = true;
+ this.$modal.msgSuccess(response.msg);
+ this.invoicefileListto.push({
+ name: file.name,
+ url: response.fileName
+ });
+ this.invoicepdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+ console.log(this.invoicepdfimgsrcList);
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+ this.rbDetails[
+ this.atpresent
+ ].invoicefilesList = this.invoicefileListto;
+ console.log(this.rbDetails[this.atpresent]);
+ } else {
+ console.log(response.msg);
+ }
}
},
@@ -2606,76 +3292,150 @@
Filepopup(index, rows, row) {
this.tableDatatop = [];
this.pdfimgsrcList = [];
+ this.invoDatatop = [];
+ this.invoicepdfimgsrcList = [];
+ this.invoDatatop.push(row);
this.tableDatatop.push(row);
-
this.atpresent = index;
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;
- // this.pdfimg = this.fileListto[0].url;
this.fileListto.forEach(item => {
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
});
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.fileListto = [];
this.pdfimg = "";
this.pdftitle = "";
}
+ // -鍙戠エ鏂囦欢
+ if (this.rbDetails[index].invoicefilesList) {
+ this.previewpdf = true;
+ this.invoicefileListto = this.rbDetails[index].invoicefilesList;
+ console.log(this.invoicefileListto);
+ this.invoicepdfimg =
+ this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
+ this.invoicefileListto.forEach(item => {
+ this.invoicepdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + item.url
+ );
+ });
+ console.log(this.invoicepdfimgsrcList);
+ console.log(this.invoicepdfimg);
+ } else {
+ this.invoicefileListto = [];
+ this.invoicepdfimg = "";
+ this.pdftitle = "";
+ }
+
+ if (this.activeName == 1) {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- this.pdftitle =
- "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
- let name = item.name.split(".");
- if (name[1] == "pdf") {
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- } else if (name[1] == "jpg" || "png") {
- this.previewpdf = true;
- if (item.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
-
- // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
- // this.pdfimgsrcList.push(this.pdfimg);
- // }
+ if (this.activeName == 1) {
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+ } else {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
+ }
} else {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
}
} else {
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
+ console.log(this.invoicepdfimg, "pdfimg");
+ console.log(this.invoicepdfimgsrcList, "imglist");
+ } else {
+ this.invoicepdfimg =
+ this.Networkheader + "/prod-api" + item.response.url;
+ }
+ } else {
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ }
}
},
getIndexInArray(arr, obj) {
return arr.indexOf(obj);
},
+ // 鍙戠エ鍒囨崲
+ handleClick(tab, event) {
+ if (this.activeName == 1) {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
+ },
// 鐐瑰嚮鍒犻櫎
deletedowfile(row) {
- const indexlist = this.getIndexInArray(
- this.pdfimgsrcList,
- this.Networkheader + "/prod-api" + row.url
- );
- this.pdfimgsrcList.splice(indexlist, 1);
- const index = this.getIndexInArray(this.fileListto, row);
- this.fileListto.splice(index, 1);
+ if (this.activeName == 1) {
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ this.pdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.fileListto, row);
+ this.fileListto.splice(index, 1);
+ } else {
+ const indexlist = this.getIndexInArray(
+ this.invoicepdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ this.invoicepdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ this.invoicefileListto.splice(index, 1);
+ }
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
- const index = this.getIndexInArray(this.fileListto, row);
- const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
- this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ if (this.activeName == 1) {
+ const index = this.getIndexInArray(this.fileListto, row);
+ const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ } else {
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ }
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ShowDetailDialog(spoce, showType) {
this.spocewl = spoce;
this.selectionType = showType;
- if (this.businessType == 4 || !showType) {
+ if (this.businessType == 4 || this.businessType == 3 || !showType) {
this.selectionType = this.experthear;
}
// if (!showType) {
@@ -2683,7 +3443,7 @@
// }
this.expertfrom = "1";
-
+ console.log(spoce);
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
@@ -2702,20 +3462,23 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
- if (this.businessType == 4) {
- if (this.experthear == "expert") {
- this.funddetailForm.beneficiaryname = this.unitforname;
- } else {
- this.funddetailForm.beneficiaryname = this.Personnelforname;
- }
- }
-
+ // if (this.businessType == 4) {
+ // if (this.experthear == "expert") {
+ // this.funddetailForm.beneficiaryname = this.unitforname;
+ // } else {
+ // this.funddetailForm.beneficiaryname = this.Personnelforname;
+ // }
+ // }
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
- if (this.selectionType == "expert" || this.businessType == 4) {
+ if (
+ this.selectionType == "expert" ||
+ this.businessType == 4 ||
+ this.businessType == 3
+ ) {
if (this.expertfrom == "1" || this.experthear == "unit") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
@@ -2833,7 +3596,7 @@
// if (this.experthear == "unit") {
// singleDetail.unitname = "";
// }
- if (this.businessType == 4) {
+ if (this.businessType == 4 || this.businessType == 3) {
singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
}
this.rbDetails[tempIndex] = singleDetail;
@@ -2861,13 +3624,15 @@
// this.getFeeUnitList();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() {
+ window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
@@ -2950,7 +3715,7 @@
line-height: 25px;
}
-::v-deep .el-checkbox.is-bordered+.el-checkbox.is-bordered {
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
margin-left: 0 !important;
margin-bottom: 10px;
}
--
Gitblit v1.9.3