From 86a98c135c7ebc417f8af2045aa105a94f2ccbeb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 23 五月 2023 18:45:17 +0800
Subject: [PATCH] 修改了财务和审批
---
src/views/project/donateconsolationfundlist/index.vue | 180 +++++++++++++++++++++++++++++-------------------------------
1 files changed, 87 insertions(+), 93 deletions(-)
diff --git a/src/views/project/donateconsolationfundlist/index.vue b/src/views/project/donateconsolationfundlist/index.vue
index 0c5b1d5..de47182 100644
--- a/src/views/project/donateconsolationfundlist/index.vue
+++ b/src/views/project/donateconsolationfundlist/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
<el-row>
- <el-col :span="9">
+ <el-col :span="8">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
type="daterange" range-separator="鑷�" start-placeholder="鐢宠寮�濮嬫棩鏈�" end-placeholder="鐢宠缁撴潫鏃ユ湡"
@@ -10,14 +10,13 @@
</el-date-picker>
</el-form-item>
</el-col>
-
- <el-col :span="8">
- <el-form-item label="鐢宠浜�" label-width="180px" prop="APPLICANT">
+ <el-col :span="5">
+ <el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
<el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
- <el-col :span="7">
+ <el-col :span="5">
<el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
<el-select v-model="queryParams.CHECKFLAG" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value">
@@ -25,14 +24,12 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ </el-col>
</el-row>
</el-form>
- <el-row type="flex" :gutter="10" align="right" class="mb8">
- <el-col>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="flowconclusion">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
- </el-col>
- </el-row>
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
@@ -48,34 +45,23 @@
<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="donorno" width="240px" />
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
- <!-- <el-table-column
- label="宸ヤ綔鍗曚綅"
- align="center"
- prop="unitname"
- width="230px"
- /> -->
- <!-- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="phone"
- width="160"
- /> -->
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" width="120px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="160px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
+ <!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> -->
+ <!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> -->
<el-table-column label="绋庡墠閲戦" align="center" prop="pretaxcost" width="120px" />
<el-table-column label="绋庡悗閲戦" align="center" prop="taxedcost" width="120px" />
<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="recordstatus" width="180">
<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="prepaidamount" width="120px" />
- <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-
+ <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
+ <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
+ <!--<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />-->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
@@ -97,7 +83,8 @@
<el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> -->
- <el-row><el-col :span="7">
+ <el-row>
+ <el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> -->
<el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
@@ -105,26 +92,9 @@
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
- </el-form-item>
- </el-col>
-
- <el-col :span="7">
- <el-form-item label="鎹愮尞鑰�" prop="donorname">
- <el-input disabled v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="鐢宠浜哄鍚�" prop="username">
- <!-- <el-input
- v-model="form.username"
- placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
- clearable
- /> -->
+ <el-col :span="5">
+ <el-form-item label="缁忓姙浜�" prop="username">
+ <!-- <el-input v-model="form.username" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable /> -->
<el-select v-model="form.username" placeholder="鐢宠浜哄鍚�" clearable filterable allow-create
style="width: 100%">
<el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
@@ -132,35 +102,80 @@
</el-select>
</el-form-item>
</el-col>
-
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input disabled v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input disabled v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="鐢宠绫诲瀷">
+ <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="1">涓撳璐圭敤鐢宠</el-radio>
+ </el-radio-group>
+ </el-form-item></el-col>
+ <el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input disabled v-model="form.remark" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="donorname">
+ <el-input disabled v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </el-form-item>
+ </el-col>
+ <!--
+ <el-col :span="8">
+ <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
+ <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ </el-form-item>
+ </el-col>
<el-col :span="8">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
</el-form-item>
</el-col>
-
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
</el-form-item>
</el-col>
+ -->
</el-row>
-
- <el-row style="text-align: left">
- <el-form-item label="鐢宠绫诲瀷">
- <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="1">涓撳璐圭敤鐢宠</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="鍚堣閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡墠閲戦" prop="amountrequested">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="amountrequested">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鐢宠鐘舵��" prop="recordstatus">
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
+ <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="4">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow"
@@ -217,8 +232,8 @@
<el-table-column v-if="show === 1" prop="amount" align="center" label="绋庡墠閲戦" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" v-on:input="(val) => {
- change(scope.row);
- }
+ change(scope.row);
+ }
" placeholder="绋庡墠閲戦" />
</template>
</el-table-column>
@@ -276,27 +291,6 @@
</el-form-item>
</el-col>
</el-row>
- <el-row style="margin-top: 25px; margin-bottom: 5px">
- <el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <!-- <el-input v-model="form.donorno" placeholder="璇疯緭鍏ョ敵璇锋棩鏈�" /> -->
- <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡墠閲戦鍚堣" prop="amountrequested">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡悗閲戦鍚堣" prop="amountrequested">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
- </el-row>
-
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" />
@@ -348,7 +342,7 @@
getdownloadYX,
getdownloadBX,
checkfund,
- listbypower,addFundSharedInfo
+ listbypower, addFundSharedInfo
} from "@/api/project/fund";
import {
onelistFunds,
--
Gitblit v1.9.3