From f26808b4a9f2441a938a02540675b65db0a00ce5 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 25 八月 2023 17:20:44 +0800
Subject: [PATCH] 11
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 164 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 109 insertions(+), 55 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index cd24f2c..c9090c5 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -209,11 +209,12 @@
</el-row>
-->
<el-row style="margin-top: 25px; margin-bottom: 5px">
- <el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col>
+ <el-col :span="20">鎶ラ攢鏄庣粏</el-col>
</el-row>
<el-row>
<el-table
:data="rbDetails"
+ ref="table"
border
highlight-current-row
:summary-method="getSummaries"
@@ -478,18 +479,25 @@
/>
</template>
</el-table-column>
- <!--
- <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="100">
+ <el-table-column
+ prop="cityfee"
+ label="甯傚唴浜ら�氳垂"
+ align="center"
+ width="100"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
- (val) => {
- sumRowFee(scope.row);
- }
- ">{{ Number(scope.row.cityfee).toFixed(2) }}
+ <el-input
+ v-model="scope.row.cityfee"
+ placeholder="甯傚唴浜ら�氳垂"
+ @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ "
+ >{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
</template>
</el-table-column>
- -->
<el-table-column
prop="hotelexpense"
label="浣忓璐�"
@@ -619,7 +627,7 @@
type="text"
size="mini"
@click="addDetailRow(scope.$index)"
- v-if="dialogType == 'edit'"
+ v-if="operationType == 'edit'"
>鏂板</el-button
>
<el-button
@@ -628,7 +636,7 @@
"
type="text"
size="small"
- v-if="dialogType == 'edit'"
+ v-if="operationType == 'edit'"
>鍒犻櫎</el-button
>
<el-button
@@ -644,9 +652,9 @@
</el-table>
</el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
- <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
+ <el-col :span="20">鎵撴鏄庣粏</el-col>
</el-row>
- <el-row style="margin-top: 30px">
+ <el-row style="margin-top: 5px">
<el-table
:data="rbPayees"
border
@@ -810,7 +818,7 @@
label="鎿嶄綔"
align="center"
width="100"
- v-if="dialogType == 'edit'"
+ v-if="operationType == 'edit'"
>
<template slot-scope="scope">
<el-button
@@ -832,32 +840,36 @@
</el-table-column>
</el-table>
</el-row>
-
- <el-row v-if="dialogType == 'detail' || dialogType == 'check'">
+ <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 != 'add'">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
<el-table-column
label="瀹℃牳鏃ユ湡"
align="center"
- width="160"
+ width="200"
prop="createTime"
+ />
+ <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
- >
+ >
+ <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="瀹℃牳澶囨敞"
@@ -868,7 +880,7 @@
</el-row>
<el-row
style="margin-top: 25px; margin-bottom: 5px"
- v-if="dialogType == 'check'"
+ v-if="operationType == 'check'"
>
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
@@ -879,7 +891,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="dialogType == 'check'">
+ <el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
<el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" />
@@ -891,13 +903,13 @@
<el-button
type="primary"
@click="submitForm"
- v-if="dialogType == 'edit'"
+ v-if="operationType == 'edit'"
>淇� 瀛�</el-button
>
<el-button
type="primary"
@click="checksubmit"
- v-if="dialogType == 'check'"
+ v-if="operationType == 'check'"
>鎻� 浜�</el-button
>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
@@ -921,14 +933,14 @@
uploadSccess(response, file, fileList)
"
:on-preview="downFile"
- :disabled="dialogType == 'detail'"
+ :disabled="operationType == 'detail'"
:on-error="handleUploadError"
:on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
<el-button
- :disabled="dialogType == 'detail'"
+ :disabled="operationType == 'detail'"
size="small"
type="primary"
>涓婁紶</el-button
@@ -946,7 +958,13 @@
</div>
<div v-if="this.previewpdf" class="pdfimgmin">
- <img :src="pdfimg" />
+ <!-- <img :src="pdfimg" /> -->
+ <el-image
+ style="width: 100px; height: 100px"
+ :src="pdfimg"
+ :preview-src-list="pdfimgsrcList"
+ >
+ </el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
@@ -1035,6 +1053,7 @@
value: 0,
label: ""
},
+ pdfimgsrcList: [],
hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
atpresent: "",
@@ -1052,6 +1071,9 @@
loading: true,
// 瀵煎嚭閬僵灞�
exportLoading: false,
+
+ // 褰撳墠鍗曟嵁ID
+ curId: 0,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -1114,7 +1136,7 @@
defaultperson: {},
fundflowList: [],
showApproveRecordDialog: false,
- dialogType: "edit",
+ operationType: "edit",
//涓婁紶鍙戠エ鏂囦欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
@@ -1179,18 +1201,23 @@
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);
}
+ },
+ updated() {
+ this.$nextTick(() => {
+ this.$refs["table"].doLayout();
+ });
},
methods: {
@@ -1247,6 +1274,8 @@
this.previewpdf = true;
if (item.url) {
this.pdfimg = item.url;
+ this.pdfimgsrcList=[]
+ this.pdfimgsrcList.push(item.url);
} else {
this.pdfimg = item.response.url;
}
@@ -1262,6 +1291,9 @@
treeselect().then(response => {
this.deptOptions = response.data;
});
+ },
+ cellCilicksa(row) {
+ console.log(row);
},
//鑾峰彇浜哄憳鍒楄〃
@@ -1391,7 +1423,17 @@
}
//浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.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);
@@ -1635,7 +1677,7 @@
this.reset();
// this.open = true;
this.title = "鏂板宸梾鐢宠鍗�";
- this.dialogType = "edit";
+ this.operationType = "edit";
this.fundflowList = [];
console.log(this.title, this.defaultperson);
@@ -1651,20 +1693,19 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(ids) {
+ handleUpdate(curId) {
// this.$router.push({
// path: "/finance/travelexpenseslist/Modifydetails/",
// query: { id: ids }
// });
- this.dialogType = "edit";
+ this.operationType = "edit";
this.reset();
// this.open = true;
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
@@ -1673,11 +1714,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);
}
@@ -1698,19 +1737,29 @@
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
- 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;
+ });
});
},
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(ids) {
- this.dialogType = "detail";
+ this.operationType = "detail";
this.title = "鎶ラ攢鐢宠璇︽儏";
this.reset();
@@ -1770,7 +1819,7 @@
/** 瀹℃牳鎸夐挳鎿嶄綔 */
handleCheck(ids) {
- this.dialogType = "check";
+ this.operationType = "check";
this.title = "鎶ラ攢鐢宠璇︽儏";
this.reset();
@@ -1852,8 +1901,10 @@
checkfund(checkfundobj).then(res => {
this.reset();
this.open = false;
- this.getList();
this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
+ // 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
});
},
@@ -1970,7 +2021,9 @@
this.open = false;
// 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
+
// this.getList();
// })
// .catch(err => {
@@ -1998,6 +2051,7 @@
this.open = false;
// 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
})
.catch(err => {
--
Gitblit v1.9.3