From 1cfc281eef281cf3313233df8341519480d2ae8c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 18 一月 2024 13:56:53 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/applyDetail/index.vue | 665 ++++++++++++++++++++++++------------------------------
1 files changed, 298 insertions(+), 367 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index bc1e350..62c8afc 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -6,8 +6,13 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row>
<el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.createTime" type="date"
+ <el-form-item label="鎶ラ攢鍗曞彿" prop="bh">
+ <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>
</el-form-item>
@@ -22,13 +27,8 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <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-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
</el-row>
@@ -47,30 +47,33 @@
}}</el-radio>
</el-form-item>
</el-col>
-
- <el-col :span="5">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
- </el-form-item>
- </el-col>
- <el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
- </el-form-item>
- </el-col>
<el-col :span="5" v-if="ismanager == true">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <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-form-item>
+ </el-col>
</el-row>
<el-row style="text-align: left">
- <el-col :span="8">
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞妗堜緥" prop="name">
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
-
<!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
@@ -90,21 +93,21 @@
</el-row>
<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 style="margin-bottom: 15px;">
+ <el-button type="primary" icon="el-icon-download" size="small" @click.native.prevent="importFeeItems">
+ 鎵归噺瀵煎叆鏈嶅姟椤圭洰
+ </el-button>
</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-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>
+ </div>
+ </el-col>
+ <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>
</div>
</el-col>
</el-row>
@@ -136,7 +139,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
+ <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="businessType == '1'" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create
@change="verifyFeeRemark(scope.row)">
@@ -161,53 +164,32 @@
" />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- ismanager == true
- " prop="amount" align="center" :label="amountLabel" width="120">
+ <el-table-column prop="amount" align="center" :label="amountlabel" 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="閲戦" @blur="val => {
- calculateTax(scope.row, 'A');
- }
- " />
+ <el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="(this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '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="鎵ｇ◣閲戦" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- ">
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120"
+ v-if="(ismanager == true) && (businessType == '1' || businessType == '2')">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="val => {
- calculateTax(scope.row, 'B');
- }
- " />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
</template>
</el-table-column>
- <el-table-column prop="beneficiaryname" 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>
+ scope.row.beneficiaryname ? scope.row.beneficiaryname : "鐐瑰嚮閫夋嫨" }}</el-button>
</template>
</el-table-column>
<el-table-column prop="unitno" align="center" label="涓撳鎵�鍦ㄥ崟浣�" width="250"
- v-if="form.applytype == '1' && form.applytype == '2'">
+ 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 : "鐐瑰嚮閫夋嫨"
@@ -242,16 +224,16 @@
</el-table-column>
-->
<el-table-column prop="title" align="center" label="鑱岀О" width="120"
- v-if="form.applytype == '1' || form.applytype == '2'">
+ 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="form.applytype == '1' || form.applytype == '2'">
+ v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
- <el-form-item :error="scope.row.error" label-width="0">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ <el-form-item label-width="0">
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'
" v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿" />
</el-form-item>
@@ -259,13 +241,12 @@
</el-table-column>
<el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
<template slot-scope="scope">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
- " 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">
<template slot-scope="scope">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' && businessType == 1
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'
" v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
@@ -274,11 +255,7 @@
<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-if="businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- 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="澶囨敞" />
</template>
@@ -299,7 +276,7 @@
</el-button>
<el-button @click.native.prevent="
Filepopup(scope.$index, rbDetails, scope.row)
- " type="text" size="small" v-if="businessType == 3 || businessType == 2 || businessType == 4
+ " type="text" size="small" v-if="businessType == 2 || businessType == 3 || businessType == 4
">绁ㄦ嵁</el-button>
</template>
</el-table-column>
@@ -361,7 +338,7 @@
<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-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>
@@ -405,11 +382,11 @@
<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="expertunitno" label-width="120px">
- <el-select v-model="accountselectform.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ <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.organizationid"></el-option>
+ :value="spec.organizationname"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -419,7 +396,7 @@
<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>
@@ -433,42 +410,48 @@
</el-form-item>
</el-col>
</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-radio label="expert">鏂板涓撳璐﹀彿</el-radio>
- <el-radio label="org">鏂板鍗曚綅璐﹀彿</el-radio>
+ <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>
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <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>
- </el-col>
- </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="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-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉帮紝鎴栦笓瀹跺鍚嶏紝鎴栧叾浠栬处鍙�" />
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="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-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>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <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> </el-form-item>
+ </el-select>
</el-form-item>
</el-col>
<el-col>
@@ -477,25 +460,28 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="accountselectform.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item>
+ <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-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鍦板潃" prop="address">
- <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item>
+ <el-input v-model="accountselectform.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" />
+ </el-form-item>
</el-col>
</el-row>
- <el-row v-if="accountfrom == '2'">
+ <el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col>
<el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
- <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item>
+ <el-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -512,7 +498,7 @@
</el-table-column>
<el-table-column prop="quantity" align="center" label="鏁伴噺" v-if="businessType == 4">
</el-table-column>
- <el-table-column prop="amount" align="center" :label="amountLabel">
+ <el-table-column 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')
@@ -744,7 +730,8 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson
+ exportExternalperson,
+ getOnlyCode,
} from "@/api/project/externalperson";
import { listItemexpense } from "@/api/project/itemexpense";
@@ -881,41 +868,31 @@
selectionScope: "",
//閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛�
selectionType: "",
- //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
- beneficiarylabel: "",
//璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧�
accountfrom: "1",
+ //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
+ beneficiarylabel: "",
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
- amountLabel: "绋庡墠閲戦",
+ amountlabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
- // createTime: [
- // { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- // ],
- reason: [
- { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
- ],
- deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
- ]
+ reason: [{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }],
+ deptmentname: [{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }]
},
+
dialogrules: {
- // expertidcardno: [{ validator: validatePass, trigger: "blur" }],
- depositbank: [
- { required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
- ],
- bankcardno: [
- { required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }
- ],
- unitno: [
- { required: true, message: "璇烽�夋嫨鍗曚綅鍚嶇О", trigger: "change" }
- ]
+ usertype: [{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }],
+ username: [{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }],
+ idcardno: [{ required: true, message: "璇疯緭鍏ヨ韩浠借处鍙�", trigger: "blur" }],
+ //idcardno: [{ validator: validatePass, trigger: "blur" }],
+ depositbank: [{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }],
+ bankcardno: [{ required: true, message: "璇疯緭鍏ラ摱琛屽崱鍙�", trigger: "change" }],
},
accountselectform: {
index: null,
- usertype: 'expert',
+ usertype: "expert",
accountname: null,
accountno: null,
expertunitname: null,
@@ -928,13 +905,15 @@
unitno: null,
personnelunitno: null,
address: null,
- telephone: null
+ telephone: null,
+ username: null,
+ userno: null
},
accountform: {
searchValue: null,
id: null,
- userstatus: 1,
+ userstatus: 0,
usertype: null,
pym: null,
@@ -999,6 +978,11 @@
userno: null,
username: null,
usertype: null
+ },
+ // 鏌ヨ鏈�鏂板簭鍙峰弬鏁�
+ seqnoParams: {
+ businessType: "externalperson",
+ datequery: false,
},
//璁＄畻涓◣鍙傛暟
@@ -1145,22 +1129,22 @@
// if (!this.businessType && !this.operationType) {
if (this.businessType == "1") {
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟";
- this.amountLabel = "绋庡墠閲戦";
+ this.amountlabel = "绋庡墠閲戦";
this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "2") {
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
- this.amountLabel = "绋庡墠閲戦";
+ this.amountlabel = "绋庡墠閲戦";
this.beneficiarylabel = "涓撳鎴栧崟浣嶅悕绉�";
this.getUnitList();
} else if (this.businessType == "3") {
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
- this.amountLabel = "閲戦";
+ this.amountlabel = "閲戦";
this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
this.getUnitList();
} else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
- this.amountLabel = "閲戦";
+ this.amountlabel = "閲戦";
this.beneficiarylabel = "鍗曚綅鍚嶇О鎴栦釜浜�";
this.getUnitList();
@@ -1219,11 +1203,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));
// this.form.recordstate =-1;
@@ -1271,8 +1252,6 @@
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));
@@ -1282,7 +1261,7 @@
//涓氬姟鏄庣粏
getownFundDetail(this.curId).then(res => {
this.rbDetails = res.data;
- console.log("this.feeBlocks", this.feeBlocks);
+
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
this.getRowFeeItems(m, this.rbDetails[m]);
@@ -1290,10 +1269,6 @@
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
r => r.itemid == this.rbDetails[m].itemid
- );
- console.log(
- "this.rbDetails[m].rowfeeblocks",
- this.rbDetails[m].rowfeeblocks
);
}
@@ -1319,10 +1294,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));
//闄勪欢澶勭悊
@@ -1399,7 +1372,18 @@
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
this.form.recordstatus = 0;
var currenttime = new Date();
- this.form.createTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
+ this.form.applyTime =
+ currenttime.getFullYear() +
+ "-" +
+ (currenttime.getMonth() + 1) +
+ "-" +
+ currenttime.getDate() +
+ " " +
+ currenttime.getHours() +
+ ":" +
+ currenttime.getMinutes() +
+ ":" +
+ currenttime.getSeconds();
if (!this.form.id) {
this.form.id = this.$route.query.id;
@@ -1461,22 +1445,6 @@
);
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) {
@@ -1603,6 +1571,8 @@
// });
} else {
this.form.recordstatus = -1;
+ var currenttime = new Date();
+ this.form.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth() + 1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
// addorupdateFund(this.form).then((response) => {
// if (response.code === 200) {
@@ -1620,8 +1590,6 @@
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("鐢宠鍗曚慨鏀规垚鍔燂紒");
@@ -1656,42 +1624,32 @@
});
}, 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() {
- console.log(this.checkObj.flowlevelone);
- if (this.userprofile.nickName == "闄堟厱鍗�") {
- //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
- if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
- this.$modal.msgError("璇风‘璁ゆ姤閿�鐨勭焊璐ㄦ潗鏂欏凡缁忔敹鍒帮紒");
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if (this.checkObj.flowlevelone == 2) {
+ if (!this.checkObj.flowconclusion) {
+ this.$modal.msgError("璇疯緭鍏ュ鏍镐笉閫氳繃鐨勮鏄庝俊鎭紝鏂逛究缁忓姙浜轰慨鏀圭敵璇峰崟锛�");
return;
}
+ }
+ else if (this.checkObj.flowlevelone == 1) {
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ //妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
+ if (this.form.checkstatus != 3) {
+ 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;
+ //妫�鏌ヤ釜绋庤绠�
+ if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
+ this.$modal.msgError("璇峰厛瀹屾垚涓撳璐圭敤鐨勪釜绋庤绠楀悗锛屽啀鎻愪氦瀹℃牳閫氳繃锛�");
+ return;
+ }
}
+ }
+ else {
+ this.$modal.msgError("璇峰厛閫夋嫨瀹℃壒缁撴灉鍐嶆彁浜わ紒");
+ return;
}
this.Savenow();
@@ -1708,7 +1666,6 @@
getUserProfile() {
getUserProfile().then(res => {
this.userprofile = res.data;
- console.log(this.userprofile);
this.standardlevel = res.data.standardlevel;
if (
this.userprofile.userName == "admin" ||
@@ -1727,8 +1684,7 @@
this.form.deptmentno = this.userprofile.dept.deptId;
this.form.managername = this.userprofile.dept.leader;
this.form.phone = this.userprofile.phonenumber;
- // this.form.applytype = this.businessType;
- // this.form.createTime = new Date();
+ // this.form.applytype = this.businessType;
if (this.businessType == "4") {
this.getUserAccount();
@@ -1748,28 +1704,23 @@
getAccountList() {
listExternalperson().then(res => {
this.accountlist = res.rows;
- /**
- for (let j = 0; j < this.accountlist.length; j++) {
+ //鑾峰彇鍚敤鐨勮处鎴峰垪琛�
+ for (let j = 0; j < res.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.expertAccountList.push({
- expertNo: this.accountlist[j].id,
- exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")"
+ 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
});
}
}
- */
});
},
@@ -1777,7 +1728,7 @@
getUserAccount() {
this.accountlist.map(res => {
if (res.username == this.form.username) {
- this.form.bankname = res.depositbank; //res.branchbankname銆乺es.depositbank;
+ this.form.bankname = res.depositbank;
this.form.bankcardno = res.bankcardno;
this.form.phone = res.telephone;
}
@@ -1789,7 +1740,6 @@
listOrganization(3).then(response => {
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
- //organizationid: response.rows[i].organizationid,
organizationid: response.rows[i].id,
organizationname: response.rows[i].organizationname
});
@@ -1848,7 +1798,6 @@
//鑾峰彇鏈嶅姟椤圭洰
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);
},
@@ -1870,22 +1819,11 @@
row.amount = 0.0;
row.taxamount = 0.0;
row.taxedamount = item.expense;
-
- //璁＄畻绋庡墠閲戦
- // this.calculateTax(row, "B");
} else {
row.amount = item.expense;
row.taxamount = 0.0;
row.taxedamount = 0.0;
-
- //璁＄畻绋庡悗閲戦
- // this.calculateTax(row, "A");
}
-
- // this.form.serviceFunddetails = 0;
- // this.rbDetails.map(item => {
- // this.form.serviceFunddetails += item.amount;
- // });
}
});
},
@@ -1977,7 +1915,6 @@
}
targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
- console.log(targetValue, "鍚堣");
this.form.pretaxcost = targetValue;
},
@@ -2229,7 +2166,6 @@
// 鎵嬪姩璁＄畻
Manualcalculationfn() {
ManualCalculation(this.rbDetails).then(res => {
- console.log(res);
if (res.code == 200) {
sessionStorage.removeItem("apiform");
sessionStorage.removeItem("apifunddetail");
@@ -2372,10 +2308,6 @@
rowfeeblocks: [],
annexfiles: null
};
- // if (this.Reminderquantity >= 5) {
- // this.Savereminder = true;
- // return;
- // }
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.rbDetails.push(rowData);
} else {
@@ -2542,8 +2474,6 @@
uploadSccess(response, file, fileList) {
this.rbDetails;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- console.log(response);
- console.log(file);
if (this.activeName == 1) {
if (response.code == 200) {
// this.form.filename = file.raw.name;
@@ -2556,7 +2486,6 @@
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;
@@ -2565,7 +2494,6 @@
}
} else {
if (response.code == 200) {
- // this.form.filename = file.raw.name;
this.previewpdf = true;
this.$modal.msgSuccess(response.msg);
this.invoicefileListto.push({
@@ -2575,15 +2503,12 @@
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);
}
}
},
@@ -2598,11 +2523,9 @@
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.fileListto.forEach(item => {
this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
@@ -2616,7 +2539,6 @@
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 => {
@@ -2624,8 +2546,6 @@
this.Networkheader + "/prod-api" + item.url
);
});
- console.log(this.invoicepdfimgsrcList);
- console.log(this.invoicepdfimg);
} else {
this.invoicefileListto = [];
this.invoicepdfimg = "";
@@ -2642,7 +2562,6 @@
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
if (this.activeName == 1) {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
this.pdftitle =
"鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -2663,7 +2582,6 @@
this.previewpdf = false;
}
} else {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
this.pdftitle =
"鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -2675,8 +2593,6 @@
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;
@@ -2732,9 +2648,9 @@
}
},
Downloadfile(row) {
- console.log(row);
window.location.href = this.Networkheader + "/prod-api" + row.url;
},
+
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
showSelectionDialog(scope, selectiontype) {
this.selectionScope = scope;
@@ -2744,15 +2660,15 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
-
- this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.accountname = scope.row.beneficiaryname;
+ this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
this.accountselectform.expertunitno = "";
- this.accountselectform.unitno = "";
- this.accountselectform.unitname = "";
- this.accountselectform.telephone = "";
+
+ this.accountselectform.username = '';
+ this.accountselectform.userno = '';
this.accountselectform.idcardno = "";
+ this.accountselectform.telephone = "";
this.accountselectform.title = "";
this.accountselectform.unitno = "";
this.accountselectform.unitname = "";
@@ -2765,7 +2681,6 @@
this.accountselectform.expertunitname = scope.row.unitname;
this.accountselectform.expertunitno = scope.row.unitno;
}
-
this.showselectiondialog = true;
},
@@ -2776,119 +2691,124 @@
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- 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 (this.rbDetails[tempIndex].beneficiaryname != this.accountselectform.accountname) {
+ 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.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;
-
- 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;
-
- 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;
+ 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;
+ }
}
});
- // 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;
+ } else if (this.accountfrom == "2") {
+ //淇濆瓨鏂板璐﹀彿
+ //鑾峰彇鐢ㄦ埛缂栧彿
+ getOnlyCode(this.seqnoParams).then((res) => {
+ this.accountform.userno = res.data.currentvalue;
+ this.accountform.id = null;
- //閲嶆柊鑾峰彇璐︽埛鍒楄〃
- listExternalperson().then(res => {
- this.accountlist = res.rows;
+ 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;
- //璧嬪�间俊鎭�
- 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;
+ 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;
- 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 (this.accountselectform.usertype == "expert") {
+ this.accountform.unitno = this.accountselectform.unitno;
+ this.unitList.map(res => {
+ if (res.organizationid == this.accountform.unitno) {
+ this.accountform.unitname = res.organizationname;
+ }
});
}
+
+ addExternalperson(this.accountform).then(response => {
+ if (response.code == 200) {
+ if (this.accountselectform.usertype == "expert") {
+ this.$modal.msgSuccess("鏂拌处鎴蜂俊鎭凡娣诲姞鎴愬姛,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+ return;
+ } else {
+ 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") {
- this.rbDetails[tempIndex].unitno = this.accountselectform.expertunitno;
- this.unitList.map(res => {
- if (res.organizationid == this.accountform.unitno) {
- this.rbDetails[tempIndex].unitno.unitname = res.organizationname;
- }
- });
+ if (this.rbDetails[tempIndex].unitname != this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitname = this.accountselectform.expertunitname;
+ this.unitList.map(res => {
+ if (res.organizationname == this.accountselectform.expertunitname) {
+ this.rbDetails[tempIndex].unitno = res.organizationid;
+ }
+ });
+ }
}
//鍏抽棴绐楀彛
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) {
@@ -2899,12 +2819,23 @@
}
return;
}
- console.log(11);
+
if (regex.test(row.idcardno)) {
row.error = "";
} else {
row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
}
+ },
+
+ //璐︽埛绫诲瀷閫夋嫨鍙樺寲
+ userTypeChange(type) {
+ if (type == "org") {
+ this.accountselectform.idcardno = "";
+ this.accountselectform.unitno = "";
+ this.accountselectform.unitname = "";
+ this.accountselectform.personnelunitno = "";
+ };
+ // this.$modal.msgWarning(type);
}
},
@@ -2914,13 +2845,13 @@
this.Getnetworkheader();
this.getroute();
this.getAccountList();
+ this.getUserProfile();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
this.getUserList();
- this.getUserProfile();
let apiaccountselectform = this.accountselectform;
let apiform = this.form;
},
--
Gitblit v1.9.3