From e1d633ddeece986c1c866d4bc28e4193f3e3c41e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 十月 2023 15:49:49 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 58
src/views/project/fund/medicalCostApply/index.vue | 269 +++-
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 62
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 40
src/views/project/donatebaseinfo/index.vue | 2
src/views/project/fund/performanceApply/index.vue | 18
src/views/project/fundcheck/officeExpenseCheck/index.vue | 79
src/views/project/travelexpensecheck/index.vue | 58
src/views/project/fund/performancedetails/index.vue | 10
src/views/project/fund/applyDetail/index.vue | 38
src/views/project/fund/expertFeeApply/index.vue | 152 +-
src/views/project/fund/ethicalExpertFeeApply/index.vue | 954 +++++++++++----
src/views/project/fundcheck/medicalCostCheck/index.vue | 81
src/views/project/fundcheck/expertFeeCheck/index.vue | 747 +++++++++---
src/views/project/fund/officeExpenseApply/index.vue | 909 +++++++++++----
src/views/project/fundcheck/performanceCheck/index.vue | 55
src/views/project/travelexpenseapply/index.vue | 2
17 files changed, 2,528 insertions(+), 1,006 deletions(-)
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 9c67e7f..3fe23f0 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -1227,7 +1227,7 @@
this.registerAddresss.qu = response.data.registertownname;
});
},
-
+// 缁堟妗堜緥
handletermination(row) {
this.reset();
this.showSaveBtn = false;
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index e405756..86f19ae 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -622,7 +622,7 @@
</el-col>
</el-row>
</el-form>
- <div slot="footer" class="dialog-footer">
+ <div class="dialog-footer">
<el-button v-show="showSaveBtn" type="primary" @click="submitForm"
>淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
>
@@ -845,7 +845,7 @@
</el-col>
</el-row>
</el-form>
- <div slot="footer" class="dialog-footer">
+ <div class="dialog-footer">
<el-button v-show="showSaveBtn" type="primary" @click="submitForm"
>淇濆瓨璇勪及淇℃伅</el-button
>
@@ -1055,9 +1055,9 @@
</el-col>
</el-row>
</el-form>
- <div slot="footer" class="dialog-footer">
+ <div class="dialog-footer">
<el-button v-show="showSaveBtn" type="primary" @click="submitForm"
- >淇濆瓨璇勪及淇℃伅</el-button
+ >淇濆瓨鎹愮尞淇℃伅</el-button
>
<el-button
v-show="showTerminationBtn"
@@ -1071,7 +1071,55 @@
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</div>
- <div class="boxdiv" v-show="actives == 3">浼︾悊瀹℃煡</div>
+ <!-- 浼︾悊瀹℃煡 -->
+ <div class="boxdiv" v-show="actives == 3">
+ <el-form
+ ref="ethicform"
+ :model="ethicform"
+ :rules="ethicrules"
+ label-width="100px"
+ label-position="right"
+ >
+ <el-form-item label="瀹℃煡鎰忚">
+ <el-input v-model="ethicform.flowcontent" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ </el-form-item>
+
+ <el-row>
+ <el-col :span="18">
+ <el-form-item label="瀹℃煡缁撹">
+ <el-radio-group v-model="ethicform.flowconclusion">
+ <el-radio v-for="dict in dict.type.sys_EthicalReview" :key="dict.value" :label="parseInt(dict.value)">{{
+ dict.label }}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+
+ <!-- createtime 瀹℃煡鏃ユ湡 -->
+ <el-col :span="6" :pull="5">
+ <el-form-item label="瀹℃煡鏃ユ湡">
+ <el-date-picker clearable size="small" v-model="ethicform.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨缁撹鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
+ <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+ >淇濆瓨鎹愮尞淇℃伅</el-button
+ >
+ <el-button
+ v-show="showTerminationBtn"
+ type="primary"
+ @click="Terminationcase"
+ >缁堟妗堜緥</el-button
+ >
+ <el-button v-show="makeastepforward" type="primary" @click="ReviewFn"
+ >涓嬩竴姝�</el-button
+ >
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </div>
<div class="boxdiv" v-show="actives == 4">鍣ㄥ畼鍒嗛厤</div>
<div class="boxdiv" v-show="actives == 5">鑾峰彇瑙佽瘉</div>
<div class="boxdiv" v-show="actives == 6">瀹屾垚鐧昏</div>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 69bd09a..9168654 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -147,7 +147,8 @@
</el-col>
<el-col :span="3">
- <div style="margin-bottom: 15px;"
+ <div
+ style="margin-bottom: 15px;"
v-if="
(businessType == 1 || businessType == 2 || businessType == 5) &&
operationType != 'detail'
@@ -738,15 +739,15 @@
v-if="operationType == 'check'"
>
<el-col :span="7">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-radio-group
v-model="form.checkstatus"
align="left"
:disabled="userprofile.nickName != '闄堟厱鍗�'"
>
- <el-radio label="1">寰呴瀹�</el-radio>
- <el-radio label="2">棰勫閫氳繃绛夊緟鏉愭枡</el-radio>
- <el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
+ <el-radio :label="2">鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡</el-radio>
+ <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -780,8 +781,7 @@
v-if="
operationType == 'add' ||
operationType == 'update' ||
- ismanager == true ||
- beforehandType == '1'
+ ismanager == true
"
>鎻愪氦淇濆瓨</el-button
>
@@ -794,7 +794,7 @@
<el-button
type="primary"
@click="checksubmit"
- v-if="operationType == 'check' && beforehandType != '1'"
+ v-if="operationType == 'check'"
>鎻愪氦瀹℃牳</el-button
>
<el-button @click="cancel">鍏� 闂�</el-button>
@@ -1469,11 +1469,11 @@
baselisttages: [
{
id: 1,
- name: "寰呴瀹�"
+ name: "寰呯敵璇锋潗鏂�"
},
{
id: 2,
- name: "棰勫閫氳繃绛夊緟鏉愭枡"
+ name: "鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡"
},
{
id: 3,
@@ -1614,7 +1614,6 @@
money: "0",
startTime: ""
},
- beforehandType: null,
//鏈嶅姟璐圭敤鍙傛暟
expenseQueryParams: {
pageNum: 1,
@@ -1740,7 +1739,6 @@
this.curId = this.$route.query.id;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
- this.beforehandType = this.$route.query.beforehandType;
//鑾峰彇璐圭敤椤圭洰绫诲瀷
this.getFeeTypes();
@@ -2225,7 +2223,9 @@
console.log(this.form);
console.log(response, "淇濆瓨杩斿弬");
if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ if (this.userprofile.nickName != "闄堟厱鍗�") {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ }
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.push({
path: "/finance/applyDetail/",
@@ -2250,8 +2250,13 @@
//瀹℃壒鎻愪氦
checksubmit() {
- if (!this.form.checkstatus && this.userprofile.nickName == "闄堟厱鍗�") {
- this.$modal.msgError("璇风‘璁ら瀹＄姸鎬佸悗鍐嶆彁浜ゅ鏍革紒");
+ console.log(this.checkObj.flowlevelone);
+ if (
+ this.form.checkstatus != 3 &&
+ this.userprofile.nickName == "闄堟厱鍗�" &&
+ this.checkObj.flowlevelone == 1
+ ) {
+ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
return;
}
let checkFundObj = {
@@ -2264,6 +2269,9 @@
//鍏抽棴绐楀彛
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ this.submitForm();
+ }
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
});
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index e881f08..e07dd2b 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -1,19 +1,38 @@
<!-- -->
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
<el-row align="left">
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @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">
- <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -29,8 +48,16 @@
</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-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>
@@ -44,18 +71,32 @@
</el-row>
</el-col>
</el-row>
- <el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
- @row-click="selectDonotor">
+ <el-table
+ v-loading="loading"
+ border
+ highlight-current-row
+ :data="donatebaseinfoList"
+ @row-click="selectDonotor"
+ >
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="scope.row.recordstate"
+ />
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" />
</el-table>
- <pagination v-show="total > 0" :total="total" small :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ small
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getBaseInfoList"
+ />
</el-card>
</el-col>
<el-col :span="18">
@@ -64,7 +105,10 @@
<el-row :gutter="4" align="right" class="mb8">
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" :disabled="true"></el-input>
+ <el-input
+ v-model="curCase.donorno"
+ :disabled="true"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
@@ -75,62 +119,146 @@
</el-row>
<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:ethicalfund:add']">鏂板鐢宠鍗�</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['project:ethicalfund:add']"
+ >鏂板鐢宠鍗�</el-button
+ >
</el-col>
</el-row>
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
+ <el-table
+ v-loading="loading"
+ border
+ :data="donateconsolationfundList"
+ >
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ align="center"
+ prop="createTime"
+ width="150px"
+ >
<template slot-scope="scope">
<span>{{
parseTime(scope.row.createTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
+ <el-table-column
+ label="鐢宠浜�"
+ align="center"
+ prop="username"
+ width="120px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="200px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="150px"
+ />
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ align="center"
+ prop="recordstatus"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ <dict-tag
+ :options="dict.type.sys_recordstatus"
+ :value="scope.row.recordstatus"
+ />
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
- </template>
- </el-table-column>
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" 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">
+ <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 ||
- 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)"
- v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " 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>
+ <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 ||
+ scope.row.recordstatus == 1
+ "
+ 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-view"
+ @click="handleDetail(scope.row)"
+ >鏌ョ湅</el-button
+ >
+ <el-button
+ v-if="
+ scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ "
+ 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
+ >
</template>
</el-table-column>
</el-table>
@@ -141,72 +269,134 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
- style="text-align: center" v-loading="loading">
+ <el-dialog
+ :visible.sync="dialogOpen"
+ :close-on-click-modal="false"
+ width="1400px"
+ :title="title"
+ 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="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
+ 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
+ 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-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-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-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="donorname">
- <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ clearable
+ />
</el-form-item>
</el-col>
</el-row>
- <el-row style="text-align: left"><el-col :span="5">
+ <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-input
+ v-model="form.amountrequested"
+ placeholder="鐢宠閲戦"
+ :disabled="true"
+ />
</el-form-item>
- </el-col> <el-col :span="5">
+ </el-col>
+ <el-col :span="5">
<el-form-item label="绋庡墠閲戦" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ <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-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
+ 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>
@@ -225,130 +415,294 @@
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
- <el-button @click.native.prevent="addAlls" type="primary" size="small">
+ <el-button
+ @click.native.prevent="addAlls"
+ type="primary"
+ size="small"
+ >
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundDetailArr" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80">
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="鎺掑簭"
+ width="80"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="鎺掑簭" />
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="璐圭敤绫诲瀷"
+ width="220"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
- <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="scope.row.applytype"
+ placeholder="璐圭敤绫诲瀷"
+ @change="LoadItemTypeArr(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundtypeArr"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="鏈嶅姟椤圭洰"
+ width="260"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" @change="select(scope.row)" clearable filterable
- allow-create :filter-method="(val) => SearchItem(val, scope)">
- <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
- :value="dict.id"></el-option>
+ <el-select
+ v-model="scope.row.itemid"
+ placeholder="鏈嶅姟椤圭洰"
+ @change="select(scope.row)"
+ clearable
+ filterable
+ allow-create
+ :filter-method="val => SearchItem(val, scope)"
+ >
+ <el-option
+ v-for="dict in scope.row.itemArr"
+ :key="dict.index"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
+ <el-table-column
+ prop="beneficiaryno"
+ align="center"
+ label="濮撳悕"
+ width="120"
+ v-if="form.applytype != 3"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'name')"
+ >{{ scope.row.beneficiaryname }}</el-button
+ >
<!-- <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 prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
+ <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'">
+ <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">
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="鍗曚綅"
+ width="220"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'unit')"
+ >{{ scope.row.unitname }}</el-button
+ >
</template>
</el-table-column>
- <el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
+ <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'">
+ <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>
- <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞"
+ width="210"
+ v-if="form.applytype == '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="210"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120" v-if="dialogType == 'edit'">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="120"
+ v-if="dialogType == 'edit'"
+ >
<template slot-scope="scope">
- <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">
+ <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"
+ >
鍒犻櫎
</el-button>
</template>
@@ -398,55 +752,139 @@
<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="20" :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
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="fileList"
+ multiple
+ :limit="20"
+ :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>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogType == 'detail'">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
- slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ width="120"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ width="160"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ width="200"
+ prop="flowconclusion"
+ ><template slot-scope="scope"
+ ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
+ ><span v-if="scope.row.flowconclusion == 2"
+ >涓嶉�氳繃</span
+ ></template
+ >
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-column
+ label="瀹℃牳澶囨敞"
+ align="center"
+ prop="flowcontent"
+ />
</el-table>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
+ <el-button
+ type="primary"
+ @click="submitForm"
+ v-if="dialogType == 'edit'"
+ >淇� 瀛�</el-button
+ >
<!-- <el-button type="success" @click="print">鎵� 鍗�</el-button> -->
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'淇℃伅淇敼'"
- style="text-align: center" v-loading="loading" width="500px">
+ <el-dialog
+ :visible.sync="detailInfoDialogShow"
+ :close-on-click-modal="false"
+ :title="'淇℃伅淇敼'"
+ style="text-align: center"
+ v-loading="loading"
+ width="500px"
+ >
<el-form ref="funddetailForm" :model="funddetailForm" label-width="120px">
<el-row>
<el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
- <el-form-item align="left" label="濮撳悕" prop="beneficiaryname" label-width="80px">
- <el-select filterable allow-create ref="beneficiaryname" default-first-option
- v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
+ <el-form-item
+ align="left"
+ label="濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in arrr3"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
- <el-form-item align="left" label="鍗曚綅" prop="unitno" label-width="80px">
- <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
- :value="spec.organizationid"></el-option>
+ <el-form-item
+ align="left"
+ label="鍗曚綅"
+ prop="unitno"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.unitno"
+ placeholder="鍗曚綅"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(spec, index) in unitList"
+ :key="index"
+ :label="spec.organizationname"
+ :value="spec.organizationid"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -454,7 +892,9 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="ConfirmDetailDialog()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
</div>
@@ -478,7 +918,7 @@
getdownloadBX,
addorupdateFund,
getdownloadLL,
- getdetailsByItemId,
+ getdetailsByItemId
} from "@/api/project/fund";
import {
onelistFunds,
@@ -493,13 +933,13 @@
getItemNames,
getFundType,
getFundTypeAll,
- listcountItem,
+ listcountItem
} from "@/api/project/funddetail";
import {
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
import {
listExternalperson,
@@ -508,11 +948,11 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -524,7 +964,7 @@
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "fundApply",
dicts: [
@@ -540,7 +980,6 @@
"sys_financeitemtype",
"sys_expensetype",
"sys_stage_type"
-
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -567,28 +1006,28 @@
treatmenthospitalname: null,
donorno: null,
reportername: null,
- reporttime: null,
+ reporttime: null
},
fundQueryParam: {
pageNum: 1,
pageSize: 100,
infoid: null,
applytype: "2",
- createBy: null,
+ createBy: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
username: [
- { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
createTime: [
- { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" }
+ ]
},
//鎹愮尞妗堜緥鍒楄〃鏁版嵁
// donationCaseTableData:[],
@@ -627,7 +1066,7 @@
beneficiaryno: null,
unitno: null,
unitname: null,
- index: null,
+ index: null
},
//闄勪欢鍒楄〃
fileList: [],
@@ -635,8 +1074,8 @@
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
- Authorization: "Bearer " + getToken(),
- },
+ Authorization: "Bearer " + getToken()
+ }
};
},
@@ -645,7 +1084,7 @@
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
- //鏂规硶闆嗗悎
+ //鏂规硶闆嗗悎
methods: {
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -675,11 +1114,12 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+ message: h("p", null, [
+ h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")
+ ])
});
}
return;
-
if (this.curCase.id) {
this.istrue += 2;
@@ -707,7 +1147,7 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")])
});
}
},
@@ -732,12 +1172,16 @@
this.dialogType = "edit";
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
//闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- getownFundDetail(id).then(async (res) => {
+ getownFundDetail(id).then(async res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -768,19 +1212,23 @@
this.dialogType = "detail";
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
let listFundflowparams = {
fundid: row.id,
- fundtype: 2,
+ fundtype: 2
};
//闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
- getownFundDetail(id).then((res) => {
+ getownFundDetail(id).then(res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -790,7 +1238,7 @@
expense: this.fundDetailArr[m].expense,
expensedescribe: this.fundDetailArr[m].servicesscopename,
remark: this.fundDetailArr[m].servicesscope,
- servicesscope: this.fundDetailArr[m].servicesscope,
+ servicesscope: this.fundDetailArr[m].servicesscope
});
}
});
@@ -802,11 +1250,11 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(ids);
})
.then(() => {
- getownFundDetail(ids).then((res) => {
+ getownFundDetail(ids).then(res => {
let listdetails = res.data;
for (let i = 0; i < listdetails.length; i++) {
delFunddetail(listdetails[i].id);
@@ -816,30 +1264,30 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
handleup(row) {
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = "0";
- updateFund(row).then((response) => {
+ updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
type: "success",
- message: "鐢宠鎴愬姛",
+ message: "鐢宠鎴愬姛"
});
} else {
this.$message({
type: "error",
- message: "鐢宠澶辫触",
+ message: "鐢宠澶辫触"
});
}
this.loading = false;
@@ -848,7 +1296,7 @@
.catch(() => {
this.$message({
type: "info",
- message: "宸插彇娑堢敵璇�",
+ message: "宸插彇娑堢敵璇�"
});
});
},
@@ -866,12 +1314,12 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => { });
+ .catch(() => {});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
if (valid) {
let formData = this.form;
let totalPreTaxAmount = 0.0;
@@ -926,7 +1374,7 @@
}
if (this.form.id != null) {
- updateFund(this.form).then((response) => {
+ updateFund(this.form).then(response => {
this.getfundList();
this.dialogOpen = false;
this.getList();
@@ -939,16 +1387,16 @@
tempData.fundid = formData.id;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let itemIndex = tempItemArr.findIndex(
- (item) => tempData.itemid == item.id
+ item => tempData.itemid == item.id
);
if (itemIndex > -1) {
tempData.itemname = tempItemArr[itemIndex].itemName;
tempData.itemid = tempItemArr[itemIndex].id;
}
if (tempData.id > 0) {
- updateFunddetail(tempData).then((response2) => { });
+ updateFunddetail(tempData).then(response2 => {});
} else {
- addFunddetail(tempData).then((response2) => { });
+ addFunddetail(tempData).then(response2 => {});
}
}
});
@@ -959,7 +1407,7 @@
let tempUtemArr = tempData.itemArr;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let itemIndex = tempUtemArr.findIndex(
- (item) => tempData.itemid == item.id
+ item => tempData.itemid == item.id
);
if (itemIndex > -1) {
tempData.itemname = tempUtemArr[itemIndex].itemName;
@@ -967,7 +1415,7 @@
}
//鑾峰彇applytypename
let applytypeIndex = this.fundtypeArr.findIndex(
- (item) => tempData.applytype == item.value
+ item => tempData.applytype == item.value
);
if (applytypeIndex > -1) {
tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
@@ -976,7 +1424,7 @@
}
this.form.serviceFunddetails = this.fundDetailArr;
- addorupdateFund(this.form).then((response) => {
+ addorupdateFund(this.form).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.loading = false;
@@ -997,10 +1445,9 @@
this.reset();
},
-
//鑾峰彇鎵�鏈夌敤鎴峰垪琛�
getUsermsg() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -1011,12 +1458,13 @@
this.loading = true;
this.queryParams.params = {};
if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
- this.queryParams.params["beginReporttime"] =
- this.daterangeReporttime[0];
+ this.queryParams.params[
+ "beginReporttime"
+ ] = this.daterangeReporttime[0];
this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
}
// this.queryParams.residencetown = this.$refs.areaSelect.getQu();
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -1026,7 +1474,7 @@
//鑾峰彇鎹愮尞妗堜緥鍒楄〃
getBaseInfoList() {
this.loading = true;
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -1044,21 +1492,21 @@
this.loading = true;
this.reset();
this.fundQueryParam.infoid = this.curCase.id;
- listFund(this.fundQueryParam).then((response) => {
+ listFund(this.fundQueryParam).then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
});
},
select(row) {
- row.itemArr.map((res) => {
+ row.itemArr.map(res => {
if (row.itemid === res.id) {
row.remark = res.itemDescribe;
row.itemcode = res.itemCode;
}
});
var repeatNum = 0;
- this.fundDetailArr.map((res) => {
+ this.fundDetailArr.map(res => {
if (res.applytype === row.applytype && res.itemid == row.itemid) {
repeatNum++;
}
@@ -1067,15 +1515,15 @@
this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃鏈嶅姟椤圭洰");
}
- getdetailsByItemId(row.itemid).then((res) => {
+ getdetailsByItemId(row.itemid).then(res => {
let fundmsg = res.data;
let fundblock = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
fundblock.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servicesscope: item.id,
+ servicesscope: item.id
});
});
@@ -1125,11 +1573,11 @@
servicetypename: null,
servicesscopename: null,
pretaxcost: null,
- taxedcost: null,
+ taxedcost: null
};
this.resetForm("form");
//娓呯┖闄勪欢
- this.fileList = []
+ this.fileList = [];
},
//鏂板涓�琛�
@@ -1173,7 +1621,7 @@
updateTime: null,
uploadflag: null,
uploadtime: null,
- itemArr: [],
+ itemArr: []
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.fundDetailArr.push(rowData);
@@ -1187,7 +1635,7 @@
//鍔犺浇鏈嶅姟椤圭洰
LoadItemTypeArr(row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
row.itemid = null;
this.$forceUpdate();
@@ -1200,7 +1648,6 @@
// });
},
-
selectremark(row) {
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
@@ -1210,7 +1657,7 @@
// row.taxedamount = row.amount - row.taxamount;
// this.form.amountrequested = item.expense;
this.form.serviceFunddetails = 0;
- this.fundDetailArr.map((item) => {
+ this.fundDetailArr.map(item => {
this.form.serviceFunddetails += item.amount;
});
// row.remark
@@ -1232,30 +1679,28 @@
// },
getlistUser() {
- listUser().then((res) => {
+ listUser().then(res => {
this.userlist = res.data;
});
},
-
-
deleteRows(row, index, rows) {
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
})
.then(() => {
if (row.id !== null) {
- delFunddetail(row.id).then((res) => {
+ delFunddetail(row.id).then(res => {
if (res.code === 200) {
this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
}).then(() => {
this.$set(rows, rows.splice(index, 1));
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
@@ -1325,21 +1770,21 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(this.currentApplyType).then((res) => {
+ getFundTypeAll(this.currentApplyType).then(res => {
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
for (let m = 0; m < dataList.length; m++) {
this.fundtypeArr.push({
value: dataList[m].itemType,
- label: dataList[m].itemTypeName,
+ label: dataList[m].itemTypeName
});
}
});
},
getItemArr(rowindex, row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
this.$set(this.fundDetailArr, rowindex, row);
//this.loading = true;
@@ -1356,7 +1801,7 @@
//涓撳璐瑰姵鍔℃墦鍗�
dayin(id) {
- getdownloadLL(id).then((res) => {
+ getdownloadLL(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1370,7 +1815,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1379,7 +1824,7 @@
//涓嬭浇鎵撳嵃
totaldayin(e) {
// const id =this.row.id
- getdownloadBX(e).then((res) => {
+ getdownloadBX(e).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1393,7 +1838,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1405,7 +1850,7 @@
let arrreportlist = [];
for (let i = 0; i < arr.length; i++) {
this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
+ listReportname(arr[i]).then(res => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
});
@@ -1413,13 +1858,13 @@
},
getlistExternalperson() {
- listExternalperson().then((res) => {
+ listExternalperson().then(res => {
this.personlist = res.rows;
});
},
selectpersonmsg(row, rowindex) {
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (row.beneficiaryno === res.userno) {
row.beneficiaryname = res.username;
row.bankcardno = res.bankcardno;
@@ -1436,11 +1881,11 @@
},
getUnitList() {
- listOrganization(3).then((response) => {
+ listOrganization(3).then(response => {
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
organizationid: response.rows[i].organizationid,
- organizationname: response.rows[i].organizationname,
+ organizationname: response.rows[i].organizationname
});
}
});
@@ -1460,7 +1905,7 @@
}
scope.row.itemArr = result;
} else {
- getItemNames(scope.row.applytype).then((res) => {
+ getItemNames(scope.row.applytype).then(res => {
scope.row.itemArr = res.data;
//this.$set(this.fundDetailArr, rowindex, row);
});
@@ -1470,14 +1915,14 @@
addAlls() {
this.loading = true;
this.fundDetailArr = this.fundDetailArr.filter(
- (r) => r.applytype != "" && r.applytype != null
+ r => r.applytype != "" && r.applytype != null
);
let listAdd = [];
//let listAdd = this.fundDetailArr;
for (let i = 0; i < this.fundtypeArrAll.length; i++) {
for (let j = 0; j < this.fundtypeArrAll[i].itemDetails.length; j++) {
let list = this.fundDetailArr.filter(
- (r) =>
+ r =>
r.applytype == this.fundtypeArrAll[i].itemType &&
r.itemid == this.fundtypeArrAll[i].itemDetails[j].id
);
@@ -1491,7 +1936,7 @@
recordstatus: "-1",
itemArr: this.fundtypeArrAll[i].itemDetails,
beneficiaryname: "鐐瑰嚮閫夋嫨",
- unitname: "鐐瑰嚮閫夋嫨",
+ unitname: "鐐瑰嚮閫夋嫨"
};
listAdd.push(rowData);
}
@@ -1502,9 +1947,9 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
remove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
+ this.fileList.splice(this.fileList.indexOf(file), 1);
},
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
@@ -1523,9 +1968,9 @@
// 涓嬭浇鏂囦欢
downFile(item) {
- const url = process.env.VUE_APP_BASE_API + item.url
- var a = document.createElement('a');
- var event = new MouseEvent('click');
+ 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);
@@ -1546,7 +1991,7 @@
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetailArr[tempIndex];
if (this.detailInfoDialogShowType == "name") {
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (tempName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -1567,7 +2012,7 @@
singleDetail.unitno = this.funddetailForm.unitno;
try {
let unitIndex = this.unitList.findIndex(
- (item) => singleDetail.unitno == item.organizationid
+ item => singleDetail.unitno == item.organizationid
);
if (unitIndex > -1) {
singleDetail.unitname = this.unitList[unitIndex].organizationname;
@@ -1580,7 +2025,7 @@
}
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
- },
+ }
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
@@ -1597,14 +2042,13 @@
this.getUsermsg();
this.getlistExternalperson();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
-
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/fund/expertFeeApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
index 373d32a..3a785f3 100644
--- a/src/views/project/fund/expertFeeApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -1,56 +1,6 @@
<!-- -->
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- label-width="70px"
- >
- <el-row align="left">
- <el-col :span="6">
- <el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select
- v-model="queryParams.recordstate"
- placeholder="璇烽�夋嫨璁板綍鐘舵��"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_DonationStatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </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="6">
<el-card shadow="never">
@@ -61,6 +11,54 @@
</el-row>
</el-col>
</el-row>
+ <div>
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="queryParams.donorname"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <div style="float: right; margin-bottom: 10px;">
+ <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
+ >
+ </div>
+ </el-form>
+ </div>
<el-table
v-loading="loading"
highlight-current-row
@@ -94,7 +92,7 @@
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
<el-row :gutter="4" align="right" class="mb8">
- <el-col :span="9">
+ <el-col :span="7">
<el-form-item label="鎹愮尞缂栧彿">
<el-input
v-model="curCase.donorno"
@@ -102,12 +100,20 @@
></el-input>
</el-form-item>
</el-col>
- <el-col :span="9">
+ <el-col :span="8">
<el-form-item label="濮撳悕">
<el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
- <el-col> </el-col>
+ <el-col :span="3">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="allgetfundList"
+ >妫�绱㈠叏閮�</el-button
+ >
+ </el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
@@ -153,6 +159,12 @@
width="200px"
/>
<el-table-column
+ label="鎹愮尞浜�"
+ align="center"
+ prop="donorname"
+ width="120px"
+ />
+ <el-table-column
label="缁勯暱"
align="center"
prop="managername"
@@ -177,18 +189,18 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
- </template>
- </el-table-column>
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
@@ -2095,7 +2107,15 @@
this.curCase = row;
this.getfundList();
},
-
+ allgetfundList() {
+ this.loading = true;
+ this.reset();
+ this.fundQueryParam.infoid = null;
+ listFund(this.fundQueryParam).then(response => {
+ this.loading = false;
+ this.donateconsolationfundList = response.rows;
+ });
+ },
getfundList() {
this.loading = true;
this.reset();
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index 7b710ce..25b3387 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -1,19 +1,38 @@
<!-- -->
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
<el-row align="left">
<el-col :span="6">
<el-form-item label="濮撳悕" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @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">
- <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -29,8 +48,16 @@
</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-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>
@@ -44,18 +71,32 @@
</el-row>
</el-col>
</el-row>
- <el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
- @row-click="selectDonotor">
+ <el-table
+ v-loading="loading"
+ border
+ highlight-current-row
+ :data="donatebaseinfoList"
+ @row-click="selectDonotor"
+ >
<!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="scope.row.recordstate"
+ />
</template>
</el-table-column>
<el-table-column label="濮撳悕" align="center" prop="name" />
</el-table>
- <pagination v-show="total > 0" :total="total" small :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ small
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getBaseInfoList"
+ />
</el-card>
</el-col>
<el-col :span="18">
@@ -64,7 +105,10 @@
<el-row :gutter="4" align="right" class="mb8">
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" :disabled="true"></el-input>
+ <el-input
+ v-model="curCase.donorno"
+ :disabled="true"
+ ></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
@@ -76,62 +120,146 @@
</el-row>
<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:medicalfund:add']">鏂板鐢宠鍗�</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['project:medicalfund:add']"
+ >鏂板鐢宠鍗�</el-button
+ >
</el-col>
</el-row>
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
+ <el-table
+ v-loading="loading"
+ border
+ :data="donateconsolationfundList"
+ >
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ align="center"
+ prop="createTime"
+ width="150px"
+ >
<template slot-scope="scope">
<span>{{
parseTime(scope.row.createTime, "{y}-{m}-{d}")
}}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="200px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
+ <el-table-column
+ label="鐢宠浜�"
+ align="center"
+ prop="username"
+ width="120px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="200px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="220px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="200px"
+ />
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ align="center"
+ prop="recordstatus"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ <dict-tag
+ :options="dict.type.sys_recordstatus"
+ :value="scope.row.recordstatus"
+ />
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
- </template>
- </el-table-column>
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<!--
<el-table-column label="鑱旂郴鐢佃瘽" 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">
+ <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 ||
- 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)"
- v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " 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>
+ <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 ||
+ scope.row.recordstatus == 1
+ "
+ 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-view"
+ @click="handleDetail(scope.row)"
+ >鏌ョ湅</el-button
+ >
+ <el-button
+ v-if="
+ scope.row.recordstatus == -1 ||
+ scope.row.recordstatus == 1
+ "
+ 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
+ >
</template>
</el-table-column>
</el-table>
@@ -140,7 +268,6 @@
</el-card>
</el-col>
</el-row>
-
</div>
</template>
@@ -351,13 +478,13 @@
this.getUsermsg();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
//鏂规硶闆嗗悎
methods: {
@@ -407,7 +534,9 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")]),
+ message: h("p", null, [
+ h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")
+ ])
});
}
return;
@@ -469,8 +598,8 @@
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard
? this.form.annexbankcard
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
getownFundDetail(id).then(async res => {
@@ -516,8 +645,8 @@
//闄勪欢澶勭悊
this.fileList = this.form.annexbankcard
? this.form.annexbankcard
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
listFundflow(listFundflowparams).then(res => {
@@ -545,7 +674,7 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(ids);
})
.then(() => {
@@ -559,7 +688,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -933,9 +1062,9 @@
tempData.itemid = tempItemArr[itemIndex].id;
}
if (tempData.id > 0) {
- updateFunddetail(tempData).then(response2 => { });
+ updateFunddetail(tempData).then(response2 => {});
} else {
- addFunddetail(tempData).then(response2 => { });
+ addFunddetail(tempData).then(response2 => {});
}
}
});
@@ -1226,7 +1355,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
handleremove(file) {
this.fileList.splice(this.fileList.indexOf(file), 1);
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 1ac57d8..c9d0f40 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -1,19 +1,38 @@
<!-- -->
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="70px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
<el-row align="left">
<el-col :span="6">
<el-form-item label="缁忓姙浜�" prop="name">
- <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ョ粡鍔炰汉" clearable size="small"
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ョ粡鍔炰汉"
+ clearable
+ size="small"
+ @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">
- <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
</el-col>
@@ -29,42 +48,95 @@
</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-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 :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ >鏂板</el-button
+ >
<!-- v-hasPermi="['project:medicalfund:add']" -->
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
- @click="handleExport">瀵煎嚭</el-button>
+ <el-button
+ type="warning"
+ plain
+ icon="el-icon-download"
+ size="mini"
+ :loading="exportLoading"
+ @click="handleExport"
+ >瀵煎嚭</el-button
+ >
</el-col>
<!-- v-hasPermi="['project:medicalfund:export']" -->
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
</el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ align="center"
+ prop="createTime"
+ width="180px"
+ >
<template slot-scope="scope">
- <span>{{
- parseTime(scope.row.createTime, "{y}-{m}-{d}")
- }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="150px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
- <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠浜�"
+ align="center"
+ prop="username"
+ width="150px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="150px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="150px"
+ />
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ width="150"
+ align="center"
+ prop="recordstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_recordstatus"
+ :value="scope.row.recordstatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -81,60 +153,126 @@
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
-->
<el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="280px">
+ <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 ||
- 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)"
- v-hasPermi="['project:medicalfund:edit']">淇敼</el-button>
- <el-button size="mini" type="text" icon="el-icon-view" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="scope.row.recordstatus == -1 ||
- scope.row.recordstatus == 1
- " 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>
+ <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 || scope.row.recordstatus == 1"
+ 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-view"
+ @click="handleDetail(scope.row)"
+ >鏌ョ湅</el-button
+ >
+ <el-button
+ v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1"
+ 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
+ >
</template>
</el-table-column>
</el-table>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
- style="text-align: center" v-loading="loading">
+ <el-dialog
+ :visible.sync="dialogOpen"
+ :close-on-click-modal="false"
+ width="1400px"
+ :title="title"
+ 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="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
+ 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
+ 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-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-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="4">鏉傞」璐圭敤鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label="4"
+ >鏉傞」璐圭敤鐢宠</el-radio
+ >
</el-form-item>
</el-col>
<el-col :span="10">
@@ -144,14 +282,23 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname">
- <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ <el-input
+ :disabled="true"
+ v-model="form.donorname"
+ 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-input
+ v-model="form.amountrequested"
+ placeholder="鐢宠閲戦"
+ :disabled="true"
+ />
</el-form-item>
</el-col>
<!--<el-col :span="5">
@@ -189,34 +336,77 @@
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundDetails" border highlight-current-row>
- <el-table-column prop="orderno" align="center" label="鎺掑簭" width="80">
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="鎺掑簭"
+ width="80"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="鎺掑簭" />
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="璐圭敤绫诲瀷"
+ width="220"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
- <el-option v-for="dict in fundtypeArr" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="scope.row.applytype"
+ placeholder="璐圭敤绫诲瀷"
+ @change="LoadItemTypeArr(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundtypeArr"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="260">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="鏈嶅姟椤圭洰"
+ width="260"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create
- @change="select(scope.row)" :filter-method="(val) => SearchItem(val, scope)">
- <el-option v-for="dict in scope.row.itemArr" :key="dict.id" :label="dict.itemName"
- :value="dict.id"></el-option>
+ <el-select
+ v-model="scope.row.itemid"
+ placeholder="鏈嶅姟椤圭洰"
+ clearable
+ filterable
+ allow-create
+ @change="select(scope.row)"
+ :filter-method="val => SearchItem(val, scope)"
+ >
+ <el-option
+ v-for="dict in scope.row.itemArr"
+ :key="dict.id"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120"
- v-if="form.applytype == '1' || form.applytype == '2'">
+ <el-table-column
+ prop="beneficiaryno"
+ align="center"
+ label="濮撳悕"
+ width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'name')"
+ >{{ scope.row.beneficiaryname }}</el-button
+ >
</template>
</el-table-column>
<!-- <el-table-column
@@ -243,12 +433,28 @@
</el-select>
</template>
</el-table-column> -->
- <el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
+ <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
- @change="selectamount(scope.row)">
- <el-option v-for="dict in fundblock" :key="dict.expensedescribe" :label="dict.expense"
- :value="dict.expense"></el-option>
+ <el-select
+ v-model="scope.row.amount"
+ placeholder="绋庡墠閲戦"
+ clearable
+ filterable
+ allow-create
+ @change="selectamount(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundblock"
+ :key="dict.expensedescribe"
+ :label="dict.expense"
+ :value="dict.expense"
+ ></el-option>
</el-select>
<!--
<el-input
@@ -263,96 +469,226 @@
-->
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣" width="120" v-if="form.applytype != '3'">
+ <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'">
+ <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="绋庡悗閲戦" />
+ <el-input
+ v-model="scope.row.taxedamount"
+ placeholder="绋庡悗閲戦"
+ />
</template>
</el-table-column>
- <el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
+ <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'">
+ <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'">
+ <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">
+ <el-table-column
+ prop="unitno"
+ align="center"
+ label="璐圭敤鍗曚綅鍚嶇О"
+ width="220"
+ >
<template slot-scope="scope">
- <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
- }}</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="ShowDetailDialog(scope, 'unit')"
+ >{{ scope.row.unitname }}</el-button
+ >
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="210"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column prop="remark" align="center" label="澶囨敞" width="210" v-if="form.applytype == '3'">
+ <el-table-column
+ prop="remark"
+ align="center"
+ label="澶囨敞"
+ width="210"
+ v-if="form.applytype == '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column prop="title" align="center" label="鑱岀О" width="120" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="120"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="200"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="210" v-if="form.applytype != '3'">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="210"
+ v-if="form.applytype != '3'"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="120" v-if="dialogType == 'edit'">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="120"
+ v-if="dialogType == 'edit'"
+ >
<template slot-scope="scope">
- <el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
- <el-button @click.native.prevent="
- deleteRows(scope.row, scope.$index, fundDetails)
- " type="text" size="small">
+ <el-button type="text" size="mini" @click="addRow(scope.$index)"
+ >鏂板</el-button
+ >
+ <el-button
+ @click.native.prevent="
+ deleteRows(scope.row, scope.$index, fundDetails)
+ "
+ type="text"
+ size="small"
+ >
鍒犻櫎
</el-button>
- <el-button @click.native.prevent="
- Filepopup(scope.$index, fundDetails, scope.row)
- " type="text" size="small">
+ <el-button
+ @click.native.prevent="
+ Filepopup(scope.$index, fundDetails, scope.row)
+ "
+ type="text"
+ size="small"
+ >
绁ㄦ嵁
</el-button>
</template>
@@ -410,55 +746,143 @@
</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="20" :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="handleremove" accept="image/*,.pdf">
- <el-button :disabled='dialogType == "detail"' size="small" type="primary">涓婁紶</el-button>
+ <el-form-item
+ label="璐圭敤鐢宠闄勪欢锛�"
+ align="left"
+ prop="annexbankcard"
+ >
+ <el-upload
+ size="mini"
+ class="upload-demo"
+ :action="uploadFileUrl"
+ :file-list="fileList"
+ multiple
+ :limit="20"
+ :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="handleremove"
+ accept="image/*,.pdf"
+ >
+ <el-button
+ :disabled="dialogType == 'detail'"
+ size="small"
+ type="primary"
+ >涓婁紶</el-button
+ >
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="dialogType == 'detail'">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion"><template
- slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ width="120"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ width="160"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ width="200"
+ prop="flowconclusion"
+ ><template slot-scope="scope"
+ ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
+ ><span v-if="scope.row.flowconclusion == 2"
+ >涓嶉�氳繃</span
+ ></template
+ >
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-column
+ label="瀹℃牳澶囨敞"
+ align="center"
+ prop="flowcontent"
+ />
</el-table>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
+ <el-button
+ type="primary"
+ @click="submitForm"
+ v-if="dialogType == 'edit'"
+ >淇� 瀛�</el-button
+ >
<!-- <el-button type="success" @click="print">鎵� 鍗�</el-button> -->
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
- <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'璐圭敤鍗曚綅閫夋嫨'"
- style="text-align: center" v-loading="loading" width="500px">
+ <el-dialog
+ :visible.sync="detailInfoDialogShow"
+ :close-on-click-modal="false"
+ :title="'璐圭敤鍗曚綅閫夋嫨'"
+ style="text-align: center"
+ v-loading="loading"
+ width="500px"
+ >
<el-form ref="funddetailForm" :model="funddetailForm" label-width="120px">
<el-row>
<el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
- <el-form-item align="left" label="濮撳悕" prop="beneficiaryname" label-width="80px">
- <el-select filterable allow-create ref="beneficiaryname" default-first-option
- v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
- <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
+ <el-form-item
+ align="left"
+ label="濮撳悕"
+ prop="beneficiaryname"
+ label-width="80px"
+ >
+ <el-select
+ filterable
+ allow-create
+ ref="beneficiaryname"
+ default-first-option
+ v-model="funddetailForm.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in arrr3"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
- <el-form-item align="left" label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
- <el-select v-model="funddetailForm.unitno" placeholder="璇烽�夋嫨鍗曚綅" clearable filterable allow-create
- style="width: 100%">
- <el-option v-for="(item, index) in bankaccountlist" :key="index" :label="item.reportName"
- :value="item.reportNo"></el-option>
+ <el-form-item
+ align="left"
+ label="鍗曚綅鍚嶇О"
+ prop="unitno"
+ label-width="80px"
+ >
+ <el-select
+ v-model="funddetailForm.unitno"
+ placeholder="璇烽�夋嫨鍗曚綅"
+ clearable
+ filterable
+ allow-create
+ style="width: 100%"
+ >
+ <el-option
+ v-for="(item, index) in bankaccountlist"
+ :key="index"
+ :label="item.reportName"
+ :value="item.reportNo"
+ ></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -466,7 +890,9 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
+ <el-button type="primary" @click="ConfirmDetailDialog()"
+ >纭� 瀹�</el-button
+ >
</span>
</el-dialog>
</div>
@@ -489,7 +915,7 @@
getdownloadYX,
getdownloadBX,
addorupdateFund,
- getdetailsByItemId,
+ getdetailsByItemId
} from "@/api/project/fund";
import {
onelistFunds,
@@ -504,13 +930,13 @@
getItemNames,
getFundType,
getFundTypeAll,
- listcountItem,
+ listcountItem
} from "@/api/project/funddetail";
import {
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
import {
listExternalperson,
@@ -519,11 +945,11 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
@@ -535,7 +961,7 @@
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "fundApply",
dicts: [
@@ -551,7 +977,6 @@
"sys_financeitemtype",
"sys_expensetype",
"sys_stage_type"
-
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -576,7 +1001,7 @@
treatmenthospitalname: null,
donorno: null,
reportername: null,
- reporttime: null,
+ reporttime: null
},
fundQueryParam: {
@@ -584,21 +1009,21 @@
pageSize: 100,
infoid: null,
applytype: "4",
- createBy: null,
+ createBy: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
username: [
- { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
createTime: [
- { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
- { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ]
},
//鎹愮尞妗堜緥鍒楄〃鏁版嵁
@@ -638,7 +1063,7 @@
beneficiaryno: null,
unitno: null,
unitname: null,
- index: null,
+ index: null
},
//闄勪欢鍒楄〃
@@ -646,9 +1071,8 @@
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
headers: {
- Authorization: "Bearer " + getToken(),
- },
-
+ Authorization: "Bearer " + getToken()
+ }
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -673,7 +1097,7 @@
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetails[tempIndex];
if (this.detailInfoDialogShowType == "name") {
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (tempName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -694,13 +1118,17 @@
singleDetail.unitno = this.funddetailForm.unitno;
try {
let unitIndex = this.bankaccountlist.findIndex(
- (item) => singleDetail.unitno == item.reportNo
+ item => singleDetail.unitno == item.reportNo
);
if (unitIndex > -1) {
singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
- singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
- singleDetail.bankcardno = this.bankaccountlist[unitIndex].bankcardno;
+ singleDetail.depositbank = this.bankaccountlist[
+ unitIndex
+ ].depositbank;
+ singleDetail.bankcardno = this.bankaccountlist[
+ unitIndex
+ ].bankcardno;
} else {
singleDetail.unitname = singleDetail.unitno;
}
@@ -708,7 +1136,7 @@
singleDetail.unitname = singleDetail.unitno;
}
}
-
+
this.fundDetails[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
@@ -718,7 +1146,7 @@
row.servivesscope = item.servivesscope;
row.amount = item.expense;
this.form.serviceFunddetails = 0;
- this.fundDetails.map((item) => {
+ this.fundDetails.map(item => {
this.form.serviceFunddetails += item.amount;
});
// row.remark
@@ -730,23 +1158,23 @@
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = 0;
- updateFund(row).then((response) => {
+ updateFund(row).then(response => {
if (response.code == 200) {
this.$message({
type: "success",
- message: "鐢宠鎴愬姛",
+ message: "鐢宠鎴愬姛"
});
} else {
this.$message({
type: "error",
- message: "鐢宠澶辫触",
+ message: "鐢宠澶辫触"
});
}
this.loading = false;
@@ -755,19 +1183,19 @@
.catch(() => {
this.$message({
type: "info",
- message: "宸插彇娑堢敵璇�",
+ message: "宸插彇娑堢敵璇�"
});
});
},
select(row) {
- row.itemArr.map((res) => {
+ row.itemArr.map(res => {
if (row.itemid === res.id) {
row.remark = res.itemDescribe;
row.itemcode = res.itemCode;
}
});
var repeatNum = 0;
- this.fundDetails.map((res) => {
+ this.fundDetails.map(res => {
if (res.applytype === row.applytype && res.itemid == row.itemid) {
repeatNum++;
}
@@ -776,15 +1204,15 @@
this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃鏈嶅姟椤圭洰");
}
- getdetailsByItemId(row.itemid).then((res) => {
+ getdetailsByItemId(row.itemid).then(res => {
let fundmsg = res.data;
let fundblock = [];
- fundmsg.forEach((item) => {
+ fundmsg.forEach(item => {
fundblock.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
- servicesscope: item.id,
+ servicesscope: item.id
});
});
row.fundblock = fundblock;
@@ -800,7 +1228,7 @@
});
},
getUsermsg() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -857,14 +1285,17 @@
this.dialogOpen = true;
this.title = "淇敼璐圭敤鐢宠";
-
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
//闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- getownFundDetail(id).then(async (res) => {
+ getownFundDetail(id).then(async res => {
this.fundDetails = res.data;
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemArr = [];
@@ -889,19 +1320,23 @@
this.dialogType = "detail";
const id = row.id || this.ids;
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.form = response.data;
let listFundflowparams = {
fundid: row.id,
- fundtype: 4,
+ fundtype: 4
};
//闄勪欢澶勭悊
- this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+ this.fileList = this.form.annexbankcard
+ ? this.form.annexbankcard
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
- getownFundDetail(id).then((res) => {
+ getownFundDetail(id).then(res => {
this.fundDetails = res.data;
for (let m = 0; m < this.fundDetails.length; m++) {
this.fundDetails[m].itemArr = [];
@@ -911,13 +1346,13 @@
expense: this.fundDetails[m].expense,
expensedescribe: this.fundDetails[m].servicesscopename,
remark: this.fundDetails[m].servicesscope,
- servicesscope: this.fundDetails[m].servicesscope,
+ servicesscope: this.fundDetails[m].servicesscope
});
}
});
});
},
-
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
const queryParams = this.queryParams;
@@ -938,11 +1373,11 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function () {
+ .then(function() {
return delFund(ids);
})
.then(() => {
- getownFundDetail(ids).then((res) => {
+ getownFundDetail(ids).then(res => {
let listdetails = res.data;
for (let i = 0; i < listdetails.length; i++) {
delFunddetail(listdetails[i].id);
@@ -951,12 +1386,12 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
- this.$refs["form"].validate((valid) => {
+ this.$refs["form"].validate(valid => {
if (valid) {
let formData = this.form;
for (let k = 0; k < this.fundDetails.length; k++) {
@@ -999,7 +1434,7 @@
);
if (this.form.id != null) {
- updateFund(this.form).then((response) => {
+ updateFund(this.form).then(response => {
this.dialogOpen = false;
this.getList();
this.$modal.msgSuccess("淇敼鎴愬姛");
@@ -1010,16 +1445,16 @@
tempData.fundid = formData.id;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let itemIndex = tempItemArr.findIndex(
- (item) => tempData.itemid == item.id
+ item => tempData.itemid == item.id
);
if (itemIndex > -1) {
tempData.itemname = tempItemArr[itemIndex].itemName;
tempData.itemid = tempItemArr[itemIndex].id;
}
if (tempData.id > 0) {
- updateFunddetail(tempData).then((response2) => { });
+ updateFunddetail(tempData).then(response2 => {});
} else {
- addFunddetail(tempData).then((response2) => { });
+ addFunddetail(tempData).then(response2 => {});
}
}
});
@@ -1031,7 +1466,7 @@
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let itemIndex = tempUtemArr.findIndex(
- (item) => tempData.itemid == item.id
+ item => tempData.itemid == item.id
);
if (itemIndex > -1) {
tempData.itemname = tempUtemArr[itemIndex].itemName;
@@ -1039,7 +1474,7 @@
}
//鑾峰彇applytypename
let applytypeIndex = this.fundtypeArr.findIndex(
- (item) => tempData.applytype == item.value
+ item => tempData.applytype == item.value
);
if (applytypeIndex > -1) {
tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
@@ -1048,7 +1483,7 @@
}
this.form.serviceFunddetails = this.fundDetails;
- addorupdateFund(this.form).then((response) => {
+ addorupdateFund(this.form).then(response => {
if (response.code === 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.loading = false;
@@ -1071,7 +1506,7 @@
this.loading = true;
this.queryParams.params = {};
this.reset();
- listFund(this.fundQueryParam).then((response) => {
+ listFund(this.fundQueryParam).then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
});
@@ -1079,7 +1514,7 @@
getBaseInfoList() {
this.loading = true;
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
@@ -1133,12 +1568,12 @@
servicetypename: null,
servicesscopename: null,
dialogType: "edit",
- fundflowList: [],
+ fundflowList: []
};
this.resetForm("form");
//娓呯┖闄勪欢
- this.fileList = []
+ this.fileList = [];
},
//鏂板涓�琛�
@@ -1183,7 +1618,7 @@
uploadflag: null,
uploadtime: null,
itemArr: [],
- servivesscope: null,
+ servivesscope: null
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.fundDetails.push(rowData);
@@ -1197,7 +1632,7 @@
//鍔犺浇鏈嶅姟椤圭洰
LoadItemTypeArr(row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
row.itemid = null;
this.$forceUpdate();
@@ -1210,38 +1645,36 @@
// });
},
-
getBankAccount() {
//鑾峰彇閾惰璐﹀彿鍒楄〃锛岀被鍨嬫槸鏈烘瀯
- listReportname("org").then((res) => {
+ listReportname("org").then(res => {
this.bankaccountlist = res.data;
});
},
getlistUser() {
- listUser().then((res) => {
+ listUser().then(res => {
this.userlist = res.data;
});
},
-
deleteRows(row, index, rows) {
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
})
.then(() => {
if (row.id !== null) {
- delFunddetail(row.id).then((res) => {
+ delFunddetail(row.id).then(res => {
if (res.code === 200) {
this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
}).then(() => {
this.$set(rows, rows.splice(index, 1));
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.$set(this.fundDetails, res.data);
this.sumTotalFee(row);
// this.fundDetails = res.data
@@ -1299,21 +1732,21 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(this.businesstype).then((res) => {
+ getFundTypeAll(this.businesstype).then(res => {
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
for (let m = 0; m < dataList.length; m++) {
this.fundtypeArr.push({
value: dataList[m].itemType,
- label: dataList[m].itemTypeName,
+ label: dataList[m].itemTypeName
});
}
});
},
getItemArr(rowindex, row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ let list = this.fundtypeArrAll.filter(r => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
this.$set(this.fundDetails, rowindex, row);
//this.loading = true;
@@ -1327,14 +1760,14 @@
addAlls() {
this.loading = true;
this.fundDetails = this.fundDetails.filter(
- (r) => r.applytype != "" && r.applytype != null
+ r => r.applytype != "" && r.applytype != null
);
let listAdd = [];
//let listAdd = this.fundDetails;
for (let i = 0; i < this.fundtypeArrAll.length; i++) {
for (let j = 0; j < this.fundtypeArrAll[i].itemDetails.length; j++) {
let list = this.fundDetails.filter(
- (r) =>
+ r =>
r.applytype == this.fundtypeArrAll[i].itemType &&
r.itemid == this.fundtypeArrAll[i].itemDetails[j].id
);
@@ -1348,7 +1781,7 @@
recordstatus: "-1",
itemArr: this.fundtypeArrAll[i].itemDetails,
beneficiaryname: "鐐瑰嚮閫夋嫨",
- unitname: "鐐瑰嚮閫夋嫨",
+ unitname: "鐐瑰嚮閫夋嫨"
};
listAdd.push(rowData);
}
@@ -1369,13 +1802,13 @@
},
getUnitList() {
- listOrganization(3).then((res) => {
+ listOrganization(3).then(res => {
for (let i = 0; i < res.rows.length; i++) {
this.unitList.push({
organizationid: res.rows[i].organizationid,
organizationname: res.rows[i].organizationname,
bankname: res.rows[i].bankname,
- bankaccount: res.rows[i].bankaccount,
+ bankaccount: res.rows[i].bankaccount
});
}
});
@@ -1383,7 +1816,7 @@
// 鎹愮尞鑰呭尰瀛︾粺璁℃墦鍗�
dayin2(id) {
- getdownloadYX(id).then((res) => {
+ getdownloadYX(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1397,7 +1830,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1406,7 +1839,7 @@
//姹囨�绘墦鍗�
totaldayin(e) {
// const id =this.row.id
- getdownloadBX(e).then((res) => {
+ getdownloadBX(e).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1420,7 +1853,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1445,7 +1878,7 @@
}
scope.row.itemArr = result;
} else {
- getItemNames(scope.row.applytype).then((res) => {
+ getItemNames(scope.row.applytype).then(res => {
scope.row.itemArr = res.data;
//this.$set(this.fundDetails, rowindex, row);
});
@@ -1453,9 +1886,9 @@
},
//鏂囦欢涓婁紶
- handleUploadError() { },
+ handleUploadError() {},
handleremove(file) {
- this.fileList.splice(this.fileList.indexOf(file), 1)
+ this.fileList.splice(this.fileList.indexOf(file), 1);
},
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
@@ -1468,18 +1901,18 @@
this.$modal.msgSuccess(response.msg);
this.fileList.push({ name: response.fileName, url: response.fileName });
} else {
- console.log(response.msg);;
+ console.log(response.msg);
}
},
// 涓嬭浇鏂囦欢
downFile(item) {
- const url = process.env.VUE_APP_BASE_API + item.url
- var a = document.createElement('a');
- var event = new MouseEvent('click');
+ 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);
- },
+ }
},
// 鐐瑰嚮鏂囦欢
@@ -1510,13 +1943,13 @@
this.getUsermsg();
},
- beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() { }, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
<style scoped>
diff --git a/src/views/project/fund/performanceApply/index.vue b/src/views/project/fund/performanceApply/index.vue
index 8503f4f..d39b062 100644
--- a/src/views/project/fund/performanceApply/index.vue
+++ b/src/views/project/fund/performanceApply/index.vue
@@ -63,9 +63,6 @@
</el-select>
</el-form-item>
</el-col>
-
-
-
</el-row>
<el-row>
<el-col :span="6">
@@ -157,7 +154,7 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -209,7 +206,6 @@
>淇敼</el-button
>
<el-button
-
size="mini"
type="text"
icon="el-icon-edit"
@@ -290,7 +286,6 @@
"sys_expensetype",
"sys_performance_type",
"sys_stage_type"
-
],
data() {
//杩欓噷瀛樻斁鏁版嵁
@@ -466,11 +461,16 @@
query: { id: row.id, businessType: "5", operationType: "update" }
});
},
- /** 澶嶅埗鎸夐挳鎿嶄綔 */
- duplicationfn(row) {
+ /** 澶嶅埗鎸夐挳鎿嶄綔 */
+ duplicationfn(row) {
this.$router.push({
path: "/finance/performancedetails/",
- query: { id: row.id, businessType: "5", Copy: "1", operationType: "update" }
+ query: {
+ id: row.id,
+ businessType: "5",
+ Copy: "1",
+ operationType: "update"
+ }
});
},
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index dc0918b..60674b1 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -58,7 +58,6 @@
</el-col>
</el-row>
<el-row>
-
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
@@ -74,11 +73,11 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-select
v-model="form.checkstatus"
filterable
- placeholder="璇烽�夋嫨棰勫鐘舵��"
+ placeholder="璇烽�夋嫨鐢宠鏉愭枡鐘舵��"
>
<el-option
v-for="item in baselisttages"
@@ -92,7 +91,6 @@
</el-col>
</el-row>
<el-row style="text-align: left">
-
<el-col :span="8">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
@@ -627,11 +625,11 @@
baselisttages: [
{
id: 1,
- name: "寰呴瀹�"
+ name: "寰呯敵璇锋潗鏂�"
},
{
id: 2,
- name: "棰勫閫氳繃绛夊緟鏉愭枡"
+ name: "鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡"
},
{
id: 3,
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 04d0e76..302c123 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -63,9 +63,30 @@
</el-select>
</el-form-item>
</el-col>
-
</el-row>
<el-row>
+ <el-col :span="5">
+ <el-form-item
+ label-width="120px"
+ label="鐢宠鏉愭枡鐘舵��"
+ prop="checkstatus"
+ style="float: left"
+ >
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
<el-input
@@ -156,7 +177,7 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkFlag"
@@ -193,14 +214,7 @@
@click="handleDetail(scope.row)"
>璇︽儏</el-button
>
- <el-button
- v-if="scope.row.checkFlag == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
- >
+
<el-button
v-if="scope.row.checkFlag == 1"
size="mini"
@@ -857,21 +871,21 @@
label: "鍏ㄩ儴"
}
],
- // 瀹℃壒鍗曟祦绋�
- checkFlagOptionsbar: [
+ checkmaterials: [
{
value: 1,
- label: "寰呴瀹�"
+ label: "寰呭鏌�"
},
{
value: 2,
- label: "棰勭畻閫氳繃锛岀瓑寰呯焊璐ㄦ姤閿�鏉愭枡"
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
},
{
value: 3,
- label: "鏀跺埌绾歌川鎶ラ攢鏉愭枡"
+ label: "宸叉敹鍒版潗鏂�"
}
],
+
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -962,8 +976,8 @@
mounted() {
if (grtItem("ethicalExpertFeeCheck")) {
this.queryParams = grtItem("ethicalExpertFeeCheck");
- this.queryParams.APPLICATIONBEGTIME = '';
- this.queryParams.APPLICATIONENDTIME ='';
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
}
this.selectReporters();
this.getlistOrganization();
@@ -1282,18 +1296,8 @@
});
}
},
- beforehandCheck(row) {
- this.$router.push({
- path: "/finance/applyDetail/",
- query: {
- id: row.id,
- beforehandType: "1",
- businessType: "2",
- operationType: "check",
- }
- });
- },
- /** 淇敼鎸夐挳鎿嶄綔 */
+
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
handleCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 8fc2cff..3bb7946 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -1,19 +1,33 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ v-show="showSearch"
+ label-width="80px"
+ >
<el-row>
<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="鐢宠缁撴潫鏃ユ湡"
- @keyup.enter.native="flowconclusion">
+ <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="鐢宠缁撴潫鏃ユ湡"
+ @keyup.enter.native="flowconclusion"
+ >
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="閲戦" prop="money" style="float: left">
<el-input
- v-model="queryParams.money"
+ v-model="queryParams.money"
placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦"
clearable
size="small"
@@ -23,14 +37,28 @@
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="APPLICANT" style="float: left">
- <el-input v-model="queryParams.APPLICANT" placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕" clearable size="small"
- @keyup.enter.native="flowconclusion" />
+ <el-input
+ v-model="queryParams.APPLICANT"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉濮撳悕"
+ clearable
+ size="small"
+ @keyup.enter.native="flowconclusion"
+ />
</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-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>
@@ -41,6 +69,23 @@
</el-col> -->
</el-row>
<el-row>
+ <el-col :span="5">
+ <el-form-item label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left">
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
<el-input
@@ -70,7 +115,12 @@
</el-form>
<el-form ref="infoform" label-width="100px">
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <el-table
+ v-loading="loading"
+ border
+ :data="donateconsolationfundList"
+ @selection-change="handleSelectionChange"
+ >
<!--
<el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
<template slot-scope="scope">
@@ -80,118 +130,225 @@
</template>
</el-table-column>
-->
- <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
+ <el-table-column
+ label="鐢宠鏃ユ湡"
+ width="120"
+ align="center"
+ prop="createTime"
+ >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
- <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
+ <el-table-column
+ label="缁忓姙浜�"
+ align="center"
+ prop="username"
+ width="150px"
+ />
+ <el-table-column
+ label="鐢宠閲戦"
+ align="center"
+ prop="pretaxcost"
+ width="200px"
+ />
+ <el-table-column
+ label="鎵�灞炵粍鍒�"
+ align="center"
+ prop="deptmentname"
+ width="200px"
+ />
+ <el-table-column
+ label="缁勯暱"
+ align="center"
+ prop="managername"
+ width="150px"
+ />
<!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> -->
<!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> -->
<!-- <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="200">
+ <el-table-column
+ label="瀹℃牳鐘舵��"
+ align="center"
+ prop="recordstatus"
+ width="200"
+ >
<template slot-scope="scope">
- <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
+ <dict-tag
+ :options="dict.type.sys_recordstatus"
+ :value="scope.row.recordstatus"
+ />
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鎹愮尞鑰�"
+ align="center"
+ prop="donorname"
+ width="120px"
/>
- </template>
- </el-table-column>
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<!--<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="260px">
+ <el-table-column
+ label="鎿嶄綔"
+ fixed="right"
+ align="center"
+ class-name="small-padding fixed-width"
+ width="260px"
+ >
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
- @click="handleDetail(scope.row)">璇︽儏</el-button>
- <el-button
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ v-if="scope.row.checkFlag == 0"
+ @click="handleDetail(scope.row)"
+ >璇︽儏</el-button
+ >
+
+ <el-button
v-if="scope.row.checkFlag == 1"
size="mini"
type="text"
icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
+ @click="handleCheck(scope.row)"
+ >瀹℃牳</el-button
>
- <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
- @click="handleCheck(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
- <el-button size="mini" type="text" icon="el-icon-download" @click="dayin(scope.row.id)">涓嬭浇</el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-download"
+ @click="dayin(scope.row.id)"
+ >涓嬭浇</el-button
+ >
</template>
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getlistbypower" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getlistbypower"
+ />
</el-row>
</el-form>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
- <el-dialog :visible.sync="dialogOpen" width="1400px" :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="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
+ 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-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"
- :value="dict.nickname"></el-option>
+ <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 disabled v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
+ <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-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-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 v-model="form.applytype" label="1"
+ >涓撳璐圭敤鐢宠</el-radio
+ >
</el-radio-group>
- </el-form-item></el-col>
+ </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-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-input
+ disabled
+ v-model="form.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ clearable
+ />
</el-form-item>
</el-col>
<!--
@@ -226,8 +383,8 @@
<el-col :span="5">
<el-form-item label="绋庡悗鍚堣" prop="taxedcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col><!--
+ </el-form-item> </el-col
+ ><!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
@@ -239,31 +396,77 @@
</el-row>
<el-row>
<el-col :span="4">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow"
- v-if="show === 1">鏂板涓撳璐�</el-button>
+ <el-button
+ type="primary"
+ plain
+ icon="el-icon-plus"
+ size="mini"
+ @click="addRow"
+ v-if="show === 1"
+ >鏂板涓撳璐�</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 v-loading="loading">
- <el-table-column prop="orderno" align="center" label="搴忓彿" width="80">
+ <el-table
+ :data="fundDetailArr"
+ :summary-method="getSummaries"
+ border
+ highlight-current-row
+ v-loading="loading"
+ >
+ <el-table-column
+ prop="orderno"
+ align="center"
+ label="搴忓彿"
+ width="80"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="applytype" align="center" label="璐圭敤绫诲瀷" width="220">
+ <el-table-column
+ prop="applytype"
+ align="center"
+ label="璐圭敤绫诲瀷"
+ width="220"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.applytype" placeholder="璐圭敤绫诲瀷" @change="LoadItemTypeArr(scope.row)">
- <el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="scope.row.applytype"
+ placeholder="璐圭敤绫诲瀷"
+ @change="LoadItemTypeArr(scope.row)"
+ >
+ <el-option
+ v-for="dict in fundtypeArr"
+ :key="dict.index"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="itemtype" align="center" label="鏈嶅姟椤圭洰" width="200">
+ <el-table-column
+ prop="itemtype"
+ align="center"
+ label="鏈嶅姟椤圭洰"
+ width="200"
+ >
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" clearable filterable allow-create>
- <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
- :value="dict.id"></el-option>
+ <el-select
+ v-model="scope.row.itemid"
+ placeholder="鏈嶅姟椤圭洰"
+ clearable
+ filterable
+ allow-create
+ >
+ <el-option
+ v-for="dict in scope.row.itemArr"
+ :key="dict.index"
+ :label="dict.itemName"
+ :value="dict.id"
+ ></el-option>
<!-- <el-option
v-for="dict in itemArr"
:key="dict.index"
@@ -273,34 +476,86 @@
</el-select>
</template>
</el-table-column>
- <el-table-column v-if="show === 1" prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="150">
+ <el-table-column
+ v-if="show === 1"
+ prop="servicesscopename"
+ align="center"
+ label="璐圭敤璇存槑"
+ width="150"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.servicesscopename" placeholder="璐圭敤璇存槑" />
+ <el-input
+ v-model="scope.row.servicesscopename"
+ placeholder="璐圭敤璇存槑"
+ />
</template>
</el-table-column>
- <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120">
+ <el-table-column
+ prop="beneficiaryno"
+ align="center"
+ label="濮撳悕"
+ width="120"
+ >
<template slot-scope="scope">
- <el-select filterable allow-create ref="getReportname" default-first-option
- @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="璇烽�夋嫨">
- <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
+ <el-select
+ filterable
+ allow-create
+ ref="getReportname"
+ default-first-option
+ @change="selectpersonmsg(scope.row)"
+ v-model="scope.row.beneficiaryname"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in arrr3"
+ :key="item.reportNo"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
</el-option>
</el-select>
- </template> </el-table-column><el-table-column prop="title" align="center" label="鑱岀О" width="150">
+ </template> </el-table-column
+ ><el-table-column
+ prop="title"
+ align="center"
+ label="鑱岀О"
+ width="150"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column v-if="show === 1" prop="amount" align="center" label="绋庡墠閲戦" width="100">
+ <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);
- }
- " placeholder="绋庡墠閲戦" />
+ <el-input
+ v-model="scope.row.amount"
+ v-on:input="
+ val => {
+ change(scope.row);
+ }
+ "
+ placeholder="绋庡墠閲戦"
+ />
</template>
</el-table-column>
- <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="绋庡悗閲戦" width="100">
+ <el-table-column
+ v-if="show === 1"
+ prop="taxedamount"
+ align="center"
+ label="绋庡悗閲戦"
+ width="100"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
+ <el-input
+ v-model="scope.row.taxedamount"
+ placeholder="绋庡悗閲戦"
+ />
</template>
</el-table-column>
<!--
@@ -310,35 +565,76 @@
</template>
</el-table-column>
-->
- <el-table-column prop="unitname" align="center" label="宸ヤ綔鍗曚綅" width="180">
+ <el-table-column
+ prop="unitname"
+ align="center"
+ label="宸ヤ綔鍗曚綅"
+ width="180"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.unitname" placeholder="宸ヤ綔鍗曚綅" />
</template>
</el-table-column>
- <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200">
+ <el-table-column
+ prop="idcardno"
+ align="center"
+ label="韬唤璇佸彿"
+ width="200"
+ >
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="240">
+ <el-table-column
+ prop="depositbank"
+ align="center"
+ label="寮�鎴烽摱琛�"
+ width="240"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input
+ v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�"
+ />
</template>
</el-table-column>
- <el-table-column prop="bankcardno" align="center" label="閾惰鍗″彿" width="220">
+ <el-table-column
+ prop="bankcardno"
+ align="center"
+ label="閾惰鍗″彿"
+ width="220"
+ >
<template slot-scope="scope">
- <el-input v-model="scope.row.bankcardno" placeholder="閾惰鍗″彿" />
+ <el-input
+ v-model="scope.row.bankcardno"
+ placeholder="閾惰鍗″彿"
+ />
</template>
</el-table-column>
- <el-table-column fixed="right" align="center" label="鎿嶄綔" width="200">
+ <el-table-column
+ fixed="right"
+ align="center"
+ label="鎿嶄綔"
+ width="200"
+ >
<template slot-scope="scope">
- <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1">
+ <el-button
+ @click="saveRows(scope.row, scope.$index)"
+ type="text"
+ size="small"
+ v-if="show === 1"
+ >
淇濆瓨
</el-button>
- <el-button @click.native.prevent="
- deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small" v-hasPermi="['project:expertFeeCheck:delete']">
+ <el-button
+ @click.native.prevent="
+ deleteRows(scope.row, scope.$index, fundDetailArr)
+ "
+ type="text"
+ size="small"
+ v-hasPermi="['project:expertFeeCheck:delete']"
+ >
鍒犻櫎
</el-button>
</template>
@@ -360,17 +656,39 @@
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundflowList" border>
- <el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" />
- <el-table-column label="瀹℃牳鏃ユ湡" align="center" prop="createTime" />
- <el-table-column label="瀹℃牳缁撴灉" align="center" prop="flowconclusion"><template slot-scope="scope"><span
- v-if="scope.row.flowconclusion == 1">閫氳繃</span><span
- v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span></template>
+ <el-table-column
+ label="瀹℃牳浜�"
+ align="center"
+ prop="checkusername"
+ />
+ <el-table-column
+ label="瀹℃牳鏃ユ湡"
+ align="center"
+ prop="createTime"
+ />
+ <el-table-column
+ label="瀹℃牳缁撴灉"
+ align="center"
+ prop="flowconclusion"
+ ><template slot-scope="scope"
+ ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
+ ><span v-if="scope.row.flowconclusion == 2"
+ >涓嶉�氳繃</span
+ ></template
+ >
</el-table-column>
- <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
+ <el-table-column
+ label="瀹℃牳澶囨敞"
+ align="center"
+ prop="flowcontent"
+ />
</el-table>
</el-row>
- <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'edit'">
+ <el-row
+ style="margin-top: 25px; margin-bottom: 5px"
+ v-if="dialogType == 'edit'"
+ >
<el-col :span="7">
<el-form-item label="瀹℃牳" align="left">
<el-radio-group v-model="newobj.flowlevelone" align="left">
@@ -381,13 +699,18 @@
</el-col>
<el-col :span="12">
<el-form-item label="瀹℃牳澶囨敞">
- <el-input v-model="newobj.flowconclusion" placeholder="鐢虫姤璐圭敤" />
+ <el-input
+ v-model="newobj.flowconclusion"
+ placeholder="鐢虫姤璐圭敤"
+ />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'">淇濆瓨</el-button>
+ <el-button type="primary" @click="dundcheck" v-if="dialogType == 'edit'"
+ >淇濆瓨</el-button
+ >
<el-button @click="cancel">鍙栨秷</el-button>
</div>
</el-dialog>
@@ -409,7 +732,8 @@
getdownloadYX,
getdownloadBX,
checkfund,
- listbypower, addFundSharedInfo
+ listbypower,
+ addFundSharedInfo
} from "@/api/project/fund";
import {
onelistFunds,
@@ -429,7 +753,7 @@
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
import {
listFundflow,
@@ -437,7 +761,7 @@
delFundflow,
addFundflow,
updateFundflow,
- exportFundflow,
+ exportFundflow
} from "@/api/project/fundflow";
import {
@@ -447,22 +771,21 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
import { getUserProfile } from "@/api/system/user";
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
-import { setItem,grtItem,removeItem } from '@/utils/storage.js';
-
+import { setItem, grtItem, removeItem } from "@/utils/storage.js";
export default {
components: {
Li_area_select,
- OrgSelecter,
+ OrgSelecter
},
name: "Donateconsolationfund",
dicts: [
@@ -487,7 +810,7 @@
newobj: {
flowlevelone: null,
flowconclusion: null,
- fundid: null,
+ fundid: null
},
showFirstapprovelevel: false,
showSecondapprovelevel: false,
@@ -496,7 +819,7 @@
sheng: "",
shi: "",
qu: "",
- organizationname: null,
+ organizationname: null
},
openbtn: true,
isopen: 0,
@@ -539,16 +862,30 @@
checkFlagOptions: [
{
value: 0,
- label: "宸插鎵�",
+ label: "宸插鎵�"
},
{
value: 1,
- label: "寰呭鎵�",
+ label: "寰呭鎵�"
},
{
value: 2,
- label: "鍏ㄩ儴",
+ label: "鍏ㄩ儴"
+ }
+ ],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏌�"
},
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
+ }
],
// 鏌ヨ鍙傛暟
queryParams: {
@@ -566,14 +903,14 @@
// 琛ㄥ崟鏍￠獙
rules: {
username: [
- { required: true, message: "璇疯緭鍏ョ敵璇蜂汉濮撳悕", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇蜂汉濮撳悕", trigger: "blur" }
],
createTime: [
- { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
+ { required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
amountrequested: [
- { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
- ],
+ { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" }
+ ]
},
//褰撳墠閫変腑鎹愮尞妗堜緥
curCase: {},
@@ -599,8 +936,8 @@
hsfbx: null,
hsfbz: null,
total: null,
- title: null,
- },
+ title: null
+ }
],
fundDetailArr: [],
fundflowList: [],
@@ -620,7 +957,7 @@
{ name: "鎹愮尞鑰呭尰瀛︽垚鏈�" },
{ name: "鎹愮尞鑰呭杽鍚庢垚鏈�" },
{ name: "鎹愮尞浼︾悊濮斿憳浼氬姵鍔″彂鏀捐〃" },
- { name: "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂" },
+ { name: "鎹愮尞鑰呭灞炰氦閫氶瀹胯垂" }
],
itemArr: [],
allnum: [],
@@ -628,7 +965,7 @@
approveLevel: 5,
show: 0,
fundtypeArrAll: [],
- dialogType: "show",
+ dialogType: "show"
};
},
watch: {},
@@ -641,9 +978,9 @@
mounted() {
if (grtItem("expertFeeCheck")) {
this.queryParams = grtItem("expertFeeCheck");
- this.queryParams.APPLICATIONBEGTIME = '';
- this.queryParams.APPLICATIONENDTIME ='';
- };
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
+ }
this.selectReporters();
this.getlistOrganization();
this.getlistbypower();
@@ -653,13 +990,13 @@
},
methods: {
getUsermsg() {
- getUserProfile().then((response) => {
+ getUserProfile().then(response => {
console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
response.data.userName === "001" ||
- response.data.userName === "002" ||
+ response.data.userName === "002" ||
response.data.userName === "012" ||
response.data.userName === "admin"
) {
@@ -677,7 +1014,7 @@
},
getlistbypower() {
this.loading = true;
- listbypower(this.queryParams).then((res) => {
+ listbypower(this.queryParams).then(res => {
console.log("鏍规嵁鏉冮檺鏄剧ず鍒楄〃", res);
removeItem("expertFeeCheck");
setItem("expertFeeCheck", this.queryParams);
@@ -694,7 +1031,7 @@
let checkfundobj = {
flowconclusion: this.newobj.flowlevelone,
flowcontent: this.newobj.flowconclusion,
- fundid: this.form.id,
+ fundid: this.form.id
};
if (
checkfundobj.flowconclusion == null ||
@@ -704,7 +1041,7 @@
this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹!");
return;
}
- checkfund(checkfundobj).then((res) => {
+ checkfund(checkfundobj).then(res => {
console.log("瀹℃牳璐圭敤", res);
this.reset();
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
@@ -714,7 +1051,7 @@
},
getlistUser() {
this.queryParams = {};
- listUser(this.queryParams).then((res) => {
+ listUser(this.queryParams).then(res => {
this.userlist = res.data;
});
},
@@ -726,7 +1063,7 @@
sums[index] = "鍚堣";
return;
}
- const values = data.map((item) => Number(item[column.property]));
+ const values = data.map(item => Number(item[column.property]));
if (
column.property == "amount" //闇�瑕佹樉绀哄拰鍚堣绾靛垪
) {
@@ -746,12 +1083,12 @@
},
getlistOrganization() {
- listOrganization().then((res) => { });
+ listOrganization().then(res => {});
},
totaldayin(e) {
// const id =this.row.id
- getdownloadBX(e).then((res) => {
+ getdownloadBX(e).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -765,7 +1102,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -777,12 +1114,12 @@
tojust(e) {
let username = "111";
- getFund(e).then((res) => {
+ getFund(e).then(res => {
username = res.data.username;
this.$modal
.confirm('鏄惁纭閫氳繃"' + username + '"鐨勮垂鐢ㄧ敵璇凤紵')
- .then(function () {
- getFund(e).then((res) => {
+ .then(function() {
+ getFund(e).then(res => {
let data = res.data;
let financechecher = "宸插鏍�";
data.financechecher = financechecher;
@@ -805,7 +1142,7 @@
// });
// },
getmessages(val) {
- getInfoBytheUserNo(val.beneficiaryno).then((res) => {
+ getInfoBytheUserNo(val.beneficiaryno).then(res => {
if (res.data) {
this.$set(val, res.data);
val.beneficiaryname = res.data.username;
@@ -832,18 +1169,18 @@
getBaseInfoList() {
this.loading = true;
- listDonatebaseinfo(this.queryParams).then((response) => {
+ listDonatebaseinfo(this.queryParams).then(response => {
this.donatebaseinfoList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//鍔ㄦ�佽绠楃◣鍓嶉噾棰�
- change(scope) { },
+ change(scope) {},
autodonorno() {
- listDonatebaseinfo().then((res) => {
+ listDonatebaseinfo().then(res => {
// console.log("鎵�鏈夋崘鐚�呭垪琛細",res);
- res.rows.forEach((data) => {
+ res.rows.forEach(data => {
// console.log("data:",data);
if (this.form.doname === data.name) {
this.form.donorno = data.donorno;
@@ -863,7 +1200,7 @@
this.loading = true;
this.reset();
var infoid = this.curCase.id;
- listFund().then((response) => {
+ listFund().then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
});
@@ -931,7 +1268,7 @@
annexregistform: null,
consolationmoney: null,
applytype: "1",
- recordstatus: null,
+ recordstatus: null
};
this.resetForm("form");
},
@@ -949,7 +1286,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map((item) => item.id);
+ this.ids = selection.map(item => item.id);
this.single = selection.length !== 1;
this.multiple = !selection.length;
},
@@ -973,23 +1310,23 @@
} else {
const h = this.$createElement;
this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")]),
+ message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")])
});
}
},
- beforehandCheck(row){
+ beforehandCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
query: {
id: row.id,
businessType: "1",
- beforehandType:'1',
- operationType: "check",
+ beforehandType: "1",
+ operationType: "check"
}
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleCheck(row) {
+ handleCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
query: {
@@ -1011,13 +1348,13 @@
const id = row.id || this.ids;
this.loading = true;
this.dialogType = "edit";
- getFund(id).then((response) => {
+ getFund(id).then(response => {
this.loading = false;
this.form = response.data;
this.form.name = this.curCase.name;
console.log("wdadwadwadaw", this.form);
this.loading = true;
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.loading = false;
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -1029,9 +1366,9 @@
this.newobj.fundid = row.id;
let listFundflowparams = {
fundid: row.id,
- fundtype: 2,
+ fundtype: 2
};
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
console.log("聽fundtype:聽1", res);
this.fundflowList = res.rows;
});
@@ -1062,16 +1399,16 @@
//鍔犺浇瀹℃牳璁板綍
let listFundflowparams = {
fundid: row.id,
- fundtype: 2,
+ fundtype: 2
};
- listFundflow(listFundflowparams).then((res) => {
+ listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
- getFund(row.id).then((response) => {
+ getFund(row.id).then(response => {
this.form = response.data;
this.form.name = this.curCase.name;
console.log("applytype", this.form.applytype);
- getownFundDetail(row.id).then((res) => {
+ getownFundDetail(row.id).then(res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -1084,9 +1421,9 @@
const infoid = this.curCase.id;
const aaa = {
infoid: infoid,
- count: this.idss,
+ count: this.idss
};
- listFunddetails(aaa).then((res) => { });
+ listFunddetails(aaa).then(res => {});
},
//鍒濆鍖栬垂鐢ㄧ敵璇疯〃鍗曠晫闈�
@@ -1128,8 +1465,8 @@
updateBy: null,
updateTime: null,
uploadflag: null,
- uploadtime: null,
- },
+ uploadtime: null
+ }
];
},
@@ -1173,7 +1510,7 @@
updateBy: null,
updateTime: null,
uploadflag: null,
- uploadtime: null,
+ uploadtime: null
};
this.fundDetailArr.push(rowData);
},
@@ -1181,19 +1518,19 @@
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
})
.then(() => {
if (row.id !== null) {
- delFunddetail(row.id).then((res) => {
+ delFunddetail(row.id).then(res => {
if (res.code === 200) {
this.$confirm("鍒犻櫎鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "success",
+ type: "success"
}).then(() => {
this.$set(rows, rows.splice(index, 1));
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.$set(this.fundDetailArr, res.data);
// this.fundDetailArr = res.data
// console.log('鍒犻櫎鍚�',this.fundDetailArr)
@@ -1218,23 +1555,21 @@
this.$confirm("鏄惁纭淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
let formData = this.form;
let tempItemArr = rows.itemArr;
rows.fundid = formData.id;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- let itemIndex = tempItemArr.findIndex(
- (item) => rows.itemid == item.id
- );
+ let itemIndex = tempItemArr.findIndex(item => rows.itemid == item.id);
if (itemIndex > -1) {
rows.itemname = tempItemArr[itemIndex].itemname;
rows.itemid = tempItemArr[itemIndex].id;
}
//鑾峰彇applytypename
let applytypeIndex = this.fundtypeArr.findIndex(
- (item) => rows.applytype == item.value
+ item => rows.applytype == item.value
);
if (applytypeIndex > -1) {
rows.applytypename = this.fundtypeArr[applytypeIndex].label;
@@ -1247,10 +1582,10 @@
rows.unitname = rows.unitno;
}
if (rows.id > 0) {
- updateFunddetail(rows).then((res) => {
+ updateFunddetail(rows).then(res => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.loading = true;
- getownFundDetail(this.form.id).then((res) => {
+ getownFundDetail(this.form.id).then(res => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -1260,8 +1595,8 @@
});
});
} else {
- addFunddetail(rows).then((response2) => {
- getownFundDetail(this.form.id).then((res) => {
+ addFunddetail(rows).then(response2 => {
+ getownFundDetail(this.form.id).then(res => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -1281,10 +1616,10 @@
this.$confirm("鏄惁纭淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
- type: "warning",
+ type: "warning"
})
.then(() => {
- updateFunddetail(this.fundDetailArr).then((res) => {
+ updateFunddetail(this.fundDetailArr).then(res => {
console.log("鐗涗父鐗涘晩", res);
});
})
@@ -1300,7 +1635,7 @@
for (let i = 0; i < this.applicationDetailArr.length; i++) {
// console.log('qqq',this.applicationDetailArr[i]);
let tempData = this.applicationDetailArr[i];
- Object.keys(tempData).forEach(function (key) {
+ Object.keys(tempData).forEach(function(key) {
// console.log('iii',key, tempData[key]);
if (
tempData[key] == null ||
@@ -1338,7 +1673,7 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
- getFundTypeAll(1).then((res) => {
+ getFundTypeAll(1).then(res => {
console.log("璐圭敤绫诲瀷", res.data);
let dataList = res.data;
this.fundtypeArrAll = dataList;
@@ -1346,7 +1681,7 @@
for (let m = 0; m < dataList.length; m++) {
this.fundtypeArr.push({
value: dataList[m].itemType,
- label: dataList[m].itemTypeName,
+ label: dataList[m].itemTypeName
});
}
});
@@ -1370,7 +1705,7 @@
let arrreportlist = [];
for (let i = 0; i < arr.length; i++) {
this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
+ listReportname(arr[i]).then(res => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
console.log("adadadadasdsad", this.arrr3, this.userlist);
@@ -1379,7 +1714,7 @@
},
selectpersonmsg(row) {
- this.personlist.map((res) => {
+ this.personlist.map(res => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
row.beneficiaryname = res.username;
@@ -1399,7 +1734,7 @@
},
getlistExternalperson() {
- listExternalperson().then((res) => {
+ listExternalperson().then(res => {
this.personlist = res.rows;
});
},
@@ -1432,7 +1767,7 @@
//涓撳璐瑰姵鍔℃墦鍗�
dayin(id) {
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1446,7 +1781,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
@@ -1457,7 +1792,7 @@
if (this.form.id) {
const id = this.form.id;
console.log(id);
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1471,14 +1806,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1486,7 +1821,7 @@
dayin1() {
if (this.form.id) {
const id = this.form.id;
- getdownloadLW(id).then((res) => {
+ getdownloadLW(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1500,14 +1835,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1515,7 +1850,7 @@
dayin2() {
if (this.form.id) {
const id = this.form.id;
- getdownloadYX(id).then((res) => {
+ getdownloadYX(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1529,14 +1864,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1544,7 +1879,7 @@
dayin3() {
if (this.form.id) {
const id = this.form.id;
- getdownloadSH(id).then((res) => {
+ getdownloadSH(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1558,14 +1893,14 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
},
@@ -1579,7 +1914,7 @@
dayin5() {
if (this.form.id) {
const id = this.form.id;
- getdownloadSS(id).then((res) => {
+ getdownloadSS(id).then(res => {
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
@@ -1593,7 +1928,7 @@
aEle.click();
this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
confirmButtonText: "纭畾",
- type: "success",
+ type: "success"
});
}
console.log("瀹跺睘浼欓浜ら�氳垂", res);
@@ -1601,10 +1936,10 @@
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
confirmButtonText: "纭畾",
- type: "warning",
+ type: "warning"
});
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 9538b5f..f5394c5 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -89,6 +89,23 @@
</el-row>
<el-row>
<el-col :span="5">
+ <el-form-item label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left">
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
<el-input
v-model="queryParams.donorname"
@@ -114,8 +131,7 @@
</div>
</el-col>
</el-row>
- </el-form
- >
+ </el-form>
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table
@@ -199,18 +215,18 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
- </template>
- </el-table-column>
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column
label="鎿嶄綔"
@@ -220,14 +236,6 @@
width="260px"
>
<template slot-scope="scope">
- <el-button
- v-if="scope.row.checkFlag == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
- >
<el-button
v-if="scope.row.checkFlag == 1"
size="mini"
@@ -923,8 +931,7 @@
import OrgSelecter from "@/views/project/components/orgselect";
import { getUserProfile } from "@/api/system/user";
import { getToken } from "@/utils/auth";
-import { setItem,grtItem,removeItem } from '@/utils/storage.js';
-
+import { setItem, grtItem, removeItem } from "@/utils/storage.js";
export default {
components: {
@@ -1017,6 +1024,20 @@
{
value: 2,
label: "鍏ㄩ儴"
+ }
+ ],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏌�"
+ },
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
}
],
// 鏌ヨ鍙傛暟
@@ -1117,9 +1138,9 @@
mounted() {
if (grtItem("medicalCostCheck")) {
this.queryParams = grtItem("medicalCostCheck");
- this.queryParams.APPLICATIONBEGTIME = '';
- this.queryParams.APPLICATIONENDTIME ='';
- };
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
+ }
this.selectReporters();
this.getlistOrganization();
//his.getlistUser();
@@ -1395,14 +1416,14 @@
});
}
},
- beforehandCheck(row){
+ beforehandCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
query: {
id: row.id,
businessType: "3",
- beforehandType:'1',
- operationType: "check",
+ beforehandType: "1",
+ operationType: "check"
}
});
},
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 1f9119c..70332bf 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/index.vue
@@ -70,6 +70,23 @@
</el-row>
<el-row>
<el-col :span="5">
+ <el-form-item label-width="120px" label="鐢宠鏉愭枡鐘舵��" prop="checkstatus" style="float: left">
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
<el-input
v-model="queryParams.donorname"
@@ -179,18 +196,18 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
- width="140"
- align="center"
- prop="checkstatus"
- >
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_stage_type"
- :value="scope.row.checkstatus"
- />
- </template>
- </el-table-column>
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkstatus"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
+ />
+ </template>
+ </el-table-column>
<el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column
label="鎿嶄綔"
@@ -208,14 +225,7 @@
@click="handleDetail(scope.row)"
>璇︽儏</el-button
>
- <el-button
- v-if="scope.row.checkFlag == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
- >
+
<el-button
v-if="scope.row.checkFlag == 1"
size="mini"
@@ -904,8 +914,7 @@
import OrgSelecter from "@/views/project/components/orgselect";
import { getUserProfile } from "@/api/system/user";
import { getToken } from "@/utils/auth";
-import { setItem,grtItem,removeItem } from '@/utils/storage.js';
-
+import { setItem, grtItem, removeItem } from "@/utils/storage.js";
export default {
components: {
@@ -998,6 +1007,20 @@
{
value: 2,
label: "鍏ㄩ儴"
+ }
+ ],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏌�"
+ },
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
}
],
// 鏌ヨ鍙傛暟
@@ -1098,9 +1121,9 @@
mounted() {
if (grtItem("officeExpenseCheck")) {
this.queryParams = grtItem("officeExpenseCheck");
- this.queryParams.APPLICATIONBEGTIME = '';
- this.queryParams.APPLICATIONENDTIME ='';
- };
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
+ }
this.selectReporters();
this.getlistOrganization();
//his.getlistUser();
@@ -1377,14 +1400,14 @@
});
}
},
- beforehandCheck(row){
+ beforehandCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
query: {
id: row.id,
businessType: "4",
- beforehandType:'1',
- operationType: "check",
+ beforehandType: "1",
+ operationType: "check"
}
});
},
diff --git a/src/views/project/fundcheck/performanceCheck/index.vue b/src/views/project/fundcheck/performanceCheck/index.vue
index 579e40d..3be9bfd 100644
--- a/src/views/project/fundcheck/performanceCheck/index.vue
+++ b/src/views/project/fundcheck/performanceCheck/index.vue
@@ -64,6 +64,28 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="5">
+ <el-form-item
+ label-width="120px"
+ label="鐢宠鏉愭枡鐘舵��"
+ prop="checkstatus"
+ style="float: left"
+ >
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ >
+ </el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
<el-row>
<el-col :span="4">
@@ -139,7 +161,7 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -168,14 +190,7 @@
@click="handleDetail(scope.row)"
>璇︽儏</el-button
>
- <el-button
- v-if="scope.row.checkFlag == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
- >
+
<el-button
v-if="scope.row.checkFlag == 1"
size="mini"
@@ -206,8 +221,6 @@
/>
</el-row>
</el-form>
-
-
</div>
</template>
@@ -372,6 +385,20 @@
label: "鍏ㄩ儴"
}
],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏍�"
+ },
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
+ }
+ ],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -437,8 +464,8 @@
mounted() {
if (grtItem("officeExpenseCheck")) {
this.queryParams = grtItem("officeExpenseCheck");
- this.queryParams.APPLICATIONBEGTIME = '';
- this.queryParams.APPLICATIONENDTIME ='';
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
}
this.getlistOrganization();
//his.getlistUser();
@@ -591,7 +618,7 @@
this.show = 3;
}
});
- },
+ }
}
};
</script>
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index 1068814..de93c46 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -158,7 +158,7 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkstatus"
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index b714ab3..bb80450 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -111,11 +111,11 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-select
v-model="form.checkstatus"
filterable
- placeholder="璇烽�夋嫨棰勫鐘舵��"
+ placeholder="璇烽�夋嫨鐢宠鏉愭枡鐘舵��"
>
<el-option
v-for="item in baselisttages"
@@ -917,14 +917,14 @@
v-if="operationType == 'check'"
>
<el-col :span="7">
- <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-form-item label="鐢宠鏉愭枡鐘舵��" prop="infoid">
<el-radio-group
v-model="form.checkstatus"
align="left"
:disabled="userprofile.nickName != '闄堟厱鍗�'"
>
- <el-radio label="1">寰呴瀹�</el-radio>
- <el-radio label="2">棰勫閫氳繃绛夊緟鏉愭枡</el-radio>
+ <el-radio label="1">寰呯敵璇锋潗鏂�</el-radio>
+ <el-radio label="2">鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡</el-radio>
<el-radio label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
</el-radio-group>
</el-form-item>
@@ -956,14 +956,14 @@
<el-button
type="primary"
@click="submitForm"
- v-if="operationType == 'edit' || beforehandType == '1'"
+ v-if="operationType == 'edit'||userprofile.nickName == '闄堟厱鍗�'"
>淇� 瀛�</el-button
>
<el-button
type="primary"
@click="checksubmit"
- v-if="operationType == 'check' && beforehandType != '1'"
- >鎻� 浜�</el-button
+ v-if="operationType == 'check'"
+ >鎻愪氦瀹℃牳</el-button
>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
</div>
@@ -1294,11 +1294,11 @@
baselisttages: [
{
id: 1,
- name: "寰呴瀹�"
+ name: "寰呯敵璇锋潗鏂�"
},
{
id: 2,
- name: "棰勫閫氳繃绛夊緟鏉愭枡"
+ name: "鐢宠鏉愭枡閫氳繃绛夊緟鏉愭枡"
},
{
id: 3,
@@ -1322,7 +1322,6 @@
persontype: null,
//鍒拌揪鍦�
arriveAddr: null,
- beforehandType: null,
headers: {
Authorization: "Bearer " + getToken()
},
@@ -1385,7 +1384,6 @@
let curId = this.$route.query.id;
let pos = this.$route.query.pos;
this.defaultperson = this.$route.query.routerparam;
- this.beforehandType = this.$route.query.beforehandType;
if (pos == 1) {
this.handleAdd(curId);
} else if (pos == 2) {
@@ -2158,8 +2156,12 @@
//鎻愪氦瀹℃牳鎰忚
checksubmit() {
- if (this.form.checkstatus != 3 && this.userprofile.nickName == "闄堟厱鍗�") {
- this.$modal.msgError("璇风‘璁ゆ敹鍒版潗鏂欏悗鍐嶆彁浜ゅ鏍革紒");
+ if (
+ this.form.checkstatus != 3 &&
+ this.userprofile.nickName == "闄堟厱鍗�" &&
+ this.checkObj.flowlevelone == 1
+ ) {
+ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
return;
}
let checkfundobj = {
@@ -2181,6 +2183,9 @@
this.reset();
this.open = false;
this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ this.submitForm();
+ }
// 鍏抽棴绐楀彛
this.$store.dispatch("tagsView/delView", this.$route);
this.$router.go(-1);
@@ -2236,8 +2241,9 @@
addReimbursementpayee(rbPayees[i]);
}
}
-
- this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!");
+ if (this.userprofile.nickName != "闄堟厱鍗�") {
+ this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔燂紒");
+ }
this.open = false;
// 鍏抽棴绐楀彛
@@ -2833,7 +2839,7 @@
"departure",
"destination",
"traffictype",
- "traffictype2",
+ "traffictype2"
];
columns.forEach((column, index) => {
if (index === 0) {
diff --git a/src/views/project/travelexpensecheck/index.vue b/src/views/project/travelexpensecheck/index.vue
index 1a6f73c..3a74a43 100644
--- a/src/views/project/travelexpensecheck/index.vue
+++ b/src/views/project/travelexpensecheck/index.vue
@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
+ <el-form-item label="瀹℃壒鐘舵��" prop="CHECKFLAG" style="float: left">
<el-select
v-model="queryParams.CHECKFLAG"
placeholder="璇烽�夋嫨"
@@ -61,6 +61,30 @@
>
<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-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label-width="120px"
+ label="鐢宠鏉愭枡鐘舵��"
+ prop="checkstatus"
+ style="float: left"
+ >
+ <el-select
+ v-model="queryParams.checkstatus"
+ placeholder="璇烽�夋嫨"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in checkmaterials"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -176,7 +200,7 @@
</template>
</el-table-column>
<el-table-column
- label="棰勫鐘舵��"
+ label="鐢宠鏉愭枡鐘舵��"
width="140"
align="center"
prop="checkstatus"
@@ -214,14 +238,7 @@
width="270"
>
<template slot-scope="scope">
- <el-button
- v-if="scope.row.checkFlag == 1"
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="beforehandCheck(scope.row)"
- >棰勫鏍�</el-button
- >
+
<el-button
size="mini"
type="text"
@@ -1289,6 +1306,20 @@
label: "鍏ㄩ儴"
}
],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏍�"
+ },
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
+ }
+ ],
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -1555,12 +1586,7 @@
this.open = true;
this.title = "娣诲姞鎶ラ攢鐢宠";
},
- beforehandCheck(row) {
- this.$router.push({
- path: "/finance/travelexpenseapply/travelexpensedetail/",
- query: { id: row.id, pos: 4, beforehandType: "1" }
- });
- },
+
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
--
Gitblit v1.9.3