From e2423f3b3a1ec61ad2c8584f410d33cfdbd611f9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 05 五月 2023 11:28:23 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/expertFeeFundApply/index.vue | 2
vue.config.js | 4
src/views/project/travelexpenseslist/index.vue | 474 +++++++++++++++++++++++++------
src/api/project/travelcity.js | 11
src/api/project/reimbursement.js | 7
src/api/project/reimbursementpayee.js | 9
src/views/project/fundflowrule/index.vue | 341 ++++------------------
src/api/project/reimbursementdetail.js | 10
8 files changed, 480 insertions(+), 378 deletions(-)
diff --git a/src/api/project/reimbursement.js b/src/api/project/reimbursement.js
index 5a42d6c..6c9ecff 100644
--- a/src/api/project/reimbursement.js
+++ b/src/api/project/reimbursement.js
@@ -42,6 +42,13 @@
data: data
})
}
+// export function updateReimbursement(data) {
+// return request({
+// url: '/project/reimbursement/editMoney',
+// method: 'post',
+// data: data
+// })
+// }
// 鍒犻櫎鎶ラ攢鐢宠
export function delReimbursement(id) {
diff --git a/src/api/project/reimbursementdetail.js b/src/api/project/reimbursementdetail.js
index 6132cd9..436d3ae 100644
--- a/src/api/project/reimbursementdetail.js
+++ b/src/api/project/reimbursementdetail.js
@@ -28,6 +28,16 @@
})
}
+// /project/reimbursement/getRBDetailList/{rbid}
+// 淇敼details鍒楄〃
+export function updateReimbursementdetaillist(data) {
+ return request({
+ url: '/project/reimbursementdetail/updateRDlList',
+ method: 'post',
+ data: data
+ })
+}
+
// /project/reimbursement/getMaxId
diff --git a/src/api/project/reimbursementpayee.js b/src/api/project/reimbursementpayee.js
index d6e99a0..4295bd3 100644
--- a/src/api/project/reimbursementpayee.js
+++ b/src/api/project/reimbursementpayee.js
@@ -26,6 +26,15 @@
})
}
+// 鏂板銆佷慨鏀瑰樊鏃呮姤閿�浠樻淇℃伅
+export function addOrUpdateRBpayee(data) {
+ return request({
+ url: '/project/reimbursementpayee/addOrUpdateRBpayee',
+ method: 'post',
+ data: data
+ })
+}
+
// 淇敼宸梾鎶ラ攢浠樻淇℃伅
export function updateReimbursementpayee(data) {
return request({
diff --git a/src/api/project/travelcity.js b/src/api/project/travelcity.js
new file mode 100644
index 0000000..871f0ef
--- /dev/null
+++ b/src/api/project/travelcity.js
@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+
+//宸梾璐逛笂鎶�
+export function getSubsidy(cityCode) {
+ return request({
+ url: '/project/travelcity/getSubsidy/' + cityCode,
+ method: 'get'
+ })
+}
\ No newline at end of file
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index b7c61c9..e130ae0 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -1239,7 +1239,7 @@
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res.rows);
+ console.log("浜哄憳琛細", res);
this.personlist = res.rows;
});
},
diff --git a/src/views/project/fundflowrule/index.vue b/src/views/project/fundflowrule/index.vue
index 4b53108..a2ad81d 100644
--- a/src/views/project/fundflowrule/index.vue
+++ b/src/views/project/fundflowrule/index.vue
@@ -1,158 +1,59 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- v-show="showSearch"
- label-width="100px"
- >
+ <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="璐圭敤绫诲埆" prop="applytype">
- <el-select
- v-model="queryParams.applytype"
- placeholder="璇烽�夋嫨璐圭敤绫诲埆"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_ConsolationType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="瀹℃牳浜虹紪鍙�" prop="checkuserno">
- <el-input
- v-model="queryParams.checkuserno"
- placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.checkuserno" placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="瀹℃牳浜哄鍚�" prop="checkusername">
- <el-input
- v-model="queryParams.checkusername"
- placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
+ <el-input v-model="queryParams.checkusername" placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕" clearable size="small"
+ @keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item
- label="鏄惁鍙鏍稿悓閮ㄩ棬"
- prop="verificationdept"
- label-width="140px"
- >
- <el-select
- v-model="queryParams.verificationdept"
- placeholder="鏄惁鍙鏍稿悓閮ㄩ棬"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in yesnoArr"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-form-item label="鏄惁鍙鏍稿悓閮ㄩ棬" prop="verificationdept" label-width="140px">
+ <el-select v-model="queryParams.verificationdept" placeholder="鏄惁鍙鏍稿悓閮ㄩ棬" clearable size="small">
+ <el-option v-for="dict in yesnoArr" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="褰撳墠瀹℃牳绾у埆" prop="flowlevel">
- <el-select
- v-model="queryParams.flowlevel"
- placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_consolationfundlevel"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.flowlevel" placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_consolationfundlevel" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="鎬诲鏍哥骇鍒�" prop="totallevel">
- <el-select
- v-model="queryParams.totallevel"
- placeholder="鏄惁鍙鏍稿悓閮ㄩ棬"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in checkLevelArr"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.totallevel" placeholder="鏄惁鍙鏍稿悓閮ㄩ棬" clearable size="small">
+ <el-option v-for="dict in checkLevelArr" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="璐圭敤绫诲埆" prop="fundtype">
- <el-select
- v-model="queryParams.fundtype"
- placeholder="璇烽�夋嫨璐圭敤绫诲埆"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_fundtypes"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="queryParams.fundtype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" clearable size="small">
+ <el-option v-for="dict in dict.type.sys_fundtypes" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</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"
- v-hasPermi="['project:fundflowrule:add']"
- >鏂板</el-button
- >
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+ v-hasPermi="['project:fundflowrule: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:fundflowrule:edit']"
- >淇敼</el-button
- >
+ <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
+ v-hasPermi="['project:fundflowrule: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:fundflowrule:remove']"
- >鍒犻櫎</el-button
- >
+ <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+ v-hasPermi="['project:fundflowrule:remove']">鍒犻櫎</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button
@@ -165,125 +66,56 @@
v-hasPermi="['project:fundflowrule:export']"
>瀵煎嚭</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="fundflowruleList"
- @selection-change="handleSelectionChange"
- >
+ <el-table v-loading="loading" :data="fundflowruleList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璐圭敤绫诲埆" align="center" prop="applytype">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_ConsolationType"
- :value="scope.row.applytype"
- />
+ <dict-tag :options="dict.type.sys_ConsolationType" :value="scope.row.applytype" />
</template>
</el-table-column>
<el-table-column label="瀹℃牳浜虹紪鍙�" align="center" prop="checkuserno" />
<el-table-column label="瀹℃牳浜哄鍚�" align="center" prop="checkusername" />
- <el-table-column
- label="鏄惁鍙鏍稿悓閮ㄩ棬"
- align="center"
- prop="verificationdept"
- >
+ <el-table-column label="鏄惁鍙鏍稿悓閮ㄩ棬" align="center" prop="verificationdept">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- v-if="scope.row.verificationdept == '0'"
- size="mini"
- >
- 鍚�</el-button
- >
- <el-button
- type="primary"
- plain
- v-if="scope.row.verificationdept == '1'"
- size="mini"
- >鏄�</el-button
- >
+ <el-button type="primary" plain v-if="scope.row.verificationdept == '0'" size="mini">
+ 鍚�</el-button>
+ <el-button type="primary" plain v-if="scope.row.verificationdept == '1'" size="mini">鏄�</el-button>
</template>
</el-table-column>
<el-table-column label="褰撳墠瀹℃牳绾у埆" align="center" prop="flowlevel">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_consolationfundlevel"
- :value="scope.row.flowlevel"
- />
+ <dict-tag :options="dict.type.sys_consolationfundlevel" :value="scope.row.flowlevel" />
</template>
</el-table-column>
<el-table-column label="鎬诲鏍哥骇鍒�" align="center" prop="totallevel">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- v-if="scope.row.totallevel == '1'"
- size="mini"
- >涓�绾�</el-button
- >
- <el-button
- type="primary"
- plain
- v-if="scope.row.totallevel == '2'"
- size="mini"
- >浜岀骇</el-button
- >
- <el-button
- type="primary"
- plain
- v-if="scope.row.totallevel == '3'"
- size="mini"
- >涓夌骇</el-button
- >
+ <el-button type="primary" plain v-if="scope.row.totallevel == '1'" size="mini">涓�绾�</el-button>
+ <el-button type="primary" plain v-if="scope.row.totallevel == '2'" size="mini">浜岀骇</el-button>
+ <el-button type="primary" plain v-if="scope.row.totallevel == '3'" size="mini">涓夌骇</el-button><el-button
+ type="primary" plain v-if="scope.row.totallevel == '4'" size="mini">鍥涚骇</el-button><el-button type="primary"
+ plain v-if="scope.row.totallevel == '5'" size="mini">浜旂骇</el-button>
</template>
</el-table-column>
<el-table-column label="璐圭敤绫诲埆" align="center" prop="fundtype">
<template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_fundtypes"
- :value="scope.row.fundtype"
- />
+ <dict-tag :options="dict.type.sys_fundtypes" :value="scope.row.fundtype" />
</template>
</el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- >
+ <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:fundflowrule:edit']"
- >淇敼</el-button
- >
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['project:fundflowrule:remove']"
- >鍒犻櫎</el-button
- >
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ v-hasPermi="['project:fundflowrule:edit']">淇敼</el-button>
+ <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:fundflowrule: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="900px" append-to-body>
@@ -292,12 +124,8 @@
<el-col :span="12">
<el-form-item label="璐圭敤绫诲埆" prop="applytype">
<el-select v-model="form.applytype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" style="width:100%">
- <el-option
- v-for="dict in dict.type.sys_ConsolationType"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-option v-for="dict in dict.type.sys_ConsolationType" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -305,12 +133,8 @@
<el-col :span="12">
<el-form-item label="璐圭敤绫诲埆" prop="fundtype">
<el-select v-model="form.fundtype" placeholder="璇烽�夋嫨璐圭敤绫诲埆" style="width:100%">
- <el-option
- v-for="dict in dict.type.sys_fundtypes"
- :key="dict.value"
- :label="dict.label"
- :value="parseInt(dict.value)"
- ></el-option>
+ <el-option v-for="dict in dict.type.sys_fundtypes" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -318,18 +142,12 @@
<el-row>
<el-col :span="12">
<el-form-item label="瀹℃牳浜虹紪鍙�" prop="checkuserno">
- <el-input
- v-model="form.checkuserno"
- placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿"
- />
+ <el-input v-model="form.checkuserno" placeholder="璇疯緭鍏ュ鏍镐汉缂栧彿" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="瀹℃牳浜哄鍚�" prop="checkusername">
- <el-input
- v-model="form.checkusername"
- placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕"
- />
+ <el-input v-model="form.checkusername" placeholder="璇疯緭鍏ュ鏍镐汉濮撳悕" />
</el-form-item>
</el-col>
</el-row>
@@ -337,38 +155,17 @@
<el-row>
<el-col :span="12">
<el-form-item label="褰撳墠瀹℃牳绾у埆" prop="flowlevel">
- <el-select
- v-model="form.flowlevel"
- placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆"
- clearable
- size="small"
- style="width:100%"
- >
- <el-option
- v-for="dict in dict.type.sys_consolationfundlevel"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="form.flowlevel" placeholder="璇烽�夋嫨褰撳墠瀹℃牳绾у埆" clearable size="small" style="width:100%">
+ <el-option v-for="dict in dict.type.sys_consolationfundlevel" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="鎬诲鏍哥骇鍒�" prop="totallevel">
- <el-select
- v-model="form.totallevel"
- placeholder="璇烽�夋嫨鎬诲鏍哥骇鍒�"
- clearable
- size="small"
- style="width:100%"
- >
- <el-option
- v-for="dict in checkLevelArr"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
+ <el-select v-model="form.totallevel" placeholder="璇烽�夋嫨鎬诲鏍哥骇鍒�" clearable size="small" style="width:100%">
+ <el-option v-for="dict in checkLevelArr" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
</el-col>
@@ -376,18 +173,10 @@
<el-row>
<el-col>
- <el-form-item
- label="鏄惁鍙鏍稿悓閮ㄩ棬"
- prop="verificationdept"
- label-width="140px"
- >
+ <el-form-item label="鏄惁鍙鏍稿悓閮ㄩ棬" prop="verificationdept" label-width="140px">
<el-radio-group v-model="form.verificationdept">
- <el-radio
- v-for="dict in yesnoArr"
- :key="dict.value"
- :label="parseInt(dict.value)"
- >{{ dict.label }}</el-radio
- >
+ <el-radio v-for="dict in yesnoArr" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
+ }}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -528,8 +317,8 @@
const id = row.id || this.ids;
getFundflowrule(id).then((response) => {
this.form = response.data;
- this.form.flowlevel = this.form.flowlevel.toString();
- this.form.totallevel = this.form.totallevel.toString();
+ this.form.flowlevel = this.form.flowlevel.toString();
+ this.form.totallevel = this.form.totallevel.toString();
this.open = true;
this.title = "淇敼璐圭敤瀹℃壒瑙勫垯";
});
@@ -566,7 +355,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
@@ -581,7 +370,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
},
};
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index 8a5b2b2..941acb8 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -133,7 +133,7 @@
<el-form-item label="缁忓姙浜�" prop="username">
<el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨">
- <el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
+ <el-option v-for="item in personList" :key="item.reportNo" :label="item.reportName"
:value="item.reportName">
</el-option>
</el-select>
@@ -146,7 +146,7 @@
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
- <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
<el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
</el-option>
</el-select>
@@ -172,7 +172,7 @@
</el-form-item>
</el-col>
</el-row>
- <!--
+ <!--
<el-row>
<el-col :span="15">
<el-form-item label="鍑哄樊浜嬬敱" prop="reason">
@@ -255,7 +255,7 @@
</el-col>
</el-row>
-->
- <!--
+ <!--
<el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
@@ -276,26 +276,48 @@
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="120">
+ <!--涓婚敭銆佸涓嶅睍绀�-->
+ <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
- <el-select v-model="form.persontype" 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>
+ <el-input v-model="scope.row.id" placeholder="id" />
</template>
</el-table-column>
- <el-table-column prop="personname" slot="" label="鍑哄樊浜�" align="center" fixed width="120">
+ <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
<template slot-scope="scope">
+ <el-input v-model="scope.row.rbid" placeholder="rbid" />
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="120">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+ @change="getTravelers(scope.row)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="personname2" slot="" label="璐圭敤浜哄憳" align="center" fixed width="120">
+ <!-- <template slot-scope="scope">
<el-input v-model="scope.row.personname" placeholder="鍑哄樊浜�" />
+ </template> -->
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option
+ placeholder="璇烽�夋嫨" @focus="filterPersonList(scope.row)">
+ <el-option v-for="item in scope.row.personname2" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
+ </el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
<template slot-scope="scope">
<el-date-picker :picker-options="{
- disabledDate: time => {
- 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"
+ disabledDate: time => {
+ 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)">
</el-date-picker>
</template>
@@ -303,10 +325,10 @@
<el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
<template slot-scope="scope">
<el-date-picker :picker-options="{
- disabledDate: time => {
- 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"
+ disabledDate: time => {
+ 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)">
</el-date-picker>
</template>
@@ -316,9 +338,16 @@
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" fixed width="100">
+ <el-table-column label="鍒拌揪鍦�" prop="destination2" align="center" fixed width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" />
+ <!-- <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)">
+ <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="days" label="澶╂暟" width="65" align="center">
@@ -344,14 +373,13 @@
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
<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="
@@ -365,49 +393,44 @@
-->
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<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="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<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="80">
<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="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
<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="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<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">
@@ -424,9 +447,8 @@
<el-table-column fixed="right" label="鎿嶄綔" align="center" width="120" v-if="dialogType == 'edit'">
<template slot-scope="scope">
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
- <el-button @click.native.prevent="
- deleteRow(scope.$index, applicationDetailArr, scope.row)
- " type="text" size="small">
+ <el-button @click.native.prevent="deleteRow(scope.$index, applicationDetailArr, scope.row)
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
@@ -434,7 +456,79 @@
</el-table>
</el-row>
- <!--
+ <el-row style="margin-top: 30px">
+ <el-table :data="applicationDetailArr2" border highlight-current-row>
+ <el-table-column prop="col_orderno" slot="" label="搴忓彿" align="center" fixed width="65">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.col_orderno" placeholder="搴忓彿" />
+ </template>
+ </el-table-column>
+
+ <!--涓婚敭銆佸涓嶅睍绀�-->
+ <el-table-column prop="id" slot="" label="涓婚敭" align="center" fixed width="95" v-if="false">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.id" placeholder="id" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="rbid" slot="" label="澶栭敭" align="center" fixed width="95" v-if="false">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.rbid" placeholder="rbid" />
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="col_personType" slot="" label="浜哄憳绫诲埆" align="center" fixed width="120">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.col_personType" value-key="value" placeholder="浜哄憳绫诲埆"
+ @change="getColTravelers(scope.row, scope.row.col_personType)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="col_personname2" slot="" label="鏀舵浜�" align="center" fixed width="130">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.col_personname" clearable filterable allow-create ref="getReportname"
+ default-first-option placeholder="璇烽�夋嫨" @change="selectedColTraveler(scope.row)">
+ <el-option v-for="item in scope.row.col_personname2" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
+ </el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="col_bank" slot="" label="鏀舵閾惰" align="center" fixed width="260">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.col_bank" placeholder="鏀舵閾惰" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="col_accounts" slot="" label="鏀舵甯愬彿" align="center" fixed width="230">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.col_accounts" placeholder="鏀舵甯愬彿" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="col_date" slot="" label="浠樻鏃ユ湡" align="center" fixed width="150">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.col_date" placeholder="浠樻鏃ユ湡" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="col_illustrate" slot="" label="璇存槑" align="center" fixed width="310">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.col_illustrate" placeholder="璇存槑" />
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" width="100" v-if="dialogType == 'edit'">
+ <template slot-scope="scope">
+ <el-button type="text" size="mini" @click="col_addRow(scope.$index)">鏂板</el-button>
+ <el-button @click.native.prevent="deleteRow2(scope.$index, applicationDetailArr2, scope.row)
+ " type="text" size="small">
+ 鍒犻櫎
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+
+ </el-row>
+
+ <!--
<el-row>
<el-col :span="7">
<el-form-item label="涓績璐熻矗浜�" prop="opochecker">
@@ -467,7 +561,7 @@
-->
<el-row>
<el-col :span="14">
- <!--
+ <!--
<el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
<el-input v-model="form.fileurl" placeholder="璇疯緭鍏ユ枃浠跺湴鍧�" />
</el-form-item>
@@ -475,10 +569,9 @@
<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) =>
+ :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>
@@ -507,6 +600,7 @@
<script>
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
+import { addOrUpdateRBpayee, listReimbursementpayee } from "@/api/project/reimbursementpayee";
import {
listReimbursement,
getReimbursement,
@@ -515,8 +609,6 @@
updateReimbursement,
exportReimbursement,
getdownload,
- //鑾峰彇鍦板競瀵瑰簲鍩哄噯閲戦
- getstandardRMB,
fundSubmit,
} from "@/api/project/reimbursement";
import {
@@ -525,7 +617,7 @@
listReimbursementdetailid,
getReimbursementdetaillist,
delReimbursementdetail,
- delReimbursementdetailrbid,
+ updateReimbursementdetaillist,
getTravelStandard,
} from "@/api/project/reimbursementdetail";
import { listFundflow } from "@/api/project/fundflow";
@@ -533,12 +625,8 @@
import { regionDataPlus, CodeToText } from "element-china-area-data";
import Li_area_select from "@/components/Address";
import { getUserProfile } from "@/api/system/user";
-import {
- listOrganization,
- getOrganization,
- listReportname,
- listUser,
-} from "@/api/project/organization";
+import { getSubsidy } from "@/api/project/travelcity";
+import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
export default {
components: {
@@ -553,11 +641,13 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
+ "sys_area_name",
],
data() {
return {
- reporters: [],
+ personList: [],
travelers: [],
+ coltravelers: [],
costtypeobj: {
value: 0,
label: "",
@@ -601,11 +691,15 @@
remark: null,
departure: null,
endtime: null,
- destination: null,
+ destination2: null,
uploadFlag: null,
uploadTime: null,
orderByColumn: "createTime",
isAsc: "desc",
+ },
+ queryParams2: {
+ persontype: null,
+ arriveAddr: null,
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -633,6 +727,7 @@
bigstrmoney: null,
},
applicationDetailArr: [],
+ applicationDetailArr2: [],
arrr2: [],
baselist: [],
balist: [],
@@ -646,6 +741,10 @@
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢鍒楄〃
fileList: [],
+ //浜哄憳绫诲埆
+ persontype: null,
+ //鍒拌揪鍦�
+ arriveAddr: null,
headers: {
Authorization: "Bearer " + getToken(),
@@ -654,8 +753,8 @@
},
created() {
this.getList();
- this.getlistUser();
- this.selectReporters();
+ this.getUserList();
+ this.getPersonList();
},
mounted() {
listDonatebaseinfo().then((res) => {
@@ -677,11 +776,13 @@
this.getUsermsg();
},
methods: {
+ alertMessage(row) {
+ debugger
+ },
+
handleUploadError() { },
remove(file) {
-
this.fileList.splice(this.fileList.indexOf(file), 1)
-
},
handleExceed() {
this.$message.error(`涓婁紶鏂囦欢鏁伴噺涓嶈兘瓒呰繃 ${5} 涓�!`);
@@ -698,39 +799,66 @@
this.$modal.msgError(response.msg);
}
},
- selectReporters() {
- //涓撳浜哄憳鍒楄〃
- let arr = ["xty1", "zzry", "fzr"];
- let arrreportlist = [];
- for (let i = 0; i < arr.length; i++) {
- this.arrr2 = [];
- listReportname(arr[i]).then((res) => {
- this.arrr2 = res.data;
- this.reporters = this.reporters.concat(this.arrr2);
- // console.log("adadadadasdsad", this.reporters);
+
+ //鑾峰彇浜哄憳鍒楄〃
+ getPersonList() {
+ //鑾峰彇鍚勭被鍒殑浜哄憳锛氬崗璋冨憳銆佷笓鑱屼汉鍛樸�佽礋璐ｄ汉銆佷笓瀹�
+ let persontypeArr = ["xty1", "zzry", "fzr", "expert"];
+ for (let i = 0; i < persontypeArr.length; i++) {
+ this.tempArrr = [];
+ listReportname(persontypeArr[i]).then((res) => {
+ this.tempArrr = res.data;
+ this.personList = this.personList.concat(this.tempArrr);
});
}
},
+ //鑾峰彇涓�涓被鍒殑浜哄憳鍒楄〃
+ filterPersonList(row) {
+ let travelertype = row.persontype;
+ },
//鑾峰彇鍑哄樊浜哄垪琛�
- getTravelers() {
+ getTravelers(row, val) {
//涓撹亴浜哄憳-1,鍗忚皟鍛�-2,涓撳-3,瀹跺睘-4,鍏朵粬浜哄憳-5
let travelertype = "";
- if (this.form.costtype == 1) {
+ if (row.persontype == "1") {
travelertype = "zzry";
- } else if (this.form.costtype == 2) {
+ } else if (row.persontype == "2") {
travelertype = "xty1";
- } else if (this.form.costtype == 3) {
+ } else if (row.persontype == "3") {
travelertype = "expert";
- } else if (this.form.costtype == 4) {
+ } else if (row.persontype == "4") {
travelertype = "jiashu";
- } else if (this.form.costtype == 5) {
+ } else if (row.persontype == "5") {
travelertype = "fzr";
}
-
listReportname(travelertype).then((res) => {
this.travelers = res.data;
+ row.personname2 = res.data;
});
+ this.form.persontype = val;
+ },
+ //鑾峰彇鏀舵浜哄垪琛�
+ getColTravelers(row, val2) {
+ debugger;
+ //涓撹亴浜哄憳-1,鍗忚皟鍛�-2,涓撳-3,瀹跺睘-4,鍏朵粬浜哄憳-5
+ let travelertype = "";
+ if (val2 == 1) {
+ travelertype = "zzry";
+ } else if (val2 == 2) {
+ travelertype = "xty1";
+ } else if (val2 == 3) {
+ travelertype = "expert";
+ } else if (val2e == 4) {
+ travelertype = "jiashu";
+ } else if (val2 == 5) {
+ travelertype = "fzr";
+ }
+ listReportname(travelertype).then((res) => {
+ this.travelers = res.data;
+ row.col_personname2 = res.data;
+ });
+ this.col_personType = val2;
},
selectcosttype() {
@@ -744,7 +872,8 @@
this.standardlevel = response.data.standardlevel;
});
},
- getlistUser() {
+
+ getUserList() {
listUser().then((res) => {
this.userlist = res.data;
});
@@ -759,6 +888,40 @@
});
}
});
+ },
+ //鑾峰彇鏀舵浜洪摱琛屽崱鍜屽笎鍙�
+ selectedColTraveler(row) {
+ let travelertype = "";
+ if (row.col_personType == 1) {
+ travelertype = "zzry";
+ } else if (row.col_personType == 2) {
+ travelertype = "xty1";
+ } else if (row.col_personType == 3) {
+ travelertype = "expert";
+ } else if (row.col_personType == 4) {
+ travelertype = "jiashu";
+ } else if (row.col_personType == 5) {
+ travelertype = "fzr";
+ }
+ listReportname(travelertype).then((res) => {
+ let dataArr = res.data;
+ for (let m = 0; m < dataArr.length; m++) {
+ if (dataArr[m].reportName == row.col_personname) {
+ row.col_bank = dataArr[m].depositbank;
+ row.col_accounts = dataArr[m].bankcardno;
+ };
+ }
+ });
+ // this.coltravelers.map((res) => {
+ // console.log("-----------------------------");
+ // if (res.reportName == this.form.travelers) {
+ // getInfoBytheUserNo(res.reportNo).then((res) => {
+ // this.form.depositbank = res.data.depositbank;
+ // this.form.bankcardno = res.data.bankcardno;
+ // this.form.phone = res.data.telephone;
+ // });
+ // }
+ // });
},
//璁＄畻琛ュ姪
getallowance(row) {
@@ -786,8 +949,8 @@
};
//鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
- if (row.destination != "") {
- var str = row.destination;
+ if (row.destination2 != "") {
+ var str = row.destination2;
//楠岃瘉鍩庡競
////if (str.indexOf("妗愬簮锛屽缓寰凤紝娣冲畨") !== -1) { };
if (str.includes("鏉窞")) { row.otherexpense = parseInt(row.days) * 0 }
@@ -801,7 +964,27 @@
//璁＄畻鍚堣
this.sumTotalFee();
},
+ getallowance2(row, val2) {
+ debugger;
+ // this.getallowance(row);
+ this.arriveAddr = val2;
+ this.queryParams2.arriveAddr;
+ this.queryParams2.personType = row;
+ console.log(row.persontype);
+ console.log(this.arriveAddr);
+ if (row.persontype != undefined && row.persontype == "2" || row.persontype == "5") {
+ console.log(this.arriveAddr);
+ this.loading = true;
+ debugger;
+ getSubsidy(val2).then((response) => {
+ debugger
+ this.loading = false;
+ row.otherexpense = response.data.others;
+ row.foodallowance = response.data.food;
+ });
+ }
+ },
getStandard(row) {
if (
row.searchAddress.sheng != "" &&
@@ -843,7 +1026,7 @@
row.searchAddress.shi != "" &&
row.searchAddress.qu != ""
) {
- row.destination =
+ row.destination2 =
row.searchAddress.sheng +
row.searchAddress.shi +
row.searchAddress.qu;
@@ -892,7 +1075,6 @@
let list = this.balist;
list.forEach((item) => {
if (item.id == this.form.infoid) {
- // console.log('鐩稿悓鐨�',item.id,item)
this.form.donorno = item.donorno;
this.form.donorname = item.name;
}
@@ -996,6 +1178,7 @@
costtypename: null,
};
this.applicationDetailArr = [];
+ this.applicationDetailArr2 = [];
this.resetForm("form");
},
//
@@ -1044,6 +1227,7 @@
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
this.addRow();
+ this.col_addRow();
this.open = true;
this.title = "娣诲姞鎶ラ攢鐢宠";
},
@@ -1061,8 +1245,17 @@
let ids = response.data.id;
getReimbursementdetaillist(ids).then((res) => {
+ if (res.data.length == 0) {
+ return;
+ }
this.applicationDetailArr = res.data;
for (let i = 0; i < this.applicationDetailArr.length; i++) {
+ debugger;
+ // this.applicationDetailArr[i].personname2 = res.data[i].personname;
+ }
+
+ for (let i = 0; i < this.applicationDetailArr.length; i++) {
+ debugger;
this.applicationDetailArr[i].index = i;
this.applicationDetailArr[i].searchAddress = {
sheng: this.applicationDetailArr[i].travelprovincename,
@@ -1072,7 +1265,19 @@
}
this.sumTotalFee();
});
+ let obj = { rbid: ids };
+ listReimbursementpayee(obj).then((res) => {
+ if (res.rows.length == 0) {
+ return;
+ }
+ this.applicationDetailArr2 = res.rows;
+ // this.sumTotalFee();
+ });
});
+ //榛樿瀛樺湪涓�琛�
+ this.addRow();
+ this.col_addRow();
+ this.selectedTraveler();
},
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
@@ -1110,7 +1315,9 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
+ debugger;
this.$refs["form"].validate((valid) => {
+ debugger;
if (valid) {
let indexErrTime = this.applicationDetailArr.findIndex((item) => {
if (item.endtime && item.starttime) {
@@ -1178,23 +1385,35 @@
this.form.costtypename = belongArr[costtypeindex].label;
}
if (this.form.id != null) {
+ //rbid涓昏〃Id,鏂逛究鍚庨潰鍏宠仈涓昏〃
+ let rbid = this.form.id;
+ for (let i = 0; i < this.applicationDetailArr.length; i++) {
+ this.applicationDetailArr[i].rbid = rbid;
+ }
updateReimbursement(this.form).then((response) => {
- // console.log('鏇存柊涓昏〃鐨勪俊鎭�',response);
- for (let i = 0; i < this.applicationDetailArr.length; i++) {
- if (this.applicationDetailArr[i].rbid != null) {
- updateReimbursementdetail(this.applicationDetailArr[i]);
- } else {
- this.applicationDetailArr[i].rbid = this.form.id;
- addReimbursementdetail(this.applicationDetailArr[i]);
+ updateReimbursementdetaillist(this.applicationDetailArr).then((response) => {
+ //鏇存柊鏀粯琛ㄤ俊鎭�
+ for (let i = 0; i < this.applicationDetailArr2.length; i++) {
+ this.applicationDetailArr2[i].rbid = rbid;
}
- }
- this.$modal.msgSuccess("淇敼鎴愬姛");
- this.open = false;
- this.getList();
+ addOrUpdateRBpayee(this.applicationDetailArr2);
+ for (let i = 0; i < this.applicationDetailArr.length; i++) {
+ if (this.applicationDetailArr[i].rbid != null) {
+ updateReimbursementdetail(this.applicationDetailArr[i]);
+ } else {
+ this.applicationDetailArr[i].rbid = this.form.id;
+ addReimbursementdetail(this.applicationDetailArr[i]);
+ }
+ }
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
});
} else {
this.form.recordstatus = -1;
const applicationDetailArr = [...this.applicationDetailArr]
+ const applicationDetailArr2 = [...this.applicationDetailArr2]
addReimbursement(this.form).then((response) => {
this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
@@ -1208,9 +1427,12 @@
let id = res.data;
for (let i = 0; i < applicationDetailArr.length; i++) {
applicationDetailArr[i].rbid = id;
-
addReimbursementdetail(applicationDetailArr[i]);
}
+ for (let i = 0; i < applicationDetailArr2.length; i++) {
+ applicationDetailArr2[i].rbid = id;
+ }
+ addOrUpdateRBpayee(applicationDetailArr2);
});
});
}
@@ -1263,7 +1485,7 @@
starttime: null,
departure: null,
endtime: null,
- destination: null,
+ destination2: null,
days: null,
trafficexpense: 0,
traffictype: null,
@@ -1286,6 +1508,9 @@
uploadTime: null,
total: 0,
orderno: null,
+ personname2: null,
+ personname: null,
+ destination: null,
};
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.applicationDetailArr.push(rowData);
@@ -1294,6 +1519,28 @@
}
for (let i = 0; i < this.applicationDetailArr.length; i++) {
this.applicationDetailArr[i].orderno = i + 1;
+ }
+ },
+
+ col_addRow(rowIndex) {
+ let rowData = {
+ id: null,
+ col_personType: null,
+ col_personname: null,
+ col_bank: null,
+ col_accounts: null,
+ col_date: null,
+ col_illustrate: null,
+ col_orderno: null,
+ col_personname2: null,
+ };
+ if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
+ this.applicationDetailArr2.push(rowData);
+ } else {
+ this.applicationDetailArr2.splice(rowIndex + 1, 0, rowData);
+ }
+ for (let i = 0; i < this.applicationDetailArr2.length; i++) {
+ this.applicationDetailArr2[i].col_orderno = i + 1;
}
},
@@ -1324,16 +1571,45 @@
});
},
+ deleteRow2(index, rows, row) {
+ this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "success",
+ })
+ .then(() => {
+ console.log(row);
+ if (row.id !== null) {
+ delReimbursementdetail(row.id).then((res) => {
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ rows.splice(index, 1);
+ this.recountOrderNo2();
+ // this.sumTotalFee();
+ });
+ } else {
+ rows.splice(index, 1);
+ //this.sumTotalFee();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ this.recountOrderNo2();
+ }
+ })
+ .catch(() => {
+ //鍑犵偣鍙栨秷鐨勬彁绀�
+ });
+ },
recountOrderNo() {
for (let i = 0; i < this.applicationDetailArr.length; i++) {
this.applicationDetailArr[i].orderno = i + 1;
}
},
+ recountOrderNo2() {
+ for (let i = 0; i < this.applicationDetailArr2.length; i++) {
+ this.applicationDetailArr2[i].orderno = i + 1;
+ }
+ },
//涓婃姤
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
diff --git a/vue.config.js b/vue.config.js
index 9a4320e..d2eb01b 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -33,9 +33,9 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://localhost:8080`,
+ target: `http://192.168.2.3:8080`,
//target: `https://slb.hospitalstar.com:9093`,
- //target:`http://192.168.0.106:8080`,
+ //target:`http://www.hxsoft.com:8099`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
--
Gitblit v1.9.3