From 8c7d6925222fd6f81a9a5869426086635e0c08df Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期日, 17 十二月 2023 15:40:27 +0800
Subject: [PATCH] 11
---
src/views/project/fund/applyDetail/index.vue | 2073 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 1,075 insertions(+), 998 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 6e7d08d..b5bcedd 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -9,11 +9,12 @@
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker
clearable
+ :disabled="true"
style="width: 100%"
v-model="form.createTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
+ placeholder="鏃� 鏈�"
>
</el-date-picker>
</el-form-item>
@@ -72,18 +73,7 @@
}}</el-radio>
</el-form-item>
</el-col>
- <!-- <el-col :span="5">
- <el-form-item label="閾惰鍚嶇О" prop="bankname">
- <el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
- </el-form-item> </el-col
- ><el-col :span="5">
- <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input
- v-model="form.bankcardno"
- placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
- />
- </el-form-item>
- </el-col> -->
+
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -98,7 +88,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="5">
+ <el-col :span="5" v-if="ismanager == true">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
<el-input
v-model="form.pretaxcost"
@@ -109,26 +99,7 @@
</el-col>
</el-row>
<el-row style="text-align: left">
- <!--
- <el-col :span="5">
- <el-form-item label="鍚堣閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
- </el-form-item>
- </el-col>
- -->
-
- <!--
- <el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
- <el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
- </el-form-item>
- </el-col>-->
- <el-col :span="10">
+ <el-col :span="8">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
@@ -145,17 +116,6 @@
</el-col>-->
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
- <el-row style="margin-bottom: 10px" v-if="businessType == '1'">
- <el-col :span="4">
- <el-button
- @click.native.prevent="importFeeItems"
- type="primary"
- size="small"
- >
- 瀵煎叆鏈嶅姟椤圭洰
- </el-button>
- </el-col>
- </el-row>
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
@@ -166,29 +126,43 @@
>
</el-alert>
</el-row>
- <el-row v-if="businessType == 2">
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ <el-row>
+ <el-col :span="3" v-if="businessType == '1'">
+ <el-button
+ @click.native.prevent="importFeeItems"
+ type="primary"
+ size="small"
+ >
+ 瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
+ </el-col>
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;" v-if="businessType == 2">
<el-button
type="success"
icon="el-icon-download"
@click="Batchentry"
>鎵归噺褰曞叆</el-button
>
- </div></el-col
- >
- </el-row>
- <el-row v-if="businessType == 1 && operationType == 'check'">
- <el-col :span="3"
- ><div style="margin-bottom: 15px;">
+ </div>
+ </el-col>
+
+ <el-col :span="3">
+ <div
+ style="margin-bottom: 15px;"
+ v-if="
+ userprofile.nickName == '闄堟厱鍗�' &&
+ (businessType == '1' || businessType == '2')
+ "
+ >
<el-button
type="success"
icon="el-icon-edit-outline"
@click="Manualcalculationfn"
- >璁＄畻鏄庣粏</el-button
+ >璁＄畻涓◣</el-button
>
- </div></el-col
- >
+ </div>
+ </el-col>
</el-row>
<el-row>
<el-table
@@ -319,7 +293,7 @@
</template>
</el-table-column>
<el-table-column
- v-if="
+ v-show="
businessType == 2 ||
businessType == 3 ||
businessType == 4 ||
@@ -331,13 +305,6 @@
width="120"
>
<template slot-scope="scope">
- <!--
- <el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
- @change="selectamount(scope.row)">
- <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.expensedescribe" :label="dict.expense"
- :value="dict.expense"></el-option>
- </el-select>
- -->
<el-input
v-model="scope.row.amount"
placeholder="閲戦"
@@ -350,11 +317,28 @@
</template>
</el-table-column>
<el-table-column
+ prop="taxamount"
+ align="center"
+ label="鎵ｇ◣閲戦"
+ width="120"
+ v-show="
+ (this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '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="
+ v-show="
(this.ismanager == true) &
(form.applytype == '1' || form.applytype == '2')
"
@@ -373,90 +357,53 @@
</el-table-column>
<el-table-column
prop="beneficiaryname"
+ column-key="sdad"
align="center"
- label="濮撳悕"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
+ :label="beneficiarylabel"
+ width="200"
>
<template slot-scope="scope">
<el-button
type="primary"
plain
- @click="ShowDetailDialog(scope, 'expert')"
+ @click="showSelectionDialog(scope, 'account')"
>{{
scope.row.beneficiaryname
? scope.row.beneficiaryname
: "鐐瑰嚮閫夋嫨"
}}</el-button
>
- <!-- <el-select
- filterable
- allow-create
- ref="getReportname"
- default-first-option
- @change="selectExpert(scope.row)"
- v-model="scope.row.beneficiaryname"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in expertlist"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
- </el-option>
- </el-select> -->
</template>
</el-table-column>
<el-table-column
prop="unitno"
align="center"
- label="鍗曚綅鍚嶇О"
+ label="涓撳鎵�鍦ㄥ崟浣�"
width="250"
- v-if="form.applytype != '4'"
+ v-if="form.applytype == '1' && form.applytype == '2'"
>
<template slot-scope="scope">
<el-button
type="primary"
plain
- @click="ShowDetailDialog(scope, 'unit')"
- >{{ scope.row.unitname?scope.row.unitname:'鐐瑰嚮閫夋嫨' }}</el-button
- >
- <!-- <el-select
- v-model="scope.row.unitno"
- placeholder="鍗曚綅"
- clearable
- filterable
- allow-create
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select> -->
- </template>
- </el-table-column>
- <el-table-column
- prop="unitno"
- align="center"
- label="鍗曚綅/涓汉"
- width="250"
- v-if="form.applytype == '4'"
- >
- <template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'expert')"
+ @click="showSelectionDialog(scope, 'workunit')"
>{{
- experthear == "expert"
- ? scope.row.unitname
- : scope.row.beneficiaryname
+ scope.row.unitname ? scope.row.unitname : "鐐瑰嚮閫夋嫨"
}}</el-button
>
- <!-- <el-select
+ </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
@@ -469,9 +416,10 @@
:label="spec.organizationname"
:value="spec.organizationid"
></el-option>
- </el-select> -->
+ </el-select>
</template>
</el-table-column>
+ -->
<el-table-column
prop="title"
align="center"
@@ -491,7 +439,16 @@
v-if="form.applytype == '1' || form.applytype == '2'"
>
<template slot-scope="scope">
- <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
+ <el-form-item :error="scope.row.error" label-width="0">
+ <el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
+ v-model.number="scope.row.idcardno"
+ @input="tableParValueChange1(scope.row)"
+ placeholder="韬唤璇佸彿"
+ />
+ </el-form-item>
</template>
</el-table-column>
<el-table-column
@@ -500,9 +457,11 @@
label="寮�鎴烽摱琛�"
width="200"
>
- <!-- v-if="form.applytype != '4'" -->
<template slot-scope="scope">
<el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
v-model="scope.row.depositbank"
placeholder="寮�鎴烽摱琛�"
/>
@@ -516,8 +475,26 @@
>
<template slot-scope="scope">
<el-input
+ :disabled="
+ userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ "
v-model="scope.row.bankcardno"
placeholder="閾惰甯愬彿"
+ />
+ </template>
+ </el-table-column>
+ <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="椤圭洰璇存槑"
/>
</template>
</el-table-column>
@@ -526,6 +503,12 @@
align="center"
width="330"
label="澶囨敞"
+ v-if="
+ businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ ismanager == true
+ "
>
<template slot-scope="scope">
<el-input
@@ -574,54 +557,16 @@
"
type="text"
size="small"
- v-if="businessType == 3 || businessType == 4"
+ v-if="
+ businessType == 3 || businessType == 2 || businessType == 4
+ "
>绁ㄦ嵁</el-button
>
</template>
</el-table-column>
</el-table>
</el-row>
- <!--
- <el-row>
- <el-col :span="7">
- <el-form-item label="棰勬敮閲戦" prop="prepaidamount">
- <el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
- <el-input v-model="form.opochecker" placeholder="opo涓績绛惧瓧" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
- <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
- <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鍔炲叕瀹や富浠�" prop="officedirector">
- <el-input v-model="form.officedirector" placeholder="璇疯緭鍏ュ姙鍏涓讳换" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="璐㈠姟閮ㄨ礋璐ｄ汉" prop="financedirector">
- <el-input v-model="form.financedirector" placeholder="璇疯緭鍏ヨ储鍔￠儴璐熻矗浜�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
- <el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
- </el-form-item>
- </el-col>
- </el-row>
- -->
+
<el-row>
<el-col :span="12">
<el-form-item
@@ -743,11 +688,26 @@
/>
</el-table>
</el-row>
+
<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">
+ <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
+ <el-radio :label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio>
+ <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row
+ style="margin-top: 5px; margin-bottom: 5px"
v-if="operationType == 'check'"
>
- <el-col :span="7">
+ <el-col :span="20">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
<el-radio label="1">閫氳繃</el-radio>
@@ -773,7 +733,13 @@
operationType == 'update' ||
ismanager == true
"
- >鎻愪氦淇濆瓨</el-button
+ >淇濆瓨</el-button
+ >
+ <el-button
+ type="success"
+ @click="handleup"
+ v-if="operationType == 'add' || operationType == 'update'"
+ >涓婃姤</el-button
>
<el-button
type="primary"
@@ -786,63 +752,28 @@
</div>
<el-dialog
- :visible.sync="showSelectionDialog"
+ :visible.sync="showselectiondialog"
:close-on-click-modal="false"
- :title="'鍗曚綅/涓汉淇℃伅閫夋嫨'"
- width="500px"
+ :title="'璐︽埛淇℃伅/鍗曚綅淇℃伅閫夋嫨'"
+ width="650px"
style="text-align: center"
v-loading="loading"
>
- <el-form ref="funddetailForm" :model="funddetailForm">
- <el-row v-if="businessType != 4">
- <el-col
- :span="24"
- v-if="selectionType == 'expert' && businessType != 4"
- >
- <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
- <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
- <el-radio label="1">涓撳搴�</el-radio>
- <el-radio label="2">鏂板涓撳</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-col>
- <el-col
- :span="24"
- v-if="selectionType == 'expert' && expertfrom == '1'"
- >
- <el-form-item
- label="涓撳濮撳悕"
- prop="beneficiaryname"
- label-width="80px"
- >
- <el-select
- filterable
- allow-create
- ref="beneficiaryname"
- default-first-option
- v-model="funddetailForm.beneficiaryname"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in expertlist"
- :key="item.expertNo"
- :label="item.exportName"
- :value="item.exportName"
- >
- </el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="24" v-if="selectionType == 'unit'">
+ <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="unitno"
+ prop="expertunitno"
label-width="120px"
- v-if="businessType == 1 || businessType == 2"
>
<el-select
- v-model="funddetailForm.unitno"
+ v-model="accountselectform.expertunitno"
placeholder="鍗曚綅鍚嶇О"
clearable
filterable
@@ -857,110 +788,84 @@
></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鍙戠エ鍗曚綅鍚嶇О"
- prop="unitno"
- label-width="120px"
- v-if="businessType == 3"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in feeUnitList"
- :key="index"
- :label="item.reportName"
- :value="item.reportNo"
- ></el-option>
- </el-select>
- </el-form-item>
</el-col>
</el-row>
-
- <el-row v-if="businessType == 4">
- <el-col :span="24">
- <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="experthear">
- <el-radio-group
- @change="ShowDetailDialog(spocewl)"
- v-model="experthear"
- style="margin-bottom: 0"
- >
- <el-radio label="unit">浜哄憳閫夐」</el-radio>
- <el-radio label="expert">鍗曚綅閫夐」</el-radio>
+ <el-row v-if="selectionType == 'account'">
+ <el-col>
+ <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-group>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="experthear == 'unit'">
- <el-form-item
- label="浜哄憳濮撳悕"
- prop="beneficiaryname"
- label-width="80px"
- >
+ <el-col :span="24" v-if="accountfrom == '1'">
+ <el-form-item label="璐︽埛鍚嶇О" prop="accountname">
<el-select
filterable
allow-create
- ref="beneficiaryname"
+ ref="accountname"
default-first-option
- @change="bbaaccss"
- v-model="funddetailForm.beneficiaryname"
+ v-model="accountselectform.accountname"
placeholder="璇烽�夋嫨"
style="width: 100%"
>
<el-option
- v-for="item in expertlist"
- :key="item.expertNo"
- :label="item.exportName"
- :value="item.exportName"
+ v-for="item in accountlist"
+ :key="item.id"
+ :label="item.username"
+ :value="item.username"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="experthear == 'expert'">
- <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px">
- <el-select
- v-model="funddetailForm.unitname"
- placeholder="鍗曚綅鍚嶇О"
- @change="bbaaccss"
- clearable
- filterable
- allow-create
- style="width: 100%"
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col :span="16"
+ ><el-form-item label="鏂板绫诲瀷" prop="usertype">
+ <el-radio-group
+ v-model="accountselectform.usertype"
+ style="margin-bottom: 0"
>
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationname"
- ></el-option>
- </el-select>
+ <el-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
+ <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
+ </el-radio-group>
</el-form-item>
</el-col>
</el-row>
-
- <el-row v-if="businessType != 4">
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
+ <el-row v-if="accountfrom == '2'">
+ <el-col :span="24">
+ <el-form-item label="璐﹀彿鍚嶇О" prop="username">
<el-input
- v-model="funddetailForm.expertname"
- placeholder="蹇呭～椤�"
+ v-model="accountselectform.username"
+ placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕"
/>
</el-form-item>
</el-col>
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item
- label="鑱� 绉�"
- prop="experttitle"
- label-width="80px"
- >
+ </el-row>
+ <el-row
+ v-if="accountfrom == '2' && accountselectform.usertype != 'org'"
+ >
+ <el-col :span="12">
+ <el-form-item label="韬唤璇佸彿" prop="idcardno">
+ <el-input
+ v-model="accountselectform.idcardno"
+ placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鑱岀О" prop="title">
<el-select
- v-model="funddetailForm.experttitle"
- placeholder="蹇呭～椤�"
+ v-model="accountselectform.title"
+ placeholder="璇烽�夋嫨浜哄憳鑱岀О"
>
<el-option
v-for="dict in dict.type.sys_professionaltitle"
@@ -972,41 +877,13 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="businessType != 4">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="韬唤璇佸彿"
- prop="expertidcardno"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertidcardno"
- placeholder="蹇呭～椤�"
- />
- </el-form-item>
- </el-col>
- </el-row>
- <!--
- <el-row>
- <el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item label="浜哄憳绫诲埆" prop="usertype" label-width="80px">
- <el-select v-model="funddetailForm.usertype" placeholder="蹇呭～椤�">
- <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- </el-row>
- -->
- <el-row v-if="businessType != 4">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="expertunitno"
- label-width="80px"
- >
+ <el-row
+ v-if="accountfrom == '2' && accountselectform.usertype != 'org'"
+ >
+ <el-col>
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
<el-select
- v-model="funddetailForm.expertunitno"
+ v-model="accountselectform.unitno"
placeholder="鍗曚綅鍚嶇О"
clearable
filterable
@@ -1019,41 +896,62 @@
:label="spec.organizationname"
:value="spec.organizationid"
></el-option>
- </el-select> </el-form-item
- ></el-col>
- </el-row>
- <el-row v-if="businessType != 4">
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="寮�鎴烽摱琛�"
- prop="expertdepositbank"
- label-width="80px"
- >
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col>
+ <el-form-item label="鍗曚綅宸ュ彿" prop="personnelunitno">
<el-input
- v-model="funddetailForm.expertdepositbank"
- placeholder="蹇呭～椤�"
+ v-model="accountselectform.personnelunitno"
+ placeholder="璇疯緭鍏ユ墍鍦ㄥ崟浣嶇殑宸ュ彿"
/>
</el-form-item>
</el-col>
- <el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="閾惰鍗″彿"
- prop="expertbankcardno"
- label-width="80px"
- >
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col
+ ><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
<el-input
- v-model="funddetailForm.expertbankcardno"
- placeholder="蹇呭～椤�"
+ 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-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col>
+ <el-form-item label="鑱旂郴鍦板潃" prop="address">
+ <el-input
+ v-model="accountselectform.address"
+ placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="accountfrom == '2'">
+ <el-col>
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+ <el-input
+ v-model="accountselectform.telephone"
+ placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()"
+ <el-button type="primary" @click="confirmSelectionDialog()"
>纭� 瀹�</el-button
>
+ <el-button @click="showselectiondialog = false">鍙� 娑�</el-button>
</span>
</el-dialog>
<el-dialog
@@ -1092,29 +990,23 @@
"
>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="beneficiaryname"
align="center"
label="濮撳悕"
v-if="form.applytype == '1' || form.applytype == '2'"
>
- </el-table-column>
+ </el-table-column> -->
- <el-table-column
- prop="unitno"
+ <!-- <el-table-column
+ prop="beneficiaryname"
align="center"
label="鍗曚綅鍚嶇О"
width="250"
v-if="form.applytype != '4'"
>
- </el-table-column>
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="鍗曚綅/涓汉"
- width="250"
- v-if="form.applytype == '4'"
- >
+ </el-table-column> -->
+ <el-table-column prop="" align="center" label="鍗曚綅/涓汉" width="250">
</el-table-column>
<el-table-column
prop="title"
@@ -1143,106 +1035,220 @@
</el-table-column>
</el-table>
</div>
- <div class="pdfimg">
- <div class="box-pdf">
- <div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- :show-file-list="false"
- multiple
- drag
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
- <i class="el-icon-upload"></i>
- <div class="el-upload__text">
- 灏嗙エ鎹嫋鍒版澶勶紝鎴�
- <em
- ><el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >鐐瑰嚮涓婁紶</el-button
- ></em
+
+ <el-tabs
+ style="margin-top: 20px;"
+ v-model="activeName"
+ type="border-card"
+ @tab-click="handleClick"
+ >
+ <el-tab-pane label="鏅�氶檮浠�" :name="1">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="fileListto"
+ :show-file-list="false"
+ multiple
+ drag
+ :headers="headers"
+ :on-success="
+ (response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ "
+ :on-preview="downFile"
+ :disabled="operationType == 'detail'"
+ :on-error="handleUploadError"
+ :on-remove="remove"
+ accept="image/*,.pdf"
>
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗙エ鎹嫋鍒版澶勶紝鎴�
+ <em
+ ><el-button
+ :disabled="operationType == 'detail'"
+ size="small"
+ type="primary"
+ >鐐瑰嚮涓婁紶</el-button
+ ></em
+ >
+ </div>
+ </el-upload>
+ <el-table
+ :data="fileListto"
+ @row-click="downFile"
+ style="width: 100%"
+ height="400"
+ >
+ <el-table-column
+ prop="name"
+ :show-overflow-tooltip="true"
+ label="鍚嶇О"
+ >
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />
+ <span>{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
+
+ <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>
+ </template>
+ </el-table-column>
+ </el-table>
</div>
- <!-- <div class="el-upload__tip" slot="tip">
- 鍙兘涓婁紶jpg/png鏂囦欢锛屼笖涓嶈秴杩�500kb
- </div> -->
- </el-upload>
- <el-table
- :data="fileListto"
- @row-click="downFile"
- style="width: 100%"
- height="400"
+ </div>
+
+ <div
+ v-if="this.previewpdf && pdfimgsrcList.length"
+ class="pdfimgmin"
>
- <el-table-column
- prop="name"
- :show-overflow-tooltip="true"
- label="鍚嶇О"
+ <!-- <img :src="pdfimg" /> -->
+ <el-image
+ style="width: 95%; height: 90%"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
>
- <template slot-scope="scope">
- <i style="color:#409EFF" class=" el-icon-s-order" />{{
- scope.row.name
- }}
- </template>
- </el-table-column>
-
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
- <template slot-scope="scope">
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="deletedowfile(scope.row)"
- >鍒犻櫎</el-button
- >
- <el-button
- type="primary"
- size="mini"
- @click.native.prevent.stop="moveupdowfile(scope.row)"
- >涓婄Щ</el-button
- >
- </template>
- </el-table-column>
- </el-table>
+ <!-- <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
+ </el-image>
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
- <!-- <div
- class="pdftit"
- @click="pdffn(item)"
- v-for="item in fileList"
- :key="item.name"
- >
- {{ item.name }}
- </div> -->
- </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍙戠エ鏂囦欢" :name="2">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="invoicefileList"
+ :show-file-list="false"
+ multiple
+ drag
+ :headers="headers"
+ :on-success="
+ (response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ "
+ :on-preview="downFile"
+ :disabled="operationType == 'detail'"
+ :on-error="handleUploadError"
+ :on-remove="remove"
+ accept="image/*,.pdf"
+ >
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴�
+ <em
+ ><el-button
+ :disabled="operationType == 'detail'"
+ size="small"
+ type="primary"
+ >鐐瑰嚮涓婁紶</el-button
+ ></em
+ >
+ </div>
+ </el-upload>
+ <el-table
+ :data="invoicefileListto"
+ @row-click="downFile"
+ style="width: 100%"
+ height="400"
+ >
+ <el-table-column
+ prop="name"
+ :show-overflow-tooltip="true"
+ label="鍚嶇О"
+ >
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />
+ <span>{{ scope.row.name }}</span>
+ </template>
+ </el-table-column>
- <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
- <!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="pdfimg"
- :preview-src-list="pdfimgsrcList"
- >
- </el-image>
- </div>
- <div v-else class="pdfimgmins">{{ hintitle }}</div>
- </div>
+ <el-table-column
+ prop="name"
+ width="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>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ <div
+ v-if="this.previewpdf && invoicepdfimgsrcList.length"
+ class="pdfimgmin"
+ >
+ <!-- <img :src="pdfimg" /> -->
+ <el-image
+ style="width: 95%; height: 90%"
+ :src="invoicepdfimg"
+ :preview-src-list="invoicepdfimgsrcList"
+ >
+ <!-- <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
+ </el-image>
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
<el-alert
@@ -1255,8 +1261,8 @@
>
</el-alert>
<span slot="footer" class="dialog-footer">
- <el-button @click="unsave">鍙� 娑�</el-button>
<el-button type="primary" @click="Savenow">纭� 瀹�</el-button>
+ <el-button @click="unsave">鍙� 娑�</el-button>
</span>
</el-dialog>
@@ -1289,8 +1295,8 @@
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
<el-button type="primary" @click="BatchentryFn">纭� 瀹�</el-button>
+ <el-button @click="batchdialogVisible = false">鍙� 娑�</el-button>
</span>
</el-dialog>
</div>
@@ -1396,6 +1402,14 @@
],
data() {
+ var validatePass = (rule, value, callback) => {
+ const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
+ if (regex.test(value)) {
+ callback();
+ } else {
+ callback(new Error("韬唤璇佸彿鐮佹牸寮忛敊璇�"));
+ }
+ };
//杩欓噷瀛樻斁鏁版嵁
return {
// 閬僵灞�
@@ -1404,11 +1418,9 @@
exportLoading: false,
usernamedata: "",
jurisdiction: false,
-
+ Routinglevel: 1,
// 琛ㄥ崟鍙傛暟
form: {},
- experthear: "",
- spocewl: "",
//璐圭敤鐢宠琛ㄥ崟title
title: "",
//鐢宠鍗曠被鍨�
@@ -1428,14 +1440,11 @@
userprofile: {},
//绯荤粺鐢ㄦ埛鍒楄〃
userlist: [],
- //鎵�鏈変汉鍛樿〃
- personlist: [],
- //涓撳鍒楄〃
- expertlist: [],
+ //璐﹀彿鍒楄〃
+ accountlist: [],
//鍖荤枟鏈烘瀯鍒楄〃
unitList: [],
- //璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- feeUnitList: [],
+
// 缃戠粶璇锋眰澶�
Networkheader: null,
batchdialogVisible: false,
@@ -1449,8 +1458,20 @@
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
- //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
- expertfrom: "1",
+ baselisttages: [
+ {
+ id: 1,
+ name: "鏉愭枡寰呭鏍�"
+ },
+ {
+ id: 2,
+ name: "瀹℃煡閫氳繃绛夊緟閭瘎绾歌川鏉愭枡"
+ },
+ {
+ id: 3,
+ name: "宸叉敹鍒扮焊璐ㄦ潗鏂�"
+ }
+ ],
//鎹愮尞妗堜緥鍒楄〃
donateList: [],
@@ -1477,17 +1498,24 @@
// 闅忔満鏁�
randomnumber: "",
- //涓撳/鍗曚綅閫夋嫨锛歟xpert/unit
+ //閫夋嫨绐楀彛鏄剧ず鐘舵��
+ showselectiondialog: false,
+ //閫夋嫨鏃跺綋鍓嶈
+ selectionScope: "",
+ //閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛�
selectionType: "",
- showSelectionDialog: false,
+ //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
+ beneficiarylabel: "",
+ //璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧�
+ accountfrom: "1",
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
amountLabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
+ // createTime: [
+ // { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
+ // ],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
@@ -1495,48 +1523,65 @@
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
]
},
-
- funddetailForm: {
- index: null,
- beneficiaryname: null,
- beneficiaryno: null,
- unitno: null,
- unitname: null,
- expertname: null,
- expertidcardno: null,
- expertunitno: null,
- expertunitname: null,
- experttitle: null,
- expertdepositbank: null,
- expertbankcardno: null
+ dialogrules: {
+ // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
+ depositbank: [
+ { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
+ ],
+ bankcardno: [
+ { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
+ ],
+ unitno: [
+ { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
+ ]
},
- expertform: {
- id: null,
- address: null,
- bankcardno: null,
- branchbankname: null,
- createBy: null,
- createTime: null,
- del_flag: null,
+ accountselectform: {
+ index: null,
+ usertype: "expert",
+ accountname: null,
+ accountno: null,
+ expertunitname: null,
+ expertunitno: null,
depositbank: null,
+ bankcardno: null,
idcardno: null,
- personnelunitno: null,
- pym: null,
- remark: null,
- searchValue: null,
- sex: null,
- telephone: null,
title: null,
unitname: null,
unitno: null,
- updateBy: null,
- updateTime: null,
- username: null,
- userno: null,
+ personnelunitno: null,
+ address: null,
+ telephone: null
+ },
+
+ accountform: {
+ searchValue: null,
+ id: null,
userstatus: 1,
usertype: null,
- wbm: null
+
+ pym: null,
+ wbm: null,
+ username: null,
+ userno: null,
+ sex: null,
+ idcardno: null,
+ title: null,
+ address: null,
+ telephone: null,
+ depositbank: null,
+ branchbankname: null,
+ bankcardno: null,
+ unitname: null,
+ unitno: null,
+ personnelunitno: null,
+
+ del_flag: null,
+ createBy: null,
+ createTime: null,
+ updateBy: null,
+ updateTime: null,
+ remark: null
},
//瀹℃壒鍙傛暟
checkObj: {
@@ -1585,7 +1630,6 @@
money: "0",
startTime: ""
},
-
//鏈嶅姟璐圭敤鍙傛暟
expenseQueryParams: {
pageNum: 1,
@@ -1599,6 +1643,12 @@
//闄勪欢鍒楄〃
fileList: [],
fileListto: [],
+ invoicefileList: [],
+ invoicefileListto: [],
+ invoicepdfimg: "",
+ invoicepdfimgsrcList: [],
+ invoDatatop: [],
+ activeName: 1, //鏂囦欢绫诲瀷
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢涓婁紶token
@@ -1719,17 +1769,22 @@
if (this.businessType == "1") {
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
this.amountLabel = "绋庡墠閲戦";
+ this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "2") {
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
this.amountLabel = "绋庡墠閲戦";
+ this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "3") {
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
+ this.getUnitList();
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
this.amountLabel = "閲戦";
+ this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
this.getUnitList();
// this.getBaseInfoList();
@@ -1787,6 +1842,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -1837,6 +1894,8 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
+
this.form = response.data;
sessionStorage.removeItem("apiform");
sessionStorage.setItem("apiform", JSON.stringify(this.form));
@@ -1883,6 +1942,7 @@
this.reset();
getFund(this.curId).then(response => {
+ console.log(response.data, "鍒濆");
this.form = response.data;
sessionStorage.removeItem("apiform");
@@ -1941,7 +2001,17 @@
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
- handleUp() {
+ handleup() {
+ if (
+ (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
+ JSON.stringify(this.rbDetails) ==
+ sessionStorage.getItem("apifunddetail")) ||
+ !sessionStorage.getItem("apifunddetail")
+ ) {
+ } else {
+ this.$message.error("璇蜂繚瀛樺悗鍐嶈繘琛屼笂鎶�");
+ return;
+ }
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -1951,6 +2021,23 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
+ var currenttime = new Date();
+ this.form.createTime =
+ currenttime.getFullYear() +
+ "-" +
+ (currenttime.getMonth() + 1) +
+ "-" +
+ currenttime.getDate() +
+ " " +
+ currenttime.getHours() +
+ ":" +
+ currenttime.getMinutes() +
+ ":" +
+ currenttime.getSeconds();
+
+ if (!this.form.id) {
+ this.form.id = this.$route.query.id;
+ }
updateFund(this.form).then(response => {
if (response.code == 200) {
@@ -1958,6 +2045,7 @@
type: "success",
message: "鐢宠鎴愬姛"
});
+ this.cancel();
} else {
this.$message({
type: "error",
@@ -1995,9 +2083,6 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
- // let totalPreTaxAmount = 0.0;
- // let totalAfterTaxAmount = 0.0;
- // let totalAmount = 0.0;
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.rbDetails.length; k++) {
@@ -2010,6 +2095,22 @@
);
return;
}
+
+ /*
+ if (
+ tempDetail.idcardno == null &&
+ this.businessType != "3" &&
+ this.businessType != "4"
+ ) {
+ console.log(1122);
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝～鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ */
if (this.businessType == "1") {
if (tempDetail.servicesscope == null) {
@@ -2030,27 +2131,7 @@
return;
}
}
-
- // //鍒ゆ柇鍗曚綅 unitSel
- // try {
- // let unitIndex = this.unitList.findIndex(
- // (item) => tempDetail.unitno == item.organizationid
- // );
- // if (unitIndex > -1) {
- // tempDetail.unitname = this.unitList[unitIndex].organizationname;
- // } else {
- // tempDetail.unitname = tempDetail.unitno;
- // }
- // } catch {
- // tempDetail.unitname = tempDetail.unitno;
- // }
}
-
- //闄勪欢澶勭悊
- let list = this.fileList;
- // if (list.length > 0) {
- // this.form.annexfiles = list.map(item => item.url).join(",");
- // }
//澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
@@ -2081,44 +2162,6 @@
].subjecttypename;
}
this.rbDetails[i] = tempDetail;
- /*
- //璁＄畻涓◣
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
- if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data;
- tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
-
- // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
- if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data.nowTax;
- tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
- */
}
//璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
if (this.businessType == "2") {
@@ -2204,48 +2247,91 @@
// });
}
- addorupdateFund(this.form).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
- } else {
- this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
- }
- });
sessionStorage.setItem(
"apifunddetail",
JSON.stringify(this.rbDetails)
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
-
+ addorupdateFund(this.form)
+ .then(response => {
+ console.log(this.form);
+ console.log(response, "淇濆瓨杩斿弬");
+ if (response.code === 200) {
+ if (this.form.id) {
+ this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
+ this.$router.go(-1);
+ } else {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: response.data,
+ businessType: "2",
+ operationType: "update",
+ curCase: this.curCase
+ }
+ });
+ }
+ this.form.id = response.data;
+ this.curId = response.data;
+ this.handleUpdate();
+ } else {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
+ }
+ })
+ .catch(res => {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + res);
+ });
//鍏抽棴绐楀彛
this.loading = false;
// this.getfundList();
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
}
});
}, 500),
//瀹℃壒鎻愪氦
+ // checksubmit() {
+ // console.log(this.checkObj.flowlevelone);
+ // if (
+ // this.form.checkstatus != 3 &&
+ // this.userprofile.nickName == "闄堟厱鍗�" &&
+ // this.checkObj.flowlevelone == 1
+ // ) {
+ // this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
+ // return;
+ // }
+ // this.Savenow();
+ // console.log("淇濆瓨骞跺鎵�");
+ // },
checksubmit() {
- let checkFundObj = {
- // fundid: this.checkObj.fundid,
- fundid: this.curId,
- flowconclusion: this.checkObj.flowlevelone,
- flowcontent: this.checkObj.flowconclusion
- };
- checkfund(checkFundObj).then(res => {
- //鍏抽棴绐楀彛
- this.reset();
- this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
- });
+ console.log(this.checkObj.flowlevelone);
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
+ this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+ return;
+ }
+
+ //妫�鏌ヤ釜绋庤绠�
+ // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
+ // this.$modal.msgError(
+ // "鎻愪氦涓撳璐圭敤鐢宠鍗曘�佷鸡鐞嗕笓瀹剁敵璇疯垂鐢ㄧ敵璇峰崟瀹℃牳锛岄渶瑕佸厛瀹屾垚涓◣璁＄畻锛�"
+ // );
+ // return;
+ // }
+ if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
+ this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�");
+ return;
+ }
+ }
+
+ this.Savenow();
+ console.log("淇濆瓨骞跺鎵�");
},
// 鍙栨秷鎸夐挳
cancel() {
- // this.reset();
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
},
@@ -2254,6 +2340,7 @@
getUserProfile() {
getUserProfile().then(res => {
this.userprofile = res.data;
+ console.log(this.userprofile);
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
@@ -2289,66 +2376,43 @@
});
},
- //鑾峰彇鎵�鏈変笓瀹�/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- getExternalList() {
+ //鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃
+ getAccountList() {
listExternalperson().then(res => {
- this.personlist = res.rows;
- for (let j = 0; j < this.personlist.length; j++) {
- //鑾峰彇璐圭敤鎶ラ攢鏈烘瀯鍒楄〃
- if (this.personlist[j].usertype == "org") {
- this.feeUnitList.push({
- id: this.personlist[j].id,
- reportNo: this.personlist[j].userno,
- reportName: this.personlist[j].username,
- depositbank: this.personlist[j].depositbank,
- branchbankname: this.personlist[j].branchbankname,
- bankcardno: this.personlist[j].bankcardno
+ this.accountlist = res.rows;
+ /**
+ for (let j = 0; j < this.accountlist.length; j++) {
+ //鍗曚綅璐﹀彿鍒楄〃
+ if (this.accountlist[j].usertype == "org") {
+ this.feeAccountList.push({
+ id: this.accountlist[j].id,
+ reportNo: this.accountlist[j].userno,
+ reportName: this.accountlist[j].username,
+ depositbank: this.accountlist[j].depositbank,
+ branchbankname: this.accountlist[j].branchbankname,
+ bankcardno: this.accountlist[j].bankcardno
});
}
- //涓撳浜哄憳鍒楄〃
+ //涓撳璐﹀彿鍒楄〃
else if (res.rows[j].usertype == "expert") {
- this.expertlist.push({
- expertNo: this.personlist[j].id,
- exportName: this.personlist[j].username
+ this.expertAccountList.push({
+ expertNo: this.accountlist[j].id,
+ exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")"
});
}
}
+ */
});
},
//鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭�
getUserAccount() {
- this.personlist.map(res => {
+ this.accountlist.map(res => {
if (res.username == this.form.username) {
this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank;
this.form.bankcardno = res.bankcardno;
this.form.phone = res.telephone;
}
- });
- },
-
- //鑾峰彇涓撳浜哄憳鍒楄〃
- getExpertList() {
- let types = ["expert"];
- let templist = [];
- for (let i = 0; i < types.length; i++) {
- templist = [];
- listReportname(types[i]).then(res => {
- for (let j = 0; j < res.data.length; j++) {
- templist.push({
- reportName: res.data[j].reportName,
- reportNo: res.data[j].reportNo
- });
- }
- this.expertlist = this.expertlist.concat(templist);
- });
- }
- },
-
- //鑾峰彇璐圭敤鏈烘瀯鍒楄〃
- getFeeUnitList() {
- listReportname("org").then(res => {
- this.feeUnitList = res.data;
});
},
@@ -2416,6 +2480,7 @@
//鑾峰彇鏈嶅姟椤圭洰
getRowFeeItems(rowindex, row) {
let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
+ console.log(list[0]);
row.itemlist = list[0].itemDetails;
this.$set(this.rbDetails, rowindex, row);
},
@@ -2535,58 +2600,17 @@
});
},
- selectExpert(row) {
- // if(row.beneficiaryname)
- this.personlist.map(res => {
- if (row.beneficiaryname == res.username) {
- row.beneficiaryno = res.userno;
- row.beneficiaryname = res.username;
- row.bankcardno = res.bankcardno;
- row.branchbankname = res.branchbankname;
- row.depositbank = res.depositbank;
- row.idcardno = res.idcardno;
- row.phone = res.phonenumber;
- row.title = res.title;
- row.unitname = res.unitname;
- row.unitno = res.unitno;
- } else {
- row.beneficiaryno = row.beneficiaryname;
- }
- });
- },
-
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
let targetValue = 0;
for (let i = 0; i < this.rbDetails.length; i++) {
+ if (!this.rbDetails[i].amount) {
+ this.rbDetails[i].amount = 0;
+ }
targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
+ console.log(targetValue, "鍚堣");
this.form.pretaxcost = targetValue;
-
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- //鑾峰彇鍙傛暟
- // this.taxParam.beneficiaryNo = row.beneficiaryno;
- // this.taxParam.startTime = this.form.createTime.substring(0, 10);
-
- // if (type == "A") {
- // // 璁＄畻涓◣銆佺◣鍚庨噾棰�
- // this.taxParam.money = row.amount.toString();
- // getTaxByBeneFiciaryNo(this.taxParam).then(res => {
- // if (res.code == 200) {
- // row.taxamount = res.data;
- // row.taxedamount = row.amount - row.taxamount;
- // }
- // });
- // } else {
- // // 璁＄畻绋庡墠銆佷釜绋庨噾棰�
- // this.taxParam.money = row.taxedamount.toString();
- // getTaxBeforeByAfterMoney(this.taxParam).then(res => {
- // if (res.code == 200) {
- // row.taxamount = res.data.nowTax;
- // row.amount = parseFloat(res.data.nowTaxBeforeMoney);
- // }
- // });
- // }
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -2670,9 +2694,6 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
- // let totalPreTaxAmount = 0.0;
- // let totalAfterTaxAmount = 0.0;
- // let totalAmount = 0.0;
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.rbDetails.length; k++) {
@@ -2705,27 +2726,7 @@
return;
}
}
-
- // //鍒ゆ柇鍗曚綅 unitSel
- // try {
- // let unitIndex = this.unitList.findIndex(
- // (item) => tempDetail.unitno == item.organizationid
- // );
- // if (unitIndex > -1) {
- // tempDetail.unitname = this.unitList[unitIndex].organizationname;
- // } else {
- // tempDetail.unitname = tempDetail.unitno;
- // }
- // } catch {
- // tempDetail.unitname = tempDetail.unitno;
- // }
}
-
- //闄勪欢澶勭悊
- let list = this.fileList;
- // if (list.length > 0) {
- // this.form.annexfiles = list.map(item => item.url).join(",");
- // }
//澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
@@ -2756,44 +2757,6 @@
].subjecttypename;
}
this.rbDetails[i] = tempDetail;
- /*
- //璁＄畻涓◣
- //if (isNaN(parseFloat(tempDetail.taxedamount)))
- //鑾峰彇鍙傛暟
- this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
- // 璁＄畻绋庡悗閲戦
- if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.amount.toString();
- getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data;
- tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
-
- // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
- if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
- //鑾峰彇鍙傛暟
- this.taxParam.money = tempDetail.taxedamount.toString();
- getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
- if (res.code == 200) {
- tempDetail.taxamount = res.data.nowTax;
- tempDetail.amount = parseFloat(res.data.nowTaxBeforeMoney);
- this.rbDetails[k] = tempDetail;
-
- this.totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- this.totalAmount += parseFloat(tempDetail.amount);
- }
- });
- }
- */
}
//璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
if (this.businessType == "2") {
@@ -2838,11 +2801,6 @@
}
}
- //璐圭敤鍚堣
- // this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
- // this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
- // this.form.amountrequested = this.totalAmount.toFixed(2);
-
//淇濆瓨鏁版嵁
this.loading = true;
this.form.serviceFunddetails = 0;
@@ -2852,39 +2810,31 @@
this.form.serviceFunddetails = this.rbDetails;
if (this.form.id != null) {
- // updateFund(this.form).then((response) => {
- // if (response.code === 200) {
- // this.loading = false;
- // for (let m = 0; m < this.rbDetails.length; m++) {
- // if (this.rbDetails[m].id > 0) {
- // updateFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�1锛�" + response.msg); } });
- // } else {
- // addFunddetail(this.rbDetails[m]).then((response2) => { if (response.code != 200) { this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐�2锛�" + response.msg); } });
- // }
- // }
- // this.$modal.msgSuccess("涓撳鍔冲姟璐逛繚瀛樻垚鍔燂紒");
- // } else {
- // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
- // }
- // });
} else {
this.form.recordstatus = -1;
-
- // addorupdateFund(this.form).then((response) => {
- // if (response.code === 200) {
- // this.selectDonotor(this.curCase);
- // } else {
- // this.$modal.msgError("涓撳鍔冲姟璐逛繚瀛樺け璐ワ細" + response.msg);
- // }
- // });
}
addorupdateFund(this.form).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ // 闈炴彁閱掔姸鎬佷笅鎵ц瀹℃壒瑙ｅ喅寮傛璋冪敤寤惰繜闂
+ if (!this.Savereminder) {
+ let checkFundObj = {
+ // fundid: this.checkObj.fundid,
+ fundid: this.curId,
+ flowconclusion: this.checkObj.flowlevelone,
+ flowcontent: this.checkObj.flowconclusion
+ };
+ checkfund(checkFundObj).then(res => {
+ //鍏抽棴绐楀彛
+ this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
+ });
+ }
this.Getnetworkheader();
this.getroute();
- this.getExternalList();
+ this.getAccountList();
this.getUserList();
this.getUserProfile();
} else {
@@ -2920,12 +2870,23 @@
JSON.stringify(this.rbDetails)
);
sessionStorage.setItem("apiform", JSON.stringify(this.form));
- this.$router.go(0);
- } else {
- // this.$message({
- // type: "error",
- // message: "鐢宠澶辫触"
+ // this.$router.go(0);
+ // this.$router.push({
+ // path: "/finance/applyDetail/",
+ // query: {
+ // id: this.curId,
+ // businessType: this.businessType,
+ // operationType: this.operationType,
+ // curCase: this.curCase
+ // }
// });
+ this.$modal.msgSuccess("璁＄畻鎴愬姛");
+ this.handleCheck();
+ } else {
+ this.$message({
+ type: "error",
+ message: "璁＄畻閿欒"
+ });
}
});
},
@@ -2979,6 +2940,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
+ itemdescribe: null,
uploadtime: null,
itemlist: [{ id: "27", itemName: "鍣ㄥ畼鎹愮尞浼︾悊瀹℃牳涓撳璐�" }],
servicesscope: null,
@@ -2991,6 +2953,7 @@
for (let i = 0; i < this.checkedCities.length + 1; i++) {
this.rbDetails[i].orderno = i + 1;
}
+ this.calculateTax();
this.batchdialogVisible = false;
},
//鏂板涓�琛�
@@ -3002,6 +2965,7 @@
beneficiaryname: null,
beneficiaryno: null,
unitname: null,
+ itemdescribe: null,
unitno: null,
uintuserno: null,
title: null,
@@ -3198,39 +3162,61 @@
handleUploadError() {},
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
- this.fileListto.splice(this.fileListto.indexOf(file), 1);
- rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ if (this.activeName == 1) {
+ this.fileListto.splice(this.fileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ } else {
+ this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto;
+ }
},
- //鏂囦欢涓婁紶鎴愬姛鍥炶皟
- // uploadSccess(response, file, fileList) {
- // //鑾峰彇闄勪欢淇℃伅浣嶇疆
- // if (response.code == 200) {
- // this.form.filename = file.raw.name;
- // this.$modal.msgSuccess(response.msg);
- // this.fileList.push({ name: response.fileName, url: response.fileName });
- // } else {
- // }
- // },
uploadSccess(response, file, fileList) {
this.rbDetails;
-
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- if (response.code == 200) {
- this.form.filename = file.raw.name;
- this.previewpdf = true;
- this.$modal.msgSuccess(response.msg);
- this.fileListto.push({ name: file.name, url: response.fileName });
- // this.fileListto.push({ name: file.name, url: response.url });
- this.pdfimgsrcList.push(
- this.Networkheader + "/prod-api" + response.fileName
- );
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
-
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
-
- this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ console.log(response);
+ console.log(file);
+ if (this.activeName == 1) {
+ if (response.code == 200) {
+ // this.form.filename = file.raw.name;
+ this.previewpdf = true;
+ this.$modal.msgSuccess(response.msg);
+ this.fileListto.push({
+ name: file.name,
+ url: response.fileName
+ });
+ this.pdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+ console.log(this.pdfimgsrcList);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+ this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ } else {
+ console.log(response.msg);
+ }
} else {
+ if (response.code == 200) {
+ // this.form.filename = file.raw.name;
+ this.previewpdf = true;
+ this.$modal.msgSuccess(response.msg);
+ this.invoicefileListto.push({
+ name: file.name,
+ url: response.fileName
+ });
+ this.invoicepdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + response.fileName
+ );
+ console.log(this.invoicepdfimgsrcList);
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+ this.rbDetails[
+ this.atpresent
+ ].invoicefilesList = this.invoicefileListto;
+ console.log(this.rbDetails[this.atpresent]);
+ } else {
+ console.log(response.msg);
+ }
}
},
@@ -3238,238 +3224,326 @@
Filepopup(index, rows, row) {
this.tableDatatop = [];
this.pdfimgsrcList = [];
+ this.invoDatatop = [];
+ this.invoicepdfimgsrcList = [];
+ this.invoDatatop.push(row);
this.tableDatatop.push(row);
-
this.atpresent = index;
this.pdfVisible = true;
+ console.log(this.rbDetails[index]);
if (this.rbDetails[index].annexfilesList) {
this.previewpdf = true;
this.fileListto = this.rbDetails[index].annexfilesList;
+ console.log(this.fileListto);
this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
- // this.pdfimg = this.fileListto[0].url;
this.fileListto.forEach(item => {
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
});
- this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.fileListto = [];
this.pdfimg = "";
this.pdftitle = "";
}
+ // -鍙戠エ鏂囦欢
+ if (this.rbDetails[index].invoicefilesList) {
+ this.previewpdf = true;
+ this.invoicefileListto = this.rbDetails[index].invoicefilesList;
+ console.log(this.invoicefileListto);
+ this.invoicepdfimg =
+ this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
+ this.invoicefileListto.forEach(item => {
+ this.invoicepdfimgsrcList.push(
+ this.Networkheader + "/prod-api" + item.url
+ );
+ });
+ console.log(this.invoicepdfimgsrcList);
+ console.log(this.invoicepdfimg);
+ } else {
+ this.invoicefileListto = [];
+ this.invoicepdfimg = "";
+ this.pdftitle = "";
+ }
+
+ if (this.activeName == 1) {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- this.pdftitle =
- "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
- let name = item.name.split(".");
- if (name[1] == "pdf") {
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- } else if (name[1] == "jpg" || "png") {
- this.previewpdf = true;
- if (item.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
-
- // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
- // this.pdfimgsrcList.push(this.pdfimg);
- // }
+ if (this.activeName == 1) {
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+ } else {
+ this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
+ }
} else {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
}
} else {
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
+ console.log(this.invoicepdfimg, "pdfimg");
+ console.log(this.invoicepdfimgsrcList, "imglist");
+ } else {
+ this.invoicepdfimg =
+ this.Networkheader + "/prod-api" + item.response.url;
+ }
+ } else {
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ }
}
},
getIndexInArray(arr, obj) {
return arr.indexOf(obj);
},
+ // 鍙戠エ鍒囨崲
+ handleClick(tab, event) {
+ if (this.activeName == 1) {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
+ },
// 鐐瑰嚮鍒犻櫎
deletedowfile(row) {
- const indexlist = this.getIndexInArray(
- this.pdfimgsrcList,
- this.Networkheader + "/prod-api" + row.url
- );
- this.pdfimgsrcList.splice(indexlist, 1);
- const index = this.getIndexInArray(this.fileListto, row);
- this.fileListto.splice(index, 1);
+ if (this.activeName == 1) {
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ this.pdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.fileListto, row);
+ this.fileListto.splice(index, 1);
+ } else {
+ const indexlist = this.getIndexInArray(
+ this.invoicepdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ this.invoicepdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ this.invoicefileListto.splice(index, 1);
+ }
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
- const index = this.getIndexInArray(this.fileListto, row);
- const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
- this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ if (this.activeName == 1) {
+ const index = this.getIndexInArray(this.fileListto, row);
+ const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ } else {
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ }
+ },
+ Downloadfile(row) {
+ console.log(row);
+ window.location.href = this.Networkheader + "/prod-api" + row.url;
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
- ShowDetailDialog(spoce, showType) {
- this.spocewl = spoce;
- this.selectionType = showType;
- if (this.businessType == 4 || !showType) {
- this.selectionType = this.experthear;
+ showSelectionDialog(scope, selectiontype) {
+ this.selectionScope = scope;
+ this.selectionType = selectiontype;
+ this.accountselectform.index = scope.$index;
+
+ if (this.selectionType == "account") {
+ //榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
+ this.accountfrom = "1";
+
+ this.accountselectform.accountno = scope.row.beneficiaryno;
+ this.accountselectform.accountname = scope.row.beneficiaryname;
+ this.accountselectform.expertunitname = "";
+ this.accountselectform.expertunitno = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.telephone = "";
+ this.accountselectform.idcardno = "";
+ this.accountselectform.title = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.depositbank = "";
+ this.accountselectform.bankcardno = "";
+ this.accountselectform.personnelunitno = "";
+ this.accountselectform.address = "";
+ this.accountselectform.telephone = "";
+ } else if (this.selectionType == "workunit") {
+ this.accountselectform.expertunitname = scope.row.unitname;
+ this.accountselectform.expertunitno = scope.row.unitno;
}
- // if (!showType) {
- // this.selectionType = this.experthear;
- // }
- this.expertfrom = "1";
-
- this.funddetailForm.index = spoce.$index;
- this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
- this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
- this.funddetailForm.unitno = spoce.row.unitno;
- this.funddetailForm.unitname = spoce.row.unitname;
- this.funddetailForm.expertname = "";
- this.funddetailForm.expertidcardno = "";
- this.funddetailForm.expertunitno = "";
- this.funddetailForm.expertunitname = "";
- this.funddetailForm.experttitle = "";
- this.funddetailForm.expertdepositbank = "";
- this.funddetailForm.expertbankcardno = "";
-
- this.showSelectionDialog = true;
+ this.showselectiondialog = true;
},
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
- ConfirmDetailDialog() {
- if (this.businessType == 4) {
- if (this.experthear == "expert") {
- this.funddetailForm.beneficiaryname = this.unitforname;
- } else {
- this.funddetailForm.beneficiaryname = this.Personnelforname;
- }
- }
+ confirmSelectionDialog() {
+ this.$refs["accountselectform"].validate(valid => {
+ let tempIndex = this.accountselectform.index;
+ if (this.selectionType == "account") {
+ if (this.accountfrom == "1") {
+ //璧嬪�间俊鎭�
+ this.accountlist.map(res => {
+ if (res.username == this.accountselectform.accountname) {
+ console.log(res);
+ 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;
- let tempIndex = this.funddetailForm.index;
- let tempExpertName = this.funddetailForm.beneficiaryname;
- let tempUnitname = this.funddetailForm.unitname;
- let singleDetail = this.rbDetails[tempIndex];
+ 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;
+ }
+ }
+ });
+ } else if (this.accountfrom == "2") {
+ //淇濆瓨鏂板璐﹀彿
+ this.accountform.id = null;
+ this.accountform.userno =
+ this.accountlist[this.accountlist.length - 1].id + 1;
+ this.accountform.usertype = this.accountselectform.usertype;
+ this.accountform.username = this.accountselectform.username;
+ this.accountform.idcardno = this.accountselectform.idcardno;
+ this.accountform.sex = null;
+ this.accountform.title = this.accountselectform.title;
+ this.accountform.telephone = this.accountselectform.telephone;
+ this.accountform.address = this.accountselectform.address;
+ this.accountform.wbm = null;
+ this.accountform.pym = null;
- if (this.selectionType == "expert" || this.businessType == 4) {
- if (this.expertfrom == "1" || this.experthear == "unit") {
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (tempExpertName == res.username) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
- });
- } else {
- //淇濆瓨鏂板涓撳
- this.expertform.id = null;
- this.expertform.userno =
- this.personlist[this.personlist.length - 1].id + 1;
- this.expertform.usertype = "expert";
- this.expertform.username = this.funddetailForm.expertname;
- this.expertform.idcardno = this.funddetailForm.expertidcardno;
- this.expertform.sex = null;
- this.expertform.telephone = null;
- this.expertform.address = null;
- this.expertform.wbm = null;
- this.expertform.pym = null;
+ this.accountform.depositbank = this.accountselectform.depositbank;
+ this.accountform.bankcardno = this.accountselectform.bankcardno;
+ this.accountform.branchbankname = null;
+ this.accountform.remark = null;
+ this.accountform.del_flag = "0";
+ this.accountform.personnelunitno = null;
- this.expertform.unitno = this.funddetailForm.expertunitno;
- try {
- let unitIndex = this.unitList.findIndex(
- item => this.expertform.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- this.expertform.unitname = this.unitList[
- unitIndex
- ].organizationname;
- } else {
- this.expertform.unitname = this.expertform.unitno;
- }
- } catch {
- this.expertform.unitname = this.expertform.unitno;
- }
- this.expertform.title = this.funddetailForm.experttitle;
- this.expertform.personnelunitno = null;
-
- this.expertform.depositbank = this.funddetailForm.expertdepositbank;
- this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
- this.expertform.branchbankname = null;
- this.expertform.remark = null;
- this.expertform.del_flag = "0";
-
- addExternalperson(this.expertform).then(response => {
- if (response.code == 200) {
- this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
-
- listExternalperson().then(res => {
- this.personlist = res.rows;
- //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
- this.personlist.map(res => {
- if (res.username == this.funddetailForm.expertname) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
- });
+ if (this.accountselectform.usertype != "org") {
+ this.accountform.unitno = this.accountselectform.unitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.accountform.unitname = res.organizationname;
+ }
});
+ // try {
+ // let unitIndex = this.unitList.findIndex(
+ // item => this.accountform.unitno == item.organizationid
+ // );
+ // if (unitIndex > -1) {
+ // this.accountform.unitname = this.unitList[unitIndex].organizationname;
+ // } else {
+ // this.accountform.unitname = this.accountform.unitno;
+ // }
+ // } catch {
+ // this.accountform.unitname = this.accountform.unitno;
+ // }
+ }
+ addExternalperson(this.accountform).then(response => {
+ if (response.code == 200) {
+ //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
+ this.accountselectform.accountno = this.accountselectform.userno;
+ this.accountselectform.accountname = this.accountselectform.username;
+
+ //閲嶆柊鑾峰彇璐︽埛鍒楄〃
+ listExternalperson().then(res => {
+ this.accountlist = res.rows;
+
+ //璧嬪�间俊鎭�
+ 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;
+ }
+ }
+ });
+ });
+ }
+ });
+ }
+ } else if (this.selectionType == "workunit") {
+ console.log(tempIndex);
+
+ this.rbDetails[
+ tempIndex
+ ].unitno = this.accountselectform.expertunitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
}
});
}
- } else if (this.selectionType == "unit") {
- singleDetail.unitno = this.funddetailForm.unitno;
- if (this.businessType == 1 || this.businessType == 2) {
- try {
- let unitIndex = this.unitList.findIndex(
- item => singleDetail.unitno == item.organizationid
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.unitList[unitIndex].organizationname;
- } else {
- singleDetail.unitname = singleDetail.unitno;
- }
- } catch {
- singleDetail.unitname = singleDetail.unitno;
- }
- } else if (this.businessType == 3 || this.businessType == 4) {
- try {
- let unitIndex = this.feeUnitList.findIndex(
- item => singleDetail.unitno == item.reportNo
- );
- if (unitIndex > -1) {
- singleDetail.unitname = this.feeUnitList[unitIndex].reportName;
- singleDetail.depositbank = this.feeUnitList[
- unitIndex
- ].depositbank;
- singleDetail.bankcardno = this.feeUnitList[unitIndex].bankcardno;
- } else {
- singleDetail.unitname = singleDetail.unitno;
- }
- } catch {
- singleDetail.unitname = singleDetail.unitno;
- }
- }
- }
- // if (this.experthear == "unit") {
- // singleDetail.unitname = "";
- // }
- if (this.businessType == 4) {
- singleDetail.beneficiaryname = this.funddetailForm.beneficiaryname;
+ //鍏抽棴绐楀彛
+ this.showselectiondialog = false;
+ });
+ },
+ tableParValueChange(row, tto) {
+ const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
+ if (tto) {
+ if (regex.test(accountselectform.expertidcardno)) {
+ row.error = "";
+ } else {
+ row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
+ }
+ return;
}
- this.rbDetails[tempIndex] = singleDetail;
- this.showSelectionDialog = false;
+ console.log(11);
+ if (regex.test(row.idcardno)) {
+ row.error = "";
+ } else {
+ row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
+ }
}
},
@@ -3478,27 +3552,30 @@
//鑾峰彇璺敱鍙傛暟
this.Getnetworkheader();
this.getroute();
- this.getExternalList();
- this.getFeeUnitList();
+ this.getAccountList();
+ this.getUserProfile();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
this.getUserList();
- this.getUserProfile();
- let apifunddetailForm = this.funddetailForm;
+ let apiaccountselectform = this.accountselectform;
let apiform = this.form;
-
- // this.getFeeUnitList();
},
-
+ beforeRouteLeave(to, from, next) {
+ // 鎵ц閿�姣佹搷浣�
+ this.$destroy();
+ next();
+ },
beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ destroyed() {
+ window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
--
Gitblit v1.9.3