From c0b29ee03f4f6c984f35618bfa669ba3f2ab6517 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 20 二月 2024 10:09:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/ethicalExpertFeeApply/index.vue | 820 +++++++++++++--------------------------------------------
1 files changed, 191 insertions(+), 629 deletions(-)
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index e07dd2b..176db36 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -1,63 +1,31 @@
<!-- -->
<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>
<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-input v-model="queryParams.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</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>
@@ -71,32 +39,18 @@
</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">
@@ -105,10 +59,7 @@
<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">
@@ -119,146 +70,54 @@
</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="applyTime" width="150px">
<template slot-scope="scope">
<span>{{
- parseTime(scope.row.createTime, "{y}-{m}-{d}")
+ parseTime(scope.row.applyTime, "{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"
- >
+ <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"
- />
+ <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>
@@ -269,134 +128,72 @@
</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-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker clearable style="width: 100%" v-model="form.applyTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<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-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>
@@ -415,294 +212,130 @@
</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>
@@ -752,139 +385,55 @@
<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) =>
+ <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
- >
+ " :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>
@@ -892,9 +441,7 @@
</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>
@@ -1022,7 +569,7 @@
username: [
{ required: true, message: "璇疯緭鍏ョ敵璇蜂汉", trigger: "blur" }
],
- createTime: [
+ applyTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" }
],
deptmentname: [
@@ -1177,8 +724,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 => {
@@ -1221,8 +768,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 => {
@@ -1250,7 +797,7 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(ids);
})
.then(() => {
@@ -1264,7 +811,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
handleup(row) {
@@ -1277,6 +824,8 @@
//鏌ユ壘鏄惁瀛樺湪鐧昏瀹屾垚璁板綍
//鍒ゆ柇鏄惁瀛樺湪涓婃姤璁板綍
row.recordstatus = "0";
+ var currenttime = new Date();
+ row.applyTime = currenttime.getFullYear() + "-" + (currenttime.getMonth()+1) + "-" + currenttime.getDate() + " " + currenttime.getHours() + ":" + currenttime.getMinutes() + ":" + currenttime.getSeconds();
updateFund(row).then(response => {
if (response.code == 200) {
@@ -1314,7 +863,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
/** 鎻愪氦鎸夐挳 */
@@ -1394,9 +943,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 => { });
}
}
});
@@ -1802,22 +1351,35 @@
//涓撳璐瑰姵鍔℃墦鍗�
dayin(id) {
getdownloadLL(id).then(res => {
- if (res.downloadUrl) {
- var fileUrl = res;
- //鑾峰彇褰撳墠缃戝潃
- var urlBase = process.env.VUE_APP_BASE_API;
- var curWWWPath = window.document.location.href;
- var pos = curWWWPath.indexOf(window.document.location.pathname);
- // 鍒涘缓a鏍囩
- var aEle = document.createElement("a");
- aEle.href =
- curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
- aEle.click();
- this.$alert("涓嬭浇鎴愬姛", "鎻愮ず", {
- confirmButtonText: "纭畾",
- type: "success"
+ var fileUrl = res;
+ //鑾峰彇褰撳墠缃戝潃
+ var urlBase = process.env.VUE_APP_BASE_API;
+ var curWWWPath = window.document.location.href;
+ var pos = curWWWPath.indexOf(window.document.location.pathname);
+ // 鍒涘缓a鏍囩
+ var aEle = document.createElement("a");
+ aEle.href =
+ curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
+ console.log(aEle.href);
+ // 娣诲姞Authorization澶撮儴
+ fetch(aEle.href, {
+ headers: this.headers
+ })
+ .then(response => {
+ // 灏嗘枃浠朵笅杞介摼鎺ヤ綔涓篵lob瀵硅薄杩涜涓嬭浇
+ return response.blob();
+ })
+ .then(blob => {
+ const url = window.URL.createObjectURL(new Blob([blob]));
+ console.log(url);
+ const link = document.createElement("a");
+ link.href = url;
+ const name=fileUrl["downloadName"]
+ link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
+ document.body.appendChild(link);
+ link.click();
+ link.parentNode.removeChild(link);
});
- }
});
},
@@ -1947,7 +1509,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() {},
+ handleUploadError() { },
remove(file) {
this.fileList.splice(this.fileList.indexOf(file), 1);
},
@@ -2042,13 +1604,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>
--
Gitblit v1.9.3