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/fund/fundapplycheck/index.vue | 30
src/views/project/fund/expertFeeFundApply/index.vue | 166 +++---
vue.config.js | 1
src/views/project/donateconsolationfundlist/index.vue | 180 +++---
src/views/project/travelexpenseslist/index.vue | 79 +-
src/views/project/fund/fundApply/index.vue | 227 ++++----
src/views/project/medicalcostfundapplycheck/index.vue | 240 ++++-----
src/views/project/fund/index.vue | 133 +----
src/views/project/travelexpenseslistrecord/index.vue | 109 ++--
src/views/project/fund/medicalCostFundApply/index.vue | 258 +++++-----
src/views/project/fundflowrule/index.vue | 19
11 files changed, 677 insertions(+), 765 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,
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 96d3ecf..ed687bc 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -59,12 +59,12 @@
</el-col>
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" disabled></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" disabled></el-input>
+ <el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col>
@@ -86,14 +86,16 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
<!-- <el-table-column
label="鐢宠閲戦"
align="center"
prop="amountrequested"
width="120px"
- /> -->
+ />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" /> -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
@@ -132,35 +134,33 @@
<el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px"
:rules="rules">
<el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="璐圭敤绫诲瀷">
- <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
+ <el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <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="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
- <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
- </el-col>
- </el-row>
- <el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
+ </el-col><el-col :span="5">
+ <el-form-item label="缁忓姙浜�" prop="username">
<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"
:value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <!--
<el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
@@ -171,18 +171,46 @@
<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-col :span="14">
+ -->
+ <el-col :span="5">
+ <el-form-item label="璐圭敤绫诲瀷">
+ <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <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-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <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="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </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>
@@ -289,16 +317,16 @@
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -341,31 +369,14 @@
</template>
</el-table-column>
</el-table>
- </el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="鐢宠閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
- </el-form-item>
- </el-col> <el-col :span="7">
- <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <!--
+ </el-row> <!--
+ <el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
</el-form-item>
- </el-col>
- -->
- </el-row>
- <!--
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="7">
<el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
@@ -404,7 +415,7 @@
<el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
:headers="headers" :on-success="(response, file, fileList) =>
- uploadSccess(response, file, fileList)
+ uploadSccess(response, file, fileList)
" :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
:on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
<el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button>
@@ -590,6 +601,9 @@
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
+ ],
// amountrequested: [
// { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
// ],
@@ -705,13 +719,11 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- debugger;
+
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -753,7 +765,6 @@
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
if (
@@ -803,7 +814,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -814,14 +824,13 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -857,7 +866,6 @@
},
getUnitList() {
listOrganization(3).then((response) => {
- debugger;
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
//organizationid: response.rows[i].organizationid,
@@ -887,6 +895,10 @@
this.form.infoid = this.curCase.id;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
+
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
// this.form.createTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
@@ -1014,7 +1026,6 @@
// });
},
addAll(row, i, arr) {
- console.log("cecececececececece", row, row.itemArr);
row.itemArr.map((res) => {
if (res.id !== row.itemid) {
let a = arr.length;
@@ -1024,7 +1035,6 @@
arr[a].itemid = res.id;
getdetailsByItemId(arr[a].itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -1035,7 +1045,6 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
row.fundblock = fundblock;
});
}
@@ -1233,7 +1242,6 @@
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res);
this.personlist = res.rows;
});
},
@@ -1251,12 +1259,10 @@
});
}
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
selectpersonmsg(row) {
- console.log("row", row);
// if(row.beneficiaryname)
this.personlist.map((res) => {
if (row.beneficiaryname == res.username) {
@@ -1301,7 +1307,6 @@
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
getownFundDetail(id).then((res) => {
- console.log("鏌ヨ鏄庣粏璁板綍锛�", res);
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -1314,7 +1319,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1357,7 +1361,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1403,14 +1406,12 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
// getownFundDetail(this.form.id).then(res=>{
// this.$set(this.fundDetailArr,res.data)
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
// })
});
} else {
@@ -1461,13 +1462,11 @@
}
// this.form.amountrequested = allSum.toFixed(2);
// this.$forceUpdate();
- // console.log(this.form);
},
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
getFundTypeAll(this.currentApplyType).then((res) => {
- console.log("璐圭敤绫诲瀷", res.data);
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
@@ -1493,7 +1492,6 @@
},
mixExport(scope) {
- console.log(scope);
this.dayin(scope.row.id);
//this.totaldayin(id);
},
@@ -1550,7 +1548,6 @@
for (let i = 0; i < tempItemArr.length; i++) {
let pym = tempItemArr[i].itempinyin;
if (pym != null && pym != undefined && pym != "") {
- console.log(pym);
if (pym.indexOf(val) != -1) {
result.push(tempItemArr[i]);
}
@@ -1583,7 +1580,16 @@
} else {
this.$modal.msgError(response.msg);
}
- //console.log("涓婁紶鏂囦欢鍚庯細" + JSON.stringify(this.fileList));
+ },
+
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
},
},
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index a475f27..dfee463 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -17,14 +17,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -59,12 +57,12 @@
</el-col>
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" disabled></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" disabled></el-input>
+ <el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col> </el-col>
@@ -81,27 +79,26 @@
<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="deptmentname" width="150px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" />
+ <!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
-
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
-
+ -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ " size="mini" type="text" icon="el-icon-edit" @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)"
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['project:ethicalfund:delete']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
v-hasPermi="['project:ethicalfund:download']">涓嬭浇</el-button>
@@ -119,35 +116,72 @@
style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠绫诲瀷">
- <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ <el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <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="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚" /> -->
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
- <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 style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
- <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
+ <el-col :span="5">
+ <el-form-item label="缁忓姙浜�" prop="username">
+ <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"
:value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <el-col :span="5">
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ </el-form-item>
+ </el-col><el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left"><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="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </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-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
@@ -158,20 +192,7 @@
<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-col :span="14">
- <el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <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-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
@@ -209,7 +230,7 @@
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
- <!-- <el-input
+ <!-- <el-input
v-model="scope.row.beneficiaryname"
placeholder="濮撳悕"
/> -->
@@ -226,21 +247,19 @@
</el-table-column>
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
@@ -252,21 +271,19 @@
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
@@ -302,29 +319,16 @@
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
<el-button @click.native.prevent="
deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small">
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
- <el-row>
- <el-col :span="7">
- <el-form-item label="鐢宠閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
- </el-form-item>
- </el-col> <el-col :span="7">
- <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
+
<!--
+ <el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
@@ -360,16 +364,15 @@
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
</el-col>
- -->
</el-row>
+ -->
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
- :headers="headers" :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
+ :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
:on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
<el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button>
</el-upload>
@@ -552,6 +555,9 @@
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" },
+ ],
amountrequested: [
{ required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
],
@@ -665,8 +671,6 @@
this.detailInfoDialogShow = false;
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -701,7 +705,6 @@
},
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -755,6 +758,10 @@
this.form.infoid = this.curCase.id;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
+
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
// this.form.createTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
@@ -804,7 +811,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -815,7 +821,7 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
@@ -830,10 +836,10 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
+ id: null,
recordstatus: "-1",
username: null,
userno: null,
- id: null,
infoid: null,
donorno: null,
delFlag: null,
@@ -1066,7 +1072,6 @@
});
},
selectremark(row) {
- console.log("row", row.amount, this.fundblock);
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
row.servivesscope = item.servivesscope;
@@ -1083,7 +1088,6 @@
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -1169,7 +1173,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1215,14 +1218,12 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
// getownFundDetail(this.form.id).then(res=>{
// this.$set(this.fundDetailArr,res.data)
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
// })
});
} else {
@@ -1279,7 +1280,6 @@
this.form.pretaxcost = preTaxSum.toFixed(2);
this.form.taxedcost = taxedSum.toFixed(2);
this.$forceUpdate();
- console.log(this.form);
},
//鑾峰彇璐圭敤绫诲瀷
@@ -1294,7 +1294,6 @@
label: dataList[m].itemTypeName,
});
}
- console.log(this.fundtypeArr);
});
},
@@ -1367,19 +1366,16 @@
listReportname(arr[i]).then((res) => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res.rows);
this.personlist = res.rows;
});
},
selectpersonmsg(row, rowindex) {
- console.log("row", row);
this.personlist.map((res) => {
if (row.beneficiaryno === res.userno) {
row.beneficiaryname = res.username;
@@ -1402,7 +1398,6 @@
for (let i = 0; i < tempItemArr.length; i++) {
let pym = tempItemArr[i].itempinyin;
if (pym != null && pym != undefined && pym != "") {
- console.log(pym);
if (pym.indexOf(val) != -1) {
result.push(tempItemArr[i]);
}
@@ -1419,7 +1414,6 @@
getUnitList() {
listOrganization(3).then((response) => {
- console.log("鏈烘瀯鍒楄〃锛�" + JSON.stringify(response));
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
organizationid: response.rows[i].organizationid,
@@ -1481,7 +1475,16 @@
} else {
this.$modal.msgError(response.msg);
}
- //console.log("涓婁紶鏂囦欢鍚庯細" + JSON.stringify(this.fileList));
+ },
+
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
},
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
diff --git a/src/views/project/fund/fundapplycheck/index.vue b/src/views/project/fund/fundapplycheck/index.vue
index 4333561..ae68fdf 100644
--- a/src/views/project/fund/fundapplycheck/index.vue
+++ b/src/views/project/fund/fundapplycheck/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
<el-row align="left">
- <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,15 +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">
@@ -26,14 +24,12 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="5">
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</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="handleQuery">鎼滅储</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">
@@ -188,8 +184,8 @@
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" @blur="(val) => {
- sumTotalFee();
- }
+ sumTotalFee();
+ }
" placeholder="绋庡墠閲戦" />
</template>
</el-table-column>
@@ -206,8 +202,8 @@
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="(val) => {
- sumTotalFee();
- }
+ sumTotalFee();
+ }
" />
</template>
</el-table-column>
@@ -329,7 +325,7 @@
getdownloadYX,
getdownloadBX,
checkfund,
- listbypower,addFundSharedInfo
+ listbypower, addFundSharedInfo
} from "@/api/project/fund";
import {
onelistFunds,
diff --git a/src/views/project/fund/index.vue b/src/views/project/fund/index.vue
index 0f76269..06e5d2c 100644
--- a/src/views/project/fund/index.vue
+++ b/src/views/project/fund/index.vue
@@ -2,31 +2,16 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="鎹愮尞鑰呯紪鍙�" prop="donorno">
- <el-input
- v-model="queryParams.donorno"
- placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.donorno" placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐢宠浜虹紪鍙�" prop="userno">
- <el-input
- v-model="queryParams.userno"
- placeholder="璇疯緭鍏ョ敵璇蜂汉缂栧彿"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.userno" placeholder="璇疯緭鍏ョ敵璇蜂汉缂栧彿" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐢宠浜哄鍚�" prop="username">
- <el-input
- v-model="queryParams.username"
- placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="璐圭敤绫诲埆 瑙佸瓧鍏竤ys_ConsolationType" prop="applytype">
<el-select v-model="queryParams.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆 瑙佸瓧鍏竤ys_ConsolationType" clearable size="small">
@@ -34,13 +19,8 @@
</el-select>
</el-form-item>
<el-form-item label="閮ㄩ棬鍚嶇О" prop="deptmentname">
- <el-input
- v-model="queryParams.deptmentname"
- placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.deptmentname" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="璁板綍鐘舵��" prop="recordstatus">
<el-select v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
@@ -48,19 +28,11 @@
</el-select>
</el-form-item>
<el-form-item label="涓婁紶鏍囧織" prop="uploadflag">
- <el-input
- v-model="queryParams.uploadflag"
- placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.uploadflag" placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="涓婁紶鏃堕棿" prop="uploadtime">
- <el-date-picker clearable size="small"
- v-model="queryParams.uploadtime"
- type="date"
- value-format="yyyy-MM-dd"
+ <el-date-picker clearable size="small" v-model="queryParams.uploadtime" type="date" value-format="yyyy-MM-dd"
placeholder="閫夋嫨涓婁紶鏃堕棿">
</el-date-picker>
</el-form-item>
@@ -72,47 +44,20 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="el-icon-plus"
- size="mini"
- @click="handleAdd"
- v-hasPermi="['project:fund:add']"
- >鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['project:fund:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['project:fund:edit']"
- >淇敼</el-button>
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['project:fund:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['project:fund:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['project:fund:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- :loading="exportLoading"
- @click="handleExport"
- v-hasPermi="['project:fund:export']"
- >瀵煎嚭</el-button>
+ <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
+ v-hasPermi="['project:fund:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@@ -155,31 +100,16 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['project:fund:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['project:fund:remove']"
- >鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:fund:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:fund:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇蜂富瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
@@ -273,10 +203,7 @@
<el-input v-model="form.uploadflag" placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�" />
</el-form-item>
<el-form-item label="涓婁紶鏃堕棿" prop="uploadtime">
- <el-date-picker clearable size="small"
- v-model="form.uploadtime"
- type="date"
- value-format="yyyy-MM-dd"
+ <el-date-picker clearable size="small" v-model="form.uploadtime" type="date" value-format="yyyy-MM-dd"
placeholder="閫夋嫨涓婁紶鏃堕棿">
</el-date-picker>
</el-form-item>
@@ -408,7 +335,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -450,12 +377,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璐圭敤鐢宠涓荤紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎璐圭敤鐢宠涓荤紪鍙蜂负"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delFund(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -466,7 +393,7 @@
}).then(response => {
this.$download.name(response.msg);
this.exportLoading = false;
- }).catch(() => {});
+ }).catch(() => { });
}
}
};
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue
index 15fb538..cd1d52e 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostFundApply/index.vue
@@ -9,7 +9,6 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
@@ -18,14 +17,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -36,7 +33,6 @@
</el-row>
</el-col>
</el-row>
-
<el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
@row-click="selectDonotor">
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
@@ -51,7 +47,6 @@
:limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
</el-card>
</el-col>
-
<el-col :span="16">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
@@ -62,12 +57,12 @@
</el-col>
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" disabled></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" disabled></el-input>
+ <el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col> </el-col>
@@ -88,26 +83,26 @@
</template>
</el-table-column>
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="150px" />
- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="150px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" />
+ <!--
+ <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
-
+ -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ " size="mini" type="text" icon="el-icon-edit" @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)"
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['project:medicalfund:delete']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
v-hasPermi="['project:medicalfund:download']">涓嬭浇</el-button>
@@ -124,59 +119,84 @@
style="text-align: center" v-loading="loading">
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠绫诲瀷">
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰鐢宠</el-radio>
- </el-form-item></el-col>
- <el-col :span="7">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!--<el-input v-if="0" v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/>-->
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small"
- style="width: 100%">
- <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 style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
- <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"
- :value="dict.nickname"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <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-col :span="14">
- <el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
+ <el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
<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="5">
+ <el-form-item label="缁忓姙浜�" prop="username">
+ <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"
+ :value="dict.nickname"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <el-col :span="5">
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰鐢宠</el-radio>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="澶囨敞" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <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="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
+ <!--<el-input v-if="0" 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-col :span="5">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <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="margin-bottom: 10px">
<el-col :span="4">
@@ -216,7 +236,7 @@
}}</el-button>
</template>
</el-table-column>
- <!-- <el-table-column
+ <!-- <el-table-column
prop="servicesscopename"
align="center"
label="璐圭敤璇存槑"
@@ -247,7 +267,7 @@
<el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense"
:value="dict.expense"></el-option>
</el-select>
- <!--
+ <!--
<el-input
v-model="scope.row.amount"
placeholder="绋庡墠閲戦"
@@ -262,11 +282,10 @@
</el-table-column>
<el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" @blur="
- (val) => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣" @blur="(val) => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
@@ -276,30 +295,27 @@
</el-table-column>
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="
- (val) => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
- (val) => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="amount" align="center" label="閲戦" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="浠锋牸" @blur="
- (val) => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.amount" placeholder="浠锋牸" @blur="(val) => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
@@ -348,14 +364,14 @@
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
<el-button @click.native.prevent="
deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small">
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
- <!-- <el-row>
+ <!-- <el-row>
<el-col :span="4">
<el-button
type="primary"
@@ -366,23 +382,8 @@
>鏂板鎴愭湰璐圭敤</el-button
>
</el-col>
- </el-row> -->
- <el-row>
- <el-col :span="7">
- <el-form-item label="鐢宠閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" />
- </el-form-item>
- </el-col> <el-col :span="7">
- <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <!--
+ </el-row>
+ <el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
@@ -417,17 +418,15 @@
<el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
- </el-col>
- -->
- </el-row>
+ </el-col>
+ </el-row> -->
<el-row>
<el-col :span="24">
<el-form-item label="璐圭敤鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
- :headers="headers" :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
+ :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
:on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
<el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button>
</el-upload>
@@ -553,7 +552,6 @@
name: "fundApply",
dicts: [
"sys_recordstatus",
- "sys_recordstatus",
"sys_OrganizationType",
"sys_DonationStatus",
"sys_depositbank",
@@ -606,6 +604,9 @@
],
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ ],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
],
amountrequested: [
{ required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
@@ -701,7 +702,6 @@
});
} else if (this.detailInfoDialogShowType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
- debugger;
try {
let unitIndex = this.unitList.findIndex(
(item) => singleDetail.unitno == item.organizationid
@@ -720,7 +720,6 @@
this.detailInfoDialogShow = false;
},
selectremark(row) {
- console.log("row", row.amount, this.fundblock);
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
row.servivesscope = item.servivesscope;
@@ -734,8 +733,6 @@
});
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -786,7 +783,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -797,14 +793,12 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -813,7 +807,6 @@
},
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -867,6 +860,10 @@
this.form.infoid = this.curCase.id;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
+
// this.form.createTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
@@ -1035,7 +1032,6 @@
//鍒ゆ柇鍗曚綅 unitSel
// try {
// //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- // debugger;
// let unitIndex = this.unitList.findIndex(
// (item) => tempDetail.unitno == item.organizationid
// );
@@ -1166,13 +1162,11 @@
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
getownFundDetail(id).then(async (res) => {
- console.log("鏌ヨ鏄庣粏璁板綍锛�", res);
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
this.getItemArr(m, this.fundDetailArr[m]);
}
- console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1215,7 +1209,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1261,7 +1254,6 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee(row);
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
@@ -1317,7 +1309,6 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
getFundTypeAll(this.currentApplyType).then((res) => {
- console.log("鍖诲鎴愭湰鐩綍", res.data);
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
@@ -1454,7 +1445,6 @@
for (let i = 0; i < tempItemArr.length; i++) {
let pym = tempItemArr[i].itempinyin;
if (pym != null && pym != undefined && pym != "") {
- console.log(pym);
if (pym.indexOf(val) != -1) {
result.push(tempItemArr[i]);
}
@@ -1487,7 +1477,15 @@
} else {
this.$modal.msgError(response.msg);
}
- //console.log("涓婁紶鏂囦欢鍚庯細" + JSON.stringify(this.fileList));
+ },
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
},
},
diff --git a/src/views/project/fundflowrule/index.vue b/src/views/project/fundflowrule/index.vue
index a2ad81d..a09db95 100644
--- a/src/views/project/fundflowrule/index.vue
+++ b/src/views/project/fundflowrule/index.vue
@@ -122,19 +122,18 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="璐圭敤绫诲埆" prop="applytype">
- <el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" style="width:100%">
- <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
- </el-col>
-
- <el-col :span="12">
<el-form-item label="璐圭敤绫诲埆" prop="fundtype">
<el-select v-model="form.fundtype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" style="width:100%">
<el-option v-for="dict in dict.type.sys_fundtypes" :key="dict.value" :label="dict.label"
:value="parseInt(dict.value)"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="璐圭敤鍚嶇О" prop="applytype">
+ <el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤鍚嶇О" style="width:100%">
+ <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -254,6 +253,8 @@
{ label: "涓�绾�", value: "1" },
{ label: "浜岀骇", value: "2" },
{ label: "涓夌骇", value: "3" },
+ { label: "鍥涚骇", value: "4" },
+ { label: "浜旂骇", value: "5" },
],
};
},
diff --git a/src/views/project/medicalcostfundapplycheck/index.vue b/src/views/project/medicalcostfundapplycheck/index.vue
index 560438d..cea00b2 100644
--- a/src/views/project/medicalcostfundapplycheck/index.vue
+++ b/src/views/project/medicalcostfundapplycheck/index.vue
@@ -2,7 +2,7 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
<el-row align="left">
- <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,15 +10,13 @@
</el-date-picker>
</el-form-item>
</el-col>
-
- <el-col :span="8">
- <el-form-item label="鐢宠浜�" label-width="180px" prop="APPLICANT">
- <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
+ <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">
@@ -26,14 +24,11 @@
</el-select>
</el-form-item>
</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-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-form ref="infoform" label-width="100px">
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
@@ -50,44 +45,26 @@
</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="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="unitname"
- width="230px"
- /> -->
- <!-- <el-table-column
- label="鑱旂郴鐢佃瘽"
- align="center"
- prop="phone"
- width="160"
- /> -->
+ <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
-
- <!-- <el-table-column
- label="褰撳墠瀹℃牳绾у埆"
- width="180"
- align="center"
- prop="flowlevel"
- >
+ <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="phone" width="160" />
+ <el-table-column label="褰撳墠瀹℃牳绾у埆" width="180" align="center" prop="flowlevel">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_consolationfundlevel"
- :value="scope.row.flowlevel"
- />
+ <dict-tag :options="dict.type.sys_consolationfundlevel" :value="scope.row.flowlevel" />
</template>
- </el-table-column> -->
+ </el-table-column>
+ <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
+ -->
<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="鎿嶄綔" 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"
@@ -117,30 +94,20 @@
</el-form>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" width="1200px" :title="title" style="text-align: center">
+ <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="8">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="璇疯緭鍏ユ崘鐚紪鍙�" clearable />
+ <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"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
-
- <el-col :span="8">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="8">
- <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-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"
@@ -148,41 +115,86 @@
</el-select>
</el-form-item>
</el-col>
-
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable :disabled="true" />
+ </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="3">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="鐢宠璇存槑" prop="remark">
+ <el-input v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="donorname">
+ <el-input v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable :disabled="true" />
+ </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="8">
<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="3">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
- </el-radio-group>
- </el-form-item>
- </el-row>
-
<el-row>
- <el-col :span="4">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow">鏂板涓撳璐�</el-button>
+ <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="绋庡墠閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="amountrequested">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </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"
+ :disabled="true">鏂板涓撳璐�</el-button>
+ </el-col>
+ </el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row>
<el-table-column prop="orderno" align="center" label="鎺掑簭" width="80">
@@ -207,36 +219,21 @@
</el-select>
</template>
</el-table-column>
-
<el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
<el-input v-model="scope.row.beneficiaryname" placeholder="濮撳悕" />
</template>
</el-table-column>
- <!-- <el-table-column
- prop="servicesscopename"
- align="center"
- label="璐圭敤璇存槑"
- width="180"
- >
+ <!--
+ <el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.servicesscopename"
- placeholder="璐圭敤璇存槑"
- clearable
- allow-create
- filterable
- @change="selectremark(scope.row)"
- >
- <el-option
- v-for="dict in fundblock"
- :key="dict.expensedescribe"
- :label="dict.expensedescribe"
- :value="dict.expensedescribe"
- ></el-option>
+ <el-select v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" clearable allow-create filterable
+ @change="selectremark(scope.row)">
+ <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expensedescribe"
+ :value="dict.expensedescribe"></el-option>
</el-select>
</template>
- </el-table-column> -->
+ </el-table-column>-->
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -260,16 +257,16 @@
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="80" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -336,27 +333,6 @@
</el-table-column>
</el-table>
</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.amountrequested" placeholder="鐢虫姤璐圭敤" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="璐㈠姟瀹℃牳" prop="financechecher">
- <el-input v-model="form.financechecher" 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" />
@@ -409,7 +385,7 @@
getdownloadBX,
checkfund,
listbypower,
- getdetailsByItemId,addFundSharedInfo
+ getdetailsByItemId, addFundSharedInfo
} from "@/api/project/fund";
import {
onelistFunds,
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 6c1658e..f9ced41 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -17,7 +17,6 @@
@keyup.enter.native="handleQuery" />
</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"
@@ -58,13 +57,7 @@
</el-row>
<el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
- <!-- <el-table-column type="selection" width="55" align="center" /> -->
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="160">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
- </template>
- </el-table-column>
- <!--
+ <!-- <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" />
@@ -75,14 +68,20 @@
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" width="150" align="center" prop="username">
- </el-table-column><!--
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="160">
+ <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="180" align="center" prop="travelers">
</el-table-column>-->
<el-table-column label="鎶ラ攢閲戦" width="150" align="center" prop="amountrequested">
</el-table-column>
- <el-table-column label="鍑哄樊浜嬬敱" align="center" width="500" prop="reason">
- </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="鍑哄樊浜嬬敱" align="center" prop="reason" />
<!-- <el-table-column label="鑱旂郴鐢佃瘽" width="120" align="center" prop="phone">
</el-table-column>
<el-table-column label="寮�鎴烽摱琛�" width="180" align="center" prop="depositbank">
@@ -91,8 +90,7 @@
</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>
+ <el-table-column label="鎹愮尞鑰�" width="150" align="center" prop="donorname" />
<el-table-column label="鎿嶄綔" align="center" fixed="right" 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"
@@ -124,8 +122,7 @@
placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
- </el-col>
- <el-col :span="5">
+ </el-col> <el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
<el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨">
@@ -134,15 +131,27 @@
</el-option>
</el-select>
</el-form-item>
- </el-col><el-col :span="5">
- <el-form-item label="鍖哄煙缁勯暱" prop="managername">
- <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="鎵�灞炵粍鍒�" />
</el-form-item>
</el-col>
-
- <el-col :span="5">
+ <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="缁勯暱" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="15">
+ <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
+ <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
- <el-select v-model="form.infoid" @change="selectbaseinfo" filterable disabled placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
<el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
</el-option>
</el-select>
@@ -165,13 +174,6 @@
<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="20">
- <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
- <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
</el-form-item>
</el-col>
</el-row>
@@ -272,7 +274,7 @@
</el-col>
</el-row>
-->
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col>
</el-row>
<el-row>
@@ -458,7 +460,7 @@
</el-table-column>
</el-table>
</el-row>
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
</el-row>
<el-row style="margin-top: 30px">
@@ -568,9 +570,8 @@
<el-input v-model="form.financedirector" placeholder="璐㈠姟閮ㄤ富浠�" />
</el-form-item>
</el-col>
- </el-row>
- -->
- <el-row>
+ </el-row> -->
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="14">
<!--
<el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
@@ -738,6 +739,9 @@
],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" },
+ ],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
],
},
//璐圭敤鐢宠鍗昮orm
@@ -1215,8 +1219,13 @@
this.title = "鏂板鎶ラ攢鐢宠";
this.dialogType = "edit";
this.fundflowList = [];
- this.form.username = this.defaultperson.nickName;
+
this.form.userno = this.defaultperson.userName;
+ this.form.username = this.defaultperson.nickName;
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
+
this.addDetailRow(0);
this.addPayeeRow(0);
},
diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpenseslistrecord/index.vue
index 203a29e..8c968ae 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/src/views/project/travelexpenseslistrecord/index.vue
@@ -3,31 +3,12 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-row>
- <!--
- <el-col :span="6">
+ <!-- <el-col :span="6">
<el-form-item label="鍑哄樊浜�" prop="travelers">
<el-input v-model="queryParams.travelers" placeholder="璇疯緭鍏ュ嚭宸汉" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
- </el-col>
--->
- <el-col :span="6">
- <el-form-item label="缁忓姙浜�" prop="username">
- <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ユ姤閿�浜�" clearable size="small"
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- </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"
- @keyup.enter.native="handleQuery" />
- <el-select v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small">
- <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-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"
@@ -36,7 +17,20 @@
</el-date-picker>
</el-form-item>
</el-col>
-
+ <el-col :span="5">
+ <el-form-item label="缁忓姙浜�" prop="username">
+ <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ユ姤閿�浜�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ </el-col>
+ <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">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="6">
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
@@ -74,8 +68,9 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" width="120" align="center" prop="username">
- </el-table-column>
+ <el-table-column label="缁忓姙浜�" width="120" align="center" prop="username" />
+ <el-table-column label="鎵�灞炵粍鍒�" width="120" align="center" prop="deptmentname" />
+ <el-table-column label="缁勯暱" width="120" align="center" prop="managername" />
<el-table-column label="鎶ラ攢閲戦" width="120" align="center" prop="amountrequested">
</el-table-column>
<el-table-column label="鍑哄樊浜嬬敱" align="center" prop="reason">
@@ -109,7 +104,7 @@
涓嬭浇
</el-button>
<!-- v-hasPermi="['project:funddetail:edit']" -->
- <el-button size="mini" type="text" icon="el-icon-delete" disabled
+ <el-button size="mini" type="text" icon="el-icon-delete" :disabled="true"
@click="handleDelete(scope.row)">鍒犻櫎</el-button>
<!-- v-hasPermi="['project:funddetail:remove']" -->
</template>
@@ -125,33 +120,31 @@
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker style="width: 100%" v-model="form.createTime" disabled type="date"
+ <el-date-picker style="width: 100%" v-model="form.createTime" :disabled="true" type="date"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-input v-model="form.username" placeholder="鎶ラ攢浜�" />
+ <el-input v-model="form.username" placeholder="鎶ラ攢浜�" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鍖哄煙缁勯暱" prop="managerno">
- <el-input v-model="form.managerno" placeholder="鍖哄煙缁勯暱" />
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="鎵�灞炵粍鍒�" :disabled="true" />
+ </el-form-item> </el-col> <el-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="缁勯暱" :disabled="true" />
</el-form-item> </el-col>
- <el-col :span="5"><el-form-item label="鎹愮尞鑰�" prop="donorname">
- <el-input v-model="form.donorname" placeholder="鎹愮尞鑰�" />
- </el-form-item>
-
- </el-col></el-row> <!--
+ </el-row>
+ <!--
<el-row>
<el-col :span="8">
<el-form-item label="鎹愮尞缂栧彿" prop="donorno">
<el-input disabled v-model="form.donorno" placeholder="鎹愮尞缂栧彿" />
</el-form-item>
</el-col>
-
-
<el-col :span="8">
<el-form-item label="鍑哄樊浜�" prop="travelers">
<el-input v-model="form.travelers" placeholder="鍑哄樊浜�" />
@@ -172,18 +165,29 @@
<el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
</el-form-item>
</el-col>
- </el-row>-->
-
+ </el-row>
+ -->
+ <el-row>
+ <el-col :span="15">
+ <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
+ <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5"><el-form-item label="鎹愮尞鑰�" prop="donorname">
+ <el-input v-model="form.donorname" placeholder="鎹愮尞鑰�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">
<el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣" />
+ <el-input v-model="form.amountrequested" placeholder="鎶ラ攢閲戦" :disabled="true" />
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item label="澶у啓閲戦" prop="bigstrmoney">
- <el-input v-model="form.bigstrmoney" placeholder="棰嗘閲戦" />
+ <el-input v-model="form.bigstrmoney" placeholder="澶у啓閲戦" :disabled="true" />
</el-form-item>
</el-col><!--
<el-col :span="6">
@@ -204,18 +208,13 @@
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="20">
- <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
- <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
- </el-form-item>
- </el-col>
- </el-row>
<el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" disabled @click="addRow">鏂板涓�琛�</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" :disabled="true"
+ @click="addRow">鏂板涓�琛�</el-button>
</el-col>
- </el-row> <el-row>
+ </el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢鏄庣粏淇℃伅锛�</el-col>
</el-row>
<el-row>
@@ -394,7 +393,7 @@
<template slot-scope="scope">
<el-button @click.native.prevent="
deleteRow(scope.$index, rbDetails, scope.row)
- " type="text" size="small" disabled>
+ " type="text" size="small" :disabled="true">
鍒犻櫎
</el-button>
</template>
@@ -434,7 +433,7 @@
<el-input v-model="form.financechecher" placeholder="璐㈠姟瀹℃牳" />
</el-form-item> </el-col></el-row>
-->
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
</el-row>
<el-row style="margin-top: 30px">
@@ -513,7 +512,7 @@
</el-table-column>
</el-table>
</el-row>
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢闄勪欢锛�</el-col>
</el-row>
<el-row>
@@ -532,7 +531,7 @@
</el-row>
</el-form>
<el-form label-width="120px">
- <el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px">
<el-col :span="20">鎶ラ攢瀹℃壒璁板綍锛�</el-col>
</el-row>
<el-table :data="fundflowList" border>
@@ -629,7 +628,7 @@
"sys_0_1",
"sys_fund_type",
"sys_financeitemtype",
- "sys_travelexpensebelong",
+ "sys_travelexpensebelong"
],
data() {
return {
@@ -733,7 +732,9 @@
},
getList() {
this.loading = true;
+ console.log("this.queryParams", this.queryParams)
listbypowerone(this.queryParams).then((response) => {
+
this.reimbursementList = response.rows;
this.total = response.total;
this.loading = false;
diff --git a/vue.config.js b/vue.config.js
index 99d3645..ee3dea1 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,6 +35,7 @@
[process.env.VUE_APP_BASE_API]: {
target:`http://localhost:8080`,
//target:`http://116.62.18.175:8080`,
+ // target:`http://192.168.1.4:8080`,
//target: `https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.3