From 6db905917daf50d8002df4f86f9d6de3329b4cce Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 02 九月 2026 09:43:21 +0800
Subject: [PATCH] 修改了排序
---
src/views/project/travelexpenseapply/index.vue | 200 +++++++++++++++++++++++++++++++++----------------
1 files changed, 133 insertions(+), 67 deletions(-)
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index d5a9478..8e19f52 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -17,12 +17,13 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="鎶ラ攢鏃ユ湡" prop="createTime">
- <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
- range-separator="鑷�" start-placeholder="鎶ラ攢寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢缁撴潫鏃ユ湡" @keyup.enter.native="handleQuery">
+ <el-form-item label="鎶ラ攢鏃ユ湡" prop="applyTime">
+ <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange"
+ @change="selecttime" range-separator="鑷�" start-placeholder="鎶ラ攢寮�濮嬫棩鏈�" end-placeholder="鎶ラ攢缁撴潫鏃ユ湡"
+ @keyup.enter.native="handlQuery">
</el-date-picker>
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="6">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
<el-input v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" v-if="0"
@@ -31,6 +32,14 @@
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
<el-col :span="4">
@@ -44,42 +53,48 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd">鏂板</el-button>
<!-- v-hasPermi="['project:funddetail:add']" -->
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+ <el-button type="warning" plain icon="el-icon-download" :loading="exportLoading"
@click="handleExport">瀵煎嚭</el-button>
</el-col>
<!-- v-hasPermi="['project:funddetail:export']" -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
+ <el-table :row-class-name="rowClassName" v-loading="loading" :data="reimbursementList"
+ @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="鎶ラ攢浜虹被鍒�" width="120" align="center" prop="costtype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_travelexpensebelong" :value="scope.row.costtype" />
</template>
- </el-table-column>-->
- <el-table-column label="鐢宠鏃堕棿" width="150" align="center" prop="createTime">
+</el-table-column>-->
+ <el-table-column label="鐢宠鏃堕棿" width="120" align="center" prop="applyTime">
<template slot-scope="scope">
- <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+ <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="160">
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="140">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" width="150" align="center" prop="username" />
+ <el-table-column label="鏉愭枡棰勫鐘舵��" width="140" align="center" prop="checkstatus">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" />
+ </template>
+ </el-table-column>
+ <el-table-column label="缁忓姙浜�" width="100" align="center" prop="username" />
<!--
<el-table-column label="鍑哄樊浜�" width="180" align="center" prop="travelers">
</el-table-column>-->
- <el-table-column label="鎶ラ攢閲戦" width="150" align="center" prop="amountrequested">
+ <el-table-column label="鎶ラ攢閲戦" width="120" align="center" prop="amountrequested">
</el-table-column>
- <el-table-column label="鎵�灞炵粍鍒�" width="150" align="center" prop="deptmentname" />
- <el-table-column label="缁勯暱" width="150" align="center" prop="managername" />
+ <el-table-column label="鎵�灞炵粍鍒�" width="120" align="center" prop="deptmentname" />
+ <el-table-column label="缁勯暱" width="100" align="center" prop="managername" />
<el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason" />
<!-- <el-table-column label="鑱旂郴鐢佃瘽" width="120" align="center" prop="phone">
</el-table-column>
@@ -89,22 +104,30 @@
</el-table-column>
<el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
<!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
- <el-table-column label="鎹愮尞鑰�" width="150" align="center" prop="donorname" />
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="210">
+ <el-table-column label="鎹愮尞鑰�" width="100" align="center" prop="donorname" />
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" width="300" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
icon="el-icon-upload2" @click="handleup(scope.row)">涓婃姤</el-button>
<el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+ <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
<!-- v-hasPermi="['project:funddetail:edit']" -->
<el-button size="mini" type="text" icon="el-icon-download" @click="gettable(scope.row)">
涓嬭浇
</el-button>
<!-- v-hasPermi="['project:funddetail:edit']" -->
<el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
- icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
+ @click="handleDelete(scope.row)"><span class="button-delete"><i
+ class="el-icon-delete"></i>鍒犻櫎</span></el-button>
<!-- v-hasPermi="['project:funddetail:remove']" -->
+ </template>
+ </el-table-column>
+ <el-table-column fixed="right" align="center" width="120" label="鍔熻兘" v-if="false">
+ <template slot-scope="scope">
+ <el-button size="mini" v-if="scope.row.uploadStates == 1">绾夸笅宸叉姤閿�</el-button>
+ <el-button size="mini" type="success" v-else-if="scope.row.uploadStates == 0"
+ @click="Dooffline('1', scope.row)">绾夸笅鎶ラ攢</el-button>
</template>
</el-table-column>
</el-table>
@@ -118,9 +141,9 @@
@close="reset">
<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 style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker style="width: 100%" v-model="form.applyTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
@@ -387,10 +410,11 @@
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
<template slot-scope="scope">
- <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
+ <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<!--
@@ -407,44 +431,49 @@
-->
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
- <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
+ <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
- <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => {
+ <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
- <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => {
+ <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => {
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
+ <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
@@ -655,6 +684,7 @@
import { getUser, getUserProfile } from "@/api/system/user";
import { treeselect } from "@/api/system/dept";
import { getSubsidy } from "@/api/project/travelcity";
+import { addorupdateFund } from "@/api/project/fund";
import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
export default {
@@ -671,7 +701,8 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
- "sys_area_name"
+ "sys_area_name",
+ "sys_stage_type"
],
data() {
return {
@@ -727,17 +758,10 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- itemname: null,
- itemtype: null,
+ costtype: null,
+ donorname: null,
starttime: null,
- remark: null,
- departure: null,
endtime: null,
- destination: null,
- uploadFlag: null,
- uploadTime: null,
- // orderByColumn: "createTime",
- orderByColumn: "id",
isAsc: "desc"
},
queryParams2: {
@@ -836,6 +860,8 @@
},
methods: {
+
+
handleUploadError() { },
remove(file) {
@@ -844,6 +870,17 @@
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
+ },
+ Dooffline(a, value) {
+ value.uploadStates = 1;
+ value.notes = "绾夸笅宸叉姤閿�";
+ addorupdateFund(value).then(res => {
+ if (res.code == 200) {
+ this.$modal.msgSuccess("璁板綍鎴愬姛");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ });
},
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
@@ -855,7 +892,7 @@
this.$modal.msgSuccess(response.msg);
this.fileList.push({ name: response.fileName, url: response.fileName });
} else {
- console.log(response.msg);;
+ console.log(response.msg);
}
},
@@ -986,9 +1023,9 @@
if (tempStr == "鏉窞") {
row.otherexpense = "";
} else if (
- tempStr == "鏉窞-妗愬簮" ||
- tempStr == "鏉窞-寤哄痉" ||
- tempStr == "鏉窞-娣冲畨"
+ tempStr.includes("妗愬簮") ||
+ tempStr.includes("寤哄痉") ||
+ tempStr.includes("娣冲畨")
) {
row.otherexpense = (parseInt(row.days) * 60).toString();
} else {
@@ -1119,11 +1156,7 @@
}
});
},
-
- onpick(e) {
- // console.log(e,this.value1)
- },
-
+
gettable(e) {
const id = e.id;
getdownload(e.id).then(res => {
@@ -1136,21 +1169,27 @@
var aEle = document.createElement("a");
aEle.href =
curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
- aEle.click();
+ console.log(aEle.href);
+ // 娣诲姞Authorization澶撮儴
+ fetch(aEle.href, {
+ headers: this.headers
+ })
+ .then(response => {
+ // 灏嗘枃浠朵笅杞介摼鎺ヤ綔涓篵lob瀵硅薄杩涜涓嬭浇
+ return response.blob();
+ })
+ .then(blob => {
+ const url = window.URL.createObjectURL(new Blob([blob]));
+ console.log(url);
+ const link = document.createElement("a");
+ link.href = url;
+ const name = fileUrl["downloadName"];
+ link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
+ document.body.appendChild(link);
+ link.click();
+ link.parentNode.removeChild(link);
+ });
});
-
- // downloadconfirmationinfo(id).then((response) => {
- // var fileUrl = response;
- // //鑾峰彇褰撳墠缃戝潃
- // var urlBase = process.env.VUE_APP_BASE_API;
- // var curWWWPath = window.document.location.href;
- // var pos = curWWWPath.indexOf(window.document.location.pathname);
- // // 鍒涘缓a鏍囩
- // var aEle = document.createElement("a");
- // aEle.href =
- // curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
- // aEle.click();
- // });
},
/** 鏌ヨ鎶ラ攢鐢宠鍒楄〃 */
@@ -1552,6 +1591,7 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
+ console.log(ids);
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
.then(function () {
@@ -1963,7 +2003,33 @@
chineseStr += cnInteger;
}
return chineseStr;
+ },
+
+ //鏄庢樉鎻愮ず瀹℃壒閫�鍥炶褰�
+ rowClassName({ row, column, rowIndex, columnIndex }) {
+ //姝ゅ垽鏂负鏈�鍚庝笁琛�
+ if (row.recordstatus == -1 && row.backflowlevel != null) {
+ return "error-row";
+ }
+ return "";
}
}
};
</script>
+<!-- <style scoped> -->
+<!-- 涓嶅彲鍔爏coped,浼氱嫭绔嬫牱寮廵lement璁块棶涓嶅埌 -->
+<style lang="scss" scoped>
+.addClassva {
+ /* background: #10aec2; */
+ background: #e8f4ff !important;
+ /* color:whitesmoke; */
+}
+
+.button-delete {
+ color: rgb(236, 69, 69);
+}
+
+::v-deep.el-table .error-row {
+ background: #fcebeb;
+}
+</style>
--
Gitblit v1.9.3