From b756a06d2736a563b4a82328b383a91170162016 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 12 八月 2026 09:33:52 +0800
Subject: [PATCH] yxh20260812
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 2126 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 1,317 insertions(+), 809 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index cd24f2c..e499411 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -3,21 +3,21 @@
<div class="boxdiv">
<div class="top-text">{{ title }}</div>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row
- ><el-col :span="5">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
- >
+ <el-row><el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
+ <el-date-picker style="width: 100%" v-model="form.applyTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡" :disabled="true">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
+<<<<<<< HEAD
+ <el-select v-model="form.username" clearable filterable allow-create ref="getReportname"
+ default-first-option placeholder="璇烽�夋嫨">
+ <el-option v-for="item in personsList" :key="item.reportNo" :label="item.reportName"
+ :value="item.reportName">
+=======
<el-select
v-model="form.username"
clearable
@@ -29,10 +29,10 @@
>
<el-option
v-for="item in personsList"
- :key="item.reportNo"
:label="item.reportName"
:value="item.reportName"
>
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</el-form-item>
@@ -50,16 +50,48 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="15">
+ <el-col :span="10">
<el-form-item label="鍑哄樊浜嬬敱" prop="reason">
<el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鎹愮尞鑰�" prop="infoid">
+ <el-form-item label="鎶ラ攢绫诲埆" prop="costtype">
+<<<<<<< HEAD
+ <el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鎶ラ攢浜哄憳绫诲埆">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+=======
+ <el-select
+ v-model="form.costtype"
+ value-key="value"
+ placeholder="璇烽�夋嫨鎶ラ攢浜哄憳绫诲埆"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_travelexpensebelong"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+<<<<<<< HEAD
+ <el-form-item label="鎹愮尞鑰�" prop="infoid" v-show="form.costtype == 3||form.costtype == 4">
+ <el-select v-model="form.infoid" @change="selectbaseinfo" clearable filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
+=======
+ <el-form-item
+ label="鎹愮尞鑰�"
+ prop="infoid"
+ v-show="form.costtype == 4"
+ >
<el-select
v-model="form.infoid"
@change="selectbaseinfo"
+ @clear="clearDonatorInfo"
+ clearable
filterable
placeholder="璇烽�夋嫨鎹愮尞鑰�"
>
@@ -69,45 +101,37 @@
:label="item.name"
:value="item.infoid"
>
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="4">
+ <div style="margin-left: 10px;">
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="form.invoicecount"
+ />
+ </div>
+ </el-col>
</el-row>
<el-row style="margin-top: 10px">
<el-col :span="5">
- <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
- <el-input
- :disabled="true"
- v-model="form.amountrequested"
- placeholder="鎶ラ攢鍚堣閲戦"
- />
+ <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+ <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
</el-form-item>
</el-col>
- <el-col :span="10">
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
+ <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
<el-form-item label="澶у啓閲戦" prop="bigstrmoney">
- <el-input
- :disabled="true"
- v-model="form.bigstrmoney"
- placeholder="鎶ラ攢澶у啓閲戦"
- />
- </el-form-item> </el-col
- ><el-col :span="5">
- <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
- <el-select
- v-model="form.recordstatus"
- placeholder="璇烽�夋嫨瀹℃牳鐘舵��"
- clearable
- :disabled="true"
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_recordstatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
+ <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
</el-form-item>
</el-col>
</el-row>
@@ -119,18 +143,10 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="鎶ラ攢鍒嗙被" prop="costtype">
- <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>
- </el-form-item>
- </el-col>
- <el-col :span="5">
<el-form-item label="鍑哄樊浜�" prop="travelers">
<el-select v-model="form.travelers" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo()">
- <el-option v-for="item in travelers" :key="item.reportNo" :label="item.reportName"
+ <el-option v-for="item in travelers" :label="item.reportName"
:value="item.reportName">
</el-option>
</el-select>
@@ -194,7 +210,7 @@
</el-col>
</el-row>
-->
- <!--
+ <!--
<el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
@@ -208,90 +224,52 @@
</el-col>
</el-row>
-->
+ <el-row v-if="jurisdiction">
+ <!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
+ </el-alert> -->
+ <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning" show-icon>
+ </el-alert>
+ </el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
- <el-col :span="20">鎶ラ攢鏄庣粏褰曞叆锛�</el-col>
+ <el-col :span="20">鎶ラ攢鏄庣粏</el-col>
</el-row>
<el-row>
- <el-table
- :data="rbDetails"
- border
- highlight-current-row
- :summary-method="getSummaries"
- show-summary
- >
- <el-table-column
- prop="orderno"
- slot=""
- label="搴忓彿"
- align="center"
- fixed
- width="65"
- >
+ <el-table :data="rbDetails" ref="table" border max-height="800" highlight-current-row
+ :summary-method="getSummaries" show-summary>
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="88">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
<!--涓婚敭銆佸涓嶅睍绀�-->
- <el-table-column
- prop="id"
- slot=""
- label="涓婚敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <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"
- >
+ <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="130"
- >
+ <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="130">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.persontype"
- value-key="value"
- placeholder="浜哄憳绫诲埆"
- @change="getPersons(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_travelexpensebelong"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.persontype" value-key="value" placeholder="浜哄憳绫诲埆"
+ @change="getPersons(scope.row)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="personname"
- slot=""
- label="璐圭敤浜哄憳"
- align="center"
- fixed
- width="110"
- >
+ <el-table-column prop="personname" slot="" label="璐圭敤浜哄憳" align="center" fixed width="110">
<template slot-scope="scope">
+<<<<<<< HEAD
+ <el-select v-model="scope.row.personname" clearable filterable allow-create default-first-option
+ placeholder="璇烽�夋嫨">
+ <el-option v-for="item in personsSel" :key="item.id" :label="item.reportNameDesc"
+ :value="item.reportName">
+=======
<el-select
v-model="scope.row.personname"
clearable
@@ -302,218 +280,118 @@
@focus1="getPersons(scope.row)"
>
<el-option
- v-for="item in personsSel"
- :key="item.reportNo"
+ v-for="(item, index) in personsSel"
+ :key="`${item.reportNo}_${index}`"
:label="item.reportName"
:value="item.reportName"
>
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="starttime"
- slot=""
- label="寮�濮嬫棩鏈�"
- fixed
- align="center"
- width="150"
- >
+ <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, '/'))
- );
- }
+ <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"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="寮�濮嬫棩鏈�"
- @blur="getdays(scope.row)"
- >
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
- <el-table-column
- prop="endtime"
- slot=""
- label="缁撴潫鏃ユ湡"
- align="center"
- fixed
- width="150"
- >
+ <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, '/'))
- );
- }
+ <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"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="缁撴潫鏃ユ湡"
- @blur="getdays(scope.row)"
- >
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getdays(scope.row)">
</el-date-picker>
</template>
</el-table-column>
- <el-table-column
- prop="departure"
- slot=""
- label="鍑哄彂鍦�"
- align="center"
- width="100"
- >
+ <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column
- label="鍒拌揪鍦�"
- prop="destination"
- 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="getallowance(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_area_name"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="鍒拌揪鍦�"
+ @change="getallowance(scope.row)">
+ <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column prop="days" label="澶╂暟" width="65" align="center">
+ <el-table-column prop="days" label="澶╂暟" width="100" align="center">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.days"
- @blur="getallowance(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"
- >
+ <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.traffictype"
- placeholder="鍑哄彂浜ら�氬伐鍏�"
- >
- <el-option
- v-for="dict in dict.type.sys_traffictype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="traffictype2"
- label="杩斿洖浜ら�氬伐鍏�"
- align="center"
- width="100"
- >
+ <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.traffictype2"
- placeholder="杩斿洖浜ら�氬伐鍏�"
- >
- <el-option
- v-for="dict in dict.type.sys_traffictype"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="trafficexpense"
- label="浜ら�氳垂"
- align="center"
- width="80"
- >
+ <el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.trafficexpense"
- placeholder="浜ら�氳垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <!--
- <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="100">
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
- (val) => {
+ val => {
sumRowFee(scope.row);
}
">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
</template>
</el-table-column>
- -->
- <el-table-column
- prop="hotelexpense"
- label="浣忓璐�"
- align="center"
- width="80"
- >
+ <el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.hotelexpense"
- placeholder="浣忓璐�"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
+ <!-- <el-table-column
prop="foodexpenses"
label="椁愯垂鎶ラ攢"
align="center"
- width="80"
+ width="120"
>
<template slot-scope="scope">
<el-input
@@ -526,208 +404,100 @@
"
/>
</template>
- </el-table-column>
- <el-table-column
- prop="foodallowance"
- label="浼欓琛ュ姪"
- align="center"
- width="80"
- >
+ </el-table-column> -->
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.foodallowance"
- placeholder="浼欓璐硅ˉ鍔�"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="otherexpense"
- label="鍏潅璐硅ˉ鍔�"
- align="center"
- width="80"
- >
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherexpense"
- placeholder="鏉傝垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="otherfeeamount"
- label="鍏朵粬璐圭敤"
- align="center"
- width="90"
- >
+ <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherfeeamount"
- placeholder="鍏朵粬璐圭敤"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- />
+ <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="
+ val => {
+ sumRowFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
- <el-table-column
- prop="departure"
- slot=""
- label="鍏朵粬璐圭敤璇存槑"
- align="center"
- width="120"
- >
+ <el-table-column prop="departure" slot="" label="鍏朵粬璐圭敤璇存槑" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.otherfeedesc"
- placeholder="鍏朵粬璐圭敤璇存槑"
- />
+ <el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
</template>
</el-table-column>
- <el-table-column
- prop="total"
- label="鍚堣"
- align="center"
- width="110"
- fixed="right"
- >
+ <el-table-column prop="total" label="鍚堣" align="center" width="110" fixed="right">
<template slot-scope="scope">
<el-input v-model="scope.row.total" placeholder="鍚堣" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- align="center"
- width="120"
- >
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" width="120">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addDetailRow(scope.$index)"
- v-if="dialogType == 'edit'"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteDetailRow(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- v-if="dialogType == 'edit'"
- >鍒犻櫎</el-button
- >
- <el-button
- @click.native.prevent="
- Filepopup(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- >绁ㄦ嵁</el-button
- >
+ <el-button type="text" size="mini" @click="addDetailRow(scope.$index)"
+ v-if="operationType == 'edit'">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteDetailRow(scope.$index, rbDetails, scope.row)
+ " type="text" size="small" v-if="operationType == 'edit'">鍒犻櫎</el-button>
+ <el-button @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ " type="text" size="small">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row style="margin-top: 25px; margin-bottom: 5px">
- <el-col :span="20">鎶ラ攢璇锋鏄庣粏锛�</el-col>
+ <el-col :span="20">鎵撴鏄庣粏</el-col>
</el-row>
- <el-row style="margin-top: 30px">
- <el-table
- :data="rbPayees"
- border
- highlight-current-row
- :summary-method="getSummaries"
- show-summary
- >
- <el-table-column
- prop="orderno"
- slot=""
- label="搴忓彿"
- align="center"
- fixed
- width="65"
- >
+ <el-row style="margin-top: 5px">
+ <el-table :data="rbPayees" border max-height="400" highlight-current-row :summary-method="getSummaries"
+ show-summary>
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
<!--涓婚敭銆佸閿笉灞曠ず-->
- <el-table-column
- prop="id"
- slot=""
- label="涓婚敭"
- align="center"
- fixed
- width="95"
- v-if="false"
- >
+ <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"
- >
+ <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="130"
- >
+ <el-table-column prop="persontype" slot="" label="鏀舵浜虹被鍒�" align="center" fixed width="150">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.persontype"
- value-key="value"
- placeholder="浜哄憳绫诲埆"
- @change="getPersons(scope.row)"
- >
- <el-option
- v-for="dict in dict.type.sys_travelexpensebelong"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-select v-model="scope.row.persontype" value-key="value" placeholder="鏀舵浜虹被鍒�"
+ @change="getPersons(scope.row)">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="personname"
- slot=""
- label="鏀舵浜�"
- align="center"
- fixed
- width="110"
- >
+ <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="200">
<template slot-scope="scope">
+<<<<<<< HEAD
+ <el-select v-model="scope.row.personname" clearable filterable allow-create ref="getReportname"
+ default-first-option placeholder="璇烽�夋嫨" @change="getAccountinfo2(scope.row, scope.row.persontype)">
+ <el-option v-for="item in personsSel" :key="item.id" :label="item.reportNameDesc" :value="item.id">
+=======
<el-select
v-model="scope.row.personname"
clearable
@@ -739,61 +509,32 @@
@change="getAccountinfo2(scope.row, scope.row.persontype)"
>
<el-option
- v-for="item in personsSel"
- :key="item.reportNo"
+ v-for="(item, index) in personsSel"
+ :key="`${item.reportNo}_${index}`"
:label="item.reportName"
:value="item.reportName"
>
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="bankname"
- slot=""
- label="閾惰鍚嶇О"
- align="center"
- fixed
- width="200"
- >
+ <el-table-column prop="bankname" slot="" label="鏀舵閾惰" align="center" fixed width="250">
<template slot-scope="scope">
- <el-input v-model="scope.row.bankname" placeholder="閾惰鍚嶇О" />
+ <el-input v-model="scope.row.bankname" placeholder="鏀舵閾惰" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- slot=""
- label="閾惰鍗″彿"
- align="center"
- fixed
- width="200"
- >
+ <el-table-column prop="bankcardno" slot="" label="閾惰璐﹀彿" align="center" fixed width="200">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.bankcardno"
- placeholder="閾惰鍗″彿"
- />
+ <el-input v-model="scope.row.bankcardno" placeholder="閾惰璐﹀彿" />
</template>
</el-table-column>
- <el-table-column
- prop="amount"
- slot=""
- label="鎵撴閲戦"
- align="center"
- fixed
- width="130"
- >
+ <el-table-column prop="amount" slot="" label="鎵撴閲戦" align="center" fixed width="130">
<template slot-scope="scope">
<el-input v-model="scope.row.amount" placeholder="鎵撴閲戦" />
</template>
</el-table-column>
- <el-table-column
- prop="remark"
- slot=""
- label="璇锋璇存槑"
- align="center"
- fixed
- >
+ <el-table-column prop="remark" slot="" label="璇锋璇存槑" align="center" fixed>
<template slot-scope="scope">
<el-input v-model="scope.row.remark" placeholder="璇存槑" />
</template>
@@ -806,70 +547,57 @@
</el-date-picker>
</template>
</el-table-column>-->
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="100"
- v-if="dialogType == 'edit'"
- >
+ <el-table-column label="鎿嶄綔" align="center" width="100" v-if="operationType == 'edit'">
<template slot-scope="scope">
- <el-button
- type="text"
- size="mini"
- @click="addPayeeRow(scope.$index)"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deletePayeeRow(scope.$index, rbPayees, scope.row)
- "
- type="text"
- size="small"
- >
+ <el-button type="text" size="mini" @click="addPayeeRow(scope.$index)">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deletePayeeRow(scope.$index, rbPayees, scope.row)
+ " type="text" size="small">
鍒犻櫎
</el-button>
</template>
</el-table-column>
</el-table>
</el-row>
-
- <el-row v-if="dialogType == 'detail' || dialogType == 'check'">
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'">
+ <el-col :span="20">瀹℃牳璁板綍</el-col>
+ </el-row>
+ <el-row v-if="operationType != 'add'">
<el-table :data="fundflowList" border>
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="120"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳鏃ユ湡"
- align="center"
- width="160"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- ><template slot-scope="scope"
- ><span v-if="scope.row.flowconclusion == 1">閫氳繃</span
- ><span v-if="scope.row.flowconclusion == 2"
- >涓嶉�氳繃</span
- ></template
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="200" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
+ <template slot-scope="scope">
+ <span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
+ <span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
+ </template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="dialogType == 'check'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px"
+ v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
+ <el-col :span="12">
+ <el-form-item label="棰勫鏉愭枡" prop="infoid">
+ <el-radio-group v-model="form.checkstatus" align="left">
+ <el-radio label="1">寰呯敵璇�</el-radio>
+ <el-radio label="2">瀹℃牳閫氳繃绛夊緟绾歌川鏉愭枡</el-radio>
+ <el-radio label="3">宸叉敹鍒扮焊璐ㄦ潗鏂�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="绠楃◣鐘舵��" prop="infoid">
+ <el-radio-group v-model="form.istax" align="left">
+ <el-radio :label="-1">瀹℃牳涓�</el-radio>
+ <el-radio :label="0">鍏佽绠楃◣</el-radio>
+ <el-radio :label="1">宸茬畻绋�</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -879,7 +607,7 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="dialogType == 'check'">
+ <el-row v-if="operationType == 'check'">
<el-col :span="17">
<el-form-item label="瀹℃牳澶囨敞" align="left">
<el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" />
@@ -888,81 +616,191 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="dialogType == 'edit'"
- >淇� 瀛�</el-button
- >
- <el-button
- type="primary"
- @click="checksubmit"
- v-if="dialogType == 'check'"
- >鎻� 浜�</el-button
- >
+ <el-button type="primary" @click="submitForm" v-if="operationType == 'edit' || userprofile.nickName == '闄堟厱鍗�'">淇�
+ 瀛�</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
</div>
</div>
- <el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
- <div class="pdfimg">
- <div class="box-pdf">
- <div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- multiple
- :limit="20"
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="dialogType == 'detail'"
- :on-error="handleUploadError"
- :on-exceed="handleExceed"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
- <el-button
- :disabled="dialogType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶</el-button
- >
- </el-upload>
- </div>
- <!-- <div
- class="pdftit"
- @click="pdffn(item)"
- v-for="item in fileList"
- :key="item.name"
- >
- {{ item.name }}
- </div> -->
- </div>
-
- <div v-if="this.previewpdf" class="pdfimgmin">
- <img :src="pdfimg" />
- </div>
- <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ <el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
+ width="60%">
+ <div style="margin-bottom: 10px;">
+ <el-table :data="tableDatatop" style="width: 100%">
+ <el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
+ <el-table-column prop="personname" label="璐圭敤浜哄憳">
+ </el-table-column>
+ <el-table-column prop="starttime" label="寮�濮嬫棩鏈�"> </el-table-column>
+ <el-table-column prop="endtime" label="缁撴潫鏃ユ湡"> </el-table-column>
+ <el-table-column prop="departure" label="鍑哄彂鍦�"> </el-table-column>
+ <el-table-column prop="destination" label="鍒拌揪鍦�"> </el-table-column>
+ <el-table-column prop="days" label="澶╂暟"> </el-table-column>
+ </el-table>
+ <el-table :data="tableDatatop" style="width: 100%">
+ <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�">
+ </el-table-column>
+ <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�">
+ </el-table-column>
+ <el-table-column prop="trafficexpense" label="浜ら�氳垂">
+ </el-table-column>
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂"> </el-table-column>
+ <el-table-column prop="hotelexpense" label="浣忓璐�">
+ </el-table-column>
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪">
+ </el-table-column>
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�">
+ </el-table-column>
+ <el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤">
+ </el-table-column>
+ </el-table>
</div>
+ <el-alert title="鏂颁笂浼犳枃浠堕渶鍦ㄦ彁浜や繚瀛樺悗鎵嶅彲杩涜妗堜緥鍏宠仈锛屽惁鍒欒涓烘斁寮�" type="error" show-icon close-text="鐭ラ亾浜�">
+ </el-alert>
+ <el-tabs style="margin-top: 20px;" v-model="activeName" type="border-card" @tab-click="handleClick">
+ <el-tab-pane label="鏅�氶檮浠�" :name="1">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗙エ鎹嫋鍒版澶勶紝鎴�
+ <em><el-button :disabled="operationType == 'detail'" size="small"
+ type="primary">鐐瑰嚮涓婁紶</el-button></em>
+ </div>
+ </el-upload>
+ <el-table :data="fileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />{{
+ scope.row.name
+ }}
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
+ <template slot-scope="scope">
+ <el-button type="danger" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
+ <!-- <img :src="pdfimg" /> -->
+ <!-- <el-image
+ style="width: 95%; height: 90%"
+ :src="pdfimg"
+<<<<<<< HEAD
+ :preview-src-list="pdfimgsrcList" -->
+ >
+ <el-image ref="imagePreview" style="width: 95%; height: 90%" :src="pdfimg"
+ @click="handleImageClick(initialIndex)">
+=======
+ :preview-src-list="pdfimgsrcList"
+ > -->
+ <el-image
+ ref="imagePreview"
+ style="width: 95%; height: 90%"
+ :src="pdfimg"
+ @click="handleImageClick(initialIndex)"
+ >
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
+ </el-image>
+ <custom-image-viewer :url-list="pdfimgsrcList" :initial-index="currentIndex" :visible="viewerVisible"
+ @update:visible="viewerVisible = $event" @close="handleViewerClose" />
+ <!-- <div slot="error" class="image-slot">
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
+ <!-- </el-image> -->
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane label="鍙戠エ鏂囦欢" :name="2">
+ <div class="pdfimg">
+ <div class="box-pdf">
+ <div>
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="invoicefileList"
+ :show-file-list="false" multiple drag :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-remove="remove" accept="image/*,.pdf">
+ <i class="el-icon-upload"></i>
+ <div class="el-upload__text">
+ 灏嗗彂绁ㄦ枃浠舵嫋鍒版澶勶紝鎴�
+ <em><el-button :disabled="operationType == 'detail'" size="small"
+ type="primary">鐐瑰嚮涓婁紶</el-button></em>
+ </div>
+ </el-upload>
+ <el-table :data="invoicefileListto" @row-click="downFile" style="width: 100%" height="400">
+ <el-table-column prop="name" :show-overflow-tooltip="true" label="鍚嶇О">
+ <template slot-scope="scope">
+ <i style="color:#409EFF" class=" el-icon-s-order" />{{
+ scope.row.name
+ }}
+ </template>
+ </el-table-column>
+
+ <el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
+ <template slot-scope="scope">
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="deletedowfile(scope.row)">鍒犻櫎</el-button>
+ <el-button type="primary" size="mini"
+ @click.native.prevent.stop="moveupdowfile(scope.row)">涓婄Щ</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
+ </div>
+
+ <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
+ <!-- <img :src="pdfimg" /> -->
+ <el-image style="width: 95%; height: 90%" :src="invoicepdfimg"
+ @click="invoicehandleImageClick(initialIndex)">
+ </el-image>
+ <custom-image-viewer :url-list="invoicepdfimgsrcList" :initial-index="invoicecurrentIndex"
+ :visible="invoiceviewerVisible" @update:visible="invoiceviewerVisible = $event"
+ @close="invoicehandleViewerClose" />
+ </div>
+ <div v-else class="pdfimgmins">{{ hintitle }}</div>
+ </div>
+ </el-tab-pane>
+ </el-tabs>
+ </el-dialog>
+ <el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
+ <el-alert :title="'鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ " type="warning">
+ </el-alert>
+ <span slot="footer" class="dialog-footer">
+ <el-button @click="unsave">鍙� 娑�</el-button>
+ <el-button type="primary" @click="Savenow">纭� 瀹�</el-button>
+ </span>
</el-dialog>
</div>
</template>
<script>
import pdf from "vue-pdf";
+import Decimal from 'decimal.js';
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import {
listReimbursementpayee,
addReimbursementpayee,
- updateReimbursementpayee
+ updateReimbursementpayee,
+ delReimbursementpayee
} from "@/api/project/reimbursementpayee";
import {
listReimbursement,
@@ -988,15 +826,18 @@
import { getInfoBytheUserNo } from "@/api/project/externalperson";
import { regionDataPlus, CodeToText } from "element-china-area-data";
import Li_area_select from "@/components/Address";
+import CustomImageViewer from "@/components/CustomImageViewer"; // 鏍规嵁浣犵殑璺緞璋冩暣
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";
+import debounce from "lodash/debounce";
export default {
components: {
Treeselect,
Li_area_select,
+ CustomImageViewer,
pdf
},
name: "Funddetail",
@@ -1008,7 +849,8 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
- "sys_area_name"
+ "sys_area_name",
+ "sys_DonationStatus"
],
data() {
return {
@@ -1024,6 +866,7 @@
personsList: [],
//涓嬫媺鍙互閫夋嫨浜哄憳鍒楄〃
personsSel: [],
+ activeName: 1, //鏂囦欢绫诲瀷
// 閮ㄩ棬鏍戦�夐」
deptOptions: undefined,
@@ -1035,6 +878,11 @@
value: 0,
label: ""
},
+ ICDtoken: getToken(),
+ pdfimgsrcList: [],
+ Savereminder: false, //鎻愰啋淇濆瓨寮规
+ Reminderquantity: 0, //鎻愰啋鏁伴噺
+ totalquantity: 0, //鎬绘暟閲�
hintitle: "閫変腑宸︿晶宸蹭笂浼犳枃浠堕瑙堟煡鐪�",
atpresent: "",
@@ -1052,6 +900,11 @@
loading: true,
// 瀵煎嚭閬僵灞�
exportLoading: false,
+ // 缃戠粶璇锋眰澶�
+ Networkheader: null,
+
+ // 褰撳墠鍗曟嵁ID
+ curId: 0,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -1077,24 +930,33 @@
starttime: null,
endtime: null
},
+ tableDatatop: [
+ {
+ date: "2016-05-02",
+ name: "鐜嬪皬铏�",
+ address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�"
+ }
+ ],
//鏌ヨ浠樻
queryParamsPayee: {
rbid: null
},
+ // 褰撳墠鐢ㄦ埛淇℃伅
+ userprofile: {},
// 琛ㄥ崟鍙傛暟
form: {},
reimbursementList: [],
// 琛ㄥ崟鏍￠獙
rules: {
- createTime: [
- { required: true, message: "璇疯緭鍏ュ～鎶ユ棩鏈�", trigger: "blur" }
- ],
reason: [
{ required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" }
],
deptmentname: [
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ],
+ costtype: [
+ { required: true, message: "璇疯緭鍏ユ姤閿�绫诲埆", trigger: "blur" }
]
},
//璐圭敤鐢宠鍗昮orm
@@ -1108,24 +970,47 @@
rbDetails: [],
rbPayees: [],
arrr2: [],
+ baselisttages: [
+ {
+ id: 1,
+ name: "寰呯敵璇�"
+ },
+ {
+ id: 2,
+ name: "棰勫閫氳繃绛夊緟绾歌川鏉愭枡"
+ },
+ {
+ id: 3,
+ name: "宸叉敹鍒扮焊璐ㄦ潗鏂�"
+ }
+ ],
baselist: [],
donatorList: [],
standardlevel: 0,
defaultperson: {},
fundflowList: [],
showApproveRecordDialog: false,
- dialogType: "edit",
+ operationType: "edit",
//涓婁紶鍙戠エ鏂囦欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
//鏂囦欢鍒楄〃
fileList: [],
fileListto: [],
+ invoicefileList: [],
+ invoicefileListto: [],
+ invoicepdfimg: "",
+ invoicepdfimgsrcList: [],
+ currentIndex: 0, // 鍒濆绱㈠紩
+ invoicecurrentIndex: 0, // 鍒濆绱㈠紩
+ initialIndex: 0, // 鍒濆绱㈠紩
+ viewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+ invoiceviewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+
//浜哄憳绫诲埆
persontype: null,
//鍒拌揪鍦�
arriveAddr: null,
-
headers: {
Authorization: "Bearer " + getToken()
},
@@ -1136,6 +1021,7 @@
flowconclusion: null,
fundid: null
},
+ jurisdiction: false,
//淇濆瓨鎸夐挳鎺у埗
idisabled: false
@@ -1143,6 +1029,8 @@
},
created() {
+ this.Getnetworkheader();
+
//鑾峰彇璁板綍鍒楄〃
// this.getList();
@@ -1151,6 +1039,7 @@
//鑾峰彇鐧诲綍鑰呬俊鎭�
getUserProfile().then(response => {
+ this.userprofile = response.data;
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
console.log("this.defaultperson", this.defaultperson);
@@ -1178,28 +1067,147 @@
},
mounted() {
+ window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
+ this.$nextTick(() => {
+ const viewer = this.$refs.imagePreview.$el.querySelector(
+ ".el-image-viewer"
+ );
+ if (viewer) {
+ viewer.addEventListener("click", this.handlePreviewClick);
+ }
+ });
//閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
- let ids = this.$route.query.id;
+ let curId = this.$route.query.id;
let pos = this.$route.query.pos;
this.defaultperson = this.$route.query.routerparam;
if (pos == 1) {
- this.handleAdd(ids);
+ this.handleAdd(curId);
} else if (pos == 2) {
- this.handleUpdate(ids);
+ this.handleUpdate(curId);
} else if (pos == 3) {
- this.handleDetail(ids);
+ this.handleDetail(curId);
} else if (pos == 4) {
- this.handleCheck(ids);
+ this.handleCheck(curId);
}
},
-
+ updated() {
+ this.$nextTick(() => {
+ this.$refs["table"].doLayout();
+ });
+ },
+ destroyed() {
+ window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ beforeDestroy() {
+ // 绉婚櫎浜嬩欢鐩戝惉
+ const viewer = this.$refs.imagePreview.$el.querySelector(
+ ".el-image-viewer"
+ );
+ if (viewer) {
+ viewer.removeEventListener("click", this.handlePreviewClick);
+ }
+ },
methods: {
- handleUploadError() {},
+ // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
+ beforeunloadHandler(e) {
+ if (
+ (JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
+ JSON.stringify(this.rbDetails) ==
+ sessionStorage.getItem("apifunddetail")) ||
+ !sessionStorage.getItem("apifunddetail")
+ ) {
+ } else {
+ this._beforeUnload_time = new Date().getTime();
+ e = e || window.event;
+ if (e) {
+ e.returnValue = "鍏抽棴鎻愮ず";
+ }
+ return "鍏抽棴鎻愮ず";
+ }
+ },
+ handlePreviewClick(e) {
+ const viewer = this.$refs.imagePreview.$el.querySelector(
+ ".el-image-viewer"
+ );
+ if (!viewer) return;
+ // 鍒ゆ柇鏄惁鐐瑰嚮浜嗏�滀笅涓�寮犫�濇寜閽紙鍙充晶绠ご锛�
+ const isNextBtn = e.target.closest(".el-image-viewer__next");
+ if (isNextBtn) {
+ const currentIndex = this.getCurrentPreviewIndex();
+ if (currentIndex === this.pdfimgsrcList.length - 1) {
+ e.preventDefault(); // 闃绘榛樿鍒囨崲琛屼负
+ this.$message.warning("宸茬粡鏄渶鍚庝竴寮犱簡锛�");
+ return;
+ }
+ }
+ },
+ // 鑾峰彇褰撳墠棰勮鐨勫浘鐗囩储寮�
+ getCurrentPreviewIndex() {
+ const viewer = this.$refs.imagePreview.$el.querySelector(
+ ".el-image-viewer"
+ );
+ if (viewer) {
+ const img = viewer.querySelector(".el-image-viewer__img");
+ if (img) {
+ const currentSrc = img.getAttribute("src");
+ return this.pdfimgsrcList.indexOf(currentSrc);
+ }
+ }
+ return 0;
+ },
+ handleImageClick(index) {
+ this.currentIndex = index;
+ this.viewerVisible = true;
+ },
+ invoicehandleImageClick(index) {
+ this.invoicecurrentIndex = index;
+ this.invoiceviewerVisible = true;
+ },
+ handleViewerClose() {
+ this.viewerVisible = false;
+ },
+ invoicehandleViewerClose() {
+ this.invoiceviewerVisible = false;
+ },
+ handleImageError() {
+ console.error("鍥剧墖鍔犺浇澶辫触");
+ },
+ handleImageLoad() {
+ console.log("鍥剧墖鍔犺浇鎴愬姛");
+ },
+ handleUploadError() { },
+ // 鑾峰彇璇锋眰澶�
+ Getnetworkheader() {
+ console.log(window.location.href);
+ let string = window.location.href;
+ if (string.includes("9091")) {
+ const index = string.indexOf("9091");
+ this.Networkheader = string.slice(0, index + 4); // 鎴彇9091鍙婂叾鍓嶉儴瀛楃
+ console.log(this.Networkheader);
+ } else {
+ const index = string.indexOf("8032");
+ this.Networkheader = string.slice(0, index + 4); // 鎴彇8032鍙婂叾鍓嶉儴瀛楃
+ console.log(this.Networkheader);
+ }
+ },
+ // 鍙戠エ鍒囨崲
+ handleClick(tab, event) {
+ if (this.activeName == 1) {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
+ },
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
- this.fileListto.splice(this.fileListto.indexOf(file), 1);
- rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ if (this.activeName == 1) {
+ this.fileListto.splice(this.fileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ } else {
+ this.invoicefileListto.splice(this.invoicefileListto.indexOf(file), 1);
+ rbDetails[this.atpresent].invoicefilesList = this.invoicefileListto;
+ }
},
handleExceed() {
@@ -1209,51 +1217,326 @@
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
this.rbDetails;
-
+ const config = {
+ headers: { Authorization: "Bearer " + this.ICDtoken }
+ };
+ const pdfimg = this.Networkheader + "/prod-api" + response.fileName;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- if (response.code == 200) {
- this.form.filename = file.raw.name;
+ if (this.activeName == 1) {
+ if (response.code == 200) {
+ this.previewpdf = true;
- this.$modal.msgSuccess(response.msg);
- this.fileListto.push({ name: file.name, url: response.url });
- this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
+ fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
+ this.pdfimg = URL.createObjectURL(blob);
+ this.pdfimgsrcList.push(URL.createObjectURL(blob));
+ this.fileListto.push({
+ name: file.name,
+ url: URL.createObjectURL(blob)
+ });
+ // console.log(file.response.url);
+ // console.log(file);
+
+ this.pdfimgsrcList.push(file.response.url);
+ this.fileListto.push({
+ name: file.response.fileName,
+ url: file.response.url
+ });
+ console.log(URL.createObjectURL(blob), "ur杞崲");
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return;
+ });
+
+ this.$modal.msgSuccess(response.msg);
+
+ console.log(this.fileListto, "鏂板鍚�");
+ if (!this.rbDetails[this.atpresent].annexfilesList) {
+ this.rbDetails[this.atpresent].annexfilesList = [];
+ }
+ this.rbDetails[this.atpresent].annexfilesList.push({
+ name: file.name,
+ url: response.fileName
+ });
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ console.log(response.msg);
+ }
} else {
- console.log(response.msg);
+ if (response.code == 200) {
+ this.previewpdf = true;
+ fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
+ this.invoicepdfimg = URL.createObjectURL(blob);
+ this.invoicepdfimgsrcList.push(URL.createObjectURL(blob));
+ this.invoicefileListto.push({
+ name: file.name,
+ url: URL.createObjectURL(blob)
+ });
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return;
+ });
+
+ this.$modal.msgSuccess(response.msg);
+
+ console.log(this.invoicefileListto, "鏂板鍚�");
+ if (!this.rbDetails[this.atpresent].invoicefilesList) {
+ this.rbDetails[this.atpresent].invoicefilesList = [];
+ }
+ this.rbDetails[this.atpresent].invoicefilesList.push({
+ name: file.name,
+ url: response.fileName
+ });
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
}
},
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
+ const config = {
+ headers: { Authorization: "Bearer " + this.ICDtoken }
+ };
+
+ this.tableDatatop = [];
+ this.fileListto = [];
+ this.invoicefileListto = [];
+ this.pdfimg = "";
+ this.invoicepdfimg = [];
+ this.pdfimgsrcList = [];
+ this.invoicepdfimgsrcList = [];
+ this.tableDatatop.push(row);
this.atpresent = index;
this.pdfVisible = true;
+
if (this.rbDetails[index].annexfilesList) {
- this.fileListto = this.rbDetails[index].annexfilesList;
+ const fetchPromises = this.rbDetails[index].annexfilesList.map(
+ (value, indexson) => {
+ const pdfimg = this.Networkheader + "/prod-api" + value.url;
+ return fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ return {
+ name: value.name,
+ url: URL.createObjectURL(blob)
+ };
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return null;
+ });
+ }
+ );
+
+ Promise.all(fetchPromises).then(fileListto => {
+ this.fileListto = fileListto.filter(item => item !== null);
+ this.pdfimg = this.fileListto[0].url;
+ console.log(this.pdfimg, "pdfimg");
+ this.pdfimgsrcList = this.fileListto.map(item => item.url);
+ });
+
+ this.previewpdf = true;
} else {
this.fileListto = [];
this.pdfimg = "";
this.pdftitle = "";
}
+ //鍙戠エ
+ if (this.rbDetails[index].invoicefilesList) {
+ const fetchPromises = this.rbDetails[index].invoicefilesList.map(
+ (value, indexson) => {
+ const pdfimg = this.Networkheader + "/prod-api" + value.url;
+ return fetch(pdfimg, config)
+ .then(response => response.blob())
+ .then(blob => {
+ return {
+ name: value.name,
+ url: URL.createObjectURL(blob)
+ };
+ })
+ .catch(error => {
+ console.error("Error loading image", error);
+ return null;
+ });
+ }
+ );
+
+ Promise.all(fetchPromises).then(invoicefileListto => {
+ this.invoicefileListto = invoicefileListto.filter(
+ item => item !== null
+ );
+ this.invoicepdfimg = this.invoicefileListto[0].url;
+ console.log(this.invoicepdfimg, "invoicepdfimg");
+ this.invoicepdfimgsrcList = this.invoicefileListto.map(
+ item => item.url
+ );
+ });
+
+ this.previewpdf = true;
+ } else {
+ this.invoicefileListto = [];
+ this.invoicepdfimg = "";
+ this.pdftitle = "";
+ }
+
+ if (this.activeName == "common") {
+ this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+ } else {
+ this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
+ }
+ console.log(this.fileListto, "this.fileListto");
+ console.log(this.rbDetails[index].annexfilesList, "annexfilesList");
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
- console.log(item);
- this.pdftitle = item.name;
- let name = item.name.split(".");
- if (name[1] == "pdf") {
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- } else if (name[1] == "jpg" || "png") {
- this.previewpdf = true;
- if (item.url) {
- this.pdfimg = item.url;
+ if (this.activeName == 1) {
+ this.pdftitle =
+ "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ console.log(item, "灞曠ず");
+ this.previewpdf = true;
+ if (item.url) {
+ this.pdfimg = item.url;
+ } else {
+ this.pdfimg = "";
+ }
} else {
- this.pdfimg = item.response.url;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
}
} else {
- this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
- this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
- this.previewpdf = false;
+ this.pdftitle =
+ "鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
+ let name = item.name.split(".");
+ if (name[1] == "pdf") {
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ } else if (name[1] == "jpg" || "png") {
+ this.previewpdf = true;
+ if (item.url) {
+ this.invoicepdfimg = item.url;
+ } else {
+ this.invoicepdfimg = "";
+ }
+ } else {
+ this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
+ this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
+ this.previewpdf = false;
+ }
+ }
+ },
+ getIndexInArray(arr, obj) {
+ return arr.indexOf(obj);
+ },
+ // 鐐瑰嚮鍒犻櫎
+ deletedowfile(row) {
+ console.log(row);
+ let indexvalue = "";
+ if (this.activeName == 1) {
+ const indexlist = this.getIndexInArray(this.pdfimgsrcList, row.url);
+ this.pdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.fileListto, row);
+ this.fileListto.splice(index, 1);
+ console.log(this.rbDetails[this.atpresent].annexfilesList);
+ // indexvalue = this.rbDetails[this.atpresent].annexfilesList.find(
+ // (item, index) => {
+ // return item.name == row.name;
+ // }
+ // );
+ // console.log(indexvalue, "鍒犻櫎绱㈠紩");
+ // this.rbDetails[this.atpresent].annexfilesList.splice(indexvalue, 1);
+ const targetIndex = this.rbDetails[
+ this.atpresent
+ ].annexfilesList.findIndex(item => {
+ return item.name === row.name; // 寤鸿浣跨敤涓ユ牸鐩哥瓑 ===
+ });
+ console.log(targetIndex, "鍒犻櫎绱㈠紩"); // 鐜板湪鎵撳嵃鐨勬槸绱㈠紩鍙凤紝渚嬪 0, 1, 2...
+
+ if (targetIndex > -1) {
+ // 纭繚鎵惧埌浜嗗厓绱�
+ this.rbDetails[this.atpresent].annexfilesList.splice(targetIndex, 1);
+ console.log("鍒犻櫎鎴愬姛");
+ } else {
+ console.log("鏈壘鍒板搴旈」鐩紝鏃犳硶鍒犻櫎");
+ }
+ } else {
+ const indexlist = this.getIndexInArray(
+ this.invoicepdfimgsrcList,
+ row.url
+ );
+ this.invoicepdfimgsrcList.splice(indexlist, 1);
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ this.invoicefileListto.splice(index, 1);
+ console.log(this.rbDetails[this.atpresent].invoicefilesList);
+ const targetIndex = this.rbDetails[
+ this.atpresent
+ ].invoicefilesList.findIndex(item => {
+ return item.name === row.name; // 寤鸿浣跨敤涓ユ牸鐩哥瓑 ===
+ });
+ console.log(targetIndex, "鍒犻櫎绱㈠紩"); // 鐜板湪鎵撳嵃鐨勬槸绱㈠紩鍙凤紝渚嬪 0, 1, 2...
+
+ if (targetIndex > -1) {
+ // 纭繚鎵惧埌浜嗗厓绱�
+ this.rbDetails[this.atpresent].invoicefilesList.splice(
+ targetIndex,
+ 1
+ );
+ console.log("鍒犻櫎鎴愬姛");
+ } else {
+ console.log("鏈壘鍒板搴旈」鐩紝鏃犳硶鍒犻櫎");
+ }
+ }
+ },
+ // 鐐瑰嚮涓婄Щ
+ moveupdowfile(row) {
+ if (this.activeName == 1) {
+ const index = this.getIndexInArray(this.fileListto, row);
+ const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+
+ const indexann = this.rbDetails[
+ this.atpresent
+ ].annexfilesList.findIndex(item => item.name == row.name);
+ const itemann = this.rbDetails[this.atpresent].annexfilesList.splice(
+ indexann,
+ 1
+ )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.rbDetails[this.atpresent].annexfilesList.splice(
+ indexann - 1,
+ 0,
+ itemann
+ ); // 灏唅temann鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ } else {
+ const index = this.getIndexInArray(this.invoicefileListto, row);
+ const item = this.invoicefileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.invoicefileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+
+ const indexinvo = this.rbDetails[
+ this.atpresent
+ ].invoicefilesList.findIndex(item => item.name == row.name);
+ const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice(
+ indexinvo,
+ 1
+ )[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
+ this.rbDetails[this.atpresent].invoicefilesList.splice(
+ indexinvo - 1,
+ 0,
+ iteminvo
+ ); // 灏唅teminvo鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
}
},
@@ -1262,6 +1545,9 @@
treeselect().then(response => {
this.deptOptions = response.data;
});
+ },
+ cellCilicksa(row) {
+ console.log(row);
},
//鑾峰彇浜哄憳鍒楄〃
@@ -1306,6 +1592,11 @@
} else if (row.persontype == "绠＄悊浜哄憳") {
this.personsSel = this.personsManager;
}
+ if (this.personsSel && this.personsSel.length) {
+ this.personsList.forEach(item => {
+ item.reportNameDesc = `${item.reportName}(${item.unitname})`;
+ });
+ }
},
//鑾峰彇璁剧疆浜哄憳璐﹀彿淇℃伅
@@ -1335,7 +1626,8 @@
}
for (let m = 0; m < dataArr.length; m++) {
- if (dataArr[m].reportName == row.personname) {
+ if (dataArr[m].id == row.personname) {
+ row.personname = dataArr[m].reportName;
row.bankname = dataArr[m].depositbank;
row.bankcardno = dataArr[m].bankcardno;
}
@@ -1354,7 +1646,7 @@
row.days = (
Math.floor(
Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) /
- (1000 * 3600 * 24)
+ (1000 * 3600 * 24)
) + 1
).toString();
} else {
@@ -1391,7 +1683,17 @@
}
//浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
- row.foodallowance = (parseInt(row.days) * 100).toString();
+ if (tempStr == "鏉窞") {
+ row.foodallowance = "";
+ } else if (
+ tempStr == "瑗胯棌" ||
+ tempStr == "鏂扮枂" ||
+ tempStr == "闈掓捣"
+ ) {
+ row.foodallowance = (parseInt(row.days) * 120).toString();
+ } else {
+ row.foodallowance = (parseInt(row.days) * 100).toString();
+ }
//璁＄畻鍚堣
this.sumRowFee(row);
@@ -1494,10 +1796,22 @@
if (item.id == this.form.infoid) {
this.form.donorno = item.donorno;
this.form.donorname = item.name;
+
+ // 鏂板锛氬皢鎹愮尞鑰呯殑 recordstate 璧嬪�煎埌 invoicecount
+ if (item.recordstate !== undefined && item.recordstate !== null) {
+ this.form.invoicecount = item.recordstate.toString();
+ } else {
+ this.form.invoicecount = ""; // 濡傛灉 recordstate 涓虹┖锛屾竻绌哄瓧娈�
+ }
}
});
},
-
+ // 娣诲姞娓呴櫎鏂规硶
+ clearDonatorInfo() {
+ this.form.donorno = "";
+ this.form.donorname = "";
+ this.form.invoicecount = ""; // 娓呯┖ invoicecount
+ },
onpick(e) {
// console.log(e,this.value1)
},
@@ -1514,21 +1828,27 @@
var aEle = document.createElement("a");
aEle.href =
curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
- aEle.click();
+ console.log(aEle.href);
+ // 娣诲姞Authorization澶撮儴
+ fetch(aEle.href, {
+ headers: this.headers
+ })
+ .then(response => {
+ // 灏嗘枃浠朵笅杞介摼鎺ヤ綔涓篵lob瀵硅薄杩涜涓嬭浇
+ return response.blob();
+ })
+ .then(blob => {
+ const url = window.URL.createObjectURL(new Blob([blob]));
+ console.log(url);
+ const link = document.createElement("a");
+ link.href = url;
+ const name = fileUrl["downloadName"];
+ link.setAttribute("download", name); // 鏇挎崲file.pdf涓哄疄闄呯殑鏂囦欢鍚�
+ document.body.appendChild(link);
+ link.click();
+ link.parentNode.removeChild(link);
+ });
});
-
- // downloadconfirmationinfo(id).then((response) => {
- // var fileUrl = response;
- // //鑾峰彇褰撳墠缃戝潃
- // var urlBase = process.env.VUE_APP_BASE_API;
- // var curWWWPath = window.document.location.href;
- // var pos = curWWWPath.indexOf(window.document.location.pathname);
- // // 鍒涘缓a鏍囩
- // var aEle = document.createElement("a");
- // aEle.href =
- // curWWWPath.substring(0, pos) + urlBase + fileUrl["downloadUrl"];
- // aEle.click();
- // });
},
/** 鏌ヨ鎶ラ攢鐢宠鍒楄〃 */
@@ -1536,6 +1856,7 @@
this.loading = true;
listReimbursement(this.queryParams).then(response => {
this.reimbursementList = response.rows;
+ console.log(this.reimbursementList);
this.total = response.total;
this.loading = false;
});
@@ -1635,7 +1956,7 @@
this.reset();
// this.open = true;
this.title = "鏂板宸梾鐢宠鍗�";
- this.dialogType = "edit";
+ this.operationType = "edit";
this.fundflowList = [];
console.log(this.title, this.defaultperson);
@@ -1651,81 +1972,96 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(ids) {
+ handleUpdate(curId) {
// this.$router.push({
// path: "/finance/travelexpenseslist/Modifydetails/",
// query: { id: ids }
// });
- this.dialogType = "edit";
+ this.operationType = "edit";
this.reset();
// this.open = true;
this.title = "鎶ラ攢鐢宠淇敼";
//鑾峰彇鎶ラ攢涓讳俊鎭�
- const id = ids || this.ids;
- getReimbursement(id).then(response => {
+ getReimbursement(curId).then(response => {
this.form = response.data;
+
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
+ this.invoicefileListto = this.form.invoicefilesList
+ ? this.form.invoicefilesList
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.form.recordstatus = response.data.recordstatus + "";
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
- let ids = response.data.id;
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
- getReimbursementdetaillist(ids).then(res => {
+ getReimbursementdetaillist(curId).then(res => {
this.rbDetails = res.data;
console.log(this.rbDetails);
if (this.rbDetails.length == 0) {
this.addDetailRow(0);
}
-
//瀹炴椂鍚堣閲戦
//this.sumTotalFee();
for (let i = 0; i < this.rbDetails.length; i++) {
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,
- }; */
}
+ sessionStorage.removeItem("apifunddetail");
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
- this.queryParamsPayee.rbid = ids;
+ this.queryParamsPayee.rbid = curId;
listReimbursementpayee(this.queryParamsPayee).then(res => {
this.rbPayees = res.rows;
if (this.rbPayees.length == 0) {
this.addPayeeRow(0);
}
});
+
+ //瀹℃牳鐘舵��
+ this.form.recordstatus = response.data.recordstatus + "";
+ let listFundflowparams = {
+ fundid: curId,
+ fundtype: 1
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
});
},
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(ids) {
- this.dialogType = "detail";
+ this.operationType = "detail";
this.title = "鎶ラ攢鐢宠璇︽儏";
-
+ this.jurisdiction = true;
this.reset();
this.open = true;
const id = ids || this.ids;
-
getReimbursement(id).then(response => {
this.form = response.data;
//绁ㄦ嵁
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
-
+ this.invoicefileListto = this.form.invoicefilesList
+ ? this.form.invoicefilesList
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
//瀹℃牳鐘舵��
this.form.recordstatus = response.data.recordstatus + "";
let ids = response.data.id;
@@ -1740,16 +2076,6 @@
//鎶ラ攢鏄庣粏
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 = {
- sheng: this.rbDetails[i].travelprovincename,
- shi: this.rbDetails[i].travelcityname,
- qu: this.rbDetails[i].traveltownname,
- };
- }
- */
//鍚堣璐圭敤
// if (this.rbDetails.length > 0) this.sumTotalFee();
for (let i = 0; i < this.rbDetails.length; i++) {
@@ -1765,12 +2091,14 @@
this.addPayeeRow(0);
}
});
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
});
},
/** 瀹℃牳鎸夐挳鎿嶄綔 */
handleCheck(ids) {
- this.dialogType = "check";
+ this.operationType = "check";
this.title = "鎶ラ攢鐢宠璇︽儏";
this.reset();
@@ -1780,11 +2108,19 @@
getReimbursement(id).then(response => {
this.form = response.data;
+ console.log(this.form.checkstatus, "checkstatus");
+ this.form.checkstatus = this.form.checkstatus.toString();
+
//绁ㄦ嵁
this.fileListto = this.form.annexfiles
? this.form.annexfiles
- .split(",")
- .map(item => ({ url: item, name: item }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
+ this.invoicefileListto = this.form.invoicefilesList
+ ? this.form.invoicefilesList
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
//瀹℃牳鐘舵��
@@ -1803,16 +2139,6 @@
getReimbursementdetaillist(ids).then(res => {
this.rbDetails = res.data;
console.log(this.rbDetails);
- /*
- 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,
- };
- }
- */
//鍚堣璐圭敤
// if (this.rbDetails.length > 0) this.sumTotalFee();
@@ -1829,11 +2155,21 @@
this.addPayeeRow(0);
}
});
+ sessionStorage.removeItem("apiform");
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
});
},
//鎻愪氦瀹℃牳鎰忚
checksubmit() {
+ if (
+ this.form.checkstatus != 3 &&
+ this.userprofile.nickName == "闄堟厱鍗�" &&
+ this.checkObj.flowlevelone == 1
+ ) {
+ this.$modal.msgError("璇烽�夌‘璁ゆ潗鏂欑姸鎬佸凡鏀跺埌锛�");
+ return;
+ }
let checkfundobj = {
flowconclusion: this.checkObj.flowlevelone,
flowcontent: this.checkObj.flowconclusion,
@@ -1848,91 +2184,279 @@
this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹鍚庡啀鎻愪氦瀹℃壒缁撴灉!");
return;
}
+ if (this.userprofile.nickName == "闄堟厱鍗�") {
+ this.Savenow();
+ console.log("淇濆瓨");
+ }
+ this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
checkfund(checkfundobj).then(res => {
- this.reset();
- this.open = false;
- this.getList();
- this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
+ if (res.code == 200) {
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
+ // 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
+ } else {
+ this.$modal.closeLoading();
+ if (res.msg) {
+ this.$modal.msgError("鎿嶄綔澶辫");
+ } else {
+ this.$modal.msgError(res.msg);
+ }
+ }
});
},
/** 鎻愪氦淇濆瓨鎸夐挳 */
- submitForm() {
+ submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
- // idisabled=true;
- /**
- let indexErrTime = this.rbDetails.findIndex((item) => {
- if (item.endtime && item.starttime) {
- let d = this.$moment(item.endtime).diff(this.$moment(item.starttime), "d");
- if (d < 0) {
- return true;
- } else {
- return false;
- }
- } else {
- false;
- }
- });
-
- if (indexErrTime > -1) {
- this.$message({
- message: "绗�" + (indexErrTime + 1) + "琛屽埌杈炬棩鏈熸棭浜庡嚭鍙戞棩鏈�",
- type: "warning",
- });
- return;
- }
-
- let emptyStartTimeindex = this.rbDetails.findIndex(
- (item) => item.starttime == null || item.starttime == undefined || item.starttime == ""
- );
-
- if (emptyStartTimeindex > -1) {
- this.$message({
- message: "绗�" + (emptyStartTimeindex + 1) + "琛屽嚭鍙戞棩鏈熶负绌�",
- type: "warning",
- });
- return;
- }
-
- let emptyEndTimeindex = this.rbDetails.findIndex(
- (item) => item.endtime == null || item.endtime == undefined || item.endtime == ""
- );
-
- if (emptyEndTimeindex > -1) {
- this.$message({
- message: "绗�" + (emptyEndTimeindex + 1) + "琛屽埌杈炬棩鏈熶负绌�",
- type: "warning",
- });
- return;
- }
-
- //璐圭敤褰掑睘
- let belongArr = this.dict.type.sys_travelexpensebelong;
- let costtypeindex = belongArr.findIndex(
- (item) => this.form.costtype == item.value
- );
- if (costtypeindex > -1) {
- this.form.costtypename = belongArr[costtypeindex].label;
- }
- */
-
//绁ㄦ嵁鏂囦欢澶勭悊
- let list = this.fileListto;
- console.log(list);
+ // const addnumber = new Decimal(this.rbPayees.reduce((amount, item) => amount + Number(item.amount), 0 ));
+ // console.log(this.form.amountrequested,addnumber);
+ // //鏍￠獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰�
+ // if (this.form.amountrequested != addnumber) {
+ // this.$message({
+ // message:
+ // "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛侊紒",
+ // type: "warning"
+ // });
+ // return;
+ // }
+<<<<<<< HEAD
+ // 1. 鍦� reduce 绱姞鏃讹紝鐩存帴浼犲叆瀛楃涓茬粰 Decimal锛屽苟浣跨敤 .plus() 鏂规硶杩涜绱姞
+ // 鍒濆鍊艰涓� new Decimal(0)锛岀‘淇濆叏绋嬮珮绮惧害杩愮畻
+ const addnumber = this.rbPayees.reduce((amount, item) => {
+ return amount.plus(new Decimal(item.amount.toString()));
+ }, new Decimal(0));
+
+ console.log(this.form.amountrequested, addnumber.toString());
+
+ // 2. 浣跨敤 Decimal 鐨� .eq() 鏂规硶杩涜涓ユ牸鐩哥瓑姣旇緝
+ // 杩欐牱鏃㈣В鍐充簡绮惧害闂锛屼篃瑙ｅ喅浜嗙被鍨嬭浆鎹㈡瘮杈冪殑闂
+ if (!addnumber.eq(this.form.amountrequested)) {
+=======
+ // 淇濈暀2浣嶅皬鏁板悗杩涜姣旇緝
+ const requestedAmount = Number(this.form.amountrequested);
+ const calculatedAmount = Number(addnumber);
+
+ // 浣跨敤toFixed淇濈暀2浣嶅皬鏁�
+ if (requestedAmount.toFixed(2) !== calculatedAmount.toFixed(2)) {
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
+ this.$message({
+ message: "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛侊紒",
+ type: "warning"
+ });
+ return;
+ }
+
+
+ const rbDetails = [...this.rbDetails];
+ const rbPayees = [...this.rbPayees];
+ //淇濆瓨鍓嶆牎楠屾暟鎹�
+ for (let k = 0; k < rbDetails.length; k++) {
+ let tempDetail = rbDetails[k];
+ console.log(tempDetail, "tem");
+ if (!tempDetail.persontype) {
+ this.$modal.msgWarning(
+ "鏄庣粏琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑浜哄憳绫诲埆鏈�夋嫨锛岃鍏堥�夋嫨浜哄憳绫诲埆鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+
+ if (!tempDetail.personname) {
+ this.$modal.msgWarning(
+ "鏄庣粏琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑璐圭敤浜哄憳鏈�夋嫨,璇烽�夋嫨璐圭敤浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+
+ if (!tempDetail.starttime) {
+ this.$modal.msgWarning(
+ "鏄庣粏琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑寮�濮嬫棩鏈熸湭閫夋嫨,璇烽�夋嫨寮�濮嬫棩鏈熷悗鍐嶆彁浜や繚瀛橈紒"
+ );
+ return;
+ }
+
+ if (!tempDetail.endtime) {
+ this.$modal.msgWarning(
+ "鏄庣粏琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑缁撴潫鏃ユ湡濮撳悕涓洪�夋嫨,璇烽�夋嫨缁撴潫鏃ユ湡鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ }
+
+ if (this.form.id != null) {
+ updateReimbursement(this.form);
+ // .then(res => {
+ //淇濆瓨鏄庣粏
+ for (let i = 0; i < rbDetails.length; i++) {
+ if (rbDetails[i].rbid != null) {
+ if (rbDetails[i].persontype == "瀹跺睘"||rbDetails[i].persontype == "涓撳") {
+ if (this.form.infoid) {
+ updateReimbursementdetail(rbDetails[i]);
+ } else {
+ return this.$message.error(
+ "鍥犺储鍔℃牳绠楃殑瑕佹眰锛屽灞炴垨涓撳鐨勬姤閿�锛岄渶瑕侀�夋嫨瀵瑰簲鐨勬崘鐚�咃紒"
+ );
+ }
+ } else {
+ updateReimbursementdetail(rbDetails[i]);
+ }
+ } else {
+ if (rbDetails[i].persontype == "瀹跺睘") {
+ if (this.form.infoid) {
+ //rbid鍏宠仈涓昏〃Id
+ rbDetails[i].rbid = this.form.id;
+ addReimbursementdetail(rbDetails[i]);
+ } else {
+ return this.$message.error(
+ "鍥犺储鍔℃牳绠楃殑瑕佹眰锛屽灞炴垨涓撳鐨勬姤閿�锛岄渶瑕侀�夋嫨瀵瑰簲鐨勬崘鐚�咃紒"
+ );
+ }
+ } else {
+ //rbid鍏宠仈涓昏〃Id
+ rbDetails[i].rbid = this.form.id;
+ addReimbursementdetail(rbDetails[i]);
+ }
+ }
+ }
+
+ //淇濆瓨璐︽埛
+ for (let i = 0; i < rbPayees.length; i++) {
+ if (rbPayees[i].rbid != null) {
+ updateReimbursementpayee(rbPayees[i]);
+ } else {
+ //rbid鍏宠仈涓昏〃Id
+ rbPayees[i].rbid = this.form.id;
+ addReimbursementpayee(rbPayees[i]);
+ }
+ }
+ if (this.userprofile.nickName != "闄堟厱鍗�") {
+ this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔燂紒");
+ }
+ this.open = false;
+
+ // 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
+ } else {
+ this.form.recordstatus = -1;
+ // 鐢宠鏃堕棿
+ var currenttime = new Date();
+ this.form.applyTime =
+ currenttime.getFullYear() +
+ "-" +
+ (currenttime.getMonth() + 1) +
+ "-" +
+ currenttime.getDate() +
+ " " +
+ currenttime.getHours() +
+ ":" +
+ currenttime.getMinutes() +
+ ":" +
+ currenttime.getSeconds();
+
+ addReimbursement(this.form)
+ .then(response => {
+ //淇濆瓨鏄庣粏
+ for (let i = 0; i < rbDetails.length; i++) {
+ //rbid鍏宠仈涓昏〃Id
+ rbDetails[i].rbid = response.data;
+ addReimbursementdetail(rbDetails[i]);
+ }
+
+ //淇濆瓨璐﹀彿
+ for (let i = 0; i < rbPayees.length; i++) {
+ //rbid鍏宠仈涓昏〃Id
+ rbPayees[i].rbid = response.data;
+ addReimbursementpayee(rbPayees[i]);
+ }
+ sessionStorage.setItem(
+ "apifunddetail",
+ JSON.stringify(this.rbDetails)
+ );
+ sessionStorage.setItem("apiform", JSON.stringify(this.form));
+
+ this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!");
+ this.open = false;
+
+ // 鍏抽棴绐楀彛
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
+ })
+ .catch(err => {
+ this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒" + res);
+ });
+ }
+ }
+ });
+ }, 500),
+
+ /** 鍒犻櫎鎸夐挳鎿嶄綔 */
+ handleDelete(row) {
+ const ids = row.id || this.ids;
+ this.$modal
+ .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
+ .then(function () {
+ // 鍒犻櫎details鍐呯殑鏁版嵁
+ return delReimbursement(ids);
+ })
+ .then(() => {
+ delReimbursementdetail(ids);
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => { });
+ },
+
+ /** 瀵煎嚭鎸夐挳鎿嶄綔 */
+ handleExport() {
+ const queryParams = this.queryParams;
+ this.$modal
+ .confirm("鏄惁纭瀵煎嚭鎵�鏈夋姤閿�鐢宠鏁版嵁椤癸紵")
+ .then(() => {
+ this.exportLoading = true;
+ return exportReimbursement(queryParams);
+ })
+ .then(response => {
+ this.$download.name(response.msg);
+ this.exportLoading = false;
+ })
+ .catch(() => { });
+ },
+ // 鍙栨秷鎻愰啋
+ unsave() {
+ this.Savereminder = false;
+ this.Reminderquantity = 0;
+ },
+ // 鎺ュ彈鎻愰啋绔嬪埢淇濆瓨
+ Savenow() {
+ this.Savereminder = false;
+ this.Reminderquantity = 0;
+ this.totalquantity = 0;
+ const addnumber = this.rbPayees.reduce(
+ (amount, item) => amount + Number(item.amount),
+ 0
+ );
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ //绁ㄦ嵁鏂囦欢澶勭悊
//鏍￠獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰�
- if (
- this.form.amountrequested !=
- this.rbPayees.reduce(
- (amount, item) => amount + Number(item.amount),
- 0.0
- )
- ) {
+ if (this.form.amountrequested != addnumber) {
this.$message({
message:
- "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
+ "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛侊紒锛�",
type: "warning"
});
return;
@@ -1941,7 +2465,6 @@
const rbDetails = [...this.rbDetails];
const rbPayees = [...this.rbPayees];
if (this.form.id != null) {
- console.log(this.form);
updateReimbursement(this.form);
// .then(res => {
//淇濆瓨鏄庣粏
@@ -1967,15 +2490,6 @@
}
this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!");
- this.open = false;
-
- // 鍏抽棴绐楀彛
- this.$router.go(-1);
- // this.getList();
- // })
- // .catch(err => {
- // this.$modal.msgError("淇敼鎶ラ攢鍗曚繚瀛樺け璐ワ紒");
- // });
} else {
this.form.recordstatus = -1;
addReimbursement(this.form)
@@ -1995,10 +2509,6 @@
}
this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!");
- this.open = false;
-
- // 鍏抽棴绐楀彛
- this.$router.go(-1);
})
.catch(err => {
this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒");
@@ -2008,41 +2518,10 @@
});
},
- /** 鍒犻櫎鎸夐挳鎿嶄綔 */
- handleDelete(row) {
- const ids = row.id || this.ids;
- this.$modal
- .confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
- .then(function() {
- // 鍒犻櫎details鍐呯殑鏁版嵁
- return delReimbursement(ids);
- })
- .then(() => {
- delReimbursementdetail(ids);
- this.getList();
- this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- })
- .catch(() => {});
- },
-
- /** 瀵煎嚭鎸夐挳鎿嶄綔 */
- handleExport() {
- const queryParams = this.queryParams;
- this.$modal
- .confirm("鏄惁纭瀵煎嚭鎵�鏈夋姤閿�鐢宠鏁版嵁椤癸紵")
- .then(() => {
- this.exportLoading = true;
- return exportReimbursement(queryParams);
- })
- .then(response => {
- this.$download.name(response.msg);
- this.exportLoading = false;
- })
- .catch(() => {});
- },
-
//鏂板涓�琛�
addDetailRow(rowIndex) {
+ console.log(rowIndex);
+
let rowData = {
//index: this.rbDetails.length,
searchAddress: {
@@ -2057,6 +2536,8 @@
endtime: null,
destination: null,
days: null,
+ persontype: null,
+ personname: null,
trafficexpense: 0,
traffictype: null,
traffictype2: null,
@@ -2080,14 +2561,25 @@
total: 0,
orderno: null,
personname2: null,
- personname: null,
destination: null
};
+ if (this.rbDetails.length) {
+ console.log(this.rbDetails[rowIndex].persontype);
+ console.log(this.rbDetails[rowIndex].personname);
+ rowData.persontype = this.rbDetails[rowIndex].persontype;
+ rowData.personname = this.rbDetails[rowIndex].personname;
+ }
+ // if (this.Reminderquantity >= 5) {
+ // this.Savereminder = true;
+ // return;
+ // }
if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
this.rbDetails.push(rowData);
} else {
this.rbDetails.splice(rowIndex + 1, 0, rowData);
}
+ this.Reminderquantity++;
+ this.totalquantity++;
for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].orderno = i + 1;
}
@@ -2106,11 +2598,17 @@
personname: null,
amount: null
};
+ // if (this.Reminderquantity >= 5) {
+ // this.Savereminder = true;
+ // return;
+ // }
if (rowIndex == undefined || rowIndex == null || rowIndex <= 0) {
this.rbPayees.push(rowData);
} else {
this.rbPayees.splice(rowIndex + 1, 0, rowData);
}
+ this.Reminderquantity++;
+ this.totalquantity++;
for (let i = 0; i < this.rbPayees.length; i++) {
this.rbPayees[i].orderno = i + 1;
}
@@ -2151,8 +2649,10 @@
})
.then(() => {
console.log(row);
+ let arrow = [];
+ arrow.push(row.id);
if (row.id !== null) {
- delReimbursementdetail(row.id).then(res => {
+ delReimbursementpayee(arrow).then(res => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
rows.splice(index, 1);
this.recountOrderNo2();
@@ -2243,7 +2743,7 @@
if (!isNaN(parseFloat(row.otherfeeamount))) {
totalFee += parseFloat(row.otherfeeamount);
}
- row.total = totalFee;
+ row.total = totalFee.toFixed(2);
/*
if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
@@ -2321,7 +2821,7 @@
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
- } catch {}
+ } catch { }
},
//閲戦鏁板瓧杞崲鎴愬ぇ鍐�
@@ -2438,12 +2938,15 @@
"departure",
"destination",
"traffictype",
- "traffictype2",
- "departure"
+ "traffictype2"
];
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = "鍚堣";
+ return;
+ }
+ if (index === 18) {
+ sums[index] = this.form.amountrequested;
return;
}
//鍘婚櫎閮ㄥ垎瀛楁璁＄畻
@@ -2461,7 +2964,7 @@
return prev;
}
}, 0);
- sums[index] += "";
+ sums[index] = sums[index].toFixed(2); // 淇濈暀2浣嶅皬鏁帮紝瑙ｅ喅灏忔暟鍚堣鍒�;
} else {
sums[index] = "";
}
@@ -2507,7 +3010,7 @@
height: 600px;
.box-pdf {
- width: 200px;
+ width: 400px;
padding-top: 20px;
margin-right: 30px;
border: 1px solid #dcdfe6;
@@ -2546,4 +3049,9 @@
line-height: 36px;
text-align: center;
}
+
+::v-deep .el-alert__title {
+ font-size: 20px;
+ line-height: 20px;
+}
</style>
--
Gitblit v1.9.3