From e0cba2eae77a977e914369705cd6b755380d569b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期日, 17 十二月 2023 21:17:54 +0800
Subject: [PATCH] yxh：修改报销明细单显示问题
---
src/views/project/fund/applyDetail/index.vue | 144 +++++++++++++++++++++++------------------------
1 files changed, 70 insertions(+), 74 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index bc1e350..f15f222 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -136,7 +136,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 +161,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 +221,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-input :disabled="userprofile.nickName != '闄堟厱鍗�'
" v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)"
placeholder="韬唤璇佸彿" />
</el-form-item>
@@ -259,13 +238,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 +252,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 +273,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>
@@ -445,19 +419,22 @@
<el-row v-if="accountfrom == '2'">
<el-col :span="24">
<el-form-item label="璐﹀彿鍚嶇О" prop="username">
- <el-input v-model="accountselectform.username" placeholder="璇疯緭鍏ュ崟浣嶅悕绉版垨涓撳濮撳悕" /> </el-form-item>
+ <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-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>
+ :value="dict.label"></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
@@ -468,7 +445,7 @@
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>
@@ -479,7 +456,8 @@
</el-row>
<el-row v-if="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="璇疯緭鍏ラ摱琛屽崱鍙�" />
@@ -489,13 +467,15 @@
<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-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-input v-model="accountselectform.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -512,7 +492,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')
@@ -881,12 +861,12 @@
selectionScope: "",
//閫夋嫨绫诲瀷锛氫笓瀹讹紙鍗曚綅锛夎处鎴枫�佸伐浣滃崟浣嶏紙account/workunit锛�
selectionType: "",
- //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
- beneficiarylabel: "",
//璐︽埛閫夋嫨锛�1鏄处鎴峰簱锛�2鏄柊澧�
accountfrom: "1",
+ //鍙楃泭浜烘爣绛撅細涓撳璐�-涓撳锛堝崟浣嶏級鍚嶇О锛屽尰瀛︽垚鏈�-鍔炲叕-鍗曚綅锛堜釜浜猴級鍚嶇О
+ beneficiarylabel: "",
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
- amountLabel: "绋庡墠閲戦",
+ amountlabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -915,7 +895,7 @@
accountselectform: {
index: null,
- usertype: 'expert',
+ usertype: "expert",
accountname: null,
accountno: null,
expertunitname: null,
@@ -1145,22 +1125,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();
@@ -1399,7 +1379,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.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;
@@ -1686,10 +1677,8 @@
// );
// return;
// }
- if ((this.form.applytype == "1") && this.form.fundtaxtime == null) {
- this.$modal.msgError(
- "鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�"
- );
+ if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
+ this.$modal.msgError("鎻愪氦涓撳璐圭敤鐢宠鍗曞鏍革紝闇�瑕佸厛瀹屾垚涓◣璁＄畻锛�");
return;
}
}
@@ -2778,6 +2767,7 @@
//璧嬪�间俊鎭�
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;
@@ -2785,7 +2775,7 @@
this.rbDetails[tempIndex].bankcardno = res.bankcardno;
this.rbDetails[tempIndex].phone = res.telephone;
- if (res.usertype == 'org') {
+ if (res.usertype == "org") {
this.rbDetails[tempIndex].idcardno = "";
this.rbDetails[tempIndex].title = "";
this.rbDetails[tempIndex].unitno = "";
@@ -2801,7 +2791,8 @@
} else if (this.accountfrom == "2") {
//淇濆瓨鏂板璐﹀彿
this.accountform.id = null;
- this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1;
+ 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;
@@ -2819,7 +2810,7 @@
this.accountform.del_flag = "0";
this.accountform.personnelunitno = null;
- if (this.accountselectform.usertype != 'org') {
+ if (this.accountselectform.usertype != "org") {
this.accountform.unitno = this.accountselectform.unitno;
this.unitList.map(res => {
if (res.organizationid == this.accountform.unitno) {
@@ -2841,7 +2832,7 @@
}
addExternalperson(this.accountform).then(response => {
if (response.code == 200) {
- //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
+ //this.$modal.msgSuccess("鏂扮殑涓撳鎴栧崟浣嶈处鎴蜂俊鎭凡娣诲姞鎴愬姛锛�");
this.accountselectform.accountno = this.accountselectform.userno;
this.accountselectform.accountname = this.accountselectform.username;
@@ -2855,11 +2846,12 @@
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].branchbankname =
+ res.branchbankname;
this.rbDetails[tempIndex].bankcardno = res.bankcardno;
this.rbDetails[tempIndex].phone = res.telephone;
- if (res.usertype == 'org') {
+ if (res.usertype == "org") {
this.rbDetails[tempIndex].idcardno = "";
this.rbDetails[tempIndex].title = "";
this.rbDetails[tempIndex].unitno = "";
@@ -2877,7 +2869,11 @@
});
}
} else if (this.selectionType == "workunit") {
- this.rbDetails[tempIndex].unitno = this.accountselectform.expertunitno;
+ 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;
@@ -2914,13 +2910,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