From 4fa538e7bf39c9b7d6759d33decfb9e27ce5cb2b Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 12 九月 2023 18:01:23 +0800
Subject: [PATCH] 11
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 265 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 210 insertions(+), 55 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 9670383..9ad5f04 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -208,6 +208,16 @@
</el-col>
</el-row>
-->
+ <el-row v-if="jurisdiction">
+ <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+ </el-alert> -->
+ <el-alert
+ title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
+ type="warning"
+ show-icon
+ >
+ </el-alert>
+ </el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏</el-col>
</el-row>
@@ -216,6 +226,7 @@
:data="rbDetails"
ref="table"
border
+ max-height="800"
highlight-current-row
:summary-method="getSummaries"
show-summary
@@ -226,7 +237,7 @@
label="搴忓彿"
align="center"
fixed
- width="65"
+ width="88"
>
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
@@ -412,7 +423,12 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="days" label="澶╂暟" width="65" align="center">
+ <el-table-column
+ prop="days"
+ label="澶╂暟"
+ width="100"
+ align="center"
+ >
<template slot-scope="scope">
<el-input
v-model="scope.row.days"
@@ -465,7 +481,7 @@
prop="trafficexpense"
label="浜ら�氳垂"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -483,7 +499,7 @@
prop="cityfee"
label="甯傚唴浜ら�氳垂"
align="center"
- width="100"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -502,7 +518,7 @@
prop="hotelexpense"
label="浣忓璐�"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -517,14 +533,14 @@
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="foodexpenses"
label="椁愯垂鎶ラ攢"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
- <el-input
+ <el-input
v-model="scope.row.foodexpenses"
placeholder="浼欓璐规姤閿�"
@blur="
@@ -534,12 +550,12 @@
"
/>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
prop="foodallowance"
label="浼欓琛ュ姪"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -557,7 +573,7 @@
prop="otherexpense"
label="鍏潅璐硅ˉ鍔�"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -576,7 +592,7 @@
prop="otherfeeamount"
label="鍏朵粬璐圭敤"
align="center"
- width="90"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -658,6 +674,7 @@
<el-table
:data="rbPayees"
border
+ max-height="400"
highlight-current-row
:summary-method="getSummaries"
show-summary
@@ -916,7 +933,43 @@
</div>
</div>
- <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
+ <el-dialog
+ v-dialogDrags
+ :modal="false"
+ :close-on-click-modal="false"
+ :title="pdftitle"
+ :visible.sync="pdfVisible"
+ width="60%"
+ >
+ <div>
+ <el-table :data="tableDatatop" style="width: 100%">
+ <el-table-column prop="persontype" label="浜哄憳绫诲埆" width="130">
+ </el-table-column>
+ <el-table-column prop="personname" label="璐圭敤浜哄憳" width="130">
+ </el-table-column>
+ <el-table-column prop="departure" label="鍑哄彂鍦�"> </el-table-column>
+ <el-table-column prop="destination" label="鍒拌揪鍦�"> </el-table-column>
+ <el-table-column prop="days" label="澶╂暟"> </el-table-column>
+ <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�">
+ </el-table-column>
+ <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�">
+ </el-table-column>
+ </el-table>
+ <el-table :data="tableDatatop" style="width: 100%">
+ <el-table-column prop="trafficexpense" label="浜ら�氳垂" width="130">
+ </el-table-column>
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" width="130">
+ </el-table-column>
+ <el-table-column prop="hotelexpense" label="浣忓璐�">
+ </el-table-column>
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪">
+ </el-table-column>
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�">
+ </el-table-column>
+ <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤">
+ </el-table-column>
+ </el-table>
+ </div>
<div class="pdfimg">
<div class="box-pdf">
<div>
@@ -925,8 +978,9 @@
class="upload-demo"
:action="uploadFileUrl"
:file-list="fileListto"
+ :show-file-list="false"
multiple
- :limit="20"
+ drag
:headers="headers"
:on-success="
(response, file, fileList) =>
@@ -935,29 +989,66 @@
:on-preview="downFile"
:disabled="operationType == 'detail'"
:on-error="handleUploadError"
- :on-exceed="handleExceed"
:on-remove="remove"
accept="image/*,.pdf"
>
- <el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶</el-button
- >
+ <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" />{{
+ 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>
- <!-- <div
- class="pdftit"
- @click="pdffn(item)"
- v-for="item in fileList"
- :key="item.name"
- >
- {{ item.name }}
- </div> -->
</div>
- <div v-if="this.previewpdf" class="pdfimgmin">
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
<el-image
style="width: 95%; height: 90%"
@@ -1029,6 +1120,7 @@
import { getSubsidy } from "@/api/project/travelcity";
import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
+import debounce from "lodash/debounce";
export default {
components: {
Treeselect,
@@ -1122,6 +1214,13 @@
starttime: null,
endtime: null
},
+ tableDatatop: [
+ {
+ date: "2016-05-02",
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�"
+ }
+ ],
//鏌ヨ浠樻
queryParamsPayee: {
rbid: null
@@ -1181,6 +1280,7 @@
flowconclusion: null,
fundid: null
},
+ jurisdiction: false,
//淇濆瓨鎸夐挳鎺у埗
idisabled: false
@@ -1277,16 +1377,18 @@
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
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
+ );
+ 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);
@@ -1294,16 +1396,24 @@
},
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
+ this.tableDatatop = [];
+ this.pdfimgsrcList = [];
+ this.tableDatatop.push(row);
+ // console.log(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);
+ });
+ console.log(this.pdfimgsrcList);
console.log(this.pdfimg);
- this.pdfimgsrcList = [];
- this.pdfimgsrcList.push(this.pdfimg);
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.fileListto = [];
this.pdfimg = "";
@@ -1313,8 +1423,9 @@
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- console.log(item);
- this.pdftitle = item.name;
+ console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
if (name[1] == "pdf") {
this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
@@ -1324,9 +1435,13 @@
this.previewpdf = true;
if (item.url) {
this.pdfimg = this.Networkheader + "/prod-api" + item.url;
- this.pdfimgsrcList = [];
- this.pdfimgsrcList.push(this.pdfimg);
- console.log(this.pdfimg);
+
+ // if (!this.pdfimgsrcList.includes(this.pdfimg)) {
+ // this.pdfimgsrcList.push(this.pdfimg);
+ // console.log("鍔犲叆");
+ // }
+ console.log(this.pdfimg, "pdfimg");
+ console.log(this.pdfimgsrcList, "imglist");
} else {
this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
}
@@ -1335,6 +1450,30 @@
this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
this.previewpdf = false;
}
+ },
+ getIndexInArray(arr, obj) {
+ return arr.indexOf(obj);
+ },
+ // 鐐瑰嚮鍒犻櫎
+ deletedowfile(row) {
+ console.log(this.fileListto);
+ console.log(row);
+ const indexlist = this.getIndexInArray(
+ this.pdfimgsrcList,
+ this.Networkheader + "/prod-api" + row.url
+ );
+ console.log(indexlist);
+ this.pdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.fileListto, row);
+ this.fileListto.splice(index, 1);
+ console.log(index);
+ console.log(this.pdfimgsrcList);
+ },
+ // 鐐瑰嚮涓婄Щ
+ 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鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
},
/** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
@@ -1814,6 +1953,7 @@
handleDetail(ids) {
this.operationType = "detail";
this.title = "鎶ラ攢鐢宠璇︽儏";
+ this.jurisdiction = true;
this.reset();
this.open = true;
@@ -1962,7 +2102,7 @@
},
/** 鎻愪氦淇濆瓨鎸夐挳 */
- submitForm() {
+ submitForm: debounce(function(data) {
this.$refs["form"].validate(valid => {
if (valid) {
// idisabled=true;
@@ -2113,7 +2253,7 @@
}
}
});
- },
+ }, 500),
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
@@ -2244,6 +2384,8 @@
//鏂板涓�琛�
addDetailRow(rowIndex) {
+ console.log(rowIndex);
+
let rowData = {
//index: this.rbDetails.length,
searchAddress: {
@@ -2258,6 +2400,8 @@
endtime: null,
destination: null,
days: null,
+ persontype: null,
+ personname: null,
trafficexpense: 0,
traffictype: null,
traffictype2: null,
@@ -2281,13 +2425,16 @@
total: 0,
orderno: null,
personname2: null,
- personname: null,
destination: null
};
- if (this.Reminderquantity >= 5) {
- this.Savereminder = true;
- return;
+ if (this.rbDetails.length) {
+ rowData.persontype = this.rbDetails[rowIndex].persontype;
+ rowData.personname = this.rbDetails[rowIndex].personname;
}
+ // if (this.Reminderquantity >= 5) {
+ // this.Savereminder = true;
+ // return;
+ // }
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.rbDetails.push(rowData);
} else {
@@ -2313,10 +2460,10 @@
personname: null,
amount: null
};
- if (this.Reminderquantity >= 5) {
- this.Savereminder = true;
- return;
- }
+ // if (this.Reminderquantity >= 5) {
+ // this.Savereminder = true;
+ // return;
+ // }
if (rowIndex == undefined || rowIndex == null || rowIndex <= 0) {
this.rbPayees.push(rowData);
} else {
@@ -2456,7 +2603,7 @@
if (!isNaN(parseFloat(row.otherfeeamount))) {
totalFee += parseFloat(row.otherfeeamount);
}
- row.total = totalFee;
+ row.total = totalFee.toFixed(2);
/*
if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
@@ -2659,6 +2806,10 @@
sums[index] = "鍚堣";
return;
}
+ if (index === 18) {
+ sums[index] = this.form.amountrequested;
+ return;
+ }
//鍘婚櫎閮ㄥ垎瀛楁璁＄畻
if (columnnames.indexOf(column.property) > -1) {
return;
@@ -2674,7 +2825,7 @@
return prev;
}
}, 0);
- sums[index] += "";
+ sums[index] = sums[index].toFixed(2); // 淇濈暀2浣嶅皬鏁帮紝瑙ｅ喅灏忔暟鍚堣鍒�;
} else {
sums[index] = "";
}
@@ -2720,7 +2871,7 @@
height: 600px;
.box-pdf {
- width: 200px;
+ width: 400px;
padding-top: 20px;
margin-right: 30px;
border: 1px solid #dcdfe6;
@@ -2759,4 +2910,8 @@
line-height: 36px;
text-align: center;
}
+::v-deep .el-alert__title {
+ font-size: 20px;
+ line-height: 20px;
+}
</style>
--
Gitblit v1.9.3