From c0b29ee03f4f6c984f35618bfa669ba3f2ab6517 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 20 二月 2024 10:09:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/applyDetail/index.vue | 1306 ++++++++++++++++------------------------------------------
1 files changed, 363 insertions(+), 943 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 8418eb9..8b17f43 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,45 +7,22 @@
<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>
@@ -72,40 +49,24 @@
</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">
@@ -127,69 +88,34 @@
<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-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>
@@ -198,192 +124,83 @@
<el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
v-if="form.applytype == '1'">
</el-table-column>-->
- <el-table-column
- prop="applytype"
- align="center"
- label="鏈嶅姟绫诲瀷"
- width="200"
- >
+ <el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.applytype"
- placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷"
- @change="verifyFeeItemType(scope.row)"
- >
- <el-option
- v-for="dict in rowfeeItemTypes"
- :key="dict.index"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
+ <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="itemid"
- align="center"
- label="鏈嶅姟椤圭洰"
- width="260"
- >
+ <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.itemid"
- placeholder="璇烽�夋嫨鏈嶅姟椤圭洰"
- filterable
- @change="verifyFeeItem(scope.row)"
- :filter-method="val => searchItemType(val, scope)"
- >
- <el-option
- v-for="dict in scope.row.itemlist"
- :key="dict.index"
- :label="dict.itemName"
- :value="dict.id"
- ></el-option>
+ <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
+ :filter-method="val => searchItemType(val, scope)">
+ <el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
+ :value="dict.id"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="servicesscope"
- align="center"
- label="鏈嶅姟璇存槑"
- v-if="businessType == '1'"
- width="180"
- >
+ <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 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
- prop="amount"
- align="center"
- :label="amountlabel"
- width="120"
- >
+ <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')
- "
- >
+ <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="鎵ｇ◣閲戦"
- />
+ <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')
- "
- >
+ <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="绋庡悗閲戦"
- />
+ <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"
- >
+ <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
- >
+ <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'"
- >
+ <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
- >
+ <el-button type="primary" plain @click="showSelectionDialog(scope, 'workunit')">{{
+ scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
+ }}</el-button>
</template>
</el-table-column>
<!--
@@ -413,137 +230,59 @@
</template>
</el-table-column>
-->
- <el-table-column
- prop="title"
- align="center"
- label="鑱岀О"
- width="120"
- v-if="businessType == '1' || businessType == '2'"
- >
+ <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
+ ">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -551,55 +290,20 @@
<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
@@ -607,74 +311,37 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-col>
</el-row>
- <el-row
- v-if="
- operationType == 'detail' ||
- operationType == 'check' ||
- operationType == 'update'
- "
- >
+ <el-row v-if="operationType == 'detail' ||
+ operationType == 'check' ||
+ operationType == 'update'
+ ">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="160"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
<el-col :span="20">
<el-form-item label="棰勫鏉愭枡" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
@@ -685,10 +352,7 @@
</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">
@@ -707,103 +371,45 @@
</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.username"
- :value="item.username"
- >
+ <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>
@@ -812,175 +418,102 @@
<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 label="expert">涓撳璐﹀彿</el-radio>
- <el-radio label="org">鍗曚綅璐﹀彿</el-radio>
- <el-radio label="donor">鎹愮尞鑰呬翰灞炶处鍙�</el-radio>
+ <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>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<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-form-item label="璐︽埛鍚嶇О" prop="username">
+ <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%"
- >
+ <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
+ width="60%">
<div>
<el-table :data="tableDatatop" style="width: 100%">
- <el-table-column
- v-if="businessType == 4"
- prop="price"
- align="center"
- label="鍗曚环"
- >
+ <el-table-column v-if="businessType == 4" prop="price" align="center" label="鍗曚环">
</el-table-column>
- <el-table-column
- prop="quantity"
- align="center"
- label="鏁伴噺"
- v-if="businessType == 4"
- >
+ <el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4">
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountlabel">
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- v-if="
- (this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- "
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ ">
</el-table-column>
<!-- <el-table-column
prop="beneficiaryname"
@@ -1000,137 +533,61 @@
</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-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick">
<el-tab-pane label="鏅�氶檮浠�" :name="1">
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
+ <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="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 && 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> -->
@@ -1143,99 +600,43 @@
<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> -->
@@ -1247,14 +648,10 @@
</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>
@@ -1263,30 +660,13 @@
</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>
@@ -1685,13 +1065,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 {
@@ -1982,7 +1362,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(this.curId);
})
.then(() => {
@@ -1995,7 +1375,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -2003,7 +1383,7 @@
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -2072,7 +1452,7 @@
return randomString;
},
/** 鎻愪氦鎸夐挳 */
- submitForm: debounce(function() {
+ submitForm: debounce(function () {
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -2088,8 +1468,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2098,8 +1478,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2107,8 +1487,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2155,8 +1535,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2170,8 +1550,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2364,22 +1744,39 @@
//鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃
getAccountList() {
listExternalperson().then(res => {
- this.accountlist = res.rows;
+ // this.accountlist = res.rows;
//鑾峰彇鍚敤鐨勮处鎴峰垪琛�
- for (let j = 0; j < res.length; j++) {
+ for (let j = 0; j < res.rows.length; j++) {
//鍗曚綅璐﹀彿鍒楄〃
- if (res.userstatus == "1") {
- this.accountlist.push({
- id: res.id,
- userno: res.userno,
- username: res.username,
- idcardno: res.idcardno,
- title: res.title,
- depositbank: res.depositbank,
- bankcardno: res.bankcardno,
- unitno: res.unitno,
- unitname: res.unitname
- });
+ if (res.rows[j].userstatus == "1") {
+ if (res.rows[j].usertype == "org") {
+ this.accountlist.push({
+ id: res.rows[j].id,
+ userno: res.rows[j].userno,
+ username: res.rows[j].username,
+ idcardno: res.rows[j].idcardno,
+ title: res.rows[j].title,
+ depositbank: res.rows[j].depositbank,
+ bankcardno: res.rows[j].bankcardno,
+ unitno: res.rows[j].unitno,
+ unitname: res.rows[j].unitname,
+ userid: res.rows[j].username
+ });
+ }
+ else {
+ this.accountlist.push({
+ id: res.rows[j].id,
+ userno: res.rows[j].userno,
+ username: res.rows[j].username,
+ idcardno: res.rows[j].idcardno,
+ title: res.rows[j].title,
+ depositbank: res.rows[j].depositbank,
+ bankcardno: res.rows[j].bankcardno,
+ unitno: res.rows[j].unitno,
+ unitname: res.rows[j].unitname,
+ userid: res.rows[j].username + '锛�' + res.rows[j].idcardno + '锛�'
+ });
+ }
}
}
});
@@ -2667,8 +2064,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2677,8 +2074,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2686,8 +2083,8 @@
if (tempDetail.beneficiaryno == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2734,8 +2131,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -2749,8 +2146,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -3139,7 +2536,7 @@
// 鍥剧墖鍔犺浇鎴愬姛鏃舵墽琛岀殑鎿嶄綔
console.log("Image loaded successfully");
},
- handleUploadError() {},
+ handleUploadError() { },
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
if (this.activeName == 1) {
@@ -3423,7 +2820,12 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
- this.accountselectform.accountname = scope.row.beneficiaryname;
+ 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 + '锛�';
+ }
this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
this.accountselectform.expertunitno = "";
@@ -3454,12 +2856,9 @@
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- if (
- this.rbDetails[tempIndex].beneficiaryname !=
- this.accountselectform.accountname
- ) {
+ if (this.rbDetails[tempIndex].userno != this.accountselectform.userno) {
this.accountlist.map(res => {
- if (res.username == this.accountselectform.accountname) {
+ if (res.id == this.accountselectform.accountname) {
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
@@ -3486,8 +2885,8 @@
//鑾峰彇鐢ㄦ埛缂栧彿
getOnlyCode(this.seqnoParams).then(res => {
this.accountform.userno = res.data.currentvalue;
- this.accountform.id = null;
+ this.accountform.id = null;
this.accountform.usertype = this.accountselectform.usertype;
this.accountform.username = this.accountselectform.username;
this.accountform.idcardno = this.accountselectform.idcardno;
@@ -3513,52 +2912,73 @@
}
});
}
+ else {
+ this.accountform.userstatus = 1;
+ }
addExternalperson(this.accountform).then(response => {
- if (response.code == 200) {
- if (this.accountselectform.usertype == "expert") {
- this.$modal.msgSuccess(
- "鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒"
- );
- return;
- } else {
- this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
- }
+ if (response.code == 200) {
+ // //閲嶆柊鑾峰彇璐︽埛鍒楄〃
+ // listExternalperson().then(res => {
+ // this.accountlist = res.rows;
+ // });
- this.accountselectform.accountno = this.accountselectform.userno;
+ console.log("addExternalperson", response.data.id);
+ if (this.accountselectform.usertype == "org") {
+ this.accountlist.push({
+ id: response.data.id,
+ userno: this.accountform.userno,
+ username: this.accountform.username,
+ idcardno: this.accountform.idcardno,
+ title: this.accountform.title,
+ depositbank: this.accountform.depositbank,
+ bankcardno: this.accountform.bankcardno,
+ unitno: this.accountform.unitno,
+ unitname: this.accountform.unitname,
+ userid: this.accountform.username
+ });
+ this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭紒");
+ } else {
+ this.accountlist.push({
+ id: response.data.id,
+ userno: this.accountform.userno,
+ username: this.accountform.username,
+ idcardno: this.accountform.idcardno,
+ title: this.accountform.title,
+ depositbank: this.accountform.depositbank,
+ bankcardno: this.accountform.bankcardno,
+ unitno: this.accountform.unitno,
+ unitname: this.accountform.unitname,
+ userid: this.accountform.username + '锛�' + this.accountform.idcardno + '锛�'
+ });
+ this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+ return;
+ }
+ this.accountselectform.accountno = this.accountform.userno;
this.accountselectform.accountname = this.accountselectform.username;
- //閲嶆柊鑾峰彇璐︽埛鍒楄〃
- 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].bankcardno = res.bankcardno;
+ this.rbDetails[tempIndex].phone = res.telephone;
- //璧嬪�间俊鎭�
- this.accountlist.map(res => {
- if (res.username == this.accountselectform.accountname) {
- 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].bankcardno = res.bankcardno;
- this.rbDetails[tempIndex].phone = res.telephone;
-
- if (res.usertype == "org") {
- this.rbDetails[tempIndex].idcardno = "";
- this.rbDetails[tempIndex].title = "";
- this.rbDetails[tempIndex].unitno = "";
- this.rbDetails[tempIndex].unitname = "";
- } else {
- this.rbDetails[tempIndex].idcardno = res.idcardno;
- this.rbDetails[tempIndex].title = res.title;
- this.rbDetails[tempIndex].unitno = parseInt(
- res.unitno
- );
- this.rbDetails[tempIndex].unitname = res.unitname;
- }
+ if (res.usertype == "org") {
+ this.rbDetails[tempIndex].idcardno = "";
+ this.rbDetails[tempIndex].title = "";
+ this.rbDetails[tempIndex].unitno = "";
+ this.rbDetails[tempIndex].unitname = "";
+ } else {
+ this.rbDetails[tempIndex].idcardno = res.idcardno;
+ this.rbDetails[tempIndex].title = res.title;
+ this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
+ this.rbDetails[tempIndex].unitname = res.unitname;
}
- });
+ }
});
}
});
@@ -3638,15 +3058,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>
@@ -3729,7 +3149,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