From 1c678c6fc8bbb7974ceb57d95c96e3ed2f4c2676 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 01 九月 2023 16:45:30 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fundcheck/officeExpenseCheck/index.vue | 62 ++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 18 deletions(-)
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 0bcef46..6655548 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -12,7 +12,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
- <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
+ <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
@@ -32,26 +32,28 @@
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <!--
<el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
<template slot-scope="scope">
<span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
style="color: #5fb878; font-weight: bold"></i></span>
- <!-- <span v-else>寰呭鏍�</span> -->
+ <span v-else>寰呭鏍�</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
+ -->
+ <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="140px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
<!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />-->
- <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
+ <!--
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
- <!--<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" />
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" />
<el-table-column label="褰撳墠瀹℃牳绾у埆" width="180" align="center" prop="flowlevel">
<template slot-scope="scope">
@@ -60,17 +62,19 @@
</el-table-column>
<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-->
- <el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" width="180">
+ <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="200">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
- @click="handleShow(scope.row)">璇︽儏</el-button>
+ @click="handleDetail(scope.row)">璇︽儏</el-button>
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
- @click="handleUpdate(scope.row)">瀹℃牳</el-button>
+ @click="handleCheck(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
<el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)"
v-hasPermi="['project:donateconsolationfund:download']">涓嬭浇</el-button>
@@ -131,7 +135,7 @@
<el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
<!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
:disabled="form.id != null">{{ dict.label }}</el-radio>-->
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label="4">鍔炲叕璐圭敤鐢宠</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -634,12 +638,14 @@
this.getCurFundType();
this.getUsermsg();
},
+
mounted() {
this.selectReporters();
this.getlistOrganization();
//his.getlistUser();
this.getlistbypower();
},
+
methods: {
selectapplication() {
this.queryParams.APPLICATIONBEGTIME = this.createTime[0];
@@ -859,7 +865,7 @@
annexbankcard: null,
annexregistform: null,
consolationmoney: null,
- applytype: "3",
+ applytype: "4",
};
this.resetForm("form");
@@ -908,8 +914,18 @@
});
}
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ handleCheck(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "4",
+ operationType: "check"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
@@ -940,7 +956,17 @@
},
//鏌ョ湅瀹℃牳璇︽儏
- handleShow(row) {
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "4",
+ operationType: "detail"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
@@ -1348,7 +1374,7 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(3).then((res) => {
+ getFundTypeAll(4).then((res) => {
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
--
Gitblit v1.9.3