From e5e3e1a5bc8aa300c580126703bb6067221dee96 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 15 六月 2023 10:09:08 +0800
Subject: [PATCH] 主要修改了个税计算
---
vue.config.js | 4
src/views/project/donatebaseinfo/index.vue | 1
src/views/project/donatefinishcheck/index.vue | 2
src/views/project/travelexpenseslistrecord/index.vue | 2
src/views/project/financesubject/index.vue | 1
src/views/project/donateannex/index.vue | 1
src/views/project/donatereview/index.vue | 2
src/views/project/travelexpenseslist/eidt.vue | 181 +++---
src/views/project/fund/expertFeeFundApply/index.vue | 393 +++++++++-----
src/views/project/relativesconfirmation/index.vue | 4
src/views/project/donateconsolationfund/index.vue | 1
src/views/project/funddetail/index.vue | 417 +++++---------
src/views/project/donateconsolationfundlist/index.vue | 2
src/views/project/medicalcostfundapplycheck/index.vue | 2
src/views/project/fund/medicalCostFundApply/index.vue | 2
src/views/project/donationwitness/index.vue | 4
src/views/project/organization/index.vue | 342 +++--------
src/api/project/funddetail.js | 45 +
src/views/project/travelexpenseslist/index.vue | 207 +++++--
src/views/system/medicalevalustion/index.vue | 1
src/views/project/indexstatistics/index.vue | 6
src/views/project/fundstatistics/index.vue | 1
src/views/project/fund/fundapplycheck/index.vue | 3
src/views/home/index.vue | 1
src/views/project/fund/fundApply/index.vue | 5
package.json | 5
src/views/project/components/fundsummary/index.vue | 1
src/views/project/externalperson/index.vue | 11
src/views/project/donatefinish/index.vue | 2
29 files changed, 788 insertions(+), 861 deletions(-)
diff --git a/package.json b/package.json
index b1c405f..e503fb4 100644
--- a/package.json
+++ b/package.json
@@ -5,8 +5,8 @@
"author": "娴欐睙浜ュ皵鏃朵俊鎭鎶�鏈夐檺鍏徃",
"license": "MIT",
"scripts": {
- "dev": "vue-cli-service serve",
- "build": "vue-cli-service build",
+ "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+ "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
"lint": "eslint --ext .js,.vue src"
@@ -39,6 +39,7 @@
"@jiaminghi/data-view": "^2.10.0",
"@riophae/vue-treeselect": "0.4.0",
"axios": "0.21.0",
+ "build": "^0.1.4",
"clipboard": "2.0.6",
"core-js": "3.8.1",
"dayjs": "^1.11.1",
diff --git a/src/api/project/funddetail.js b/src/api/project/funddetail.js
index 99ee9b9..3dc3d75 100644
--- a/src/api/project/funddetail.js
+++ b/src/api/project/funddetail.js
@@ -111,4 +111,49 @@
})
}
+// 鏍规嵁浜哄憳缂栧彿銆佹椂闂磋寖鍥磋幏鍙栬垂鐢ㄦ槑缁�
+export function getDataBybeneficiaryNo(data) {
+ return request({
+ url: '/project/funddetail/getDataBybeneficiaryNo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏍规嵁浜哄憳缂栧彿銆佺◣鍓嶉噾棰漒鐢虫姤鏃堕棿鑾峰彇涓◣閲戦
+export function getTaxByBeneFiciaryNo(data) {
+ return request({
+ url: '/project/funddetail/getTaxByBeneFiciaryNo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 鏍规嵁浜哄憳缂栧彿銆佹椂闂磋寖鍥磋幏鍙栫◣鍓嶉噾棰�
+export function getTaxBeforeByBeneFiciaryNo(params) {
+ return request({
+ url: '/project/funddetail/getTaxBeforeByBeneFiciaryNo',
+ method: 'post',
+ data: params
+ })
+}
+
+// 鏍规嵁浜哄憳缂栧彿銆佹椂闂磋寖鍥磋幏鍙栦釜绋庨噾棰�
+export function getTaxationByBeneFiciaryNo(data) {
+ return request({
+ url: '/project/funddetail/getTaxationByBeneFiciaryNo',
+ method: 'post',
+ data: data
+ })
+}
+// 鏍规嵁浜哄憳缂栧彿銆佹椂闂磋寖鍥淬�佹湰娆＄◣鍚庨噾棰濓紝鑾峰彇鏈绋庡墠閲戦銆佷釜绋庨噾棰�
+export function getTaxBeforeByAfterMoney(data) {
+ return request({
+ url: '/project/funddetail/getTaxBeforeByAfterMoney',
+ method: 'post',
+ data: data
+ })
+}
+
+
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 4039ada..441b195 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -1217,7 +1217,6 @@
let uuid;
login(defaultAccount, defaultPassword, code, uuid)
.then(async (res) => {
- debugger
setToken(res.token);
await this.getDictData();
this.getinfos();
diff --git a/src/views/project/components/fundsummary/index.vue b/src/views/project/components/fundsummary/index.vue
index 6ada3d8..b2499ee 100644
--- a/src/views/project/components/fundsummary/index.vue
+++ b/src/views/project/components/fundsummary/index.vue
@@ -916,7 +916,6 @@
getDonationCost(donorno).then((res) => {
if (res.code == 200) {
let resList = res.data;
- debugger
var arr = [];
for (var i in resList) {
arr.push(resList[i]);
diff --git a/src/views/project/donateannex/index.vue b/src/views/project/donateannex/index.vue
index da522d8..5da777f 100644
--- a/src/views/project/donateannex/index.vue
+++ b/src/views/project/donateannex/index.vue
@@ -1053,7 +1053,6 @@
},
//绉婚櫎闄勪欢
removeFile(file, fileList, attachmentFileInfo) {
- debugger;
let fileArr = [];
let fileUrl = "";
for (let i = 0; i < fileList.length; i++) {
diff --git a/src/views/project/donatebaseinfo/index.vue b/src/views/project/donatebaseinfo/index.vue
index 61a123d..c79b633 100644
--- a/src/views/project/donatebaseinfo/index.vue
+++ b/src/views/project/donatebaseinfo/index.vue
@@ -1206,7 +1206,6 @@
});
this.form = response.data;
response.data.sex = parseInt(response.data.sex);
- debugger;
this.form.id = response.data.id;
this.form.diseasetype = this.form.diseasetype.split(",");
this.form.infectious = this.form.infectious.split(",");
diff --git a/src/views/project/donateconsolationfund/index.vue b/src/views/project/donateconsolationfund/index.vue
index d063633..774b8ac 100644
--- a/src/views/project/donateconsolationfund/index.vue
+++ b/src/views/project/donateconsolationfund/index.vue
@@ -1563,7 +1563,6 @@
//鍔犺浇鏈嶅姟椤圭洰
LoadItemTypeArr(value) {
- // debugger
//console.log(value);
getItemNames(value).then((res) => {
this.itemArr = res.data;
diff --git a/src/views/project/donateconsolationfundlist/index.vue b/src/views/project/donateconsolationfundlist/index.vue
index de47182..eced10a 100644
--- a/src/views/project/donateconsolationfundlist/index.vue
+++ b/src/views/project/donateconsolationfundlist/index.vue
@@ -1110,7 +1110,6 @@
type: "warning",
})
.then(() => {
- debugger;
let formData = this.form;
let tempItemArr = rows.itemArr;
rows.fundid = formData.id;
@@ -1272,7 +1271,6 @@
this.personlist.map((res) => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
- debugger;
row.beneficiaryname = res.username;
row.bankcardno = res.bankcardno;
row.branchbankname = res.branchbankname;
diff --git a/src/views/project/donatefinish/index.vue b/src/views/project/donatefinish/index.vue
index 0b5171b..cbeed87 100644
--- a/src/views/project/donatefinish/index.vue
+++ b/src/views/project/donatefinish/index.vue
@@ -1118,7 +1118,6 @@
//鑾峰彇鎹愮尞瀹屾垚鐧昏璁板綍
this.loading = true;
this.reset();
- debugger;
this.curCase.registerAddresss = row.registeraddresss;
this.curCase.donorno = row.donorno;
this.curCase.name = row.name;
@@ -1150,7 +1149,6 @@
// this.GetDonortedList();
});
listnewDonatecompletioninfo(searchParam).then((response) => {
- debugger;
if (response.code == 200 && response.rows.length == 1) {
this.open = true;
this.form = response.rows[0];
diff --git a/src/views/project/donatefinishcheck/index.vue b/src/views/project/donatefinishcheck/index.vue
index 06486e7..1e855a7 100644
--- a/src/views/project/donatefinishcheck/index.vue
+++ b/src/views/project/donatefinishcheck/index.vue
@@ -1294,7 +1294,6 @@
LoadReportList() {
listDonatebaseinfo().then((res) => {
- debugger
let list = res.rows;
let reportlist = [];
reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
@@ -1304,7 +1303,6 @@
reportername: element.reportername,
});
});
- debugger
if (reportlist != 0) {
reportlist = this.resetArr(reportlist);
this.reportlist = reportlist;
diff --git a/src/views/project/donatereview/index.vue b/src/views/project/donatereview/index.vue
index 85ef268..0890e56 100644
--- a/src/views/project/donatereview/index.vue
+++ b/src/views/project/donatereview/index.vue
@@ -1628,7 +1628,6 @@
LoadReportList() {
listDonatebaseinfo().then((res) => {
- debugger
let list = res.rows;
let reportlist = [];
reportlist.push({ reporterno: "", reportername: "鍏ㄩ儴" });
@@ -1638,7 +1637,6 @@
reportername: element.reportername,
});
});
- debugger
if (reportlist != 0) {
reportlist = this.resetArr(reportlist);
this.reportlist = reportlist;
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index 4fa5c29..633cbcb 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -988,7 +988,6 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
- debugger;
this.curCase = {
id: row.id,
recordstate: null,
@@ -1019,7 +1018,6 @@
let searchParam = {
infoid: row.id,
};
- debugger;
this.GetDonortedList();
const infoid = this.form.infoid;
getByInfoId(infoid).then((response) => {
@@ -1160,12 +1158,10 @@
//donorno: this.form.donorno,
infoid: this.curCase.id,
};
- debugger;
console.log(
"璋冪敤鍣ㄥ畼鍒楄〃鎺ュ彛锛屽弬鏁帮細" + JSON.stringify(oraganqueryParam)
);
listDonateorgan(oraganqueryParam).then((response) => {
- debugger;
this.loading = false;
if (response.code == 200) {
this.organdonation = [];
diff --git a/src/views/project/externalperson/index.vue b/src/views/project/externalperson/index.vue
index e3547dc..8f411ef 100644
--- a/src/views/project/externalperson/index.vue
+++ b/src/views/project/externalperson/index.vue
@@ -118,12 +118,13 @@
<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="12"><el-form-item label="閾惰鍚嶇О" prop="depositbank">
- <el-input v-model="form.depositbank" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" /> </el-form-item></el-col><el-col
- :span="12"><el-form-item label="閾惰鍗″彿" prop="bankcardno">
+ </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-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-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>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
diff --git a/src/views/project/financesubject/index.vue b/src/views/project/financesubject/index.vue
index 158afb4..760c19c 100644
--- a/src/views/project/financesubject/index.vue
+++ b/src/views/project/financesubject/index.vue
@@ -467,7 +467,6 @@
submitForm() {
this.$refs["form"].validate((valid) => {
if (valid) {
- debugger
this.form.costtypename = this.$refs.costTypeSel.selectedLabel;
this.form.expensetypename = this.$refs.expenseTypeSel.selectedLabel;
if (this.form.id != null) {
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index ed687bc..d4b0c3f 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -34,8 +34,7 @@
</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" 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">
@@ -217,29 +216,29 @@
<el-row style="margin-top: 5px; margin-bottom: 5px">
<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="addAllItems" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
- <el-table :data="fundDetailArr" v-loading="loading" border highlight-current-row>
+ <el-table :data="fundDetails" v-loading="loading" border highlight-current-row>
<el-table-column prop="orderno" align="center" label="搴忓彿" width="65">
<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="200">
+ <el-table-column prop="applytype" align="center" label="鏈嶅姟璐圭敤绫诲瀷" width="200">
<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"
+ <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟璐圭敤绫诲瀷" @change="loadItemType(scope.row)">
+ <el-option v-for="dict in rowfeeItemTypes" :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="260">
+ <el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰鍚嶇О" width="260">
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰" filterable @change="select(scope.row)"
- :filter-method="(val) => SearchItem(val, scope)">
+ <el-select v-model="scope.row.itemid" placeholder="鏈嶅姟椤圭洰鍚嶇О" filterable @change="verifyFeeItem(scope.row)"
+ :filter-method="(val) => searchItemType(val, scope)">
<el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
:value="dict.id"></el-option>
</el-select>
@@ -247,25 +246,25 @@
</el-table-column>
<el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip="" v-if="false">
</el-table-column>
- <el-table-column prop="servicesscopename" align="center" label="璐圭敤璇存槑" width="180">
+ <el-table-column prop="servicesscope" align="center" label="璐圭敤璇存槑" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.servicesscope" placeholder="璐圭敤璇存槑" clearable allow-create filterable
@change="selectedRemark(scope.row)">
- <el-option v-for="dict in scope.row.fundblock" :key="dict.servicesscope" :label="dict.expensedescribe"
+ <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
:value="dict.servicesscope"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="100">
+ <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="绋庡墠閲戦" width="120">
<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 scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
+ <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.expensedescribe" :label="dict.expense"
:value="dict.expense"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="100" v-if="this.ismanager == true">
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="this.ismanager == true">
<!-- v-if="form.applytype != '3'"涓婂悓 -->
<template slot-scope="scope">
<el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
@@ -335,7 +334,6 @@
<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'">
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
@@ -360,9 +358,8 @@
<el-table-column fixed="right" align="center" label="鎿嶄綔" width="180" 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)
+ deleteRows(scope.row, scope.$index, fundDetails)
" type="text" size="small">
鍒犻櫎
</el-button>
@@ -413,8 +410,8 @@
<el-row>
<el-col :span="12">
<el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
- :headers="headers" :on-success="(response, file, fileList) =>
+ <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">
@@ -512,6 +509,11 @@
getFundType,
getFundTypeAll,
listcountItem,
+ getDataBybeneficiaryNo,
+ getTaxByBeneFiciaryNo,
+ getTaxBeforeByBeneFiciaryNo,
+ getTaxationByBeneFiciaryNo,
+ getTaxBeforeByAfterMoney
} from "@/api/project/funddetail";
import { listFundflow } from "@/api/project/fundflow";
import {
@@ -590,6 +592,14 @@
applytype: "1",
createBy: null,
},
+
+ //璁＄畻涓◣鍙傛暟
+ taxParam: {
+ beneficiaryNo: '',
+ money: '0',
+ startTime: '',
+ },
+
// 琛ㄥ崟鍙傛暟
form: {},
personlist: [],
@@ -622,22 +632,26 @@
// 鎹愮尞浜洪亾鎱伴棶閲戣〃鏍兼暟鎹�
donateconsolationfundList: [],
-
- fundDetailArr: [],
+ //璐圭敤鏄庣粏鍒楄〃
+ fundDetails: [],
// 寮瑰嚭灞傛爣棰�
title: "",
userlist: [],
itemArr: [],
reporters: [],
+
+ //琛岃褰曠殑璐圭敤绫诲瀷鏁扮粍
+ rowfeeItemTypes: [],
//璐圭敤绫诲瀷鏁扮粍
- fundtypeArr: [],
- fundblock: [],
+ feeItemTypes: [],
+ //璐圭敤璇存槑
+ rowfeeblocks: [],
defaultperson: {},
//鏄惁鏄笓瀹惰垂鐨凮PO瀹℃壒浜哄憳
ismanager: false,
- fundtypeArrAll: [],
+
unitList: [],
dialogType: "edit",
fundflowList: [],
@@ -681,11 +695,12 @@
this.detailInfoDialogShow = true;
this.detailInfoDialogShowType = showType;
},
+
ConfirmDetailDialog() {
let tempIndex = this.funddetailForm.index;
let tempName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
- let singleDetail = this.fundDetailArr[tempIndex];
+ let singleDetail = this.fundDetails[tempIndex];
if (this.detailInfoDialogShowType == "name") {
this.personlist.map((res) => {
if (tempName == res.username) {
@@ -699,11 +714,9 @@
singleDetail.title = res.title;
singleDetail.unitname = res.unitname;
singleDetail.unitno = parseInt(res.unitno);
- } else {
- singleDetail.beneficiaryname = tempName;
- singleDetail.beneficiaryno = tempName;
}
});
+
} else if (this.detailInfoDialogShowType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
try {
@@ -720,9 +733,10 @@
}
}
- this.fundDetailArr[tempIndex] = singleDetail;
+ this.fundDetails[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
+
handleup(row) {
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
@@ -757,29 +771,22 @@
});
},
- // recordstatus
- // updateFund(row).then(res=>{
- // console.log('鐘舵�佹洿鏂�',res);
- // })
- // },
-
+ //鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
getUsermsg() {
getUserProfile().then((response) => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
- if (
- this.defaultperson.createBy == "admin" ||
- this.defaultperson.createBy == "001" ||
- this.defaultperson.createBy == "002"
- ) {
+ if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
this.ismanager = true;
} else {
this.ismanager = false;
}
});
},
+
+ //鑾峰彇璐圭敤椤圭洰鐨勫娉ㄤ俊鎭�
selectedRemark(row) {
- row.fundblock.forEach((item, i) => {
+ row.rowfeeblocks.forEach((item, i) => {
if (item.servicesscope === row.servicesscope) {
row.servicesscopename = item.expensedescribe;
if (row.servicesscopename.includes("绋庡悗")) {
@@ -789,14 +796,17 @@
row.amount = item.expense;
row.taxedamount = 0.0;
}
+
this.form.serviceFunddetails = 0;
- this.fundDetailArr.map((item) => {
+ this.fundDetails.map((item) => {
this.form.serviceFunddetails += item.amount;
});
}
});
},
- select(row) {
+
+ //鏍￠獙鏀惰垂椤圭洰鏄惁閲嶅
+ verifyFeeItem(row) {
row.itemArr.map((res) => {
if (row.itemid === res.id) {
row.remark = res.itemDescribe;
@@ -804,20 +814,21 @@
}
});
var repeatNum = 0;
- this.fundDetailArr.map((res) => {
+ this.fundDetails.map((res) => {
if (res.applytype === row.applytype && res.itemid == row.itemid) {
repeatNum++;
}
});
if (repeatNum > 1) {
- this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃鏈嶅姟椤圭洰");
+ this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔￠」鐩簡");
}
+ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
getdetailsByItemId(row.itemid).then((res) => {
let fundmsg = res.data;
- let fundblock = [];
+ let rowfeeblocks = [];
fundmsg.forEach((item) => {
- fundblock.push({
+ rowfeeblocks.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
@@ -825,18 +836,22 @@
});
});
- row.fundblock = fundblock;
+ row.rowfeeblocks = rowfeeblocks;
row.servicesscope = null;
row.servicesscopename = "";
});
+
},
+
+ //
selectamount(row) {
- this.fundblock.forEach((item, i) => {
+ this.rowfeeblocks.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
}
});
},
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -902,7 +917,7 @@
// this.form.createTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
- this.fundDetailArr = [];
+ this.fundDetails = [];
this.addRow();
this.dialogOpen = true;
this.dialogType = "edit";
@@ -982,41 +997,65 @@
this.fileList = []
},
- addAlls() {
+ //瀵煎叆鎵�鏈夐」鐩�
+ addAllItems() {
this.loading = true;
- this.fundDetailArr = this.fundDetailArr.filter(
+ this.fundDetails = this.fundDetails.filter(
(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(
+ //let listAdd = this.fundDetails;
+ for (let i = 0; i < this.feeItemTypes.length; i++) {
+ for (let j = 0; j < this.feeItemTypes[i].itemDetails.length; j++) {
+ let list = this.fundDetails.filter(
(r) =>
- r.applytype == this.fundtypeArrAll[i].itemType &&
- r.itemid == this.fundtypeArrAll[i].itemDetails[j].id
+ r.applytype == this.feeItemTypes[i].itemType &&
+ r.itemid == this.feeItemTypes[i].itemDetails[j].id
);
+
if (list.length == 0) {
let rowData = {
id: null,
orderno: listAdd.length + 1,
- applytype: this.fundtypeArrAll[i].itemType,
- itemid: this.fundtypeArrAll[i].itemDetails[j].id,
- itemcode: this.fundtypeArrAll[i].itemDetails[j].itemCode,
+ applytype: this.feeItemTypes[i].itemType,
+ itemid: this.feeItemTypes[i].itemDetails[j].id,
+ itemcode: this.feeItemTypes[i].itemDetails[j].itemCode,
recordstatus: "-1",
beneficiaryname: "鐐瑰嚮閫夋嫨",
unitname: "鐐瑰嚮閫夋嫨",
- itemArr: this.fundtypeArrAll[i].itemDetails,
+ itemArr: this.feeItemTypes[i].itemDetails,
+ rowfeeblocks: null,
+ servicesscope: null,
+ servicesscopename: ""
};
+
+ //鑾峰彇鏀惰垂椤圭洰鐨勮鏄庝俊鎭�
+ getdetailsByItemId(rowData.itemid).then((res) => {
+ let fundmsg = res.data;
+ let rowfeeblocks = [];
+ fundmsg.forEach((item) => {
+ rowfeeblocks.push({
+ expense: item.expense,
+ expensedescribe: item.expensedescribe,
+ remark: item.expensedescribe,
+ servicesscope: item.id,
+ });
+ });
+
+ rowData.rowfeeblocks = rowfeeblocks;
+ rowData.servicesscope = null;
+ rowData.servicesscopename = "";
+ });
+
listAdd.push(rowData);
}
}
}
- this.fundDetailArr = listAdd;
+ this.fundDetails = listAdd;
this.loading = false;
- // let Outerarr = this.fundDetailArr;
+ // let Outerarr = this.fundDetails;
// Outerarr.map((res) => {
- // let onelist = this.fundtypeArr;
+ // let onelist = this.rowfeeItemTypes;
// onelist.map((item) => {
// //绗竴灞備笉鐩哥瓑鏃讹紱
// if (res.applytype !== item.itemType) {
@@ -1025,6 +1064,7 @@
// });
// });
},
+
addAll(row, i, arr) {
row.itemArr.map((res) => {
if (res.id !== row.itemid) {
@@ -1036,20 +1076,21 @@
getdetailsByItemId(arr[a].itemid).then((res) => {
let fundmsg = res.data;
- let fundblock = [];
+ let rowfeeblocks = [];
fundmsg.forEach((item) => {
- fundblock.push({
+ rowfeeblocks.push({
expense: item.expense,
expensedescribe: item.expensedescribe,
remark: item.expensedescribe,
servicesscope: item.id,
});
});
- row.fundblock = fundblock;
+ row.rowfeeblocks = rowfeeblocks;
});
}
});
},
+
//鏂板涓�琛�
addRow(rowIndex) {
let rowData = {
@@ -1093,21 +1134,21 @@
uploadtime: null,
itemArr: [],
servicesscope: null,
- fundblock: [],
+ rowfeeblocks: [],
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
- this.fundDetailArr.push(rowData);
+ this.fundDetails.push(rowData);
} else {
- this.fundDetailArr.splice(rowIndex + 1, 0, rowData);
+ this.fundDetails.splice(rowIndex + 1, 0, rowData);
}
- for (let i = 0; i < this.fundDetailArr.length; i++) {
- this.fundDetailArr[i].orderno = i + 1;
+ for (let i = 0; i < this.fundDetails.length; i++) {
+ this.fundDetails[i].orderno = i + 1;
}
},
//鍔犺浇鏈嶅姟椤圭洰
- LoadItemTypeArr(row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ loadItemType(row) {
+ let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
row.itemid = null;
this.$forceUpdate();
@@ -1128,12 +1169,20 @@
let totalPreTaxAmount = 0.0;
let totalAfterTaxAmount = 0.0;
let totalAmount = 0.0;
- for (let k = 0; k < this.fundDetailArr.length; k++) {
- let tempDetail = this.fundDetailArr[k];
+
+ //淇濆瓨鍓嶆牎楠屾暟鎹�
+ for (let k = 0; k < this.fundDetails.length; k++) {
+ let tempDetail = this.fundDetails[k];
if (tempDetail.itemid == null) {
- this.$modal.msgWarning("璇烽�夋嫨鏈嶅姟椤圭洰");
+ this.$modal.msgWarning("鏈嶅姟椤圭洰鏄繀閫夐」锛岃閫夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�");
return;
}
+
+ if (tempDetail.beneficiaryno == null) {
+ this.$modal.msgWarning("鏈嶅姟椤圭洰琛ㄤ腑锛岀" + (k + 1).toString() + "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�");
+ return;
+ }
+
// //鍒ゆ柇鍗曚綅 unitSel
// try {
// let unitIndex = this.unitList.findIndex(
@@ -1147,15 +1196,41 @@
// } catch {
// tempDetail.unitname = tempDetail.unitno;
// }
- if (!isNaN(parseFloat(tempDetail.amount))) {
- totalPreTaxAmount += parseFloat(tempDetail.amount);
- totalAmount += parseFloat(tempDetail.amount);
+
+ //璁＄畻涓◣
+ //if (isNaN(parseFloat(tempDetail.taxedamount)))
+ if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
+ //鑾峰彇鍙傛暟
+ this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
+ this.taxParam.money = tempDetail.amount.toString();
+ this.taxParam.startTime = this.form.createTime.substring(0, 10);
+ getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
+ if (res.code == 200) {
+ tempDetail.taxamount = res.data;
+ tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
+ }
+ });
}
- if (!isNaN(parseFloat(tempDetail.taxedamount))) {
- totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
- totalAmount += parseFloat(tempDetail.taxedamount);
+
+ //if (isNaN(parseFloat(tempDetail.amount)))
+ if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
+ //鑾峰彇鍙傛暟
+ this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
+ this.taxParam.money = tempDetail.taxedamount.toString();
+ 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;
+ }
+ });
}
- this.fundDetailArr[k] = tempDetail;
+
+ totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
+ totalAmount += parseFloat(tempDetail.amount);
+ this.fundDetails[k] = tempDetail;
}
this.loading = true;
@@ -1178,8 +1253,8 @@
this.selectDonotor(this.curCase);
this.$modal.msgSuccess("淇敼鎴愬姛");
this.loading = false;
- for (let m = 0; m < this.fundDetailArr.length; m++) {
- let tempData = this.fundDetailArr[m];
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ let tempData = this.fundDetails[m];
let tempItemArr = tempData.itemArr;
tempData.fundid = formData.id;
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
@@ -1190,6 +1265,15 @@
tempData.itemname = tempItemArr[itemIndex].itemName;
tempData.itemid = tempItemArr[itemIndex].id;
}
+
+ //鑾峰彇applytypename
+ let applytypeIndex = this.rowfeeItemTypes.findIndex(
+ (item) => tempData.applytype == item.value
+ );
+ if (applytypeIndex > -1) {
+ tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+ }
+
if (tempData.id > 0) {
updateFunddetail(tempData).then((response2) => { });
} else {
@@ -1199,9 +1283,10 @@
});
} else {
//淇濆瓨璐圭敤鐢宠
- for (let m = 0; m < this.fundDetailArr.length; m++) {
- let tempData = this.fundDetailArr[m];
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ let tempData = this.fundDetails[m];
let tempUtemArr = tempData.itemArr;
+
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
let itemIndex = tempUtemArr.findIndex(
(item) => tempData.itemid == item.id
@@ -1210,21 +1295,24 @@
tempData.itemname = tempUtemArr[itemIndex].itemName;
tempData.itemid = tempUtemArr[itemIndex].id;
}
+
//鑾峰彇applytypename
- let applytypeIndex = this.fundtypeArr.findIndex(
+ let applytypeIndex = this.rowfeeItemTypes.findIndex(
(item) => tempData.applytype == item.value
);
if (applytypeIndex > -1) {
- tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
+ tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
}
- this.fundDetailArr[m] = tempData;
+ this.fundDetails[m] = tempData;
}
+
this.form.serviceFunddetails = 0;
- this.fundDetailArr.map((item) => {
+ this.fundDetails.map((item) => {
this.form.serviceFunddetails += item.amount;
});
- this.form.serviceFunddetails = this.fundDetailArr;
+ this.form.serviceFunddetails = this.fundDetails;
this.form.recordstatus = -1;
+
batchUploadFund(this.form).then((response) => {
if (response.code === 200) {
this.$modal.msgSuccess("鏂板鎴愬姛");
@@ -1240,13 +1328,16 @@
}
});
},
+
+ //鑾峰彇涓撳鍒楄〃
getlistExternalperson() {
listExternalperson().then((res) => {
this.personlist = res.rows;
});
},
+
+ //涓撳浜哄憳鍒楄〃
selectReporters() {
- //涓撳浜哄憳鍒楄〃
let arr = ["expert"];
let arrreportlist = [];
for (let i = 0; i < arr.length; i++) {
@@ -1262,6 +1353,7 @@
});
}
},
+
selectpersonmsg(row) {
// if(row.beneficiaryname)
this.personlist.map((res) => {
@@ -1281,11 +1373,13 @@
}
});
},
+
getlistUser() {
listUser().then((res) => {
this.userlist = res.data;
});
},
+
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.isopen = 0;
@@ -1305,19 +1399,32 @@
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.fundDetailArr = res.data;
- for (let m = 0; m < this.fundDetailArr.length; m++) {
- this.fundDetailArr[m].itemArr = [];
- this.getItemArr(m, this.fundDetailArr[m]);
- this.fundDetailArr[m].fundblock = [];
- this.fundDetailArr[m].fundblock.push({
- expense: this.fundDetailArr[m].expense,
- expensedescribe: this.fundDetailArr[m].servicesscopename,
- remark: this.fundDetailArr[m].servicesscope,
- servicesscope: this.fundDetailArr[m].servicesscope,
+ this.fundDetails = res.data;
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ this.fundDetails[m].itemArr = [];
+ this.getItemArr(m, this.fundDetails[m]);
+
+ //鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
+ this.fundDetails[m].rowfeeblocks = [];
+
+ this.fundDetails[m].rowfeeblocks.push({
+ servicesscope: this.fundDetails[m].servicesscope,
+ expensedescribe: this.fundDetails[m].servicesscopename,
+ expense: this.fundDetails[m].expense,
+ remark: this.fundDetails[m].servicesscopename,
});
+ // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
+ // let fundmsg = res.data;
+ // fundmsg.forEach((item) => {
+ // this.fundDetails[m].rowfeeblocks.push({
+ // servicesscope: item.id,
+ // expensedescribe: item.expensedescribe,
+ // expense: item.expense,
+ // remark: item.expensedescribe,
+ // });
+ // });
+ // });
}
});
});
@@ -1349,16 +1456,16 @@
this.fundflowList = res.rows;
});
getownFundDetail(id).then((res) => {
- this.fundDetailArr = res.data;
- for (let m = 0; m < this.fundDetailArr.length; m++) {
- this.fundDetailArr[m].itemArr = [];
- this.getItemArr(m, this.fundDetailArr[m]);
- this.fundDetailArr[m].fundblock = [];
- this.fundDetailArr[m].fundblock.push({
- expense: this.fundDetailArr[m].expense,
- expensedescribe: this.fundDetailArr[m].servicesscopename,
- remark: this.fundDetailArr[m].servicesscope,
- servicesscope: this.fundDetailArr[m].servicesscope,
+ this.fundDetails = res.data;
+ for (let m = 0; m < this.fundDetails.length; m++) {
+ this.fundDetails[m].itemArr = [];
+ this.getItemArr(m, this.fundDetails[m]);
+ this.fundDetails[m].rowfeeblocks = [];
+ this.fundDetails[m].rowfeeblocks.push({
+ expense: this.fundDetails[m].expense,
+ expensedescribe: this.fundDetails[m].servicesscopename,
+ remark: this.fundDetails[m].servicesscope,
+ servicesscope: this.fundDetails[m].servicesscope,
});
}
});
@@ -1403,15 +1510,15 @@
}).then(() => {
this.$set(rows, rows.splice(index, 1));
getownFundDetail(this.form.id).then((res) => {
- this.$set(this.fundDetailArr, res.data);
+ this.$set(this.fundDetails, res.data);
this.sumTotalFee();
- // this.fundDetailArr = res.data
+ // this.fundDetails = res.data
});
});
}
// getownFundDetail(this.form.id).then(res=>{
- // this.$set(this.fundDetailArr,res.data)
- // this.fundDetailArr = res.data
+ // this.$set(this.fundDetails,res.data)
+ // this.fundDetails = res.data
// })
});
} else {
@@ -1424,37 +1531,40 @@
});
},
+ //璁＄畻涓◣
+ calculateTax() { },
+
//璁＄畻鎬婚噾棰�
sumTotalFee(row) {
let allSum = 0;
if (this.form.applytype != null) {
- for (let i = 0; i < this.fundDetailArr.length; i++) {
+ for (let i = 0; i < this.fundDetails.length; i++) {
let totalFee = 0;
let taxFee = 0;
if (this.form.applytype == 1 || this.form.applytype == 2) {
//璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.fundDetailArr[i].amount))) {
- totalFee += parseFloat(this.fundDetailArr[i].amount);
- taxFee += parseFloat(this.fundDetailArr[i].amount);
+ if (!isNaN(parseFloat(this.fundDetails[i].amount))) {
+ totalFee += parseFloat(this.fundDetails[i].amount);
+ taxFee += parseFloat(this.fundDetails[i].amount);
}
- if (!isNaN(parseFloat(this.fundDetailArr[i].taxamount))) {
- totalFee -= parseFloat(this.fundDetailArr[i].taxamount);
- taxFee -= parseFloat(this.fundDetailArr[i].taxamount);
+ if (!isNaN(parseFloat(this.fundDetails[i].taxamount))) {
+ totalFee -= parseFloat(this.fundDetails[i].taxamount);
+ taxFee -= parseFloat(this.fundDetails[i].taxamount);
}
} else if (this.form.applytype == 3) {
if (
- !isNaN(parseFloat(this.fundDetailArr[i].price)) &&
- !isNaN(parseFloat(this.fundDetailArr[i].quantity))
+ !isNaN(parseFloat(this.fundDetails[i].price)) &&
+ !isNaN(parseFloat(this.fundDetails[i].quantity))
) {
totalFee +=
- parseFloat(this.fundDetailArr[i].price) *
- parseFloat(this.fundDetailArr[i].quantity);
+ parseFloat(this.fundDetails[i].price) *
+ parseFloat(this.fundDetails[i].quantity);
}
}
//绋庡墠銆佺◣鍚庨渶瑕佺嫭绔嬪綍鍏�
// if (!isNaN(parseFloat(taxFee))) {
- // this.fundDetailArr[i].taxedamount = taxFee.toFixed(2);
+ // this.fundDetails[i].taxedamount = taxFee.toFixed(2);
// }
allSum += totalFee;
@@ -1468,10 +1578,10 @@
getCurFundType() {
getFundTypeAll(this.currentApplyType).then((res) => {
let dataList = res.data;
- this.fundtypeArrAll = dataList;
- this.fundtypeArr = [];
+ this.feeItemTypes = dataList;
+ this.rowfeeItemTypes = [];
for (let m = 0; m < dataList.length; m++) {
- this.fundtypeArr.push({
+ this.rowfeeItemTypes.push({
value: dataList[m].itemType,
label: dataList[m].itemTypeName,
});
@@ -1480,14 +1590,14 @@
},
getItemArr(rowindex, row) {
- let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
+ let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
row.itemArr = list[0].itemDetails;
- this.$set(this.fundDetailArr, rowindex, row);
+ this.$set(this.fundDetails, rowindex, row);
//this.loading = true;
// getItemNames(row.applytype).then((res) => {
// this.loading = false;
// row.itemArr = res.data;
- // this.$set(this.fundDetailArr, rowindex, row);
+ // this.$set(this.fundDetails, rowindex, row);
// });
},
@@ -1541,7 +1651,8 @@
});
},
- SearchItem(val, scope) {
+ //绛涙煡鍑哄搴旂殑璐圭敤椤圭洰
+ searchItemType(val, scope) {
let result = [];
if (val != "") {
let tempItemArr = scope.row.itemArr;
@@ -1557,7 +1668,7 @@
} else {
getItemNames(scope.row.applytype).then((res) => {
scope.row.itemArr = res.data;
- //this.$set(this.fundDetailArr, rowindex, row);
+ //this.$set(this.fundDetails, rowindex, row);
});
}
},
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index dfee463..d79a315 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -369,7 +369,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
+ <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"
@@ -627,14 +627,12 @@
this.detailInfoDialogShowType = showType;
},
ConfirmDetailDialog() {
- debugger;
let tempIndex = this.funddetailForm.index;
let tempName = this.funddetailForm.beneficiaryname;
let tempUnitname = this.funddetailForm.unitname;
let singleDetail = this.fundDetailArr[tempIndex];
if (this.detailInfoDialogShowType == "name") {
this.personlist.map((res) => {
- debugger;
if (tempName == res.username) {
singleDetail.beneficiaryno = res.userno;
singleDetail.beneficiaryname = res.username;
@@ -666,7 +664,6 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- debugger;
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
diff --git a/src/views/project/fund/fundapplycheck/index.vue b/src/views/project/fund/fundapplycheck/index.vue
index ae68fdf..3ded818 100644
--- a/src/views/project/fund/fundapplycheck/index.vue
+++ b/src/views/project/fund/fundapplycheck/index.vue
@@ -1039,7 +1039,6 @@
},
saveRows(rows, rowIndex) {
- debugger;
this.$confirm("鏄惁纭淇濆瓨?", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -1200,7 +1199,6 @@
this.personlist.map((res) => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
- debugger;
row.beneficiaryname = res.username;
row.bankcardno = res.bankcardno;
row.branchbankname = res.branchbankname;
@@ -1275,7 +1273,6 @@
console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
- debugger;
if (
response.data.userName === "001" ||
response.data.userName === "002" ||
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostFundApply/index.vue
index cd1d52e..948b666 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostFundApply/index.vue
@@ -423,7 +423,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="璐圭敤鐢宠闄勪欢锛�" align="left" prop="annexbankcard">
- <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
+ <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"
diff --git a/src/views/project/funddetail/index.vue b/src/views/project/funddetail/index.vue
index b3148db..5c18378 100644
--- a/src/views/project/funddetail/index.vue
+++ b/src/views/project/funddetail/index.vue
@@ -1,89 +1,40 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�" prop="beneficiaryname">
- <el-input
- v-model="queryParams.beneficiaryname"
- placeholder="璇疯緭鍏ユ敹鐩婁汉濮撳悕 瀹跺睘鎴栦笓瀹�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label="涓撳濮撳悕" prop="beneficiaryname">
+ <el-input v-model="queryParams.beneficiaryname" placeholder="璇疯緭鍏ヤ笓瀹跺鍚�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="宸ヤ綔鍗曚綅" prop="uintname">
- <el-input
- v-model="queryParams.uintname"
- placeholder="璇疯緭鍏ュ伐浣滃崟浣�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.uintname" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType" prop="applytype">
- <el-select v-model="queryParams.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType" clearable size="small">
+ <el-form-item label="璐圭敤绫诲埆" prop="applytype">
+ <el-select v-model="queryParams.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" clearable size="small">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О" prop="itemname">
- <el-input
- v-model="queryParams.itemname"
- placeholder="璇疯緭鍏ラ」鐩悕绉�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.itemname" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="椤圭洰绫诲埆" prop="itemtype">
<el-select v-model="queryParams.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲埆" clearable size="small">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
- <el-form-item label="鐢宠閲戦" prop="amount">
- <el-input
- v-model="queryParams.amount"
- placeholder="璇疯緭鍏ョ敵璇烽噾棰�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
<el-form-item label="璁板綍鐘舵��" prop="recordstatus">
<el-select v-model="queryParams.recordstatus" placeholder="璇烽�夋嫨璁板綍鐘舵��" clearable size="small">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
</el-form-item>
- <el-form-item label="鍒涘缓浜�" prop="createBy">
- <el-input
- v-model="queryParams.createBy"
- placeholder="璇疯緭鍏ュ垱寤轰汉"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-form-item label="缁忓姙浜�" prop="createBy">
+ <el-input v-model="queryParams.createBy" placeholder="璇疯緭鍏ュ垱寤轰汉" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="鍒涘缓鏃ユ湡" prop="createTime">
- <el-date-picker clearable size="small"
- v-model="queryParams.createTime"
- type="date"
- value-format="yyyy-MM-dd"
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker clearable size="small" v-model="queryParams.createTime" type="date" value-format="yyyy-MM-dd"
placeholder="閫夋嫨鍒涘缓鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="涓婁紶鏍囧織" prop="uploadflag">
- <el-input
- v-model="queryParams.uploadflag"
- placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="涓婁紶鏃堕棿" prop="uploadtime">
- <el-date-picker clearable size="small"
- v-model="queryParams.uploadtime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨涓婁紶鏃堕棿">
</el-date-picker>
</el-form-item>
<el-form-item>
@@ -94,216 +45,170 @@
<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:funddetail:add']"
- >鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['project:funddetail:add']">鏂板</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['project:funddetail:edit']"
- >淇敼</el-button>
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['project:funddetail:edit']">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['project:funddetail:remove']"
- >鍒犻櫎</el-button>
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['project:funddetail:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="el-icon-download"
- size="mini"
- :loading="exportLoading"
- @click="handleExport"
- v-hasPermi="['project:funddetail:export']"
- >瀵煎嚭</el-button>
+ <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
+ v-hasPermi="['project:funddetail:export']">瀵煎嚭</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="funddetailList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="涓婚敭ID" align="center" prop="id" />
- <el-table-column label="璐圭敤鐢宠涓昏〃ID" align="center" prop="fundid" />
- <el-table-column label="鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�" align="center" prop="beneficiaryname" />
- <el-table-column label="鏀剁泭浜虹紪鍙�" align="center" prop="beneficiaryno" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="uintname" />
- <el-table-column label="宸ヤ綔鍗曚綅缂栧彿" align="center" prop="uintno" />
- <el-table-column label="宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿" align="center" prop="uintuserno" />
- <el-table-column label="璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType" align="center" prop="idcardtype" />
- <el-table-column label="璇佷欢鍙风爜" align="center" prop="idcardno" />
- <el-table-column label="鎬у埆 鏍规嵁瀛楀吀sys_user_sex" align="center" prop="sex" />
- <el-table-column label="涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation" align="center" prop="familyrelations" />
- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
- <el-table-column label="寮�鎴烽摱琛�" align="center" prop="depositbank" />
- <el-table-column label="鍗″彿" align="center" prop="bankcardno" />
- <el-table-column label="鏀鍚嶇О" align="center" prop="branchbankname" />
- <el-table-column label="閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" align="center" prop="annexbankcard" />
- <el-table-column label="鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" align="center" prop="annexregistform" />
- <el-table-column label="璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType" align="center" prop="applytype" />
- <el-table-column label="椤圭洰ID" align="center" prop="itemid" />
- <el-table-column label="椤圭洰鍚嶇О" align="center" prop="itemname" />
+ <el-table-column label="涓撳濮撳悕" width="120" align="center" prop="beneficiaryname" />
+ <el-table-column label="璐圭敤绫诲埆" align="center" prop="applytype" />
<el-table-column label="椤圭洰绫诲埆" align="center" prop="itemtype" />
- <el-table-column label="鐢宠閲戦" align="center" prop="amount" />
- <el-table-column label="棰勬敮閲戦" align="center" prop="prepaidamount" />
- <el-table-column label="鍙戠エ寮犳暟" align="center" prop="invoicecount" />
- <el-table-column label="闄勪欢寮犳暟" align="center" prop="attachcount" />
- <el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" />
- <el-table-column label="涓婁紶鏍囧織" align="center" prop="uploadflag" />
- <el-table-column label="涓婁紶鏃堕棿" align="center" prop="uploadtime" width="180">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.uploadtime, '{y}-{m}-{d}') }}</span>
- </template>
- </el-table-column>
+ <el-table-column label="璐圭敤椤圭洰鍚嶇О" align="left" prop="itemname" />
+ <el-table-column label="璐圭敤閲戦" align="center" prop="amount" />
+ <el-table-column label="鎵ｇ◣閲戦" align="center" prop="taxamount" />
+ <el-table-column label="绋庡悗閲戦" align="center" prop="taxedamount" />
+ <!--
+ <el-table-column label="涓撳鍗曚綅" align="center" prop="uintname" />
+ <el-table-column label="璇佷欢鍙风爜" align="center" prop="idcardno" />
+ <el-table-column label="涓撳鐢佃瘽" align="center" prop="phone" />
+ <el-table-column label="鐘舵��" align="center" prop="recordstatus" />
+ <el-table-column label="缁忓姙浜�" align="center" prop="createby" />
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createtime" />
+ -->
+ <el-table-column label="澶囨敞" align="left" prop="remark" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['project:funddetail:edit']"
- >淇敼</el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['project:funddetail:remove']"
- >鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:funddetail:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:funddetail:remove']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇锋槑缁嗗璇濇 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="璐圭敤鐢宠涓昏〃ID" prop="fundid">
- <el-input v-model="form.fundid" placeholder="璇疯緭鍏ヨ垂鐢ㄧ敵璇蜂富琛↖D" />
- </el-form-item>
- <el-form-item label="鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�" prop="beneficiaryname">
- <el-input v-model="form.beneficiaryname" placeholder="璇疯緭鍏ユ敹鐩婁汉濮撳悕 瀹跺睘鎴栦笓瀹�" />
- </el-form-item>
- <el-form-item label="鏀剁泭浜虹紪鍙�" prop="beneficiaryno">
- <el-input v-model="form.beneficiaryno" placeholder="璇疯緭鍏ユ敹鐩婁汉缂栧彿" />
- </el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅" prop="uintname">
- <el-input v-model="form.uintname" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
- </el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅缂栧彿" prop="uintno">
- <el-input v-model="form.uintno" placeholder="璇疯緭鍏ュ伐浣滃崟浣嶇紪鍙�" />
- </el-form-item>
- <el-form-item label="宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿" prop="uintuserno">
- <el-input v-model="form.uintuserno" placeholder="璇疯緭鍏ュ伐浣滃崟浣嶇敤鎴风紪鍙�" />
- </el-form-item>
- <el-form-item label="璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType" prop="idcardtype">
- <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input v-model="form.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" />
- </el-form-item>
- <el-form-item label="鎬у埆 鏍规嵁瀛楀吀sys_user_sex" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆 鏍规嵁瀛楀吀sys_user_sex">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation" prop="familyrelations">
- <el-input v-model="form.familyrelations" placeholder="璇疯緭鍏ヤ笌鎹愯禒鑰呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation" />
- </el-form-item>
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
- </el-form-item>
- <el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="form.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
- </el-form-item>
- <el-form-item label="鍗″彿" prop="bankcardno">
- <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ュ崱鍙�" />
- </el-form-item>
- <el-form-item label="鏀鍚嶇О" prop="branchbankname">
- <el-input v-model="form.branchbankname" placeholder="璇疯緭鍏ユ敮琛屽悕绉�" />
- </el-form-item>
- <el-form-item label="閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" prop="annexbankcard">
- <el-input v-model="form.annexbankcard" placeholder="璇疯緭鍏ラ摱琛屽崱鐓х墖璺緞 澶氫釜鐢�;鍒嗗紑" />
- </el-form-item>
- <el-form-item label="鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" prop="annexregistform">
- <el-input v-model="form.annexregistform" placeholder="璇疯緭鍏ョ櫥璁拌〃鐓х墖璺緞 澶氫釜鐢�;鍒嗗紑" />
- </el-form-item>
- <el-form-item label="璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType" prop="applytype">
- <el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="椤圭洰ID" prop="itemid">
- <el-input v-model="form.itemid" placeholder="璇疯緭鍏ラ」鐩甀D" />
- </el-form-item>
- <el-form-item label="椤圭洰鍚嶇О" prop="itemname">
- <el-input v-model="form.itemname" placeholder="璇疯緭鍏ラ」鐩悕绉�" />
- </el-form-item>
- <el-form-item label="椤圭洰绫诲埆" prop="itemtype">
- <el-select v-model="form.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲埆">
- <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
- </el-select>
- </el-form-item>
- <el-form-item label="鐢宠閲戦" prop="amount">
- <el-input v-model="form.amount" placeholder="璇疯緭鍏ョ敵璇烽噾棰�" />
- </el-form-item>
- <el-form-item label="棰勬敮閲戦" prop="prepaidamount">
- <el-input v-model="form.prepaidamount" placeholder="璇疯緭鍏ラ鏀噾棰�" />
- </el-form-item>
- <el-form-item label="鍙戠エ寮犳暟" prop="invoicecount">
- <el-input v-model="form.invoicecount" placeholder="璇疯緭鍏ュ彂绁ㄥ紶鏁�" />
- </el-form-item>
- <el-form-item label="闄勪欢寮犳暟" prop="attachcount">
- <el-input v-model="form.attachcount" placeholder="璇疯緭鍏ラ檮浠跺紶鏁�" />
- </el-form-item>
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
- </el-form-item>
- <el-form-item label="璁板綍鐘舵��">
- <el-radio-group v-model="form.recordstatus">
- <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="涓婁紶鏍囧織" prop="uploadflag">
- <el-input v-model="form.uploadflag" placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�" />
- </el-form-item>
- <el-form-item label="涓婁紶鏃堕棿" prop="uploadtime">
- <el-date-picker clearable size="small"
- v-model="form.uploadtime"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="閫夋嫨涓婁紶鏃堕棿">
- </el-date-picker>
- </el-form-item>
+ <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+ <el-row>
+ <el-col :span="5"><el-form-item label="璐圭敤鐢宠涓昏〃ID" prop="fundid">
+ <el-input v-model="form.fundid" placeholder="璇疯緭鍏ヨ垂鐢ㄧ敵璇蜂富琛↖D" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鏀剁泭浜哄鍚� 瀹跺睘鎴栦笓瀹�" prop="beneficiaryname">
+ <el-input v-model="form.beneficiaryname" placeholder="璇疯緭鍏ユ敹鐩婁汉濮撳悕 瀹跺睘鎴栦笓瀹�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鏀剁泭浜虹紪鍙�" prop="beneficiaryno">
+ <el-input v-model="form.beneficiaryno" placeholder="璇疯緭鍏ユ敹鐩婁汉缂栧彿" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="宸ヤ綔鍗曚綅" prop="uintname">
+ <el-input v-model="form.uintname" placeholder="璇疯緭鍏ュ伐浣滃崟浣�" />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5"><el-form-item label="宸ヤ綔鍗曚綅缂栧彿" prop="uintno">
+ <el-input v-model="form.uintno" placeholder="璇疯緭鍏ュ伐浣滃崟浣嶇紪鍙�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="宸ヤ綔鍗曚綅鐢ㄦ埛缂栧彿" prop="uintuserno">
+ <el-input v-model="form.uintuserno" placeholder="璇疯緭鍏ュ伐浣滃崟浣嶇敤鎴风紪鍙�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType" prop="idcardtype">
+ <el-select v-model="form.idcardtype" placeholder="璇烽�夋嫨璇佷欢绫诲瀷 鏍规嵁瀛楀吀sys_IDType">
+ <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ </el-select>
+ </el-form-item></el-col>
+ <el-col :span="5"><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="5"><el-form-item label="鎬у埆 鏍规嵁瀛楀吀sys_user_sex" prop="sex">
+ <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆 鏍规嵁瀛楀吀sys_user_sex">
+ <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ </el-select>
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation" prop="familyrelations">
+ <el-input v-model="form.familyrelations" placeholder="璇疯緭鍏ヤ笌鎹愯禒鑰呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
+ <el-input v-model="form.depositbank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5"> <el-form-item label="鍗″彿" prop="bankcardno">
+ <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ュ崱鍙�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鏀鍚嶇О" prop="branchbankname">
+ <el-input v-model="form.branchbankname" placeholder="璇疯緭鍏ユ敮琛屽悕绉�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="閾惰鍗＄収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" prop="annexbankcard">
+ <el-input v-model="form.annexbankcard" placeholder="璇疯緭鍏ラ摱琛屽崱鐓х墖璺緞 澶氫釜鐢�;鍒嗗紑" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鐧昏琛ㄧ収鐗囪矾寰� 澶氫釜鐢�;鍒嗗紑" prop="annexregistform">
+ <el-input v-model="form.annexregistform" placeholder="璇疯緭鍏ョ櫥璁拌〃鐓х墖璺緞 澶氫釜鐢�;鍒嗗紑" />
+ </el-form-item></el-col>
+ </el-row>
+
+
+ <el-row>
+ <el-col :span="5"><el-form-item label="璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType" prop="applytype">
+ <el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆 瑙佸瓧鍏竤ys_SubjectType">
+ <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ </el-select>
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="椤圭洰ID" prop="itemid">
+ <el-input v-model="form.itemid" placeholder="璇疯緭鍏ラ」鐩甀D" />
+ </el-form-item></el-col>
+ <el-col :span="5"> <el-form-item label="椤圭洰鍚嶇О" prop="itemname">
+ <el-input v-model="form.itemname" placeholder="璇疯緭鍏ラ」鐩悕绉�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="椤圭洰绫诲埆" prop="itemtype">
+ <el-select v-model="form.itemtype" placeholder="璇烽�夋嫨椤圭洰绫诲埆">
+ <el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
+ </el-select>
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5"><el-form-item label="鐢宠閲戦" prop="amount">
+ <el-input v-model="form.amount" placeholder="璇疯緭鍏ョ敵璇烽噾棰�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="棰勬敮閲戦" prop="prepaidamount">
+ <el-input v-model="form.prepaidamount" placeholder="璇疯緭鍏ラ鏀噾棰�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="鍙戠エ寮犳暟" prop="invoicecount">
+ <el-input v-model="form.invoicecount" placeholder="璇疯緭鍏ュ彂绁ㄥ紶鏁�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="闄勪欢寮犳暟" prop="attachcount">
+ <el-input v-model="form.attachcount" placeholder="璇疯緭鍏ラ檮浠跺紶鏁�" />
+ </el-form-item></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5"><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="璁板綍鐘舵��">
+ <el-radio-group v-model="form.recordstatus">
+ <el-radio label="1">璇烽�夋嫨瀛楀吀鐢熸垚</el-radio>
+ </el-radio-group>
+ </el-form-item></el-col>
+ <el-col :span="5"> <el-form-item label="涓婁紶鏍囧織" prop="uploadflag">
+ <el-input v-model="form.uploadflag" placeholder="璇疯緭鍏ヤ笂浼犳爣蹇�" />
+ </el-form-item></el-col>
+ <el-col :span="5"><el-form-item label="涓婁紶鏃堕棿" prop="uploadtime">
+ <el-date-picker clearable size="small" v-model="form.uploadtime" type="date" value-format="yyyy-MM-dd"
+ placeholder="閫夋嫨涓婁紶鏃堕棿">
+ </el-date-picker>
+ </el-form-item></el-col>
+ </el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -434,7 +339,7 @@
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
- this.single = selection.length!==1
+ this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 鏂板鎸夐挳鎿嶄綔 */
@@ -476,12 +381,12 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const ids = row.id || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璐圭敤鐢宠鏄庣粏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ this.$modal.confirm('鏄惁纭鍒犻櫎璐圭敤鐢宠鏄庣粏缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function () {
return delFunddetail(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ }).catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -492,7 +397,7 @@
}).then(response => {
this.$download.name(response.msg);
this.exportLoading = false;
- }).catch(() => {});
+ }).catch(() => { });
}
}
};
diff --git a/src/views/project/fundstatistics/index.vue b/src/views/project/fundstatistics/index.vue
index d8ae804..2920619 100644
--- a/src/views/project/fundstatistics/index.vue
+++ b/src/views/project/fundstatistics/index.vue
@@ -244,7 +244,6 @@
//瀵煎嚭姹囨�昏〃
exportSummary(id) {
exportFundCost(id).then((res) => {
- debugger;
if (res.downloadUrl) {
var fileUrl = res;
//鑾峰彇褰撳墠缃戝潃
diff --git a/src/views/project/indexstatistics/index.vue b/src/views/project/indexstatistics/index.vue
index c3b03a1..44853f7 100644
--- a/src/views/project/indexstatistics/index.vue
+++ b/src/views/project/indexstatistics/index.vue
@@ -858,7 +858,6 @@
}
this.organData = list;
*/
- debugger;
let list = response.data;
for (let i = 0; i < this.organData.length; i++) {
let ii = list.findIndex(
@@ -1053,15 +1052,12 @@
// getOrgansOfHospital
// getOrgansOfHospitalByMonth
getOrgansOfHospitalByMonth(param).then((response) => {
- // debugger
-
if (response.code == 200) {
let newConfig = {
...DEF_TABLE_CONFIG,
};
let arr = response.data;
let dataList = [];
- debugger
dataList = response.data.map((item) => {
let li = [];
li.push(
@@ -1095,7 +1091,6 @@
return li;
});
newConfig.data = dataList;
- debugger
this.config = newConfig;
}
});
@@ -1105,7 +1100,6 @@
closeBaseInfoTab() {
// 鍏抽棴鎸囧畾椤电
// const obj = { path: "/organ/donatebaseinfo", name: "Donatebaseinfo" };
- // debugger
// console.log(this.$tab)
// this.$tab.closePage(obj);
},
diff --git a/src/views/project/medicalcostfundapplycheck/index.vue b/src/views/project/medicalcostfundapplycheck/index.vue
index cea00b2..ffa2d20 100644
--- a/src/views/project/medicalcostfundapplycheck/index.vue
+++ b/src/views/project/medicalcostfundapplycheck/index.vue
@@ -1379,7 +1379,6 @@
this.personlist.map((res) => {
if (row.beneficiaryname == res.username) {
row.beneficiaryno = res.userno;
- debugger;
row.beneficiaryname = res.username;
row.bankcardno = res.bankcardno;
row.branchbankname = res.branchbankname;
@@ -1407,7 +1406,6 @@
console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
// this.defaultperson = response.data;
// this.standardlevel = response.data.standardlevel;
- debugger;
if (
response.data.userName === "001" ||
response.data.userName === "002" ||
diff --git a/src/views/project/organization/index.vue b/src/views/project/organization/index.vue
index 2a106a7..f02e89f 100644
--- a/src/views/project/organization/index.vue
+++ b/src/views/project/organization/index.vue
@@ -1,333 +1,170 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- v-show="showSearch"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="缁勭粐鍚嶇О" prop="organizationname">
- <el-input
- v-model="queryParams.organizationname"
- placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.organizationname" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鏈烘瀯绫诲瀷" prop="organizationtype">
- <el-select
- v-model="queryParams.organizationtype"
- placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_OrganizationType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.organizationtype" placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
- <el-form-item label="鎵�鍦ㄥ湴鍖�" prop="regionallevel">
- <el-select
- v-model="queryParams.regionallevel"
- placeholder="璇烽�夋嫨鎵�鍦ㄥ湴鍖�"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_RegionalLevel"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-form-item label="鎵�鍦ㄥ湴鍖�" prop="regionallevel">
+ <el-select v-model="queryParams.regionallevel" placeholder="璇烽�夋嫨鎵�鍦ㄥ湴鍖�" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
- </el-form-item>
+ </el-form-item>
<el-form-item>
- <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-form-item>
</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>
</el-col>
<el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="el-icon-edit"
- size="mini"
- :disabled="single"
- @click="handleUpdate"
- >淇敼</el-button
- >
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+ @click="handleUpdate">淇敼</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="el-icon-delete"
- size="mini"
- :disabled="multiple"
- @click="handleDelete"
- >鍒犻櫎</el-button
- >
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+ @click="handleDelete">鍒犻櫎</el-button>
</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>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table
- v-loading="loading"
- :data="organizationList"
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="loading" :data="organizationList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<!-- <el-table-column label="涓婚敭鑷" align="center" prop="id" /> -->
<el-table-column label="鏈烘瀯绫诲瀷" align="center" prop="organizationtype">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_OrganizationType"
- :value="scope.row.organizationtype"
- />
+ <dict-tag :options="dict.type.sys_OrganizationType" :value="scope.row.organizationtype" />
</template>
</el-table-column>
<el-table-column label="缁勭粐缂栧彿" align="left" prop="organizationid" />
- <el-table-column
- label="缁勭粐鍚嶇О"
- width="260px"
- align="left"
- prop="organizationname"
- />
+ <el-table-column label="缁勭粐鍚嶇О" width="260px" align="left" prop="organizationname" />
<el-table-column label="鎵�鍦ㄥ湴鍖�" align="left" prop="regionallevel">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_RegionalLevel"
- :value="scope.row.regionallevel"
- />
+ <dict-tag :options="dict.type.sys_RegionalLevel" :value="scope.row.regionallevel" />
</template>
</el-table-column>
- <el-table-column
- label="鍦板潃"
- width="260px"
- align="left"
- prop="registeraddress"
- />
+ <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"
- >
+ <el-table-column label="娉ㄥ唽鏃堕棿" align="left" prop="registertime" width="180">
<template slot-scope="scope">
<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"
- >
+ <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
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+ @pagination="getList" />
<!-- 娣诲姞鎴栦慨鏀规満鏋勭鐞嗗璇濇 -->
- <el-dialog
- :title="title"
- :close-on-click-modal="false"
- :visible.sync="open"
- width="60%"
- append-to-body
- >
+ <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="60%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row style="overflow: hidden">
- <el-col :span="8">
- <el-form-item label="缁勭粐缂栧彿" prop="organizationid">
- <el-input
- v-model="form.organizationid"
- placeholder="璇疯緭鍏ョ粍缁囩紪鍙�"
- />
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炲湴鍖�" prop="regionallevel">
+ <el-select v-model="form.regionallevel" placeholder="璇烽�夋嫨鍦板尯">
+ <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
</el-form-item>
</el-col>
- <el-col :span="16">
+ <el-col :span="10">
<el-form-item label="缁勭粐鍚嶇О" prop="organizationname">
- <el-input
- v-model="form.organizationname"
- placeholder="璇疯緭鍏ョ粍缁囧悕绉�"
- />
+ <el-input v-model="form.organizationname" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="缁勭粐缂栧彿" prop="organizationid">
+ <el-input v-model="form.organizationid" placeholder="璇疯緭鍏ョ粍缁囩紪鍙�" />
</el-form-item>
</el-col>
</el-row>
- <el-row
- ><el-col :span="8">
+ <el-row>
+ <el-col :span="5">
<el-form-item label="鏈烘瀯绫诲瀷" prop="organizationtype">
- <el-select
- v-model="form.organizationtype"
- placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.sys_OrganizationType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.organizationtype" placeholder="璇烽�夋嫨鏈烘瀯绫诲瀷">
+ <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="5">
<el-form-item label="鍖婚櫌鎬ц川" prop="hospitalnature">
- <el-select
- v-model="form.hospitalnature"
- placeholder="璇烽�夋嫨鍖婚櫌鎬ц川"
- >
- <el-option
- v-for="dict in dict.type.sys_HospitalNature"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="form.hospitalnature" placeholder="璇烽�夋嫨鍖婚櫌鎬ц川">
+ <el-option v-for="dict in dict.type.sys_HospitalNature" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item
- label="鍖荤枟鏈烘瀯缂栧彿"
- prop="medicalcode"
- >
- <el-input
- v-model="form.medicalcode"
- placeholder="璇疯緭鍏ュ尰鐤楁満鏋勭紪鍙�"
- />
+ <el-col :span="5">
+ <el-form-item label="鍖婚櫌缂栫爜" prop="medicalcode">
+ <el-input v-model="form.medicalcode" placeholder="璇疯緭鍏ュ尰鐤楁満鏋勭紪鍙�" />
</el-form-item>
</el-col>
- </el-row>
- <el-row
- ><el-col :span="8">
+ <el-col :span="7">
<el-form-item label="娉ㄥ唽鏃堕棿" prop="registertime">
- <el-date-picker
- clearable
- size="small"
- v-model="form.registertime"
- type="datetime"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="閫夋嫨娉ㄥ唽鏃堕棿"
- >
+ <el-date-picker clearable size="small" v-model="form.registertime" type="datetime"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨娉ㄥ唽鏃堕棿">
</el-date-picker>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴浜�" prop="contactperson">
- <el-input
- v-model="form.contactperson"
- placeholder="璇疯緭鍏ヨ仈绯讳汉"
- />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="contactnumber">
- <el-input
- v-model="form.contactnumber"
- placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
- />
- </el-form-item>
- </el-col>
</el-row>
-
<el-row>
- <el-col :span="8">
- <el-form-item label="鎵�灞炲湴鍖�" prop="regionallevel">
- <el-select v-model="form.regionallevel" placeholder="璇烽�夋嫨鍦板尯">
- <el-option
- v-for="dict in dict.type.sys_RegionalLevel"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
- </el-select>
+ <el-col :span="10">
+ <el-form-item label="娉ㄥ唽鍦板潃" prop="registeraddress">
+ <el-input v-model="form.registeraddress" placeholder="璇疯緭鍏ユ敞鍐屽湴鐐硅缁嗗湴鍧�" />
</el-form-item>
</el-col>
-
- <el-col :span="16">
- <el-form-item label="鏈烘瀯鍦板潃" prop="registeraddress">
- <el-input
- v-model="form.registeraddress"
- placeholder="璇疯緭鍏ユ敞鍐屽湴鐐硅缁嗗湴鍧�"
- />
+ <el-col :span="5">
+ <el-form-item label="鑱旂郴浜�" prop="contactperson">
+ <el-input v-model="form.contactperson" placeholder="璇疯緭鍏ヨ仈绯讳汉" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="contactnumber">
+ <el-input v-model="form.contactnumber" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" />
</el-form-item>
</el-col>
</el-row>
-
+ <el-row>
+ <el-col :span="10">
+ <el-form-item label="閾惰鍚嶇О" prop="bankname">
+ <el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="閾惰璐﹀彿" prop="bankaccount">
+ <el-input v-model="form.bankaccount" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
+ </el-form-item>
+ </el-col>
+
+ </el-row>
<el-row>
<el-form-item label="浠嬬粛" prop="introduction">
- <el-input
- :rows="5"
- v-model="form.introduction"
- type="textarea"
- placeholder="璇疯緭鍏ュ唴瀹�"
- />
+ <el-input :rows="5" v-model="form.introduction" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
</el-row>
-
<el-row>
<el-col :span="24">
<el-form-item label="logo鍥剧墖璺緞">
@@ -396,6 +233,9 @@
],
organizationid: [
{ required: true, message: "缁勭粐缂栧彿涓嶈兘涓虹┖", trigger: "blur" },
+ ],
+ regionallevel: [
+ { required: true, message: "鎵�灞炲湴甯備笉鑳戒负绌�", trigger: "blur" },
],
},
};
@@ -519,7 +359,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -534,7 +374,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
},
};
diff --git a/src/views/project/relativesconfirmation/index.vue b/src/views/project/relativesconfirmation/index.vue
index 7230d8b..8de8f71 100644
--- a/src/views/project/relativesconfirmation/index.vue
+++ b/src/views/project/relativesconfirmation/index.vue
@@ -1267,10 +1267,7 @@
};
this.loading = true;
this.curCase = row;
- debugger;
- console.log("32323232323", searchparam, row);
listRelativesconfirmation(searchparam).then((response) => {
- console.log("wdadwadawdawd", response);
this.loading = false;
if (response.code == 200) {
if (response.rows.length == 0) {
@@ -1925,7 +1922,6 @@
const id = row.id || this.ids;
downloadconfirmationinfo(id).then((response) => {
- debugger;
var fileUrl = response;
//鑾峰彇褰撳墠缃戝潃
var urlBase = process.env.VUE_APP_BASE_API;
diff --git a/src/views/project/travelexpenseslist/eidt.vue b/src/views/project/travelexpenseslist/eidt.vue
index 00bbaac..44e0fba 100644
--- a/src/views/project/travelexpenseslist/eidt.vue
+++ b/src/views/project/travelexpenseslist/eidt.vue
@@ -24,8 +24,7 @@
<el-col :span="7">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
<el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
- <el-option v-for="item in baselist" :key="item.index" :label="item.name"
- :value="item.infoid">
+ <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
</el-option>
</el-select>
</el-form-item>
@@ -34,8 +33,7 @@
<el-row>
<el-col :span="7">
<el-form-item label="鍑哄樊浜哄垎绫�" prop="costtype">
- <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�"
- @change="getTravelers">
+ <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
<el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value"
:label="dict.label" :value="dict.value"></el-option>
</el-select>
@@ -138,66 +136,59 @@
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="
- (val) => {
+ <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
- (val) => {
+ <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="(val) => {
sumTotalFee();
}
- ">{{ Number(scope.row.cityfee).toFixed(2) }}
+ ">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
</template>
</el-table-column>
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
- (val) => {
+ <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="otherexpense" label="鏉傝垂" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
- (val) => {
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="foodexpenses" label="浼欓璐规姤閿�" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="
- (val) => {
+ <el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="foodallowance" label="浼欓璐硅ˉ鍔�" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="
- (val) => {
+ <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="
- (val) => {
+ <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="(val) => {
sumTotalFee();
}
- " />
+ " />
</template>
</el-table-column>
<el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
@@ -215,7 +206,7 @@
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
<el-button @click.native.prevent="
deleteRow(scope.$index, applicationDetailArr, scope.row)
- " type="text" size="small">
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
@@ -300,11 +291,10 @@
</el-form-item> -->
<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="5" :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-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>
@@ -657,74 +647,73 @@
});
});
},
- deleteRow(index, rows, row) {
- this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "success",
- })
- .then(() => {
-
- if (row.id !== null) {
- delReimbursementdetail(row.id).then((res) => {
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- rows.splice(index, 1);
- this.recountOrderNo();
- this.sumTotalFee();
- });
- } else {
- rows.splice(index, 1);
- this.sumTotalFee();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- this.recountOrderNo();
- }
+ deleteRow(index, rows, row) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "success",
})
- .catch(() => {
- //鍑犵偣鍙栨秷鐨勬彁绀�
- });
+ .then(() => {
+
+ if (row.id !== null) {
+ delReimbursementdetail(row.id).then((res) => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ rows.splice(index, 1);
+ this.recountOrderNo();
+ this.sumTotalFee();
+ });
+ } else {
+ rows.splice(index, 1);
+ this.sumTotalFee();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.recountOrderNo();
+ }
+ })
+ .catch(() => {
+ //鍑犵偣鍙栨秷鐨勬彁绀�
+ });
+ },
+ //璁＄畻璐圭敤鍚堣
+ sumTotalFee() {
+ let allSum = 0;
+ try {
+ for (let i = 0; i < this.applicationDetailArr.length; i++) {
+ let totalFee = 0;
+ //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].trafficexpense))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].trafficexpense);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].cityfee))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].cityfee);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].hotelexpense))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].hotelexpense);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].otherexpense))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].otherexpense);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].foodexpenses))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].foodexpenses);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].foodallowance))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].foodallowance);
+ }
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].otherfeeamount))) {
+ totalFee += parseFloat(this.applicationDetailArr[i].otherfeeamount);
+ }
+ this.applicationDetailArr[i].total = parseFloat(totalFee).toFixed(2);
+ this.$set(this.applicationDetailArr, i, this.applicationDetailArr[i]);
+ if (!isNaN(parseFloat(this.applicationDetailArr[i].total))) {
+ allSum += parseFloat(this.applicationDetailArr[i].total);
+ }
+ }
+ this.form.amountrequested = allSum.toFixed(2);
+ this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
+ } catch { }
+ },
+
},
- //璁＄畻璐圭敤鍚堣
- sumTotalFee() {
- // debugger;
- let allSum = 0;
- try {
- for (let i = 0; i < this.applicationDetailArr.length; i++) {
- let totalFee = 0;
- //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.applicationDetailArr[i].trafficexpense))) {
- totalFee += parseFloat(this.applicationDetailArr[i].trafficexpense);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].cityfee))) {
- totalFee += parseFloat(this.applicationDetailArr[i].cityfee);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].hotelexpense))) {
- totalFee += parseFloat(this.applicationDetailArr[i].hotelexpense);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].otherexpense))) {
- totalFee += parseFloat(this.applicationDetailArr[i].otherexpense);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].foodexpenses))) {
- totalFee += parseFloat(this.applicationDetailArr[i].foodexpenses);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].foodallowance))) {
- totalFee += parseFloat(this.applicationDetailArr[i].foodallowance);
- }
- if (!isNaN(parseFloat(this.applicationDetailArr[i].otherfeeamount))) {
- totalFee += parseFloat(this.applicationDetailArr[i].otherfeeamount);
- }
- this.applicationDetailArr[i].total = parseFloat(totalFee).toFixed(2);
- this.$set(this.applicationDetailArr, i, this.applicationDetailArr[i]);
- if (!isNaN(parseFloat(this.applicationDetailArr[i].total))) {
- allSum += parseFloat(this.applicationDetailArr[i].total);
- }
- }
- this.form.amountrequested = allSum.toFixed(2);
- this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
- } catch { }
- },
-
- },
-
+
}
</script>
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index f9ced41..f153007 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -135,6 +135,7 @@
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
<el-input v-model="form.deptmentname" placeholder="鎵�灞炵粍鍒�" />
+ <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="璇烽�夋嫨褰掑睘閮ㄩ棬" />-->
</el-form-item>
</el-col>
<el-col :span="5">
@@ -323,7 +324,7 @@
if (scope.row.endtime) { return time.getTime() > new Date(scope.row.endtime.replace(/-/g, '/')) }
}
}" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
@@ -334,7 +335,7 @@
if (scope.row.starttime) { return time.getTime() < new Date(scope.row.starttime.replace(/-/g, '/')) }
}
}" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
@@ -343,21 +344,20 @@
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column label="鍒拌揪鍦�" prop="destination2" align="center" width="140">
+ <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" width="140">
<template slot-scope="scope">
<!-- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" /> -->
-
<el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
- @change="getallowance2(scope.row, scope.row.destination)">
+ @change="getallowance(scope.row)">
<el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column prop="days" label="澶╂暟" width="65" align="center">
<template slot-scope="scope">
- <el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="澶╂暟" />
+ <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="澶╂暟" />
</template>
</el-table-column>
<el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
@@ -379,7 +379,7 @@
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -389,7 +389,7 @@
<template slot-scope="scope">
<el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
@@ -399,7 +399,7 @@
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -408,7 +408,7 @@
<el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -416,7 +416,7 @@
<el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -424,7 +424,7 @@
<el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -433,7 +433,7 @@
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="(val) => {
- sumTotalFee();
+ sumRowFee(scope.row);
}
" />
</template>
@@ -524,7 +524,7 @@
</el-table-column><el-table-column prop="paiddate" slot="" label="鎵撴鏃ユ湡" fixed align="center" width="150">
<template slot-scope="scope">
<el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.paiddate" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true" @blur="getallowance(scope.row)">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鎵撴鏃ユ湡" :disabled="true">
</el-date-picker>
</template>
</el-table-column>
@@ -580,8 +580,8 @@
-->
<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="5"
- :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">
@@ -611,6 +611,8 @@
</template>
<script>
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import { listReimbursementpayee, addReimbursementpayee, updateReimbursementpayee } from "@/api/project/reimbursementpayee";
import {
@@ -636,12 +638,14 @@
import { getInfoBytheUserNo } from "@/api/project/externalperson";
import { regionDataPlus, CodeToText } from "element-china-area-data";
import Li_area_select from "@/components/Address";
-import { getUserProfile } from "@/api/system/user";
+import { getUser,getUserProfile } from "@/api/system/user";
+import { treeselect } from "@/api/system/dept";
import { getSubsidy } from "@/api/project/travelcity";
import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
export default {
components: {
+ Treeselect,
Li_area_select,
},
name: "Funddetail",
@@ -668,7 +672,9 @@
//鍏ㄩ儴浜哄憳
personsList: [],
//涓嬫媺鍙互閫夋嫨浜哄憳鍒楄〃
- personsSel: [],
+ personsSel: [],
+ // 閮ㄩ棬鏍戦�夐」
+ deptOptions: undefined,
costtypeobj: {
value: 0,
@@ -713,7 +719,7 @@
remark: null,
departure: null,
endtime: null,
- destination2: null,
+ destination: null,
uploadFlag: null,
uploadTime: null,
// orderByColumn: "createTime",
@@ -723,6 +729,11 @@
queryParams2: {
persontype: null,
arriveAddr: null,
+ },
+ feesParams: {
+ beneficiaryNo: null,
+ starttime: null,
+ endtime: null,
},
//鏌ヨ浠樻
queryParamsPayee: {
@@ -806,6 +817,8 @@
//鑾峰彇鐧诲綍鑰呬俊鎭�
this.getUsermsg();
+ //鑾峰彇閮ㄩ棬淇℃伅
+ //this.getTreeselect();
},
methods: {
@@ -837,6 +850,13 @@
getUserProfile().then((response) => {
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
+ });
+ },
+
+ /** 鏌ヨ閮ㄩ棬涓嬫媺鏍戠粨鏋� */
+ getTreeselect() {
+ treeselect().then(response => {
+ this.deptOptions = response.data;
});
},
@@ -918,23 +938,25 @@
}
},
- //璁＄畻琛ュ姪
- getallowance(row) {
- if (
- row.starttime != "" &&
- row.starttime != null &&
- row.endtime != "" &&
- row.endtime != null
- ) {
+ //璁＄畻鏃ユ湡
+ getdays(row) {
+ if (row.starttime != "" && row.starttime != null && row.endtime != "" && row.endtime != null) {
//璁＄畻澶╂暟
row.days = (Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1000 * 3600 * 24)) + 1).toString()
} else {
- row.days = '';
+ row.days = 0;
};
+ //璁＄畻琛ュ姪
+ this.getallowance(row);
+ },
+
+ //璁＄畻琛ュ姪
+ getallowance(row) {
+ console.log("ro",row);
//鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
- if (row.destination2 != "") {
- var tempStr = row.destination2;
+ if (row.destination != "") {
+ var tempStr = row.destination;
//楠岃瘉鍩庡競
if (tempStr == "鏉窞") {
@@ -951,12 +973,11 @@
//浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
row.foodallowance = (parseInt(row.days) * 100).toString();
- //璁＄畻鍚堣
- this.sumTotalFee();
+ //璁＄畻鍚堣
+ this.sumRowFee(row);
},
getallowance2(row, val2) {
- // this.getallowance(row);
this.arriveAddr = val2;
this.queryParams2.arriveAddr;
this.queryParams2.personType = row;
@@ -1001,7 +1022,7 @@
row.hotelexpense = fee;
})
.finally(() => {
- this.sumTotalFee(row);
+ this.sumTotalFee();
});
}
},
@@ -1014,7 +1035,7 @@
row.searchAddress.shi != "" &&
row.searchAddress.qu != ""
) {
- row.destination2 =
+ row.destination =
row.searchAddress.sheng +
row.searchAddress.shi +
row.searchAddress.qu;
@@ -1250,17 +1271,19 @@
getReimbursementdetaillist(ids).then((res) => {
this.rbDetails = res.data;
if (this.rbDetails.length == 0) { this.addDetailRow(0); }
- //瑙ｆ瀽鍑哄樊鍦板潃
- /*
+
for (let i = 0; i < this.rbDetails.length; i++) {
- this.rbDetails[i].index = i;
- this.rbDetails[i].searchAddress = {
- sheng: this.rbDetails[i].travelprovincename,
- shi: this.rbDetails[i].travelcityname,
- qu: this.rbDetails[i].traveltownname,
- };
+ this.sumRowFee(this.rbDetails[i]);
+ //瑙ｆ瀽鍑哄樊鍦板潃
+ /*
+ this.rbDetails[i].index = i;
+ this.rbDetails[i].searchAddress = {
+ sheng: this.rbDetails[i].travelprovincename,
+ shi: this.rbDetails[i].travelcityname,
+ qu: this.rbDetails[i].traveltownname,
+ }; */
}
- */
+
//瀹炴椂鍚堣閲戦
//this.sumTotalFee();
});
@@ -1300,9 +1323,11 @@
listFundflow(listFundflowparams).then((res) => {
this.fundflowList = res.rows;
});
+
//鎶ラ攢鏄庣粏
getReimbursementdetaillist(ids).then((res) => {
this.rbDetails = res.data;
+ /*
for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].index = i;
this.rbDetails[i].searchAddress = {
@@ -1311,10 +1336,13 @@
qu: this.rbDetails[i].traveltownname,
};
}
- //this.sumTotalFee();
+ */
});
- //璐︽埛
+ if (this.rbDetails.length > 0) this.sumTotalFee();
+
+
+ //浠樻淇℃伅
this.queryParamsPayee.rbid = ids;
listReimbursementpayee(this.queryParamsPayee).then((res) => {
this.rbPayees = res.rows;
@@ -1509,7 +1537,7 @@
starttime: null,
departure: null,
endtime: null,
- destination2: null,
+ destination: null,
days: null,
trafficexpense: 0,
traffictype: null,
@@ -1610,11 +1638,11 @@
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
rows.splice(index, 1);
this.recountOrderNo2();
- // this.sumTotalFee();
+ this.sumTotalFee();
});
} else {
rows.splice(index, 1);
- //this.sumTotalFee();
+ this.sumTotalFee();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
this.recountOrderNo2();
}
@@ -1672,9 +1700,66 @@
});
},
+ //璁＄畻涓�琛屽悎璁�
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣
+ sumRowFee(row) {
+ let totalFee = 0;
+ if (!isNaN(parseFloat(row.trafficexpense))) {
+ totalFee += parseFloat(row.trafficexpense);
+ }
+ if (!isNaN(parseFloat(row.cityfee))) {
+ totalFee += parseFloat(row.cityfee);
+ }
+ if (!isNaN(parseFloat(row.hotelexpense))) {
+ totalFee += parseFloat(row.hotelexpense);
+ }
+ if (!isNaN(parseFloat(row.otherexpense))) {
+ totalFee += parseFloat(row.otherexpense);
+ }
+ if (!isNaN(parseFloat(row.foodexpenses))) {
+ totalFee += parseFloat(row.foodexpenses);
+ }
+ if (!isNaN(parseFloat(row.foodallowance))) {
+ totalFee += parseFloat(row.foodallowance);
+ }
+ if (!isNaN(parseFloat(row.otherfeeamount))) {
+ totalFee += parseFloat(row.otherfeeamount);
+ }
+ row.total = totalFee;
+
+ /*
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].trafficexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].cityfee))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].cityfee);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].hotelexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].hotelexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherexpense))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].otherexpense);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodexpenses))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].foodexpenses);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodallowance))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].foodallowance);
+ }
+ if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherfeeamount))) {
+ totalFee += parseFloat(this.rbDetails[rowIndex].otherfeeamount);
+ }
+ this.rbDetails[rowIndex].total = parseFloat(totalFee).toFixed(2);
+ this.$set(this.rbDetails, rowIndex, this.rbDetails[rowIndex]);
+ */
+ //閲嶆柊璁＄畻鏁翠釜鎶ラ攢鍗曠殑鍚堣
+ this.sumTotalFee();
+ },
+
//璁＄畻璐圭敤鍚堣
sumTotalFee() {
let allSum = 0;
+
//鎹愮尞鑰呭灞炶垂鐢�
if (!isNaN(parseFloat(this.form.donoramount))) {
allSum += parseFloat(this.form.donoramount);
@@ -1683,10 +1768,11 @@
//鎶ラ攢鏄庣粏璐圭敤
try {
for (let i = 0; i < this.rbDetails.length; i++) {
+ /*
let totalFee = 0;
//璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.rbDetails[i].trafficexpense))) {
- totalFee += parseFloat(this.rbDetails[i].trafficexpense);
+ if (!isNaN(parseFloat(this.rbDetails[i].total))) {
+ totalFee += parseFloat(this.rbDetails[i].total);
}
if (!isNaN(parseFloat(this.rbDetails[i].cityfee))) {
totalFee += parseFloat(this.rbDetails[i].cityfee);
@@ -1708,6 +1794,8 @@
}
this.rbDetails[i].total = parseFloat(totalFee).toFixed(2);
this.$set(this.rbDetails, i, this.rbDetails[i]);
+ */
+
if (!isNaN(parseFloat(this.rbDetails[i].total))) {
allSum += parseFloat(this.rbDetails[i].total);
}
@@ -1716,21 +1804,6 @@
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
} catch { }
- },
-
- getDetailArr(rbid) {
- getReimbursementdetaillist(rbid).then((res) => {
- this.rbDetails = res.data;
- for (let i = 0; i < this.rbDetails.length; i++) {
- this.rbDetails[i].index = i;
- this.rbDetails[i].searchAddress = {
- sheng: this.rbDetails[i].travelprovincename,
- shi: this.rbDetails[i].travelcityname,
- qu: this.rbDetails[i].traveltownname,
- };
- }
- this.sumTotalFee();
- });
},
//閲戦鏁板瓧杞崲鎴愬ぇ鍐�
diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpenseslistrecord/index.vue
index 8c968ae..1a80e41 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/src/views/project/travelexpenseslistrecord/index.vue
@@ -519,7 +519,7 @@
<el-col :span="14">
<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="5"
+ <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"
diff --git a/src/views/system/medicalevalustion/index.vue b/src/views/system/medicalevalustion/index.vue
index 6874d9e..efcd565 100644
--- a/src/views/system/medicalevalustion/index.vue
+++ b/src/views/system/medicalevalustion/index.vue
@@ -417,7 +417,6 @@
donorno: data.donorno,
};
this.loading = true;
- // debugger;
listMedicalevaluation(searchParam).then((response) => {
this.loading = false;
if (response.code == 200) {
diff --git a/vue.config.js b/vue.config.js
index ee3dea1..63be6bd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,8 +35,8 @@
[process.env.VUE_APP_BASE_API]: {
target:`http://localhost:8080`,
//target:`http://116.62.18.175:8080`,
- // target:`http://192.168.1.4:8080`,
- //target: `https://slb.hospitalstar.com:9093`,
+ //target:`http://192.168.1.4:8080`,
+ // target: `https://slb.hospitalstar.com:9093`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3