From f571e59e5a104498632d5185896ab1662006dd55 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期二, 22 八月 2023 09:54:19 +0800 Subject: [PATCH] yxh --- src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 18 deletions(-) diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue index 15cffd2..be6ea45 100644 --- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue +++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue @@ -443,13 +443,15 @@ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'"> <el-col :span="20">瀹℃牳璁板綍</el-col> </el-row> - <el-row v-if="operationType != 'edit'"> + <el-row v-if="operationType != 'add'"> <el-table :data="fundflowList" border> - <el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" /> <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="200" prop="createTime" /> - <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template - slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span - v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template> + <el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" /> + <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"> + <template slot-scope="scope"> + <span v-if="scope.row.flowconclusion == 1">閫氳繃</span> + <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span> + </template> </el-table-column> <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" /> </el-table> @@ -608,6 +610,9 @@ loading: true, // 瀵煎嚭閬僵灞� exportLoading: false, + + // 褰撳墠鍗曟嵁ID + curId: 0, // 閫変腑鏁扮粍 ids: [], // 闈炲崟涓鐢� @@ -735,17 +740,17 @@ mounted() { //閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪� - let ids = this.$route.query.id; + let curId = this.$route.query.id; let pos = this.$route.query.pos; this.defaultperson = this.$route.query.routerparam; if (pos == 1) { - this.handleAdd(ids); + this.handleAdd(curId); } else if (pos == 2) { - this.handleUpdate(ids); + this.handleUpdate(curId); } else if (pos == 3) { - this.handleDetail(ids); + this.handleDetail(curId); } else if (pos == 4) { - this.handleCheck(ids); + this.handleCheck(curId); } }, @@ -947,7 +952,16 @@ } //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛� - row.foodallowance = (parseInt(row.days) * 100).toString(); + if (tempStr == "鏉窞") { + row.foodallowance = ""; + } + else if (tempStr == "瑗胯棌" || tempStr == "鏂扮枂" || tempStr == "闈掓捣") { + row.foodallowance = (parseInt(row.days) * 120).toString(); + } + else { + row.foodallowance = (parseInt(row.days) * 100).toString(); + } + //璁$畻鍚堣 this.sumRowFee(row); @@ -1207,7 +1221,7 @@ }, /** 淇敼鎸夐挳鎿嶄綔 */ - handleUpdate(ids) { + handleUpdate(curId) { // this.$router.push({ // path: "/finance/travelexpenseslist/Modifydetails/", // query: { id: ids } @@ -1219,8 +1233,7 @@ this.title = "鎶ラ攢鐢宠淇敼"; //鑾峰彇鎶ラ攢涓讳俊鎭� - const id = ids || this.ids; - getReimbursement(id).then(response => { + getReimbursement(curId).then(response => { this.form = response.data; this.fileListto = this.form.annexfiles ? this.form.annexfiles @@ -1229,11 +1242,9 @@ : []; this.form.recordstatus = response.data.recordstatus + ""; - let ids = response.data.id; //鑾峰彇鎶ラ攢鏄庣粏淇℃伅 - getReimbursementdetaillist(ids).then(res => { + getReimbursementdetaillist(curId).then(res => { this.rbDetails = res.data; - console.log(this.rbDetails); if (this.rbDetails.length == 0) { this.addDetailRow(0); } @@ -1254,13 +1265,24 @@ }); //鑾峰彇鎶ラ攢鎵撴淇℃伅 - this.queryParamsPayee.rbid = ids; + this.queryParamsPayee.rbid = curId; listReimbursementpayee(this.queryParamsPayee).then(res => { this.rbPayees = res.rows; if (this.rbPayees.length == 0) { this.addPayeeRow(0); } }); + + //瀹℃牳鐘舵�� + this.form.recordstatus = response.data.recordstatus + ""; + let listFundflowparams = { + fundid: curId, + fundtype: 1 + }; + listFundflow(listFundflowparams).then(res => { + this.fundflowList = res.rows; + }); + }); }, -- Gitblit v1.9.3