From 8022f7036945b75f82f2dfc43055623f81ed98f6 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 五月 2025 22:42:56 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 1547 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 1,130 insertions(+), 417 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 956ff25..b930047 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,22 +7,45 @@
<el-row>
<el-col :span="5">
<el-form-item label="鎶ラ攢鍗曞彿" prop="bh">
- <el-input v-model="form.bh" :disabled="true" placeholder="鎶ラ攢鍗曞彿" clearable />
+ <el-input
+ v-model="form.bh"
+ :disabled="true"
+ placeholder="鎶ラ攢鍗曞彿"
+ clearable
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
- <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�">
+ <el-date-picker
+ clearable
+ :disabled="true"
+ style="width: 100%"
+ v-model="form.applyTime"
+ 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>
@@ -33,7 +56,7 @@
</el-col>
</el-row>
<el-row>
- <!--
+ <!--
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -49,24 +72,40 @@
</el-col>
<el-col :span="5" v-if="ismanager == true">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ <el-input
+ v-model="form.pretaxcost"
+ placeholder="绋庡墠閲戦鍚堣"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="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>
<el-row style="text-align: left">
<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="10">
@@ -74,7 +113,7 @@
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <!--
+ <!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
@@ -88,201 +127,396 @@
<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>
<el-col :span="3" v-if="businessType == '1'">
<div style="margin-bottom: 15px;">
- <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems">
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="small"
+ @click.native.prevent="importFeeItems"
+ >
鎵归噺瀵煎叆鏈嶅姟椤圭洰
</el-button>
</div>
</el-col>
<el-col :span="3" v-if="businessType == 2">
<div style="margin-bottom: 15px;">
- <el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-download"
+ size="small"
+ @click="Batchentry"
+ >鎵归噺褰曞叆涓撳</el-button
+ >
</div>
</el-col>
- <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' &&
- (businessType == '1' || businessType == '2')
- ">
+ <!-- <el-col
+ :span="3"
+ v-if="
+ userprofile.nickName == '闄堟厱鍗�' &&
+ (businessType == '1' || businessType == '2')
+ "
+ >
<div style="margin-bottom: 15px;">
- <el-button type="success" icon="el-icon-edit-outline" size="small"
- @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ <el-button
+ type="success"
+ icon="el-icon-edit-outline"
+ size="small"
+ @click="Manualcalculationfn"
+ >璁＄畻涓◣</el-button
+ >
</div>
- </el-col>
+ </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>
</el-table-column>
- <!--
- <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>
- </template>
- </el-table-column>
- <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>
- </template>
- </el-table-column>
- <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="businessType == '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>
- </template>
- </el-table-column>
- <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);
- }
- " />
- </template>
- </el-table-column>
- <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);
- }
- " />
- </template>
- </el-table-column>
- <el-table-column prop="amount" align="center" :label="amountlabel" width="120">
- <template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="閲戦" />
- </template>
- </el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="ismanager == true &&
- (businessType == '1' || businessType == '2')
- ">
- <template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣閲戦" />
- </template>
- </el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="ismanager == true &&
- (businessType == '1' || businessType == '2')
- ">
- <template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
- </template>
- </el-table-column>
- <el-table-column prop="beneficiaryname" column-key="sdad" align="center" :label="beneficiarylabel"
- width="200">
- <template slot-scope="scope">
- <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
- scope.row.beneficiaryname
- ? scope.row.beneficiaryname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button>
- </template>
- </el-table-column>
- <el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250"
- v-if="businessType == '1' || businessType == '2'">
- <template slot-scope="scope">
- <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{
- scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
- }}</el-button>
- </template>
- </el-table-column>
- <!--
- <el-table-column prop="unitname" align="center" label="鍗曚綅锛堜釜浜猴級鍚嶇О" width="300"
- v-if="form.applytype == '4' || form.applytype == '3'">
- <template slot-scope="scope">
- <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
- scope.row.unitname
- ? scope.row.unitname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button>
-
<el-select
- v-model="scope.row.unitno"
- placeholder="鍗曚綅"
- clearable
- filterable
- allow-create
+ v-model="scope.row.applytype"
+ placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
+ @change="verifyFeeItemType(scope.row)"
>
<el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
+ 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="title" align="center" label="鑱岀О" width="120"
- v-if="businessType == '1' || businessType == '2'">
+ <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>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="servicesscope"
+ align="center"
+ label="鏈嶅姟璇存槑"
+ v-if="businessType == '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>
+ </template>
+ </el-table-column>
+ <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);
+ }
+ "
+ />
+ </template>
+ </el-table-column>
+ <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);
+ }
+ "
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="amount"
+ align="center"
+ :label="amountlabel"
+ width="120"
+ >
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.amount" placeholder="閲戦" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="taxamount"
+ align="center"
+ label="鎵ｇ◣閲戦"
+ width="120"
+ v-if="
+ ismanager == true &&
+ (businessType == '1' || businessType == '2')
+ "
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.taxamount"
+ placeholder="鎵ｇ◣閲戦"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ width="120"
+ v-if="
+ ismanager == true &&
+ (businessType == '1' || businessType == '2')
+ "
+ >
+ <template slot-scope="scope">
+ <el-input
+ v-model="scope.row.taxedamount"
+ placeholder="绋庡悗閲戦"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="beneficiaryname"
+ column-key="sdad"
+ align="center"
+ :label="beneficiarylabel"
+ width="200"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ plain
+ @click="showSelectionDialog(scope, 'account')"
+ >{{
+ scope.row.beneficiaryname
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
+ }}</el-button
+ >
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="涓撳鎵�鍦ㄥ崟浣�"
+ width="250"
+ v-if="businessType == '1' || businessType == '2'"
+ >
+ <template slot-scope="scope">
+ <el-button
+ type="primary"
+ plain
+ @click="showSelectionDialog(scope, 'workunit')"
+ >{{
+ scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
+ }}</el-button
+ >
+ </template>
+ </el-table-column>
+
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="businessType == '1' || businessType == '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="businessType == '1' || businessType == '2'">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="businessType == '1' || businessType == '2'"
+ >
<template slot-scope="scope">
<el-form-item label-width="0">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model.number="scope.row.idcardno"
- @input="tableParValueChange1(scope.row)" placeholder="韬唤璇佸彿" />
+ <el-input
+ :disabled="userprofile.nickName != '闄堟厱鍗�'"
+ v-model.number="scope.row.idcardno"
+ @input="tableParValueChange1(scope.row)"
+ placeholder="韬唤璇佸彿"
+ />
</el-form-item>
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ >
<template slot-scope="scope">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ :disabled="userprofile.nickName != '闄堟厱鍗�'"
+ 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 :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
+ <el-input
+ :disabled="userprofile.nickName != '闄堟厱鍗�'"
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰甯愬彿"
+ />
</template>
</el-table-column>
- <el-table-column prop="itemdescrisca" align="center" width="330" label="椤圭洰璇存槑">
+ <el-table-column
+ prop="itemdescrisca"
+ align="center"
+ width="330"
+ label="椤圭洰璇存槑"
+ >
<template slot-scope="scope">
- <el-input type="textarea" :rows="2" v-model="scope.row.itemdescribe" placeholder="椤圭洰璇存槑" />
+ <el-input
+ type="textarea"
+ :rows="2"
+ v-model="scope.row.itemdescribe"
+ placeholder="椤圭洰璇存槑"
+ />
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" width="330" label="澶囨敞" v-show="ismanager == true">
+ <el-table-column
+ prop="remark"
+ align="center"
+ width="330"
+ label="澶囨敞"
+ v-show="ismanager == true"
+ >
<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.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 == 2 || businessType == 3 || businessType == 4
- ">绁ㄦ嵁</el-button>
+ <el-button
+ @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ "
+ type="text"
+ size="small"
+ v-if="
+ businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ businessType == 1
+ "
+ >绁ㄦ嵁</el-button
+ >
</template>
</el-table-column>
</el-table>
@@ -290,20 +524,55 @@
<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
@@ -311,38 +580,75 @@
</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="danger"
+ 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' && userprofile.nickName == '闄堟厱鍗�'">
- <el-col :span="20">
+ <el-row
+ style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
+ >
+ <el-col :span="12">
<el-form-item label="棰勫鏉愭枡" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
<el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
@@ -351,8 +657,20 @@
</el-radio-group>
</el-form-item>
</el-col>
+ <el-col :span="12" v-if="businessType == 1">
+ <el-form-item label="绠楃◣鐘舵��" prop="infoid">
+ <el-radio-group v-model="form.istax" align="left">
+ <el-radio :label="-1">瀹℃牳涓�</el-radio>
+ <el-radio :label="0">鍏佽绠楃◣</el-radio>
+ <el-radio :label="1">宸茬畻绋�</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-row
+ style="margin-top: 5px; margin-bottom: 5px"
+ v-if="operationType == 'check'"
+ >
<el-col :span="20">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -371,45 +689,103 @@
</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="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
+ 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="650px"
- style="text-align: center" v-loading="loading">
- <el-form ref="accountselectform" :rules="dialogrules" :model="accountselectform" label-width="120px">
+ <el-dialog
+ :visible.sync="showselectiondialog"
+ :close-on-click-modal="false"
+ :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'"
+ width="650px"
+ style="text-align: center"
+ v-loading="loading"
+ >
+ <el-form
+ ref="accountselectform"
+ :rules="dialogrules"
+ :model="accountselectform"
+ label-width="120px"
+ >
<el-row v-if="selectionType == 'workunit'">
<el-col :span="24">
- <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitname" label-width="120px">
- <el-select v-model="accountselectform.expertunitname" placeholder="鍗曚綅鍚嶇О" 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-form-item
+ label="鍗曚綅鍚嶇О"
+ prop="expertunitname"
+ label-width="120px"
+ >
+ <el-select
+ v-model="accountselectform.expertunitname"
+ placeholder="鍗曚綅鍚嶇О"
+ 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="selectionType == 'account'">
<el-col>
- <el-form-item label="璐︽埛鏉ユ簮" prop="accountfrom" class="left-align">
+ <el-form-item
+ label="璐︽埛鏉ユ簮"
+ prop="accountfrom"
+ class="left-align"
+ >
<el-radio-group v-model="accountfrom" style="margin-bottom: 0">
<el-radio label="1">浠庤处鎴峰簱</el-radio>
- <el-radio label="2">鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio>
+ <el-radio label="2"
+ >鏂板璐︽埛锛堟柊澧炰笓瀹惰处鎴峰悗闇�瑕佸鏍稿惎鐢ㄦ墠鑳戒娇鐢級</el-radio
+ >
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24" v-if="accountfrom == '1'">
<el-form-item label="璐︽埛鍚嶇О" prop="accountname">
- <el-select filterable allow-create ref="accountname" default-first-option
- v-model="accountselectform.accountname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in accountlist" :key="item.id" :label="item.userid" :value="item.id">
+ <el-select
+ filterable
+ allow-create
+ ref="accountname"
+ default-first-option
+ v-model="accountselectform.accountname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in accountlist"
+ :key="item.id"
+ :label="item.userid"
+ :value="item.id"
+ >
</el-option>
</el-select>
</el-form-item>
@@ -418,8 +794,11 @@
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="24">
<el-form-item label="鏂板绫诲瀷" prop="usertype" class="left-align">
- <el-radio-group v-model="accountselectform.usertype" style="margin-bottom: 0"
- @change="userTypeChange(accountselectform.usertype)">
+ <el-radio-group
+ v-model="accountselectform.usertype"
+ style="margin-bottom: 0"
+ @change="userTypeChange(accountselectform.usertype)"
+ >
<el-radio label="expert">涓撳璐︽埛</el-radio>
<el-radio label="org">鍗曚綅璐︽埛</el-radio>
<el-radio label="donor">鎹愮尞鑰呬翰灞炶处鎴�</el-radio>
@@ -430,90 +809,160 @@
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="24">
<el-form-item label="璐︽埛鍚嶇О" prop="username">
- <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" />
+ <el-input
+ v-model="accountselectform.username"
+ placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�"
+ />
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="selectionType == 'account' &&
- accountfrom == '2' &&
- accountselectform.usertype != 'org'
- ">
+ <el-row
+ v-if="
+ selectionType == 'account' &&
+ accountfrom == '2' &&
+ accountselectform.usertype != 'org'
+ "
+ >
<el-col :span="12">
<el-form-item label="韬唤璇佸彿" prop="idcardno">
- <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ <el-input
+ v-model="accountselectform.idcardno"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ />
</el-form-item>
</el-col>
<el-col :span="12" v-if="accountselectform.usertype == 'expert'">
<el-form-item label="鑱岀О" prop="title">
- <el-select v-model="accountselectform.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
- <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
- :value="dict.label"></el-option>
+ <el-select
+ v-model="accountselectform.title"
+ 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="selectionType == 'account' &&
- accountfrom == '2' &&
- accountselectform.usertype == 'expert'
- ">
+ <el-row
+ v-if="
+ selectionType == 'account' &&
+ accountfrom == '2' &&
+ accountselectform.usertype == 'expert'
+ "
+ >
<el-col>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
- <el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
+ <el-select
+ v-model="accountselectform.unitno"
+ placeholder="鍗曚綅鍚嶇О"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col>
<el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
- <el-input v-model="accountselectform.personnelunitno" placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿" />
+ <el-input
+ v-model="accountselectform.personnelunitno"
+ placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
- <el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" />
+ <el-col
+ ><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
+ <el-input
+ v-model="accountselectform.depositbank"
+ placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�"
+ />
</el-form-item>
</el-col>
- <el-col><el-form-item label="閾惰鍗″彿" prop="bankcardno">
- <el-input v-model="accountselectform.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" />
+ <el-col
+ ><el-form-item label="閾惰鍗″彿" prop="bankcardno">
+ <el-input
+ v-model="accountselectform.bankcardno"
+ placeholder="璇疯緭鍏ラ摱琛屽崱鍙�"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鍦板潃" prop="address">
- <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" />
+ <el-input
+ v-model="accountselectform.address"
+ placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�"
+ />
</el-form-item>
</el-col>
</el-row>
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
- <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ <el-input
+ v-model="accountselectform.telephone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="confirmSelectionDialog()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="confirmSelectionDialog()"
+ >纭� 瀹�</el-button
+ >
<el-button @click="showselectiondialog = false">鍙� 娑�</el-button>
</span>
</el-dialog>
- <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
- width="60%">
- <div>
+ <el-dialog
+ v-dialogDrags
+ :modal="false"
+ :close-on-click-modal="false"
+ :title="pdftitle"
+ :visible.sync="pdfVisible"
+ width="60%"
+ >
+ <div style="margin-bottom: 10px;">
<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"
@@ -533,61 +982,143 @@
</el-table-column> -->
<el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250">
</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'"
+ >
</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>
-
- <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick">
- <el-tab-pane label="鏅�氶檮浠�" :name="1">
+ <el-alert
+ title="鏂颁笂浼犳枃浠堕渶鍦ㄦ彁浜や繚瀛樺悗鎵嶅彲杩涜妗堜緥鍏宠仈锛屽惁鍒欒涓烘斁寮�"
+ type="error"
+ show-icon
+ close-text="鐭ラ亾浜�"
+ >
+ </el-alert>
+ <el-tabs
+ style="margin-top: 20px;"
+ v-model="activeName"
+ type="border-card"
+ @tab-click="handleClick"
+ >
+ <el-tab-pane label="鏅�氶檮浠�" name="common">
<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">
+ <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" />
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘">
+ <el-table-column
+ prop="name"
+ width="190"
+ :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="success" size="mini" icon="el-icon-search" circle
- @click.native.prevent.stop="Downloadfile(scope.row)"></el-button>
+ <el-button
+ type="danger"
+ 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="success"
+ size="mini"
+ icon="el-icon-search"
+ circle
+ @click.native.prevent.stop="Downloadfile(scope.row)"
+ ></el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
+ <div
+ v-if="this.previewpdf && pdfimgsrcList.length"
+ class="pdfimgmin"
+ >
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad" :src="pdfimg"
- :preview-src-list="pdfimgsrcList">
+ <el-image
+ style="width: 95%; height: 90%"
+ @error="handleImageError"
+ @load="handleImageLoad"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
+ >
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
@@ -596,47 +1127,103 @@
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
</el-tab-pane>
- <el-tab-pane label="鍙戠エ鏂囦欢" :name="2">
+ <el-tab-pane label="鍙戠エ鏂囦欢" name="invoice">
<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">
+ <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>
+ <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="鍚嶇О">
+ <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" />
<span>{{ scope.row.name }}</span>
</template>
</el-table-column>
- <el-table-column prop="name" width="190" :show-overflow-tooltip="true" label="鍔熻兘">
+ <el-table-column
+ prop="name"
+ width="190"
+ :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="success" size="mini" icon="el-icon-search" circle
- @click.native.prevent.stop="Downloadfile(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
+ >
+ <el-button
+ type="success"
+ size="mini"
+ icon="el-icon-search"
+ circle
+ @click.native.prevent.stop="Downloadfile(scope.row)"
+ ></el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
- <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
+ <div
+ v-if="this.previewpdf && invoicepdfimgsrcList.length"
+ class="pdfimgmin"
+ >
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad"
- :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList">
+ <el-image
+ style="width: 95%; height: 90%"
+ @error="handleImageError"
+ @load="handleImageLoad"
+ :src="invoicepdfimg"
+ :preview-src-list="invoicepdfimgsrcList"
+ >
<!-- <div slot="error" class="image-slot">
<i class="el-icon-picture-outline"></i>
</div> -->
@@ -648,10 +1235,14 @@
</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 type="primary" @click="Savenow">纭� 瀹�</el-button>
@@ -660,13 +1251,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>
@@ -1036,7 +1644,7 @@
invoicepdfimg: "",
invoicepdfimgsrcList: [],
invoDatatop: [],
- activeName: 1, //鏂囦欢绫诲瀷
+ activeName: "common", //鏂囦欢绫诲瀷
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
ICDtoken: getToken(),
@@ -1065,13 +1673,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 {
@@ -1362,7 +1970,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(this.curId);
})
.then(() => {
@@ -1375,7 +1983,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1383,7 +1991,7 @@
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1452,7 +2060,7 @@
return randomString;
},
/** 鎻愪氦鎸夐挳 */
- submitForm: debounce(function () {
+ submitForm: debounce(function() {
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -1468,8 +2076,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1478,8 +2086,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1487,8 +2095,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1535,8 +2143,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1550,8 +2158,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1629,7 +2237,7 @@
sessionStorage.setItem("apiform", JSON.stringify(this.form));
addorupdateFund(this.form)
.then(response => {
- if (response.code === 200) {
+ if (response.code == 200) {
if (this.form.id) {
this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
this.$router.go(-1);
@@ -1640,7 +2248,7 @@
path: "/finance/applyDetail/",
query: {
id: response.data,
- businessType: "2",
+ businessType: this.businessType,
operationType: "update",
curCase: this.curCase
}
@@ -1760,10 +2368,10 @@
bankcardno: res.rows[j].bankcardno,
unitno: res.rows[j].unitno,
unitname: res.rows[j].unitname,
- userid: res.rows[j].username
+ userid:
+ res.rows[j].username + "锛�" + res.rows[j].bankcardno + "锛�"
});
- }
- else {
+ } else {
this.accountlist.push({
id: res.rows[j].id,
userno: res.rows[j].userno,
@@ -1774,7 +2382,8 @@
bankcardno: res.rows[j].bankcardno,
unitno: res.rows[j].unitno,
unitname: res.rows[j].unitname,
- userid: res.rows[j].username + '锛�' + res.rows[j].idcardno + '锛�'
+ userid:
+ res.rows[j].username + "锛�" + res.rows[j].idcardno + "锛�"
});
}
}
@@ -2064,8 +2673,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2074,8 +2683,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2083,8 +2692,16 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑浜哄憳濮撳悕涓虹┖,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ if (tempDetail.unitname == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑涓撳鍗曚綅涓虹┖,璇烽�夋嫨鍗曚綅鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2131,8 +2748,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2146,8 +2763,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2188,11 +2805,23 @@
flowconclusion: this.checkObj.flowlevelone,
flowcontent: this.checkObj.flowconclusion
};
+ this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
checkfund(checkFundObj).then(res => {
- //鍏抽棴绐楀彛
- this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
+ if (res.code == 200) {
+ //鍏抽棴绐楀彛
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
+ } else {
+ this.$modal.closeLoading();
+
+ if (res.msg) {
+ this.$modal.msgError("鎿嶄綔澶辫");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ }
});
}
this.Getnetworkheader();
@@ -2420,10 +3049,8 @@
.catch(() => {
//鍑犵偣鍙栨秷鐨勬彁绀�
});
-
//鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
},
-
//璁＄畻鎬婚噾棰�
sumTotalFee(row) {
let allSum = 0;
@@ -2536,10 +3163,10 @@
// 鍥剧墖鍔犺浇鎴愬姛鏃舵墽琛岀殑鎿嶄綔
console.log("Image loaded successfully");
},
- handleUploadError() { },
+ handleUploadError() {},
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.fileListto.splice(this.fileListto.indexOf(file), 1);
rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
@@ -2555,7 +3182,7 @@
};
const pdfimg = this.Networkheader + "/prod-api" + response.fileName;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
if (response.code == 200) {
this.previewpdf = true;
@@ -2632,36 +3259,61 @@
this.tableDatatop = [];
this.fileListto = [];
this.invoicefileListto = [];
- this.pdfimg = '';
+ this.pdfimg = "";
this.invoicepdfimg = [];
this.pdfimgsrcList = [];
this.invoicepdfimgsrcList = [];
this.tableDatatop.push(row);
this.atpresent = index;
this.pdfVisible = true;
- console.log(this.fileListto, "this.fileListto");
- console.log(this.invoicefileListto, "this.invoicefileListto");
+
if (this.rbDetails[index].annexfilesList) {
- this.rbDetails[index].annexfilesList.forEach((value, indexson) => {
- const pdfimg = this.Networkheader + "/prod-api" + value.url;
- fetch(pdfimg, config)
- .then(response => response.blob())
- .then(blob => {
- // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
- this.fileListto.push({
- name: value.name,
- url: URL.createObjectURL(blob)
+ // this.rbDetails[index].annexfilesList.forEach((value, indexson) => {
+ // const pdfimg = this.Networkheader + "/prod-api" + value.url;
+ // fetch(pdfimg, config)
+ // .then(response => response.blob())
+ // .then(blob => {
+ // // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
+ // this.fileListto.push({
+ // name: value.name,
+ // url: URL.createObjectURL(blob)
+ // });
+ // if (this.fileListto.length == 1) {
+ // this.pdfimg = URL.createObjectURL(blob);
+ // }
+ // this.pdfimgsrcList.push(URL.createObjectURL(blob));
+ // })
+ // .catch(error => {
+ // console.error("Error loading image", error);
+ // return;
+ // });
+ // });
+
+ const fetchPromises = this.rbDetails[index].annexfilesList.map(
+ (value, indexson) => {
+ const pdfimg = this.Networkheader + "/prod-api" + value.url;
+ return fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ return {
+ name: value.name,
+ url: URL.createObjectURL(blob)
+ };
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return null;
});
- if (this.fileListto.length == 1) {
- this.pdfimg = URL.createObjectURL(blob);
- }
- this.pdfimgsrcList.push(URL.createObjectURL(blob));
- })
- .catch(error => {
- console.error("Error loading image", error);
- return;
- });
+ }
+ );
+
+ Promise.all(fetchPromises).then(fileListto => {
+ this.fileListto = fileListto.filter(item => item !== null);
+ this.pdfimg = this.fileListto[0].url;
+ console.log(this.pdfimg, "pdfimg");
+ this.pdfimgsrcList = this.fileListto.map(item => item.url);
});
+
this.previewpdf = true;
} else {
this.fileListto = [];
@@ -2670,26 +3322,35 @@
}
//鍙戠エ
if (this.rbDetails[index].invoicefilesList) {
- this.rbDetails[index].invoicefilesList.forEach((value, indexson) => {
- const pdfimg = this.Networkheader + "/prod-api" + value.url;
- fetch(pdfimg, config)
- .then(response => response.blob())
- .then(blob => {
- // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
- this.invoicefileListto.push({
- name: value.name,
- url: URL.createObjectURL(blob)
+ const fetchPromises = this.rbDetails[index].invoicefilesList.map(
+ (value, indexson) => {
+ const pdfimg = this.Networkheader + "/prod-api" + value.url;
+ return fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ return {
+ name: value.name,
+ url: URL.createObjectURL(blob)
+ };
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return null;
});
- if (this.invoicefileListto.length == 1) {
- this.invoicepdfimg = URL.createObjectURL(blob);
- }
- this.invoicepdfimgsrcList.push(URL.createObjectURL(blob));
- })
- .catch(error => {
- console.error("Error loading image", error);
- return;
- });
+ }
+ );
+
+ Promise.all(fetchPromises).then(invoicefileListto => {
+ this.invoicefileListto = invoicefileListto.filter(
+ item => item !== null
+ );
+ this.invoicepdfimg = this.invoicefileListto[0].url;
+ console.log(this.invoicepdfimg, "invoicepdfimg");
+ this.invoicepdfimgsrcList = this.invoicefileListto.map(
+ item => item.url
+ );
});
+
this.previewpdf = true;
} else {
this.invoicefileListto = [];
@@ -2697,16 +3358,18 @@
this.pdftitle = "";
}
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
}
+ console.log(this.fileListto, "this.fileListto");
+ console.log(this.rbDetails[index].annexfilesList, "annexfilesList");
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.pdftitle =
"鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -2754,7 +3417,7 @@
},
// 鍙戠エ鍒囨崲
handleClick(tab, event) {
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
@@ -2764,16 +3427,14 @@
deletedowfile(row) {
console.log(row);
let indexvalue = "";
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
const indexlist = this.getIndexInArray(this.pdfimgsrcList, row.url);
this.pdfimgsrcList.splice(indexlist, 1);
const index = this.getIndexInArray(this.fileListto, row);
this.fileListto.splice(index, 1);
console.log(this.rbDetails[this.atpresent].annexfilesList);
- indexvalue = this.rbDetails[this.atpresent].annexfilesList.find(
- (item, index) => {
- return item.name == row.name;
- }
+ indexvalue = this.rbDetails[this.atpresent].annexfilesList.findIndex(
+ item => item.name == row.name
);
console.log(indexvalue, "鍒犻櫎绱㈠紩");
this.rbDetails[this.atpresent].annexfilesList.splice(indexvalue, 1);
@@ -2786,10 +3447,8 @@
const index = this.getIndexInArray(this.invoicefileListto, row);
this.invoicefileListto.splice(index, 1);
console.log(this.rbDetails[this.atpresent].invoicefilesList);
- indexvalue = this.rbDetails[this.atpresent].invoicefilesList.find(
- (item, index) => {
- return item.name == row.name;
- }
+ indexvalue = this.rbDetails[this.atpresent].invoicefilesList.findIndex(
+ item => item.name == row.name
);
console.log(indexvalue, "鍒犻櫎绱㈠紩");
this.rbDetails[this.atpresent].invoicefilesList.splice(indexvalue, 1);
@@ -2797,15 +3456,52 @@
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
- if (this.activeName == 1) {
- const index = this.getIndexInArray(this.fileListto, row);
+ if (this.activeName == "common") {
+ const index = this.fileListto.findIndex(item => item.name == row.name);
const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+
+ const indexann = this.rbDetails[
+ this.atpresent
+ ].annexfilesList.findIndex(item => item.name == row.name);
+ const itemann = this.rbDetails[this.atpresent].annexfilesList.splice(
+ indexann,
+ 1
+ )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.rbDetails[this.atpresent].annexfilesList.splice(
+ indexann - 1,
+ 0,
+ itemann
+ ); // 灏唅temann鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ console.log(indexann, "indexann");
+ console.log(index, "index");
} else {
- const index = this.getIndexInArray(this.invoicefileListto, row);
+ const index = this.invoicefileListto.findIndex(
+ item => item.name == row.name
+ );
+
const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+
+ const indexinvo = this.rbDetails[
+ this.atpresent
+ ].invoicefilesList.findIndex(item => item.name == row.name);
+ const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice(
+ indexinvo,
+ 1
+ )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.rbDetails[this.atpresent].invoicefilesList.splice(
+ indexinvo - 1,
+ 0,
+ iteminvo
+ ); // 灏唅teminvo鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
}
+ console.log(
+ this.rbDetails[this.atpresent].annexfilesList,
+ "annexfilesList"
+ );
+ console.log(this.fileListto, "fileListto");
+ // console.log(this.rbDetails[this.atpresent].invoicefilesList,'invoicefilesList');
},
Downloadfile(row) {
window.location.href = row.url;
@@ -2820,11 +3516,12 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
- if (scope.row.idcardno == undefined || scope.row.idcardno == null) {
- this.accountselectform.accountname = scope.row.beneficiaryname;
- }
- else {
- this.accountselectform.accountname = scope.row.beneficiaryname + '锛�' + scope.row.idcardno + '锛�';
+ if (scope.row.idcardno) {
+ this.accountselectform.accountname =
+ scope.row.beneficiaryname + "锛�" + scope.row.idcardno + "锛�";
+ } else {
+ this.accountselectform.accountname =
+ scope.row.beneficiaryname + "锛�" + scope.row.bankcardno + "锛�";
}
this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
@@ -2856,9 +3553,22 @@
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- if (this.rbDetails[tempIndex].userno != this.accountselectform.userno) {
+ if (
+ this.rbDetails[tempIndex].userno != this.accountselectform.userno
+ ) {
this.accountlist.map(res => {
if (res.id == this.accountselectform.accountname) {
+ console.log(res, "res");
+ const hasIdOne = this.rbDetails.some(
+ obj => obj.beneficiaryname == res.username
+ );
+ if (hasIdOne) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛屼汉鍛樺悕绉帮細" +
+ res.username +
+ "閲嶅锛岃娉ㄦ剰鏍稿淇℃伅锛�"
+ );
+ }
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
@@ -2911,16 +3621,21 @@
this.accountform.unitname = res.organizationname;
}
});
- }
- else {
+ } else {
this.accountform.userstatus = 1;
}
addExternalperson(this.accountform).then(response => {
if (response.code == 200) {
+ // //閲嶆柊鑾峰彇璐︽埛鍒楄〃
+ // listExternalperson().then(res => {
+ // this.accountlist = res.rows;
+ // });
+
+ console.log("addExternalperson", response.data.id);
if (this.accountselectform.usertype == "org") {
this.accountlist.push({
- id: 0,
+ id: response.data.id,
userno: this.accountform.userno,
username: this.accountform.username,
idcardno: this.accountform.idcardno,
@@ -2929,14 +3644,16 @@
bankcardno: this.accountform.bankcardno,
unitno: this.accountform.unitno,
unitname: this.accountform.unitname,
- userid: this.accountform.username
+ userid:
+ this.accountform.username +
+ "锛�" +
+ this.accountform.bankcardno +
+ "锛�"
});
-
this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭紒");
-
} else {
this.accountlist.push({
- id: 0,
+ id: response.data.id,
userno: this.accountform.userno,
username: this.accountform.username,
idcardno: this.accountform.idcardno,
@@ -2945,9 +3662,12 @@
bankcardno: this.accountform.bankcardno,
unitno: this.accountform.unitno,
unitname: this.accountform.unitname,
- userid: this.accountform.username + '锛�' + this.accountform.idcardno + '锛�'
+ userid:
+ this.accountform.username +
+ "锛�" +
+ this.accountform.idcardno +
+ "锛�"
});
-
this.$modal.msgSuccess(
"鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒"
);
@@ -2956,21 +3676,14 @@
this.accountselectform.accountno = this.accountform.userno;
this.accountselectform.accountname = this.accountselectform.username;
- console.log("this.accountlist", this.accountlist);
- console.log("this.accountselectform.accountno", this.accountselectform.accountno);
-
- // //閲嶆柊鑾峰彇璐︽埛鍒楄〃
- // listExternalperson().then(res => {
- // this.accountlist = res.rows;
- // });
-
//璧嬪�间俊鎭�
this.accountlist.map(res => {
if (res.userno == this.accountselectform.accountno) {
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].branchbankname =
+ res.branchbankname;
this.rbDetails[tempIndex].bankcardno = res.bankcardno;
this.rbDetails[tempIndex].phone = res.telephone;
@@ -3065,15 +3778,15 @@
this.$destroy();
next();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
destroyed() {
window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
@@ -3156,7 +3869,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