From 42deb933c04571578b8bf408ada9ca1dcc8d3dd8 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 20 七月 2023 18:21:26 +0800
Subject: [PATCH] 1
---
vue.config.js | 12
src/views/project/travelexpenseslist/index.vue | 2
src/views/project/donatebaseinfo/index.vue | 54 +-
src/views/project/travelexpenseslistrecord/index.vue | 27 +
src/views/project/fund/expertFeeFundApply/index.vue | 333 ++++++++++++++++++----
src/views/project/donateconsolationfundlist/index.vue | 4
src/views/project/medicalcostfundapplycheck/index.vue | 100 ++++--
package.json | 1
public/favicon.ico | 0
src/views/project/externalperson/index.vue | 120 ++++----
src/views/project/organallocation/index.vue | 43 --
src/views/project/travelexpenseslist/Modifydetails/index.vue | 17 -
src/views/project/fund/medicalCostFundApply/index.vue | 89 +++--
src/views/project/organization/index.vue | 5
14 files changed, 521 insertions(+), 286 deletions(-)
diff --git a/package.json b/package.json
index 83be6c2..d9095d4 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,6 @@
"jsencrypt": "3.0.0-rc.1",
"moment": "^2.29.3",
"nprogress": "0.2.0",
- "pdfjs-dist": "^3.8.162",
"prettier": "^1.8.1",
"quill": "1.3.7",
"screenfull": "5.0.2",
diff --git a/public/favicon.ico b/public/favicon.ico
index d8375f0..e263760 100644
--- a/public/favicon.ico
+++ b/public/favicon.ico
Binary files differ
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index c79b633..7abbde0 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -167,15 +167,7 @@
<el-row>
<el-col :span="6">
<el-form-item align="left" label="濮撳悕" prop="name">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ュ鍚�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
- </el-select>
+ <el-input v-model="form.name" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -191,8 +183,12 @@
<el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="鍥界睄" prop="nationality">
+ <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item>
+ </el-col>
</el-row>
-
<el-row>
<el-col :span="6">
<el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
@@ -206,9 +202,27 @@
<el-form-item label="璇佷欢鍙风爜" prop="idcardno">
<el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" @blur="updateMessage" />
- </el-form-item> </el-col><el-col :span="6">
- <el-form-item label="鍥界睄" prop="nationality">
- <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
+ </el-form-item> </el-col>
+ <el-col :span="6">
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="骞撮緞" prop="age">
+ <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+ <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
+ </el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
@@ -219,20 +233,7 @@
</el-select>
</el-form-item>
</el-col>
- </el-row>
-
- <el-row>
<el-col :span="6">
- <el-form-item label="骞撮緞" prop="age">
- <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
- <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍑虹敓鏃ユ湡">
- </el-date-picker>
- </el-form-item> </el-col><el-col :span="6">
<el-form-item label="瀛﹀巻" prop="education">
<el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
<el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
@@ -241,7 +242,6 @@
</el-form-item>
</el-col>
</el-row>
-
<el-row>
<el-col :span="12">
<el-form-item label="浣忓潃" prop="residenceaddress">
diff --git a/src/views/project/donateconsolationfundlist/index.vue b/src/views/project/donateconsolationfundlist/index.vue
index eced10a..a9bcf63 100644
--- a/src/views/project/donateconsolationfundlist/index.vue
+++ b/src/views/project/donateconsolationfundlist/index.vue
@@ -60,8 +60,8 @@
</template>
</el-table-column>
<el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
- <!--<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />-->
+ <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
+ <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />-->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index 8f411ef..e2e6e92 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -1,16 +1,16 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="浜哄憳缂栧彿" prop="userno">
- <el-input v-model="queryParams.userno" placeholder="璇疯緭鍏ヤ汉鍛樼紪鍙�" clearable size="small"
+ <el-form-item label="璐﹀彿缂栧彿" prop="userno">
+ <el-input v-model="queryParams.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="浜哄憳鍚嶇О" prop="username">
- <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ヤ汉鍛樺悕绉�" clearable size="small"
+ <el-form-item label="璐﹀彿鍚嶇О" prop="username">
+ <el-input v-model="queryParams.username" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" clearable size="small"
@keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="浜哄憳绫诲埆" prop="usertype">
- <el-select v-model="queryParams.usertype" placeholder="璇烽�夋嫨浜哄憳绫诲埆" clearable size="small">
+ <el-form-item label="璐﹀彿绫诲埆" prop="usertype">
+ <el-select v-model="queryParams.usertype" placeholder="璇烽�夋嫨璐﹀彿绫诲埆" clearable size="small">
<el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
@@ -42,26 +42,32 @@
<el-table v-loading="loading" :data="externalpersonList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="浜哄憳缂栧彿" align="center" prop="userno" />
- <el-table-column label="浜哄憳濮撳悕" align="center" prop="username" />
- <el-table-column label="韬唤璇佸彿" width="200" align="center" prop="idcardno" />
- <el-table-column label="鎬у埆" align="center" prop="sex">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> </template></el-table-column>
- <el-table-column label="鑱岀О" align="center" prop="title">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.sys_professionaltitle" :value="scope.row.title" /> </template></el-table-column>
- <el-table-column label="鍗曚綅鍚嶇О" width="200" align="center" prop="unitname" />
- <el-table-column label="鍗曚綅宸ヤ綔缂栧彿" align="center" prop="personnelunitno" />
- <el-table-column label="鑱旂郴鐢佃瘽" width="200" align="center" prop="telephone" />
- <el-table-column label="鑱旂郴鍦板潃" width="250" align="center" prop="address" />
- <el-table-column label="浜哄憳绫诲埆" align="center" prop="usertype">
+ <el-table-column label="璐﹀彿绫诲埆" align="center" prop="usertype">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_UserType" :value="scope.row.usertype" />
</template>
</el-table-column>
- <el-table-column label="鍦ㄨ亴鐘舵��" align="center" prop="userstatus"><template slot-scope="scope">
- <dict-tag :options="dict.type.sys_0_1" :value="scope.row.userstatus" /> </template></el-table-column>
+ <el-table-column label="璐﹀彿缂栧彿" align="center" prop="userno" />
+ <el-table-column label="璐﹀彿鍚嶇О" align="center" prop="username" />
+ <el-table-column label="韬唤璇佸彿" width="200" align="center" prop="idcardno" />
+ <el-table-column label="鑱岀О" align="center" prop="title">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_professionaltitle" :value="scope.row.title" /> </template></el-table-column>
+ <el-table-column label="鍗曚綅鍚嶇О" width="250" align="center" prop="unitname" />
+ <!--
+ <el-table-column label="鎬у埆" align="center" prop="sex">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鍗曚綅宸ヤ綔缂栧彿" align="center" prop="personnelunitno" />
+ <el-table-column label="鍦ㄨ亴鐘舵��" align="center" prop="userstatus">
+ <template slot-scope="scope">
+ <dict-tag :options="dict.type.sys_0_1" :value="scope.row.userstatus" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鑱旂郴鐢佃瘽" width="200" align="center" prop="telephone" />
+ <el-table-column label="鑱旂郴鍦板潃" width="250" align="center" prop="address" />-->x
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -76,53 +82,51 @@
@pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀瑰鍥村崟浣嶄汉鍛樺璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row><el-col :span="12">
- <el-form-item label="浜哄憳缂栧彿" prop="userno">
- <el-input v-model="form.userno" placeholder="璇疯緭鍏ヤ汉鍛樼紪鍙�" /> </el-form-item></el-col><el-col
- :span="12"><el-form-item label="浜哄憳绫诲埆" prop="usertype">
- <el-select v-model="form.usertype" placeholder="璇烽�夋嫨浜哄憳绫诲埆">
+ <el-row><el-col :span="12"><el-form-item label="璐﹀彿绫诲埆" prop="usertype">
+ <el-select v-model="form.usertype" placeholder="璇烽�夋嫨璐﹀彿绫诲埆">
<el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
- </el-select> </el-form-item></el-col></el-row><el-row>
+ </el-select> </el-form-item></el-col><el-col :span="12">
+ <el-form-item label="璐﹀彿缂栧彿" prop="userno">
+ <el-input v-model="form.userno" placeholder="璇疯緭鍏ヨ处鍙风紪鍙�" /> </el-form-item></el-col></el-row><el-row>
<el-col :span="12">
- <el-form-item label="浜哄憳濮撳悕" prop="username">
- <el-input v-model="form.username" placeholder="璇疯緭鍏ヤ汉鍛樺鍚�" /> </el-form-item></el-col>
- <el-col :span="12">
+ <el-form-item label="璐﹀彿鍚嶇О" prop="username">
+ <el-input v-model="form.username" placeholder="璇疯緭鍏ヨ处鍙峰悕绉�" /> </el-form-item></el-col><el-col :span="12">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
+ <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item></el-col>
+ </el-row><el-row v-if="form.usertype != 'org'"><el-col :span="24">
+ <el-form-item label="韬唤璇佸彿" prop="idcardno">
+ <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item></el-col></el-row><el-row
+ v-if="form.usertype != 'org'"><el-col :span="12">
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
+ <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option> </el-select></el-form-item></el-col><el-col :span="12"><el-form-item
+ label="鑱岀О" prop="title">
+ <el-select v-model="form.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option> </el-select>
+ </el-form-item> </el-col></el-row><el-row v-if="form.usertype != 'org'"><el-col :span="24">
+ <el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitname">
+ <el-input v-model="form.unitname" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" /> </el-form-item></el-col></el-row><el-row
+ v-if="form.usertype != 'org'"><el-col :span="12">
+ <el-form-item label="鍗曚綅浜哄憳缂栧彿" prop="personnelunitno">
+ <el-input v-model="form.personnelunitno" placeholder="璇疯緭鍏ュ崟浣嶄汉鍛樼紪鍙�" />
+ </el-form-item></el-col><el-col :span="12">
<el-form-item label="鍦ㄨ亴鐘舵��" prop="userstatus">
<el-radio-group v-model="form.userstatus">
<el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
}}</el-radio>
</el-radio-group>
- </el-form-item></el-col></el-row><el-row><el-col :span="24">
- <el-form-item label="韬唤璇佸彿" prop="idcardno">
- <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" /> </el-form-item></el-col></el-row><el-row><el-col
- :span="12">
- <el-form-item label="鎬� 鍒�" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆">
- <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option> </el-select></el-form-item></el-col><el-col :span="12">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="telephone">
- <el-input v-model="form.telephone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> </el-form-item></el-col></el-row><el-row><el-col
- :span="24">
- <el-form-item label="鑱旂郴鍦板潃" prop="address">
- <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item></el-col></el-row><el-row><el-col
- :span="24">
- <el-form-item label="鍗曚綅鍚嶇О" prop="unitname">
- <el-input v-model="form.unitname" placeholder="璇疯緭鍏ュ崟浣嶅悕绉�" /> </el-form-item></el-col></el-row><el-row><el-col
- :span="12">
- <el-form-item label="鍗曚綅浜哄憳缂栧彿" prop="personnelunitno">
- <el-input v-model="form.personnelunitno" placeholder="璇疯緭鍏ュ崟浣嶄汉鍛樼紪鍙�" /> </el-form-item></el-col><el-col
- :span="12"><el-form-item label="鑱� 绉�" prop="title">
- <el-select v-model="form.title" placeholder="璇烽�夋嫨浜哄憳鑱岀О">
- <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option> </el-select>
- </el-form-item> </el-col></el-row><el-row><el-col :span="24"><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
+ </el-form-item></el-col></el-row><el-row><el-col :span="24"><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
<el-input v-model="form.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛屽悕绉�" /> </el-form-item></el-col><el-col
:span="24"><el-form-item label="閾惰鍗″彿" prop="bankcardno">
<el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛屽崱鍙�" />
- </el-form-item></el-col></el-row>
+ </el-form-item></el-col></el-row><el-row><el-col :span="24">
+ <el-form-item label="鑱旂郴鍦板潃" prop="address">
+ <el-input v-model="form.address" placeholder="璇疯緭鍏ヨ仈绯诲湴鍧�" /> </el-form-item></el-col></el-row>
<!--<el-row><el-col :span="24"><el-form-item label="寮�鎴锋敮琛�" prop="branchbankname">
<el-input v-model="form.branchbankname" placeholder="璇疯緭鍏ュ紑鎴锋敮琛�" /> </el-form-item></el-col></el-row>-->
</el-form>
@@ -191,7 +195,6 @@
getList() {
this.loading = true;
listExternalperson(this.queryParams).then((response) => {
- console.log("listExternalperson", response.rows);
this.externalpersonList = response.rows;
this.total = response.total;
this.loading = false;
@@ -265,6 +268,7 @@
});
} else {
addExternalperson(this.form).then((response) => {
+ console.log("addExternalperson", response);
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index d4b0c3f..c99482d 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -9,7 +9,6 @@
@keyup.enter.native="handleQuery" />
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-form-item label="鎹愮尞杩涘害" prop="recordstate">
<el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
@@ -87,14 +86,11 @@
</el-table-column>
<el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
<el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
- <!-- <el-table-column
- label="鐢宠閲戦"
- align="center"
- prop="amountrequested"
- width="120px"
- />
+ <!--
+ <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" /> -->
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
+ -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
@@ -284,7 +280,7 @@
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in arrr3"
+ v-for="item in expertlist"
:key="item.reportNo"
:label="item.reportName"
:value="item.reportName"
@@ -439,21 +435,29 @@
</div>
</el-dialog>
- <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'淇℃伅淇敼'" width="500px"
+ <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'瀵煎叆淇℃伅'" width="500px"
style="text-align: center" v-loading="loading">
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
- <el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
+ <el-col :span="24" v-if="showDetailInfoDialogType == 'name'">
+ <el-form-item label="璇烽�夋嫨涓撳淇℃伅锛�" prop="expertfrom">
+ <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
+ <el-radio label="1">涓撳搴�</el-radio>
+ <el-radio label="2">鏂板涓撳</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="showDetailInfoDialogType == 'name' && expertfrom == '1'">
<el-form-item 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 v-for="item in expertlist" :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-col :span="24" v-if="showDetailInfoDialogType == 'unit'">
<el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="80px">
<el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
style="width: 100%">
@@ -463,9 +467,65 @@
</el-form-item>
</el-col>
</el-row>
+ <el-row>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
+ <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px">
+ <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
+ <el-row>
+ <el-col :span="12" v-if="expertfrom == '2'">
+ <el-form-item label="浜哄憳绫诲埆" prop="usertype" label-width="80px">
+ <el-select v-model="funddetailForm.usertype" placeholder="蹇呭～椤�">
+ <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ -->
+ <el-row>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
+ <el-select v-model="funddetailForm.expertunitno" 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>
+ </el-row>
+ <el-row>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
+ <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24" v-if="expertfrom == '2'">
+ <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<span slot="footer" class="dialog-footer">
- <el-button @click="detailInfoDialogShow = false">鍙� 娑�</el-button>
+ <el-button @click="showDetailInfoDialog = false">鍙� 娑�</el-button>
<el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
@@ -477,7 +537,7 @@
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
import {
listDonatebaseinfo,
- getDonatebaseinfo,
+ getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import {
onelistFund,
@@ -493,7 +553,7 @@
getdownloadYX,
getdownloadBX,
batchUploadFund,
- getdetailsByItemId,
+ getdetailsByItemId
} from "@/api/project/fund";
import {
onelistFunds,
@@ -520,7 +580,7 @@
listOrganization,
getOrganization,
listReportname,
- listUser,
+ listUser
} from "@/api/project/organization";
import {
listExternalperson,
@@ -529,7 +589,7 @@
delExternalperson,
addExternalperson,
updateExternalperson,
- exportExternalperson,
+ exportExternalperson
} from "@/api/project/externalperson";
import { getUserProfile } from "@/api/system/user";
import Li_area_select from "@/components/Address";
@@ -545,25 +605,24 @@
},
name: "fundApply",
dicts: [
- "sys_consolationfundlevel",
- "sys_OrganizationType",
+ //"sys_consolationfundlevel",
+ //"sys_OrganizationType",
"sys_DonationStatus",
- "sys_depositbank",
- "sys_FamilyRelation",
- "sys_IDType",
- "sys_ConsolationType",
- "sys_fund_type",
- "sys_finsubject",
- "sys_financeitemtype",
- "sys_expensetype",
+ //"sys_depositbank",
+ //"sys_FamilyRelation",
+ //"sys_IDType",
+ //"sys_ConsolationType",
+ //"sys_fund_type",
+ //"sys_finsubject",
+ //"sys_financeitemtype",
+ //"sys_expensetype",
"sys_recordstatus",
+ "sys_professionaltitle"
],
data() {
//杩欓噷瀛樻斁鏁版嵁
return {
- arrr2: [],
- arrr3: [],
- currentApplyType: "1",
+
// 閬僵灞�
loading: true,
// 瀵煎嚭閬僵灞�
@@ -592,17 +651,29 @@
applytype: "1",
createBy: null,
},
-
+ // 琛ㄥ崟鍙傛暟
+ form: {},
+ //鎵�鏈変汉鍛樿〃
+ personlist: [],
+ expertQueryParam: {
+ pageNum: 1,
+ pageSize: 10000,
+ userno: null,
+ username: null,
+ usertype: null,
+ },
+ //鐢宠鍗曠被鍨�
+ currentApplyType: "1",
+ //涓撳鍒楄〃
+ expertlist: [],
+ //涓撳璐归�夋嫨锛�1鏄笓瀹跺簱锛�2鏄柊澧�
+ expertfrom: "1",
//璁＄畻涓◣鍙傛暟
taxParam: {
beneficiaryNo: '',
money: '0',
startTime: '',
},
-
- // 琛ㄥ崟鍙傛暟
- form: {},
- personlist: [],
// 琛ㄥ崟鏍￠獙
rules: {
username: [
@@ -652,18 +723,54 @@
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
+
+
unitList: [],
dialogType: "edit",
fundflowList: [],
- detailInfoDialogShow: false,
- detailInfoDialogShowType: "",
+ showDetailInfoDialog: false,
+ showDetailInfoDialogType: "",
funddetailForm: {
+ index: null,
beneficiaryname: null,
beneficiaryno: null,
unitno: null,
unitname: null,
- index: null,
+ expertname: null,
+ expertidcardno: null,
+ expertunitno: null,
+ expertunitname: null,
+ experttitle: null,
+ expertdepositbank: null,
+ expertbankcardno: null,
+ },
+ expertform: {
+ id: null,
+ address: null,
+ bankcardno: null,
+ branchbankname: null,
+ createBy: null,
+ createTime: null,
+ del_flag: null,
+ depositbank: null,
+ idcardno: null,
+ personnelunitno: null,
+ pym: null,
+ remark: null,
+ searchValue: null,
+ sex: null,
+ telephone: null,
+ title: null,
+ unitname: null,
+ unitno: null,
+ updateBy: null,
+ updateTime: null,
+ username: null,
+ userno: null,
+ userstatus: 1,
+ usertype: null,
+ wbm: null,
},
//闄勪欢鍒楄〃
@@ -687,13 +794,22 @@
//鏂规硶闆嗗悎
methods: {
ShowDetailDialog(spoce, showType) {
+ this.expertfrom = "1";
this.funddetailForm.index = spoce.$index;
this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
this.funddetailForm.unitno = spoce.row.unitno;
this.funddetailForm.unitname = spoce.row.unitname;
- this.detailInfoDialogShow = true;
- this.detailInfoDialogShowType = showType;
+ this.funddetailForm.expertname = "";
+ this.funddetailForm.expertidcardno = "";
+ this.funddetailForm.expertunitno = "";
+ this.funddetailForm.expertunitname = "";
+ this.funddetailForm.experttitle = "";
+ this.funddetailForm.expertdepositbank = "";
+ this.funddetailForm.expertbankcardno = "";
+
+ this.showDetailInfoDialog = true;
+ this.showDetailInfoDialogType = showType;
},
ConfirmDetailDialog() {
@@ -701,23 +817,90 @@
let tempName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetails[tempIndex];
- if (this.detailInfoDialogShowType == "name") {
- this.personlist.map((res) => {
- if (tempName == res.username) {
- singleDetail.beneficiaryno = res.userno;
- singleDetail.beneficiaryname = res.username;
- singleDetail.bankcardno = res.bankcardno;
- singleDetail.branchbankname = res.branchbankname;
- singleDetail.depositbank = res.depositbank;
- singleDetail.idcardno = res.idcardno;
- singleDetail.phone = res.telephone;
- singleDetail.title = res.title;
- singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
- }
- });
- } else if (this.detailInfoDialogShowType == "unit") {
+ if (this.showDetailInfoDialogType == "name") {
+
+ if (this.expertfrom == "1") {
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map((res) => {
+ if (tempName == res.username) {
+ console.log("閫夋嫨涓撳", res);
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
+ } else {
+ //淇濆瓨鏂板涓撳
+ this.expertform.id = null;
+ this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1;
+ this.expertform.usertype = "expert";
+ this.expertform.username = this.funddetailForm.expertname;
+ this.expertform.idcardno = this.funddetailForm.expertidcardno;
+ this.expertform.sex = null;
+ this.expertform.telephone = null;
+ this.expertform.address = null;
+ this.expertform.wbm = null;
+ this.expertform.pym = null;
+
+ this.expertform.unitno = this.funddetailForm.expertunitno;
+ try {
+ let unitIndex = this.unitList.findIndex(
+ (item) => this.expertform.unitno == item.organizationid
+ );
+ if (unitIndex > -1) {
+ this.expertform.unitname = this.unitList[unitIndex].organizationname;
+ } else {
+ this.expertform.unitname = this.expertform.unitno;
+ }
+ } catch {
+ this.expertform.unitname = this.expertform.unitno;
+ }
+ this.expertform.title = this.funddetailForm.experttitle;
+ this.expertform.personnelunitno = null;
+
+ this.expertform.depositbank = this.funddetailForm.expertdepositbank;
+ this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
+ this.expertform.branchbankname = null;
+ this.expertform.remark = null;
+ this.expertform.del_flag = "0";
+
+ addExternalperson(this.expertform).then((response) => {
+ if (response.code == 200) {
+ this.$modal.msgSuccess("鏂板涓撳淇℃伅鎴愬姛锛�");
+
+ listExternalperson().then((res) => {
+ this.personlist = res.rows;
+ console.log("new personlist", this.personlist);
+ //浠庝笓瀹跺垪琛ㄨ幏鍙栦俊鎭�
+ this.personlist.map((res) => {
+ if (res.username == this.funddetailForm.expertname) {
+ console.log("鏂板涓撳", res);
+ singleDetail.beneficiaryno = res.userno;
+ singleDetail.beneficiaryname = res.username;
+ singleDetail.bankcardno = res.bankcardno;
+ singleDetail.branchbankname = res.branchbankname;
+ singleDetail.depositbank = res.depositbank;
+ singleDetail.idcardno = res.idcardno;
+ singleDetail.phone = res.telephone;
+ singleDetail.title = res.title;
+ singleDetail.unitname = res.unitname;
+ singleDetail.unitno = parseInt(res.unitno);
+ }
+ });
+ });
+ }
+ });
+ }
+
+ } else if (this.showDetailInfoDialogType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
try {
let unitIndex = this.unitList.findIndex(
@@ -734,7 +917,7 @@
}
this.fundDetails[tempIndex] = singleDetail;
- this.detailInfoDialogShow = false;
+ this.showDetailInfoDialog = false;
},
handleup(row) {
@@ -1174,7 +1357,12 @@
for (let k = 0; k < this.fundDetails.length; k++) {
let tempDetail = this.fundDetails[k];
if (tempDetail.itemid == null) {
- this.$modal.msgWarning("鏈嶅姟椤圭洰鏄繀閫夐」锛岃閫夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+
+ if (tempDetail.servicesscope == null) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�");
return;
}
@@ -1203,7 +1391,7 @@
//鑾峰彇鍙傛暟
this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
this.taxParam.money = tempDetail.amount.toString();
- this.taxParam.startTime = this.form.createTime.substring(0, 10);
+ this.taxParam.startTime = this.form.createTime.substring(0, 10);
getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
if (res.code == 200) {
tempDetail.taxamount = res.data;
@@ -1220,7 +1408,6 @@
this.taxParam.startTime = this.form.createTime.substring(0, 10);
getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
- console.log("",res);
if (res.code == 200) {
tempDetail.taxamount = res.data.nowTax;
tempDetail.amount = res.data.nowTaxBeforeMoney;
@@ -1338,18 +1525,18 @@
//涓撳浜哄憳鍒楄〃
selectReporters() {
- let arr = ["expert"];
- let arrreportlist = [];
- for (let i = 0; i < arr.length; i++) {
- this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
+ let types = ["expert"];
+ let templist = [];
+ for (let i = 0; i < types.length; i++) {
+ templist = [];
+ listReportname(types[i]).then((res) => {
for (let j = 0; j < res.data.length; j++) {
- this.arrr2.push({
+ templist.push({
reportName: res.data[j].reportName,
reportNo: res.data[j].reportNo,
});
}
- this.arrr3 = this.arrr3.concat(this.arrr2);
+ this.expertlist = this.expertlist.concat(templist);
});
}
},
@@ -1426,6 +1613,10 @@
// });
// });
}
+
+ if (this.fundDetails.length == 0) {
+ this.addRow();
+ }
});
});
},
@@ -1468,6 +1659,10 @@
servicesscope: this.fundDetails[m].servicesscope,
});
}
+
+ if (this.fundDetails.length == 0) {
+ this.addRow();
+ }
});
});
},
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue
index 948b666..2a235b4 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostFundApply/index.vue
@@ -55,6 +55,7 @@
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
v-hasPermi="['project:medicalfund:add']">鍖诲鎴愭湰鐢宠</el-button>
</el-col>
+
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
<el-input v-model="curCase.donorno" :disabled="true"></el-input>
@@ -167,7 +168,7 @@
<el-form-item label="鐢宠閲戦" prop="amountrequested">
<el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
</el-form-item>
- </el-col> <el-col :span="5">
+ </el-col> <!--<el-col :span="5">
<el-form-item label="绋庡墠閲戦" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
@@ -179,13 +180,13 @@
</el-col>
<el-col :span="5">
<el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!--<el-input v-if="0" v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/>-->
+ <el-input v-if="0" v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/>
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
- </el-col>
+ </el-col>-->
<!--
<el-col :span="5">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
@@ -318,7 +319,7 @@
" />
</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>
@@ -423,11 +424,11 @@
<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">
+ :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>
@@ -452,7 +453,7 @@
</div>
</el-dialog>
- <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'淇℃伅淇敼'"
+ <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>
@@ -466,11 +467,11 @@
</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
+ <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-option v-for="(item, index) in bankaccountlist" :key="index" :label="item.reportName"
+ :value="item.reportNo"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -588,6 +589,7 @@
reportername: null,
reporttime: null,
},
+
fundQueryParam: {
pageNum: 1,
pageSize: 100,
@@ -631,15 +633,18 @@
// 寮瑰嚭灞傛爣棰�
title: "",
- userlist: [],
itemArr: [],
- reporters: [],
+ //鐢ㄦ埛
+ userlist: [],
+ //閾惰璐﹀彿
+ bankaccountlist: [],
+ //鏈烘瀯鍗曚綅
+ unitList: [],
//璐圭敤绫诲瀷鏁扮粍
fundtypeArr: [],
defaultperson: {},
fundblock: [],
fundtypeArrAll: [],
- unitList: [],
dialogType: "edit",
detailInfoDialogShow: false,
@@ -656,10 +661,10 @@
fileList: [],
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
-
headers: {
Authorization: "Bearer " + getToken(),
},
+
};
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -677,6 +682,7 @@
this.detailInfoDialogShow = true;
this.detailInfoDialogShowType = showType;
},
+
ConfirmDetailDialog() {
let tempIndex = this.funddetailForm.index;
let tempName = this.funddetailForm.beneficiaryname;
@@ -694,7 +700,7 @@
singleDetail.phone = res.telephone;
singleDetail.title = res.title;
singleDetail.unitname = res.unitname;
- singleDetail.unitno = parseInt(res.unitno);
+ singleDetail.unitno = res.unitno;
} else {
singleDetail.beneficiaryname = tempName;
singleDetail.beneficiaryno = tempName;
@@ -702,13 +708,17 @@
});
} else if (this.detailInfoDialogShowType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
+ console.log("this.funddetailForm", this.funddetailForm);
try {
- let unitIndex = this.unitList.findIndex(
- (item) => singleDetail.unitno == item.organizationid
+ let unitIndex = this.bankaccountlist.findIndex(
+ (item) => singleDetail.unitno == item.reportNo
);
+
+ console.log("this.bankaccountlist[unitIndex]", this.bankaccountlist[unitIndex]);
if (unitIndex > -1) {
- singleDetail.unitno = this.unitList[unitIndex].organizationid;
- singleDetail.unitname = this.unitList[unitIndex].organizationname;
+ singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
+ singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
+ singleDetail.bankcardno = this.bankaccountlist[unitIndex].bankcardno;
} else {
singleDetail.unitname = singleDetail.unitno;
}
@@ -716,6 +726,7 @@
singleDetail.unitname = singleDetail.unitno;
}
}
+ console.log("singleDetail",singleDetail);
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
@@ -1032,11 +1043,11 @@
//鍒ゆ柇鍗曚綅 unitSel
// try {
// //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- // let unitIndex = this.unitList.findIndex(
- // (item) => tempDetail.unitno == item.organizationid
+ // let unitIndex = this.bankaccountlist.findIndex(
+ // (item) => tempDetail.unitno == item.reportNo
// );
// if (unitIndex > -1) {
- // tempDetail.unitname = this.unitList[unitIndex].organizationname;
+ // tempDetail.unitname = this.bankaccountlist[unitIndex].reportName;
// } else {
// tempDetail.unitname = tempDetail.unitno;
// }
@@ -1129,10 +1140,11 @@
});
},
- selectReporters() {
+ getBankAccount() {
//涓撳浜哄憳鍒楄〃
- listReportname("gdc").then((res) => {
- this.reporters = res.data;
+ listReportname("org").then((res) => {
+ this.bankaccountlist = res.data;
+ console.log("this.bankaccountlist", this.bankaccountlist);
});
},
@@ -1378,11 +1390,14 @@
},
getUnitList() {
- listOrganization(3).then((response) => {
- for (let i = 0; i < response.rows.length; i++) {
+ listOrganization(3).then((res) => {
+ console.log("listOrganization", res);
+ for (let i = 0; i < res.rows.length; i++) {
this.unitList.push({
- organizationid: response.rows[i].organizationid,
- organizationname: response.rows[i].organizationname,
+ organizationid: res.rows[i].organizationid,
+ organizationname: res.rows[i].organizationname,
+ bankname: res.rows[i].bankname,
+ bankaccount: res.rows[i].bankaccount,
});
}
});
@@ -1461,7 +1476,7 @@
//鏂囦欢涓婁紶
handleUploadError() { },
- remove(file) {
+ handleremove(file) {
this.fileList.splice(this.fileList.indexOf(file), 1)
},
handleExceed() {
@@ -1469,6 +1484,9 @@
},
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
+ console.log("response", response);
+ console.log("file", file);
+ console.log("fileList", fileList);
//鑾峰彇闄勪欢淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
@@ -1491,15 +1509,16 @@
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
- this.getUnitList();
this.getList();
this.getBaseInfoList();
- this.getlistUser();
+
this.getCurFundType();
+ this.getlistUser();
+ // this.getUnitList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
- this.selectReporters();
+ this.getBankAccount();
this.getUsermsg();
},
beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
diff --git a/src/views/project/medicalcostfundapplycheck/index.vue b/src/views/project/medicalcostfundapplycheck/index.vue
index ffa2d20..070533a 100644
--- a/src/views/project/medicalcostfundapplycheck/index.vue
+++ b/src/views/project/medicalcostfundapplycheck/index.vue
@@ -48,7 +48,7 @@
<el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="140px" />
<el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
<el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
+ <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />-->
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
<!--<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" />
@@ -131,7 +131,7 @@
<el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
<!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
:disabled="form.id != null">{{ dict.label }}</el-radio>-->
- <el-radio v-model="form.applytype" label="3">浼︾悊瀹℃煡涓撳璐圭敵璇�</el-radio>
+ <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -168,7 +168,7 @@
<el-form-item label="鍚堣閲戦" prop="amountrequested">
<el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
</el-form-item>
- </el-col>
+ </el-col><!--
<el-col :span="5">
<el-form-item label="绋庡墠閲戦" prop="amountrequested">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
@@ -181,13 +181,12 @@
</el-col>
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
- <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
<el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
- </el-col>
+ </el-col>-->
</el-row>
<el-row>
<el-col :span="4">
@@ -333,6 +332,21 @@
</el-table-column>
</el-table>
</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="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 style="margin-top: 5px; margin-bottom: 5px">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳浜�" align="center" prop="checkusername" />
@@ -433,6 +447,7 @@
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import { getUserProfile } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
export default {
components: {
@@ -602,6 +617,15 @@
approveLevel: 5,
fundtypeArrAll: [],
dialogType: "edit",
+
+ //闄勪欢鍒楄〃
+ fileList: [],
+ //涓婁紶闄勪欢璺緞
+ uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
+ headers: {
+ Authorization: "Bearer " + getToken(),
+ },
+
};
},
watch: {},
@@ -618,7 +642,6 @@
},
methods: {
selectapplication() {
- console.log("鏃堕棿", this.createTime);
this.queryParams.APPLICATIONBEGTIME = this.createTime[0];
this.queryParams.APPLICATIONENDTIME = this.createTime[1];
},
@@ -626,8 +649,6 @@
this.loading = true;
// this.queryParams.params = {};
listbypower(this.queryParams).then((res) => {
- //console.log("鏍规嵁鏉冮檺鏄剧ず鍒楄〃", res);
- console.log("鏍规嵁鏉冮檺鏄剧ず鍒楄〃", res);
this.loading = false;
let list = res.rows;
let arr = [];
@@ -638,7 +659,6 @@
dundcheck() {
// this.$em
this.dialogOpen = false;
- console.log("1234567", this.newobj, this.form.flowconclusion);
let checkfundobj = {
flowconclusion: this.newobj.flowlevelone,
flowcontent: this.newobj.flowconclusion,
@@ -646,8 +666,6 @@
};
checkfund(checkfundobj).then((res) => {
this.reset();
- this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
- console.log("瀹℃牳璐圭敤", res);
this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
this.getlistbypower();
});
@@ -782,12 +800,9 @@
change(scope) { },
autodonorno() {
listDonatebaseinfo().then((res) => {
- // console.log("鎵�鏈夋崘鐚�呭垪琛細",res);
res.rows.forEach((data) => {
- // console.log("data:",data);
if (this.form.doname === data.name) {
this.form.donorno = data.donorno;
- console.log(this.form.donorno);
} else {
// this.$modal.alertWarning("瀵逛笉璧凤紝鏃犺鎹愮尞浜�");
}
@@ -847,6 +862,9 @@
applytype: "3",
};
this.resetForm("form");
+
+ //娓呯┖闄勪欢
+ this.fileList = []
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -868,7 +886,6 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- console.log("222", this.curCase);
if (this.curCase.id) {
this.istrue += 2;
this.reset();
@@ -908,6 +925,8 @@
getFund(id).then((response) => {
this.form = response.data;
this.form.name = this.curCase.name;
+ //闄勪欢澶勭悊
+ this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
getownFundDetail(id).then((res) => {
this.loading = false;
@@ -916,7 +935,6 @@
this.fundDetailArr[m].itemArr = [];
this.getItemArr(m, this.fundDetailArr[m]);
}
- console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -942,6 +960,9 @@
getFund(row.id).then((response) => {
this.form = response.data;
this.form.name = this.curCase.name;
+ //闄勪欢澶勭悊
+ this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
getownFundDetail(row.id).then((res) => {
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -953,7 +974,6 @@
},
select(row) {
- console.log("娴嬭瘯寮�濮�", row.itemid, row.itemArr);
row.itemArr.map((res) => {
if (row.itemid === res.id) {
row.remark = res.itemdescribe;
@@ -965,7 +985,6 @@
}
});
listcountItem(this.form.infoid, row.itemid).then((res) => {
- console.log("resresresres", res);
if (res.data > 0) {
this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔￠」鐩�");
}
@@ -981,7 +1000,7 @@
servivesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
this.fundblock = fundblock;
});
},
@@ -1086,7 +1105,6 @@
},
saverow(row, index, rows) {
- console.log("dwadw", index, rows, row);
let totallist = this.fundDetailArr;
if (this.form.id) {
if (!row.id) {
@@ -1151,14 +1169,12 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
// getownFundDetail(this.form.id).then(res=>{
// this.$set(this.fundDetailArr,res.data)
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
// })
});
} else {
@@ -1244,7 +1260,6 @@
})
.then(() => {
updateFunddetail(this.fundDetailArr).then((res) => {
- console.log("鐗涗父鐗涘晩", res);
});
})
.catch(() => {
@@ -1257,10 +1272,8 @@
//鍒ゆ柇鏁版嵁鏄庣粏鏁版嵁鏄惁姝ｇ‘
let detailDataCorrect = true;
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) {
- // console.log('iii',key, tempData[key]);
if (
tempData[key] == null ||
tempData[key] == undefined ||
@@ -1336,7 +1349,6 @@
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
getFundTypeAll(3).then((res) => {
- console.log("璐圭敤绫诲瀷", res.data);
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
@@ -1370,7 +1382,6 @@
listReportname(arr[i]).then((res) => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
@@ -1403,7 +1414,6 @@
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
if (
@@ -1415,7 +1425,6 @@
} else {
this.show = 3;
}
- console.log("where", this.show);
});
},
@@ -1449,7 +1458,6 @@
dayin() {
if (this.form.id) {
const id = this.form.id;
- console.log(id);
getdownloadLW(id).then((res) => {
if (res.downloadUrl) {
var fileUrl = res;
@@ -1565,7 +1573,6 @@
dayin4() {
const id = this.form.id;
// getdownloadLL(id).then(res=>{
- // console.log('鍔冲姟涓嬭浇',res);
// })
},
// 鎹愮尞鑰呭灞炰氦閫氶瀹挎墦鍗�
@@ -1589,7 +1596,6 @@
type: "success",
});
}
- console.log("瀹跺睘浼欓浜ら�氳垂", res);
});
} else {
this.$alert("璇风‘璁ゆ偍瑕佷笅杞界殑涓撳鍔冲姟琛�", "鎻愰啋", {
@@ -1598,6 +1604,36 @@
});
}
},
+
+ //鏂囦欢涓婁紶
+ handleUploadError() { },
+ remove(file) {
+ this.fileList.splice(this.fileList.indexOf(file), 1)
+ },
+ handleExceed() {
+ this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
+ },
+ //鏂囦欢涓婁紶鎴愬姛鍥炶皟
+ uploadSccess(response, file, fileList) {
+ //鑾峰彇闄勪欢淇℃伅浣嶇疆
+ if (response.code == 200) {
+ this.form.filename = file.raw.name;
+ this.$modal.msgSuccess(response.msg);
+ this.fileList.push({ name: response.fileName, url: response.fileName });
+ } else {
+ this.$modal.msgError(response.msg);
+ }
+ },
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
+ },
+
},
};
</script>
diff --git a/src/views/project/organallocation/index.vue b/src/views/project/organallocation/index.vue
index c99a149..b0c50f8 100644
--- a/src/views/project/organallocation/index.vue
+++ b/src/views/project/organallocation/index.vue
@@ -83,7 +83,7 @@
</el-card>
</el-col>
<el-col :span="16">
- <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
+ <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
</div> -->
<el-card shadow="never">
<el-form ref="infoForm" :model="organalForm" label-width="80px">
@@ -105,7 +105,7 @@
<el-form-item label="閫夋嫨鍣ㄥ畼">
<el-checkbox-group v-model="organalForm.organname">
<el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value"
- @click="changeorganState(dict.value)" @change="changeorganState(dict.value)">
+ @change="changeorganState(dict.value)">
{{ dict.label }}
</el-checkbox>
</el-checkbox-group>
@@ -688,7 +688,6 @@
//鏇存柊鎹愮尞鍣ㄥ畼琛�
this.form.allocationstatus = this.form.organstate;
updateOrganallocation(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
});
//鑾峰彇鍣ㄥ畼淇℃伅
getDonateorgan(this.form.organid).then((response2) => {
@@ -699,13 +698,9 @@
organData.transplanthospitalno = this.form.transplanthospitalno;
try {
- organData.transplanthospitalname =
- this.$refs.tranHosSelect.getOptionByValue(
- organData.transplanthospitalno
- ).organizationname;
+ organData.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organData.transplanthospitalno).organizationname;
} catch {
- organData.transplanthospitalname =
- organData.transplanthospitalno;
+ organData.transplanthospitalname = organData.transplanthospitalno;
}
//鏇存柊鎹愮尞鍣ㄥ畼琛�
updateDonateorgan(organData).then((response3) => {
@@ -731,15 +726,10 @@
transplantdoct: this.form.transplantdoct,
};
try {
- organaManageForm.transplanthospitalname =
- this.$refs.tranHosSelect.getOptionByValue(
- organaManageForm.transplanthospitalno
- ).organizationname;
+ organaManageForm.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organaManageForm.transplanthospitalno).organizationname;
} catch {
- organaManageForm.transplanthospitalname =
- organaManageForm.transplanthospitalno;
+ organaManageForm.transplanthospitalname = organaManageForm.transplanthospitalno;
}
-
addDonateorgan(organaManageForm).then((response) => {
this.loading = false;
@@ -747,36 +737,29 @@
//鏌ヨ鑾峰彇鏂板鐨勫櫒瀹樿〃id
let organSearchParam = {
infoid: this.curInfoid,
- donorno: this.curdonorno,
+ // donorno: this.curdonorno,
organno: this.form.organnumber,
//donorname: this.curdonorname,
//organname: this.$refs.organNameSelect.label,
};
- this.loading = false;
listDonateorgan(organSearchParam).then((response2) => {
- this.showDistributionForm = false;
if (response2.code == 200 && response2.rows.length > 0) {
for (let i = 0; i < response2.rows.length; i++) {
- console.log('1', this.form)
if (response2.rows[i].organstate == '2') {
this.form.organid = response2.rows[i].id;
- this.form.residenceprovincename = this.defultAddress.sheng;
- this.form.residencecityname = this.defultAddress.shi;
- this.form.residencetownname = this.defultAddress.qu;
+ // this.form.residenceprovincename = this.defultAddress.sheng;
+ // this.form.residencecityname = this.defultAddress.shi;
+ // this.form.residencetownname = this.defultAddress.qu;
- console.log('2', this.form)
addOrganallocation(this.form).then((response) => {
-
- console.log('3', response)
- //this.$modal.msgSuccess("鏂板鎴愬姛");
- this.loading = false;
- this.GetDonortedList();
- this.showDistributionForm = false;
+ this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
});
}
}
}
+ this.GetDonortedList();
+ this.showDistributionForm = false;
});
}
});
diff --git a/src/views/project/organization/index.vue b/src/views/project/organization/index.vue
index f02e89f..8055bc3 100644
--- a/src/views/project/organization/index.vue
+++ b/src/views/project/organization/index.vue
@@ -58,6 +58,7 @@
</template>
</el-table-column>
<el-table-column label="鍦板潃" width="260px" align="left" prop="registeraddress" />
+ <!--
<el-table-column label="鑱旂郴浜�" align="left" prop="contactperson" />
<el-table-column label="鑱旂郴鐢佃瘽" align="left" prop="contactnumber" />
<el-table-column label="娉ㄥ唽鏃堕棿" align="left" prop="registertime" width="180">
@@ -65,7 +66,7 @@
<span>{{ parseTime(scope.row.registertime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
-
+-->
<el-table-column label="鎿嶄綔" align="left" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
@@ -158,7 +159,7 @@
<el-input v-model="form.bankaccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
</el-form-item>
</el-col>
-
+
</el-row>
<el-row>
<el-form-item label="浠嬬粛" prop="introduction">
diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseslist/Modifydetails/index.vue
index 9709834..10d6c0a 100644
--- a/src/views/project/travelexpenseslist/Modifydetails/index.vue
+++ b/src/views/project/travelexpenseslist/Modifydetails/index.vue
@@ -632,7 +632,7 @@
type="text"
size="small"
>
- 闄勪欢
+ 鏂囦欢
</el-button>
</template>
</el-table-column>
@@ -1198,20 +1198,7 @@
this.pdftitle = item.name;
let name = item.name.split(".");
if (name[1] == "pdf") {
- this.$confirm("褰撳墠鏂囦欢鏆備笉鏀寔棰勮鏄惁涓嬭浇", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- })
- .then(() => {
- window.location.href = item.url;
- })
- .catch(() => {
- this.$message({
- type: "info",
- message: "宸插彇娑�"
- });
- });
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
this.previewpdf = false;
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
} else if (name[1] == "jpg" || "png") {
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 7fbe379..774f67c 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -1865,7 +1865,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/finance/travelexpenseslist/Modifydetails/",
+ path: "finance/travelexpenseslist/Modifydetails/",
query: { id: row.id, pos: 1 }
});
this.dialogType = "edit";
diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpenseslistrecord/index.vue
index 1a80e41..f5642d3 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/src/views/project/travelexpenseslistrecord/index.vue
@@ -95,7 +95,7 @@
-->
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="270">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 1"
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 1 || scope.row.checkFlag == 0"
@click="handleUpdate(scope.row)">瀹℃壒</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
@click="handleShow(scope.row)">璇︽儏</el-button>
@@ -517,7 +517,7 @@
</el-row>
<el-row>
<el-col :span="14">
- <el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
+ <el-form-item label="闄勪欢" align="left" prop="annexfiles">
<!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="20"
:headers="headers" :on-success="(response, file, fileList) =>
@@ -616,6 +616,7 @@
import { listReimbursementpayee, addReimbursementpayee, updateReimbursementpayee } from "@/api/project/reimbursementpayee";
import Li_area_select from "@/components/Address";
import { getUserProfile } from "@/api/system/user";
+import { getToken } from "@/utils/auth";
export default {
components: {
@@ -710,8 +711,15 @@
rbPayees: [],
baselist: [],
balist: [],
- //闄勪欢鏂囦欢
+
+ //闄勪欢鏂囦欢涓婁紶璺緞
+ uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
+ //鏂囦欢鍒楄〃
fileList: [],
+ headers: {
+ Authorization: "Bearer " + getToken(),
+ },
+
standardlevel: 0,
createTime: [],
//寮圭獥璇︽儏--show锛沞dit
@@ -722,7 +730,7 @@
this.getList();
},
mounted() {
- this.getlistDonatebaseinfo();
+ //this.getlistDonatebaseinfo();
this.getList();
},
methods: {
@@ -1308,6 +1316,17 @@
this.$modal.msgError(response.msg);
}
},
+
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
+ },
+
},
};
</script>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index d788a6c..eaaf55f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,21 +34,13 @@
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target:`http://localhost:8080`,
- //target:`http://116.62.18.175:8080`,
- // target:`http://192.168.1.4:8086`,
+ // target:`http://116.62.18.175:8080`,
+ // target:`http://192.168.1.4:8080`,
// target: `https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
}
- },
- //褰損df鍜屾暟鎹帴鍙ｄ笉鍦ㄥ悓涓�涓姹傚湴鍧�涓嬫椂,涓簆df棰勮杩藉姞涓�涓唬鐞�
- '/pdf': {
- target: 'http://192.168.1.4/pdf/data',
- changOrigin: true,
- pathRewrite: {
- '^/pdf': ''
- }
}
},
disableHostCheck: true
--
Gitblit v1.9.3