From 19c70ded5bc0b9af87e2eaf738a67aa8ae285e4b Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 24 六月 2026 20:54:32 +0800
Subject: [PATCH] 专家重名
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 1372 ++++++++++++++++++++++-------------------------------------
1 files changed, 519 insertions(+), 853 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index ead57ef..8750f26 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -3,37 +3,19 @@
<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-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 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">
- <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 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-option>
</el-select>
</el-form-item>
@@ -51,25 +33,23 @@
</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-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-form-item label="鎶ラ攢绫诲埆" prop="costtype">
+ <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>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="infoid" v-show="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-option>
</el-select>
</el-form-item>
@@ -77,38 +57,21 @@
</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="7">
+ <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="4">
- <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>
@@ -117,14 +80,6 @@
<el-col :span="15">
<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="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">
@@ -195,7 +150,7 @@
</el-col>
</el-row>
-->
- <!--
+ <!--
<el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
@@ -212,325 +167,145 @@
<el-row v-if="jurisdiction">
<!-- <el-alert title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��" type="warning">
</el-alert> -->
- <el-alert
- title="褰撳墠涓烘煡鐪嬬姸鎬侊紝涓嶆敮鎸佷慨鏀瑰瓨鍌ㄣ��"
- type="warning"
- show-icon
- >
+ <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-row>
<el-row>
- <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"
- >
+ <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">
- <el-select
- v-model="scope.row.personname"
- clearable
- filterable
- allow-create
- default-first-option
- placeholder="璇烽�夋嫨"
- @focus1="getPersons(scope.row)"
- >
- <el-option
- v-for="item in personsSel"
- :key="item.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <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-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="100"
- 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="120"
- >
+ <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="120"
- >
+ <el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.cityfee"
- placeholder="甯傚唴浜ら�氳垂"
- @blur="
- val => {
- sumRowFee(scope.row);
- }
- "
- >{{ Number(scope.row.cityfee).toFixed(2) }}
+ <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
+ 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="120"
- >
+ <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>
@@ -541,7 +316,7 @@
width="120"
>
<template slot-scope="scope">
- <el-input
+ <el-input
v-model="scope.row.foodexpenses"
placeholder="浼欓璐规姤閿�"
@blur="
@@ -552,118 +327,55 @@
/>
</template>
</el-table-column> -->
- <el-table-column
- prop="foodallowance"
- label="浼欓琛ュ姪"
- align="center"
- width="120"
- >
+ <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="120"
- >
+ <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="120"
- >
+ <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="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
- >
+ <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>
@@ -672,154 +384,60 @@
<el-col :span="20">鎵撴鏄庣粏</el-col>
</el-row>
<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"
- >
+ <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="150"
- >
+ <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="200"
- >
+ <el-table-column prop="personname" slot="" label="鏀舵浜�" align="center" fixed width="200">
<template slot-scope="scope">
- <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.reportNo"
- :label="item.reportName"
- :value="item.reportName"
- >
+ <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-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="bankname"
- slot=""
- label="鏀舵閾惰"
- align="center"
- fixed
- width="250"
- >
+ <el-table-column prop="bankname" slot="" label="鏀舵閾惰" align="center" fixed width="250">
<template slot-scope="scope">
<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>
@@ -832,74 +450,36 @@
</el-date-picker>
</template>
</el-table-column>-->
- <el-table-column
- label="鎿嶄綔"
- align="center"
- width="100"
- v-if="operationType == '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
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType != 'edit'"
- >
+ <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="200"
- prop="createTime"
- />
- <el-table-column
- label="瀹℃牳浜�"
- align="center"
- width="150"
- prop="checkusername"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <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="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'"
- >
+ <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">
@@ -909,12 +489,18 @@
</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-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">
@@ -933,31 +519,16 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <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 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
- v-dialogDrags
- :modal="false"
- :close-on-click-modal="false"
- :title="pdftitle"
- :visible.sync="pdfVisible"
- width="60%"
- >
- <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="璐圭敤浜哄憳">
@@ -986,59 +557,27 @@
</el-table-column>
</el-table>
</div>
- <el-tabs
- style="margin-top: 20px;"
- v-model="activeName"
- type="border-card"
- @tab-click="handleClick"
- >
+ <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"
- >
+ <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
- >
+ <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="鍚嶇О"
- >
+ <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
@@ -1046,45 +585,34 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <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
- >
+ <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"
- >
+ <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
+ <!-- <el-image
style="width: 95%; height: 90%"
:src="pdfimg"
- :preview-src-list="pdfimgsrcList"
+ :preview-src-list="pdfimgsrcList" -->
>
- <!-- <div slot="error" class="image-slot">
+ <el-image ref="imagePreview" style="width: 95%; height: 90%" :src="pdfimg"
+ @click="handleImageClick(initialIndex)">
+ </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>
+ <!-- </el-image> -->
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
@@ -1093,49 +621,20 @@
<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"
- >
+ <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
- >
+ <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="鍚嶇О"
- >
+ <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
@@ -1143,45 +642,26 @@
</template>
</el-table-column>
- <el-table-column
- prop="name"
- width="180"
- :show-overflow-tooltip="true"
- label="鍔熻兘"
- >
+ <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
- >
+ <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"
- >
+ <div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 95%; height: 90%"
- :src="invoicepdfimg"
- :preview-src-list="invoicepdfimgsrcList"
- >
- <!-- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div> -->
+ <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>
@@ -1189,14 +669,10 @@
</el-tabs>
</el-dialog>
<el-dialog title="鎻愮ず" :visible.sync="Savereminder" width="30%">
- <el-alert
- :title="
- '鎮ㄥ凡娣诲姞' +
- totalquantity +
- '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
- "
- type="warning"
- >
+ <el-alert :title="'鎮ㄥ凡娣诲姞' +
+ totalquantity +
+ '鏉℃暟鎹紝涓洪槻姝㈡暟鎹涪澶辨槸鍚︽彁浜や繚瀛樺啀缁х画娣诲姞銆�'
+ " type="warning">
</el-alert>
<span slot="footer" class="dialog-footer">
<el-button @click="unsave">鍙� 娑�</el-button>
@@ -1208,6 +684,7 @@
<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";
@@ -1241,6 +718,7 @@
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";
@@ -1251,6 +729,7 @@
components: {
Treeselect,
Li_area_select,
+ CustomImageViewer,
pdf
},
name: "Funddetail",
@@ -1366,6 +845,9 @@
],
deptmentname: [
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ],
+ costtype: [
+ { required: true, message: "璇疯緭鍏ユ姤閿�绫诲埆", trigger: "blur" }
]
},
//璐圭敤鐢宠鍗昮orm
@@ -1410,6 +892,12 @@
invoicefileListto: [],
invoicepdfimg: "",
invoicepdfimgsrcList: [],
+ currentIndex: 0, // 鍒濆绱㈠紩
+ invoicecurrentIndex: 0, // 鍒濆绱㈠紩
+ initialIndex: 0, // 鍒濆绱㈠紩
+ viewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+ invoiceviewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+
//浜哄憳绫诲埆
persontype: null,
//鍒拌揪鍦�
@@ -1471,7 +959,14 @@
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 curId = this.$route.query.id;
let pos = this.$route.query.pos;
@@ -1494,14 +989,22 @@
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: {
// 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
beforeunloadHandler(e) {
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
- sessionStorage.getItem("apifunddetail")) ||
+ sessionStorage.getItem("apifunddetail")) ||
!sessionStorage.getItem("apifunddetail")
) {
} else {
@@ -1513,8 +1016,58 @@
return "鍏抽棴鎻愮ず";
}
},
+ handlePreviewClick(e) {
+ const viewer = this.$refs.imagePreview.$el.querySelector(
+ ".el-image-viewer"
+ );
+ if (!viewer) return;
- handleUploadError() {},
+ // 鍒ゆ柇鏄惁鐐瑰嚮浜嗏�滀笅涓�寮犫�濇寜閽紙鍙充晶绠ご锛�
+ 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);
@@ -1636,7 +1189,7 @@
this.tableDatatop = [];
this.fileListto = [];
this.invoicefileListto = [];
- this.pdfimg = [];
+ this.pdfimg = "";
this.invoicepdfimg = [];
this.pdfimgsrcList = [];
this.invoicepdfimgsrcList = [];
@@ -1645,26 +1198,31 @@
this.pdfVisible = true;
if (this.rbDetails[index].annexfilesList) {
- this.rbDetails[index].annexfilesList.forEach((value, indexson) => {
- const pdfimg = this.Networkheader + "/prod-api" + value.url;
- fetch(pdfimg, config)
- .then(response => response.blob())
- .then(blob => {
- // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
- this.fileListto.push({
- name: value.name,
- url: URL.createObjectURL(blob)
+ 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;
});
- if (this.fileListto.length == 1) {
- this.pdfimg = URL.createObjectURL(blob);
- }
- this.pdfimgsrcList.push(URL.createObjectURL(blob));
- })
- .catch(error => {
- console.error("Error loading image", error);
- return;
- });
+ }
+ );
+
+ 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 = [];
@@ -1673,26 +1231,35 @@
}
//鍙戠エ
if (this.rbDetails[index].invoicefilesList) {
- this.rbDetails[index].invoicefilesList.forEach((value, indexson) => {
- const pdfimg = this.Networkheader + "/prod-api" + value.url;
- fetch(pdfimg, config)
- .then(response => response.blob())
- .then(blob => {
- // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
- this.invoicefileListto.push({
- name: value.name,
- url: URL.createObjectURL(blob)
+ 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;
});
- if (this.invoicefileListto.length == 1) {
- this.invoicepdfimg = URL.createObjectURL(blob);
- }
- this.invoicepdfimgsrcList.push(URL.createObjectURL(blob));
- })
- .catch(error => {
- console.error("Error loading image", error);
- return;
- });
+ }
+ );
+
+ 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 = [];
@@ -1700,11 +1267,13 @@
this.pdftitle = "";
}
- if (this.activeName == 1) {
+ 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");
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
@@ -1765,13 +1334,27 @@
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);
+ // 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,
@@ -1781,13 +1364,23 @@
const index = this.getIndexInArray(this.invoicefileListto, row);
this.invoicefileListto.splice(index, 1);
console.log(this.rbDetails[this.atpresent].invoicefilesList);
- indexvalue = this.rbDetails[this.atpresent].invoicefilesList.find(
- (item, index) => {
- return item.name == row.name;
- }
- );
- console.log(indexvalue, "鍒犻櫎绱㈠紩");
- this.rbDetails[this.atpresent].invoicefilesList.splice(indexvalue, 1);
+ 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("鏈壘鍒板搴旈」鐩紝鏃犳硶鍒犻櫎");
+ }
}
},
// 鐐瑰嚮涓婄Щ
@@ -1796,8 +1389,10 @@
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 indexann = this.rbDetails[
+ this.atpresent
+ ].annexfilesList.findIndex(item => item.name == row.name);
const itemann = this.rbDetails[this.atpresent].annexfilesList.splice(
indexann,
1
@@ -1811,8 +1406,10 @@
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 indexinvo = this.rbDetails[
+ this.atpresent
+ ].invoicefilesList.findIndex(item => item.name == row.name);
const iteminvo = this.rbDetails[this.atpresent].invoicefilesList.splice(
indexinvo,
1
@@ -1877,6 +1474,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})`;
+ });
+ }
},
//鑾峰彇璁剧疆浜哄憳璐﹀彿淇℃伅
@@ -1906,7 +1508,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;
}
@@ -1925,7 +1528,7 @@
row.days = (
Math.floor(
Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) /
- (1000 * 3600 * 24)
+ (1000 * 3600 * 24)
) + 1
).toString();
} else {
@@ -2256,13 +1859,13 @@
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 }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
this.form.recordstatus = response.data.recordstatus + "";
sessionStorage.removeItem("apiform");
@@ -2321,13 +1924,13 @@
//绁ㄦ嵁
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 }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
//瀹℃牳鐘舵��
this.form.recordstatus = response.data.recordstatus + "";
@@ -2381,13 +1984,13 @@
//绁ㄦ嵁
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 }))
+ .split(",")
+ .map(item => ({ url: item, name: item }))
: [];
//瀹℃牳鐘舵��
@@ -2458,38 +2061,103 @@
this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
checkfund(checkfundobj).then(res => {
- this.$modal.closeLoading();
- this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
- // 鍏抽棴绐楀彛
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
+ 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: debounce(function(data) {
+ submitForm: debounce(function (data) {
this.$refs["form"].validate(valid => {
if (valid) {
//绁ㄦ嵁鏂囦欢澶勭悊
- const addnumber = this.rbPayees.reduce(
- (amount, item) => amount + Number(item.amount),
- 0
- );
+ // 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;
+ // }
- //鏍￠獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰�
- if (this.form.amountrequested != addnumber) {
+ // 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)) {
this.$message({
- 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) {
- console.log(this.form);
updateReimbursement(this.form);
// .then(res => {
//淇濆瓨鏄庣粏
@@ -2601,7 +2269,7 @@
const ids = row.id || this.ids;
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ユ潯璁板綍锛�")
- .then(function() {
+ .then(function () {
// 鍒犻櫎details鍐呯殑鏁版嵁
return delReimbursement(ids);
})
@@ -2610,7 +2278,7 @@
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
@@ -2626,7 +2294,7 @@
this.$download.name(response.msg);
this.exportLoading = false;
})
- .catch(() => {});
+ .catch(() => { });
},
// 鍙栨秷鎻愰啋
unsave() {
@@ -2642,7 +2310,6 @@
(amount, item) => amount + Number(item.amount),
0
);
- console.log(addnumber, "addnumber");
this.$refs["form"].validate(valid => {
if (valid) {
//绁ㄦ嵁鏂囦欢澶勭悊
@@ -2650,7 +2317,7 @@
if (this.form.amountrequested != addnumber) {
this.$message({
message:
- "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
+ "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛侊紒锛�",
type: "warning"
});
return;
@@ -2659,7 +2326,6 @@
const rbDetails = [...this.rbDetails];
const rbPayees = [...this.rbPayees];
if (this.form.id != null) {
- console.log(this.form);
updateReimbursement(this.form);
// .then(res => {
//淇濆瓨鏄庣粏
@@ -3016,7 +2682,7 @@
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
- } catch {}
+ } catch { }
},
//閲戦鏁板瓧杞崲鎴愬ぇ鍐�
--
Gitblit v1.9.3