From 10f1df2abb4f9d7de6e8031c2729684faad24734 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 12 八月 2026 09:30:52 +0800
Subject: [PATCH] Merge branch 'srm-master' of http://116.62.18.175:6699/r/~yxh/opo-web into srm-master
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 796 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 639 insertions(+), 157 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 26df205..e499411 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -5,17 +5,34 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<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">
+<<<<<<< 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
+ filterable
+ allow-create
+ ref="getReportname"
+ default-first-option
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in personsList"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</el-form-item>
@@ -33,35 +50,88 @@
</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-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="璇烽�夋嫨鎹愮尞鑰�"
+ >
+ <el-option
+ v-for="item in baselist"
+ :key="item.index"
+ :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>
- </el-col>
- <el-col :span="7">
- <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-form-item>
+ </el-col>
+ <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-row>
@@ -73,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>
@@ -148,7 +210,7 @@
</el-col>
</el-row>
-->
- <!--
+ <!--
<el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
@@ -202,10 +264,28 @@
</el-table-column>
<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="璇烽�夋嫨" @focus1="getPersons(scope.row)">
- <el-option v-for="item in personsSel" :key="item.reportNo" :label="item.reportName"
+ 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
+ filterable
+ allow-create
+ default-first-option
+ placeholder="璇烽�夋嫨"
+ @focus1="getPersons(scope.row)"
+ >
+ <el-option
+ v-for="(item, index) in personsSel"
+ :key="`${item.reportNo}_${index}`"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</template>
@@ -280,27 +360,30 @@
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
+ <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">
<template slot-scope="scope">
- <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="val => {
+ <el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
+ val => {
sumRowFee(scope.row);
}
- ">{{ Number(scope.row.cityfee).toFixed(2) }}
+ ">{{ Number(scope.row.cityfee).toFixed(2) }}
</el-input>
</template>
</el-table-column>
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="120">
<template slot-scope="scope">
- <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
+ <el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
+ val => {
sumRowFee(scope.row);
}
- " />
+ " />
</template>
</el-table-column>
@@ -311,7 +394,7 @@
width="120"
>
<template slot-scope="scope">
- <el-input
+ <el-input
v-model="scope.row.foodexpenses"
placeholder="浼欓璐规姤閿�"
@blur="
@@ -324,27 +407,30 @@
</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 => {
+ <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">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="val => {
+ <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">
<template slot-scope="scope">
- <el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
+ <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">
@@ -407,10 +493,28 @@
</el-table-column>
<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.reportNo" :label="item.reportName"
- :value="item.reportName">
+ <el-option v-for="item in personsSel" :key="item.id" :label="item.reportNameDesc" :value="item.id">
+=======
+ <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, index) in personsSel"
+ :key="`${item.reportNo}_${index}`"
+ :label="item.reportName"
+ :value="item.reportName"
+ >
+>>>>>>> 5b26f73b191ca95f12df24ec3e3d7930b4590be7
</el-option>
</el-select>
</template>
@@ -474,11 +578,20 @@
<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-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 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>
@@ -512,7 +625,7 @@
<el-dialog v-dialogDrags :modal="false" :close-on-click-modal="false" :title="pdftitle" :visible.sync="pdfVisible"
width="60%">
- <div>
+ <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="璐圭敤浜哄憳">
@@ -541,6 +654,8 @@
</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">
@@ -548,13 +663,14 @@
<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)
+ 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">
@@ -568,7 +684,7 @@
<el-table-column prop="name" width="180" :show-overflow-tooltip="true" label="鍔熻兘">
<template slot-scope="scope">
- <el-button type="primary" size="mini"
+ <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>
@@ -580,11 +696,31 @@
<div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" :src="pdfimg" :preview-src-list="pdfimgsrcList">
- <!-- <div slot="error" class="image-slot">
+ <!-- <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>
+ <!-- </el-image> -->
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
@@ -595,13 +731,14 @@
<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)
+ 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">
@@ -627,11 +764,12 @@
<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>
@@ -654,6 +792,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";
@@ -687,6 +826,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";
@@ -697,6 +837,7 @@
components: {
Treeselect,
Li_area_select,
+ CustomImageViewer,
pdf
},
name: "Funddetail",
@@ -708,7 +849,8 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
- "sys_area_name"
+ "sys_area_name",
+ "sys_DonationStatus"
],
data() {
return {
@@ -736,6 +878,7 @@
value: 0,
label: ""
},
+ ICDtoken: getToken(),
pdfimgsrcList: [],
Savereminder: false, //鎻愰啋淇濆瓨寮规
Reminderquantity: 0, //鎻愰啋鏁伴噺
@@ -811,6 +954,9 @@
],
deptmentname: [
{ required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" }
+ ],
+ costtype: [
+ { required: true, message: "璇疯緭鍏ユ姤閿�绫诲埆", trigger: "blur" }
]
},
//璐圭敤鐢宠鍗昮orm
@@ -827,15 +973,15 @@
baselisttages: [
{
id: 1,
- name: "寰呯敵璇锋潗鏂�"
+ name: "寰呯敵璇�"
},
{
id: 2,
- name: "瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡"
+ name: "棰勫閫氳繃绛夊緟绾歌川鏉愭枡"
},
{
id: 3,
- name: "宸叉敹鍒版姤閿�鏉愭枡"
+ name: "宸叉敹鍒扮焊璐ㄦ潗鏂�"
}
],
baselist: [],
@@ -855,7 +1001,12 @@
invoicefileListto: [],
invoicepdfimg: "",
invoicepdfimgsrcList: [],
- invoDatatop: [],
+ currentIndex: 0, // 鍒濆绱㈠紩
+ invoicecurrentIndex: 0, // 鍒濆绱㈠紩
+ initialIndex: 0, // 鍒濆绱㈠紩
+ viewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+ invoiceviewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+
//浜哄憳绫诲埆
persontype: null,
//鍒拌揪鍦�
@@ -917,7 +1068,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;
@@ -940,7 +1098,15 @@
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) {
@@ -959,7 +1125,57 @@
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() {
@@ -1001,104 +1217,186 @@
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
this.rbDetails;
+ const config = {
+ headers: { Authorization: "Bearer " + this.ICDtoken }
+ };
+ const pdfimg = this.Networkheader + "/prod-api" + response.fileName;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
if (this.activeName == 1) {
if (response.code == 200) {
- // this.form.filename = file.raw.name;
this.previewpdf = true;
+
+ 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);
- this.fileListto.push({
+
+ 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.pdfimgsrcList.push(
- this.Networkheader + "/prod-api" + response.fileName
- );
- console.log(this.pdfimgsrcList);
this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
- this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
console.log(response.msg);
}
} else {
if (response.code == 200) {
- // this.form.filename = file.raw.name;
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);
- this.invoicefileListto.push({
+
+ 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.invoicepdfimgsrcList.push(
- this.Networkheader + "/prod-api" + response.fileName
- );
- console.log(this.invoicepdfimgsrcList);
this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
- this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
- this.rbDetails[
- this.atpresent
- ].invoicefilesList = this.invoicefileListto;
- } else {
- console.log(response.msg);
}
}
},
// 鐐瑰嚮绁ㄦ嵁
Filepopup(index, rows, row) {
+ const config = {
+ headers: { Authorization: "Bearer " + this.ICDtoken }
+ };
+
this.tableDatatop = [];
+ this.fileListto = [];
+ this.invoicefileListto = [];
+ this.pdfimg = "";
+ this.invoicepdfimg = [];
this.pdfimgsrcList = [];
- this.invoDatatop = [];
this.invoicepdfimgsrcList = [];
- this.invoDatatop.push(row);
this.tableDatatop.push(row);
this.atpresent = index;
this.pdfVisible = true;
- console.log(this.rbDetails[index]);
+
if (this.rbDetails[index].annexfilesList) {
- this.previewpdf = true;
- this.fileListto = this.rbDetails[index].annexfilesList;
- console.log(this.fileListto);
- this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
- this.fileListto.forEach(item => {
- this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
+ 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) {
- this.previewpdf = true;
- this.invoicefileListto = this.rbDetails[index].invoicefilesList;
- console.log(this.invoicefileListto);
- this.invoicepdfimg =
- this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
- this.invoicefileListto.forEach(item => {
- this.invoicepdfimgsrcList.push(
- this.Networkheader + "/prod-api" + item.url
+ 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
);
});
- console.log(this.invoicepdfimgsrcList);
- console.log(this.invoicepdfimg);
+
+ this.previewpdf = true;
} else {
this.invoicefileListto = [];
this.invoicepdfimg = "";
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");
},
// 鐐瑰嚮宸蹭笂浼犳枃浠�
downFile(item) {
if (this.activeName == 1) {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
this.pdftitle =
"鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -1107,11 +1405,12 @@
this.previewpdf = false;
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
} else if (name[1] == "jpg" || "png") {
+ console.log(item, "灞曠ず");
this.previewpdf = true;
if (item.url) {
- this.pdfimg = this.Networkheader + "/prod-api" + item.url;
+ this.pdfimg = item.url;
} else {
- this.pdfimg = this.Networkheader + "/prod-api" + item.response.url;
+ this.pdfimg = "";
}
} else {
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
@@ -1119,7 +1418,6 @@
this.previewpdf = false;
}
} else {
- console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
this.pdftitle =
"鍏�" + this.invoicepdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -1130,12 +1428,9 @@
} else if (name[1] == "jpg" || "png") {
this.previewpdf = true;
if (item.url) {
- this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
- console.log(this.invoicepdfimg, "pdfimg");
- console.log(this.invoicepdfimgsrcList, "imglist");
+ this.invoicepdfimg = item.url;
} else {
- this.invoicepdfimg =
- this.Networkheader + "/prod-api" + item.response.url;
+ this.invoicepdfimg = "";
}
} else {
this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
@@ -1149,22 +1444,61 @@
},
// 鐐瑰嚮鍒犻櫎
deletedowfile(row) {
+ console.log(row);
+ let indexvalue = "";
if (this.activeName == 1) {
- const indexlist = this.getIndexInArray(
- this.pdfimgsrcList,
- this.Networkheader + "/prod-api" + row.url
- );
+ 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,
- this.Networkheader + "/prod-api" + row.url
+ 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("鏈壘鍒板搴旈」鐩紝鏃犳硶鍒犻櫎");
+ }
}
},
// 鐐瑰嚮涓婄Щ
@@ -1173,10 +1507,36 @@
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鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
}
},
@@ -1232,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})`;
+ });
+ }
},
//鑾峰彇璁剧疆浜哄憳璐﹀彿淇℃伅
@@ -1261,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;
}
@@ -1430,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)
},
@@ -1450,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();
- // });
},
/** 鏌ヨ鎶ラ攢鐢宠鍒楄〃 */
@@ -1724,6 +2108,8 @@
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
@@ -1802,11 +2188,23 @@
this.Savenow();
console.log("淇濆瓨");
}
+ this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
+
checkfund(checkfundobj).then(res => {
- 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);
+ }
+ }
});
},
@@ -1814,37 +2212,123 @@
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) {
+<<<<<<< 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:
- "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
+ 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 => {
//淇濆瓨鏄庣粏
for (let i = 0; i < rbDetails.length; i++) {
if (rbDetails[i].rbid != null) {
- updateReimbursementdetail(rbDetails[i]);
+ if (rbDetails[i].persontype == "瀹跺睘"||rbDetails[i].persontype == "涓撳") {
+ if (this.form.infoid) {
+ updateReimbursementdetail(rbDetails[i]);
+ } else {
+ return this.$message.error(
+ "鍥犺储鍔℃牳绠楃殑瑕佹眰锛屽灞炴垨涓撳鐨勬姤閿�锛岄渶瑕侀�夋嫨瀵瑰簲鐨勬崘鐚�咃紒"
+ );
+ }
+ } else {
+ updateReimbursementdetail(rbDetails[i]);
+ }
} else {
- //rbid鍏宠仈涓昏〃Id
- rbDetails[i].rbid = this.form.id;
- addReimbursementdetail(rbDetails[i]);
+ 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]);
+ }
}
}
@@ -1882,7 +2366,7 @@
currenttime.getMinutes() +
":" +
currenttime.getSeconds();
-
+
addReimbursement(this.form)
.then(response => {
//淇濆瓨鏄庣粏
@@ -1965,7 +2449,6 @@
(amount, item) => amount + Number(item.amount),
0
);
- console.log(addnumber, "addnumber");
this.$refs["form"].validate(valid => {
if (valid) {
//绁ㄦ嵁鏂囦欢澶勭悊
@@ -1973,7 +2456,7 @@
if (this.form.amountrequested != addnumber) {
this.$message({
message:
- "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
+ "鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛侊紒锛�",
type: "warning"
});
return;
@@ -1982,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 => {
//淇濆瓨鏄庣粏
--
Gitblit v1.9.3