From 6d31fc90235ee89a8c70ab95c71eafca9b2f3732 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 12 九月 2023 17:45:43 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 1262 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 1,002 insertions(+), 260 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 2811fe1..33aa7bd 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,17 +72,39 @@
}}</el-radio>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <!-- <el-col :span="5">
<el-form-item label="閾惰鍚嶇О" prop="bankname">
<el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
- </el-form-item> </el-col><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> -->
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鐢宠閲戦" prop="pretaxcost">
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -69,11 +116,7 @@
</el-form-item>
</el-col>
-->
- <el-col :span="5">
- <el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
@@ -90,11 +133,7 @@
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
- </el-form-item>
- </el-col>
+
<!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
@@ -108,16 +147,38 @@
<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>
+ </el-row>
+ <el-row v-if="jurisdiction">
+ <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-row>
<el-table
:data="rbDetails"
v-loading="loading"
- max-height="400"
+ max-height="800"
border
highlight-current-row
>
@@ -125,7 +186,7 @@
prop="orderno"
align="center"
label="搴忓彿"
- width="65"
+ width="88"
>
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
@@ -135,10 +196,15 @@
<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"
+ v-model="scope.row.applytype"
placeholder="鏈嶅姟绫诲瀷"
@change="verifyFeeItemType(scope.row)"
>
@@ -151,10 +217,15 @@
</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"
+ v-model="scope.row.itemid"
placeholder="鏈嶅姟椤圭洰"
filterable
@change="verifyFeeItem(scope.row)"
@@ -169,36 +240,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 +322,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 +388,36 @@
</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"
+ v-if="form.applytype != '4'"
+ >
<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
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4'"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'expert')"
+ >{{ scope.row.beneficiaryname }}</el-button
+ >
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -262,50 +434,111 @@
</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"
+ >
<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="澶囨敞">
+ <el-table-column
+ prop="remark"
+ align="center"
+ width="330"
+ label="澶囨敞"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.remark" placeholder="澶囨敞" />
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.remark"
+ placeholder="澶囨敞"
+ />
</template>
</el-table-column>
- <el-table-column 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 +586,129 @@
-->
<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="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>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="operationType == 'detail' || operationType == 'check'">
+ <el-row
+ v-if="
+ operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ "
+ >
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳鏃ユ湡" 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,11 +747,20 @@
</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'">
+ <el-row v-if="businessType != 4">
+ <el-col
+ :span="24"
+ v-if="selectionType == 'expert' && businessType != 4"
+ >
<el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
<el-radio-group v-model="expertfrom" style="margin-bottom: 0">
<el-radio label="1">涓撳搴�</el-radio>
@@ -428,52 +768,183 @@
</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"
+ >
+ <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>
+
+ <el-row v-if="businessType == 4">
+ <el-col :span="24">
+ <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
+ <el-radio-group
+ @change="ShowDetailDialog(spocewl)"
+ v-model="experthear"
+ style="margin-bottom: 0"
+ >
+ <el-radio label="unit">浜哄憳閫夐」</el-radio>
+ <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="experthear == 'unit'">
+ <el-form-item
+ label="浜哄憳濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ @change="bbaaccss"
+ v-model="Personnelforname"
+ 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="unitforname"
+ 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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row v-if="businessType != 4">
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
- <el-input 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-row v-if="businessType != 4">
<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>
@@ -489,31 +960,62 @@
</el-col>
</el-row>
-->
- <el-row>
+ <el-row v-if="businessType != 4">
<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-row v-if="businessType != 4">
<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
@@ -524,6 +1026,85 @@
: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>
+ <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>
+ <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>
+ <el-table-column
+ prop="beneficiaryname"
+ align="center"
+ label="鍗曚綅/涓汉"
+ width="250"
+ v-if="form.applytype == '4'"
+ >
+ </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>
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�">
+ </el-table-column>
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰甯愬彿"
+ width="210"
+ >
+ </el-table-column>
+ </el-table>
+ </div>
<div class="pdfimg">
<div class="box-pdf">
<div>
@@ -535,7 +1116,6 @@
:show-file-list="false"
multiple
drag
- :limit="20"
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -544,7 +1124,6 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
@@ -568,6 +1147,7 @@
:data="fileListto"
@row-click="downFile"
style="width: 100%"
+ height="400"
>
<el-table-column
prop="name"
@@ -591,13 +1171,13 @@
<el-button
type="primary"
size="mini"
- @click.native.prevent="deletedowfile(scope.row)"
+ @click.native.prevent.stop="deletedowfile(scope.row)"
>鍒犻櫎</el-button
>
<el-button
type="primary"
size="mini"
- @click.native.prevent="moveupdowfile(scope.row)"
+ @click.native.prevent.stop="moveupdowfile(scope.row)"
>涓婄Щ</el-button
>
</template>
@@ -614,29 +1194,72 @@
</div> -->
</div>
- <div v-if="this.previewpdf" class="pdfimgmin">
+ <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
+ 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>
<el-button type="primary" @click="Savenow">纭� 瀹�</el-button>
</span>
</el-dialog>
+
+ <!-- 鎵归噺閫夊彇 -->
+ <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
+ >
+ <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>
+ </div>
+
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
+ </span>
+ </el-dialog>
</div>
</template>
<script>
+// 'sdaad2123UD2',1 'wsadadwsad',4 'sdadaddad',3 'ssaaddxs',2
//杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
import {
@@ -713,7 +1336,6 @@
Li_area_select,
OrgSelecter
},
-
name: "fundApply",
dicts: [
@@ -740,9 +1362,12 @@
// 瀵煎嚭閬僵灞�
exportLoading: false,
usernamedata: "",
+ jurisdiction: false,
+
// 琛ㄥ崟鍙傛暟
form: {},
-
+ experthear: "",
+ spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
//鐢宠鍗曠被鍨�
@@ -772,8 +1397,14 @@
feeUnitList: [],
// 缃戠粶璇锋眰澶�
Networkheader: null,
-
+ batchdialogVisible: false,
itemlist: [],
+ cityOptions: [],
+ checkAll: false,
+ checkedCities: [],
+ Personnelforname: "璇烽�夋嫨",
+ unitforname: "璇烽�夋嫨",
+ isIndeterminate: true,
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
@@ -790,6 +1421,7 @@
totalPreTaxAmount: 0.0,
totalAfterTaxAmount: 0.0,
totalAmount: 0.0,
+ tableDatatop: [],
//璐圭敤绫诲瀷鏁扮粍
feeItemTypes: [],
@@ -928,7 +1560,7 @@
pdfimgsrcList: [],
pdfVisible: false,
previewpdf: false,
- hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
+ hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
atpresent: "",
Savereminder: false, //鎻愰啋淇濆瓨寮规
Reminderquantity: 0, //鎻愰啋鏁伴噺
@@ -936,42 +1568,17 @@
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涓殑鏁版嵁鍙樺寲
watch: {},
//鏂规硶闆嗗悎
methods: {
+ bbaaccss(val) {
+ console.log(val);
+ console.log(this.funddetailForm);
+ },
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
@@ -1077,6 +1684,7 @@
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.getUnitList();
// this.getBaseInfoList();
}
@@ -1093,6 +1701,7 @@
this.handleUpdate();
} else if (this.operationType == "detail") {
this.title = this.businessName + "鏌ョ湅";
+ this.jurisdiction = true;
this.handleDetail();
} else if (this.operationType == "check") {
this.title = this.businessName + "瀹℃牳";
@@ -1182,6 +1791,14 @@
this.addRow(0);
}
});
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+ console.log(this.fundflowList);
});
},
@@ -1232,7 +1849,7 @@
});
},
- /** 淇敼鎸夐挳鎿嶄綔 */
+ /** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleCheck() {
this.isopen = 0;
this.reset();
@@ -1282,7 +1899,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(this.curId);
})
.then(() => {
@@ -1297,7 +1914,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1365,8 +1982,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1375,8 +1992,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1387,8 +2004,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1493,8 +2110,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1508,8 +2125,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1517,10 +2134,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -1710,13 +2328,16 @@
//鑾峰彇璐圭敤鏈烘瀯鍒楄〃
getFeeUnitList() {
+ console.log("鍗曚綅");
listReportname("org").then(res => {
this.feeUnitList = res.data;
});
+ console.log(this.feeUnitList);
},
//鑾峰彇鍖荤枟鏈烘瀯鍒楄〃
getUnitList() {
+ console.log("鍖荤枟鏈烘瀯");
listOrganization(3).then(response => {
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
@@ -1724,6 +2345,7 @@
organizationid: response.rows[i].id,
organizationname: response.rows[i].organizationname
});
+ console.log(this.unitList);
}
});
},
@@ -1794,7 +2416,6 @@
//璁＄畻绋庡墠閲戦
this.calculateTax(row, "B");
-
} else {
row.amount = item.expense;
row.taxamount = 0.0;
@@ -1903,7 +2524,6 @@
});
},
-
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
//if (isNaN(parseFloat(tempDetail.taxedamount)))
@@ -1911,20 +2531,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 +2646,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2037,8 +2656,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2049,8 +2668,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2155,8 +2774,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2170,8 +2789,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2179,10 +2798,11 @@
isNaN(parseFloat(tempDetail.taxamount)) ||
parseFloat(tempDetail.taxamount) == 0
) {
- tempDetail.taxedamount = tempDetail.amount;
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
tempDetail.taxedamount =
- tempDetail.amount + tempDetail.taxamount;
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
}
}
}
@@ -2248,7 +2868,86 @@
}
});
},
+ handleCheckAllChange(val) {
+ console.log(val);
+ this.checkedCities = val ? this.cityOptions : [];
+ this.isIndeterminate = false;
+ },
+ handleCheckedCitiesChange(value) {
+ console.log(value);
+ console.log(this.checkedCities);
+ let checkedCount = value.length;
+ console.log(checkedCount);
+ this.checkAll = checkedCount === this.cityOptions.length;
+ this.isIndeterminate =
+ checkedCount > 0 && checkedCount < this.cityOptions.length;
+ },
+ // 鎵归噺褰曞叆鐐瑰嚮
+ Batchentry() {
+ // ethical
+ listReportname("ethical").then(res => {
+ console.log(res);
+ this.cityOptions = res.data;
+ });
+ this.batchdialogVisible = true;
+ },
+ // 纭褰曞叆
+ BatchentryFn() {
+ this.checkedCities.forEach(item => {
+ console.log(item);
+ let rowData = {
+ orderno: null,
+ id: item.id,
+ fundid: null,
+ beneficiaryname: item.reportName,
+ beneficiaryno: null,
+ unitname: item.unitname,
+ unitno: null,
+ uintuserno: null,
+ title: item.title,
+ idcardtype: null,
+ idcardno: item.idcrad,
+ sex: null,
+ familyrelations: null,
+ phone: null,
+ depositbank: item.depositbank,
+ bankcardno: item.bankcardno,
+ branchbankname: item.branchbankname,
+ annexbankcard: null,
+ annexregistform: null,
+ applytype: "浼︾悊瀹℃牳涓撳璐�",
+ itemid: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�",
+ itemname: null,
+ itemtype: null,
+ amount: 200,
+ prepaidamount: null,
+ taxamount: null,
+ invoicecount: null,
+ taxedamount: null,
+ attachcount: null,
+ remark: null,
+ recordstatus: "-1",
+ delFlag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ uploadflag: null,
+ uploadtime: null,
+ itemlist: [],
+ servicesscope: null,
+ rowfeeblocks: [],
+ annexfiles: null
+ };
+ console.log(rowData);
+ this.rbDetails.push(rowData);
+ });
+ for (let i = 0; i < this.checkedCities.length + 1; i++) {
+ this.rbDetails[i].orderno = i + 1;
+ }
+ this.batchdialogVisible = false;
+ },
//鏂板涓�琛�
addRow(rowIndex) {
let rowData = {
@@ -2318,6 +3017,11 @@
type: "success"
})
.then(() => {
+ console.log(this.rbDetails.length);
+ if (this.rbDetails.length == 1) {
+ console.log("鏂板");
+ this.addRow(0);
+ }
if (row.id !== null) {
delFunddetail(row.id).then(res => {
if (res.code === 200) {
@@ -2351,9 +3055,6 @@
});
//鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
- if (this.rbDetails.length == 1) {
- this.addRow(0);
- }
},
//璁＄畻鎬婚噾棰�
@@ -2449,29 +3150,11 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
-
- /** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
- // downFile(item) {
- // const url = process.env.VUE_APP_BASE_API + item.url;
- // var a = document.createElement("a");
- // var event = new MouseEvent("click");
- // a.download = item.name;
- // a.href = url;
- // a.dispatchEvent(event);
- // },
-
- // remove(file) {
- // this.fileList.splice(this.fileList.indexOf(file), 1)
- // },
+ handleUploadError() {},
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
this.fileListto.splice(this.fileListto.indexOf(file), 1);
rbDetails[this.atpresent].annexfilesList = this.fileListto;
- },
-
- handleExceed() {
- this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
},
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
@@ -2491,11 +3174,16 @@
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
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(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;
} else {
@@ -2505,48 +3193,54 @@
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
+ console.log(row);
+ this.tableDatatop = [];
+ this.pdfimgsrcList = [];
+ this.tableDatatop.push(row);
+
this.atpresent = index;
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
+ this.previewpdf = true;
this.fileListto = this.rbDetails[index].annexfilesList;
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
// this.pdfimg = this.fileListto[0].url;
- this.pdfimgsrcList = [];
this.fileListto.forEach(item => {
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
});
console.log(this.pdfimgsrcList);
-
console.log(this.pdfimg);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.fileListto = [];
this.pdfimg = "";
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 =
+ "鍏�" + 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 (row.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + row.url;
- // this.pdfimg = row.url;
- // this.pdfimgsrcList = [];
- // this.pdfimgsrcList.push(this.pdfimg);
+ if (item.url) {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+
+ // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ // this.pdfimgsrcList.push(this.pdfimg);
+ // console.log("鍔犲叆");
+ // }
console.log(this.pdfimg);
+ console.log(this.pdfimgsrcList, "imglist");
} else {
- this.pdfimg = this.Networkheader + "/prod-api" + row.url;
+ this.pdfimg = this.Networkheader + "/prod-api" + item.url;
}
} else {
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
@@ -2561,9 +3255,16 @@
deletedowfile(row) {
console.log(this.fileListto);
console.log(row);
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ console.log(indexlist);
+ this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
- this.fileList = this.fileListto.splice(index, 1);
+ this.fileListto.splice(index, 1);
console.log(index);
+ console.log(this.pdfimgsrcList);
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
@@ -2573,7 +3274,17 @@
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ShowDetailDialog(spoce, showType) {
+ this.spocewl = spoce;
+ console.log(spoce);
this.selectionType = showType;
+ if (this.businessType == 4 || !showType) {
+ this.selectionType = this.experthear;
+ console.log(this.selectionType);
+ }
+ // if (!showType) {
+ // this.selectionType = this.experthear;
+
+ // }
this.expertfrom = "1";
this.funddetailForm.index = spoce.$index;
@@ -2594,13 +3305,27 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
ConfirmDetailDialog() {
+ console.log(this.unitforname);
+ console.log(this.Personnelforname);
+ if (this.businessType == 4) {
+ if (this.experthear == "expert") {
+ this.funddetailForm.beneficiaryname = this.unitforname;
+ } else {
+ console.log(11);
+ this.funddetailForm.beneficiaryname = this.Personnelforname;
+ console.log(this.funddetailForm.beneficiaryname);
+ }
+ }
+
+ console.log(this.funddetailForm);
let tempIndex = this.funddetailForm.index;
let tempExpertName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.rbDetails[tempIndex];
+ console.log(tempExpertName);
- if (this.selectionType == "expert") {
- if (this.expertfrom == "1") {
+ if (this.selectionType == "expert" || this.businessType == 4) {
+ if (this.expertfrom == "1" || this.experthear == "unit") {
//浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
this.personlist.map(res => {
if (tempExpertName == res.username) {
@@ -2715,6 +3440,14 @@
}
}
+ // if (this.experthear == "unit") {
+ // singleDetail.unitname = "";
+ // }
+ if (this.businessType == 4) {
+ singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
+ }
+ console.log(singleDetail);
+ console.log(this.funddetailForm);
this.rbDetails[tempIndex] = singleDetail;
this.showSelectionDialog = false;
}
@@ -2726,6 +3459,7 @@
this.Getnetworkheader();
this.getroute();
this.getExternalList();
+ this.getFeeUnitList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
@@ -2825,4 +3559,12 @@
line-height: 36px;
text-align: center;
}
+::v-deep .el-alert__title {
+ font-size: 25px;
+ line-height: 25px;
+}
+::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
+ margin-left: 0 !important;
+ margin-bottom: 10px;
+}
</style>
--
Gitblit v1.9.3