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/components/CustomImageViewer/index.vue | 293 ++++++++++++++++---------------
src/views/project/fund/performancedetails/index.vue | 58 ++++-
src/views/project/fund/applyDetail/index.vue | 12 +
src/views/project/fund/medicalCostApply/index.vue | 2
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 145 +++++++++++++++
5 files changed, 349 insertions(+), 161 deletions(-)
diff --git a/src/components/CustomImageViewer/index.vue b/src/components/CustomImageViewer/index.vue
index 942cb20..f604700 100644
--- a/src/components/CustomImageViewer/index.vue
+++ b/src/components/CustomImageViewer/index.vue
@@ -1,14 +1,34 @@
<template>
- <div v-if="visible" class="custom-image-viewer">
+ <div v-if="visible" class="custom-image-viewer" @wheel.prevent="handleWheel">
<!-- 閬僵灞� -->
<div class="el-image-viewer__mask" @click.self="handleMaskClick"></div>
- <!-- 鍥剧墖棰勮涓讳綋 -->
+ <!-- 鍏抽棴 -->
<div class="el-image-viewer__btn el-image-viewer__close" @click="close">
<i class="el-icon-close"></i>
</div>
- <!-- 涓婁竴寮犳寜閽� -->
+ <!-- 宸ュ叿鏍� -->
+ <div class="viewer-toolbar">
+ <div class="toolbar-btn" title="鏀惧ぇ" @click="zoomIn">
+ <i class="el-icon-zoom-in"></i>
+ </div>
+ <div class="toolbar-btn" title="缂╁皬" @click="zoomOut">
+ <i class="el-icon-zoom-out"></i>
+ </div>
+ <div class="toolbar-btn" title="椤烘椂閽堟棆杞�" @click="rotateRight">
+ <i class="el-icon-refresh-right"></i>
+ </div>
+ <div class="toolbar-btn" title="閫嗘椂閽堟棆杞�" @click="rotateLeft">
+ <i class="el-icon-refresh-left"></i>
+ </div>
+ <div class="toolbar-btn" title="杩樺師" @click="resetTransform">
+ <i class="el-icon-s-home"></i>
+ </div>
+ <span class="toolbar-info">{{ currentIndex + 1 }} / {{ urlList.length }}</span>
+ </div>
+
+ <!-- 涓婁竴寮� -->
<div
class="el-image-viewer__btn el-image-viewer__prev"
:class="{ 'is-disabled': isFirst }"
@@ -17,7 +37,7 @@
<i class="el-icon-arrow-left"></i>
</div>
- <!-- 涓嬩竴寮犳寜閽� -->
+ <!-- 涓嬩竴寮� -->
<div
class="el-image-viewer__btn el-image-viewer__next"
:class="{ 'is-disabled': isLast }"
@@ -27,17 +47,25 @@
</div>
<!-- 鍥剧墖灞曠ず -->
- <div class="el-image-viewer__canvas">
+ <div
+ class="el-image-viewer__canvas"
+ @mousedown="handleMouseDown"
+ @mousemove="handleMouseMove"
+ @mouseup="handleMouseUp"
+ @mouseleave="handleMouseUp"
+ >
<img
v-if="currentUrl"
:src="currentUrl"
:key="currentIndex"
@error="handleError"
class="el-image-viewer__img"
+ :style="imgStyle"
+ draggable="false"
/>
</div>
- <!-- 鑷畾涔夋彁绀轰俊鎭� -->
+ <!-- 鎻愮ず淇℃伅 -->
<div v-if="showTip" class="custom-viewer-tip">
{{ tipMessage }}
</div>
@@ -48,24 +76,22 @@
export default {
name: 'CustomImageViewer',
props: {
- urlList: {
- type: Array,
- default: () => []
- },
- initialIndex: {
- type: Number,
- default: 0
- },
- visible: {
- type: Boolean,
- default: false
- }
+ urlList: { type: Array, default: () => [] },
+ initialIndex: { type: Number, default: 0 },
+ visible: { type: Boolean, default: false }
},
data() {
return {
currentIndex: this.initialIndex,
showTip: false,
- tipMessage: ''
+ tipMessage: '',
+ scale: 1,
+ rotate: 0,
+ // 鎷栨嫿
+ dragging: false,
+ dragStart: { x: 0, y: 0 },
+ offsetX: 0,
+ offsetY: 0,
};
},
computed: {
@@ -77,174 +103,159 @@
},
isLast() {
return this.currentIndex === this.urlList.length - 1;
- }
+ },
+ imgStyle() {
+ return {
+ transform: `translate(${this.offsetX}px, ${this.offsetY}px) scale(${this.scale}) rotate(${this.rotate}deg)`,
+ transition: this.dragging ? 'none' : 'transform 0.3s',
+ cursor: this.scale > 1 ? (this.dragging ? 'grabbing' : 'grab') : 'default',
+ };
+ },
},
watch: {
initialIndex(newVal) {
this.currentIndex = newVal;
+ this.resetTransform();
},
visible(newVal) {
if (!newVal) {
this.showTip = false;
- this.tipMessage = '';
this.removeKeyListener();
} else {
- this.$nextTick(() => {
- this.addKeyListener();
- });
+ this.$nextTick(() => { this.addKeyListener(); });
}
- }
+ },
},
methods: {
close() {
this.$emit('update:visible', false);
this.$emit('close');
},
- handleMaskClick() {
- this.close();
- },
+ handleMaskClick() { this.close(); },
+
+ // 鍒囨崲鍥剧墖
goPrev() {
- if (this.isFirst) {
- this.showTipMessage('杩欏凡缁忔槸绗竴寮犱簡');
- return;
- }
+ if (this.isFirst) { this.showTipMessage('宸叉槸绗竴寮�'); return; }
this.currentIndex--;
- this.hideTip();
+ this.resetTransform();
},
goNext() {
- if (this.isLast) {
- this.showTipMessage('杩欏凡缁忔槸鏈�鍚庝竴寮犱簡');
- return;
- }
+ if (this.isLast) { this.showTipMessage('宸叉槸鏈�鍚庝竴寮�'); return; }
this.currentIndex++;
- this.hideTip();
- },
- showTipMessage(message) {
- this.tipMessage = message;
- this.showTip = true;
- setTimeout(() => {
- this.hideTip();
- }, 2000);
- },
- hideTip() {
- this.showTip = false;
- this.tipMessage = '';
- },
- handleError() {
- console.error(`鍥剧墖鍔犺浇澶辫触: ${this.currentUrl}`);
+ this.resetTransform();
},
- // 閿洏浜嬩欢澶勭悊
- handleKeydown(event) {
- switch(event.key) {
- case 'ArrowLeft':
- event.preventDefault(); // 闃绘榛樿琛屼负
- this.goPrev();
- break;
- case 'ArrowRight':
- event.preventDefault();
- this.goNext();
- break;
- case 'Escape':
- event.preventDefault();
- this.close();
- break;
+ // 缂╂斁
+ zoomIn() {
+ this.scale = Math.min(this.scale + 0.25, 5);
+ if (this.scale <= 1) { this.offsetX = 0; this.offsetY = 0; }
+ },
+ zoomOut() {
+ this.scale = Math.max(this.scale - 0.25, 0.25);
+ if (this.scale <= 1) { this.offsetX = 0; this.offsetY = 0; }
+ },
+ handleWheel(e) {
+ if (e.deltaY < 0) this.zoomIn();
+ else this.zoomOut();
+ },
+
+ // 鏃嬭浆
+ rotateRight() { this.rotate = (this.rotate + 90) % 360; },
+ rotateLeft() { this.rotate = (this.rotate - 90) % 360; },
+
+ // 杩樺師
+ resetTransform() {
+ this.scale = 1;
+ this.rotate = 0;
+ this.offsetX = 0;
+ this.offsetY = 0;
+ },
+
+ // 鎷栨嫿锛堜粎鍦ㄦ斁澶ф椂鍚敤锛�
+ handleMouseDown(e) {
+ if (this.scale <= 1) return;
+ this.dragging = true;
+ this.dragStart = { x: e.clientX - this.offsetX, y: e.clientY - this.offsetY };
+ },
+ handleMouseMove(e) {
+ if (!this.dragging) return;
+ this.offsetX = e.clientX - this.dragStart.x;
+ this.offsetY = e.clientY - this.dragStart.y;
+ },
+ handleMouseUp() {
+ this.dragging = false;
+ },
+
+ showTipMessage(msg) {
+ this.tipMessage = msg;
+ this.showTip = true;
+ setTimeout(() => { this.hideTip(); }, 2000);
+ },
+ hideTip() { this.showTip = false; this.tipMessage = ''; },
+ handleError() { console.error('鍥剧墖鍔犺浇澶辫触:', this.currentUrl); },
+
+ // 閿洏
+ handleKeydown(e) {
+ switch(e.key) {
+ case 'ArrowLeft': e.preventDefault(); this.goPrev(); break;
+ case 'ArrowRight': e.preventDefault(); this.goNext(); break;
+ case 'Escape': e.preventDefault(); this.close(); break;
+ case '+': case '=': e.preventDefault(); this.zoomIn(); break;
+ case '-': e.preventDefault(); this.zoomOut(); break;
+ case '0': e.preventDefault(); this.resetTransform(); break;
}
},
- addKeyListener() {
- document.addEventListener('keydown', this.handleKeydown);
- },
- removeKeyListener() {
- document.removeEventListener('keydown', this.handleKeydown);
- }
+ addKeyListener() { document.addEventListener('keydown', this.handleKeydown); },
+ removeKeyListener() { document.removeEventListener('keydown', this.handleKeydown); },
},
- mounted() {
- if (this.visible) {
- this.addKeyListener();
- }
- },
- beforeUnmount() {
- this.removeKeyListener();
- }
+ mounted() { if (this.visible) this.addKeyListener(); },
+ beforeUnmount() { this.removeKeyListener(); },
};
</script>
<style scoped>
.custom-image-viewer {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 2000; /* 纭繚 z-index 瓒冲楂� */
+ position: fixed; top: 0; right: 0; bottom: 0; left: 0; z-index: 2000;
}
-
.el-image-viewer__mask {
- position: absolute;
- width: 100%;
- height: 100%;
+ position: absolute; width: 100%; height: 100%;
background-color: rgba(0, 0, 0, 0.5);
}
-
.el-image-viewer__btn {
- position: absolute;
- z-index: 1;
- color: #fff;
- background-color: rgba(0, 0, 0, 0.3);
- border-radius: 50%;
- width: 40px;
- height: 40px;
- display: flex;
- align-items: center;
- justify-content: center;
- cursor: pointer;
- user-select: none;
+ position: absolute; z-index: 1; color: #fff;
+ background-color: rgba(0, 0, 0, 0.3); border-radius: 50%;
+ width: 40px; height: 40px; display: flex;
+ align-items: center; justify-content: center; cursor: pointer; user-select: none;
}
+.el-image-viewer__btn.is-disabled { cursor: not-allowed; opacity: 0.5; }
+.el-image-viewer__close { top: 20px; right: 20px; }
+.el-image-viewer__prev { left: 20px; top: 50%; transform: translateY(-50%); }
+.el-image-viewer__next { right: 20px; top: 50%; transform: translateY(-50%); }
-.el-image-viewer__btn.is-disabled {
- cursor: not-allowed;
- opacity: 0.5;
+.viewer-toolbar {
+ position: absolute; bottom: 30px; left: 50%; transform: translateX(-50%);
+ z-index: 1; display: flex; align-items: center; gap: 8px;
+ padding: 8px 16px; background: rgba(0, 0, 0, 0.6); border-radius: 24px;
}
-
-.el-image-viewer__close {
- top: 20px;
- right: 20px;
+.toolbar-btn {
+ width: 36px; height: 36px; border-radius: 50%; display: flex;
+ align-items: center; justify-content: center; cursor: pointer;
+ color: #fff; font-size: 18px; transition: background 0.2s;
}
-
-.el-image-viewer__prev {
- left: 20px;
- top: 50%;
- transform: translateY(-50%);
-}
-
-.el-image-viewer__next {
- right: 20px;
- top: 50%;
- transform: translateY(-50%);
-}
+.toolbar-btn:hover { background: rgba(255, 255, 255, 0.2); }
+.toolbar-info { color: rgba(255, 255, 255, 0.7); font-size: 13px; margin-left: 8px; white-space: nowrap; }
.el-image-viewer__canvas {
- display: flex;
- justify-content: center;
- align-items: center;
- height: 100%;
+ display: flex; justify-content: center; align-items: center;
+ height: 100%; overflow: hidden;
}
-
.el-image-viewer__img {
- max-width: 90%;
- max-height: 90%;
- object-fit: contain;
+ max-width: 90%; max-height: 90%;
+ object-fit: contain; user-select: none; -webkit-user-drag: none;
}
-
.custom-viewer-tip {
- position: absolute;
- bottom: 50px;
- left: 50%;
- transform: translateX(-50%);
- background-color: rgba(0, 0, 0, 0.7);
- color: #fff;
- padding: 10px 20px;
- border-radius: 4px;
- z-index: 2001;
+ position: absolute; bottom: 100px; left: 50%; transform: translateX(-50%);
+ background-color: rgba(0, 0, 0, 0.7); color: #fff;
+ padding: 10px 20px; border-radius: 4px; z-index: 2001;
}
</style>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index df6f172..9497b6f 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -69,6 +69,14 @@
<el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</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-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
@@ -800,6 +808,7 @@
//"sys_finsubject",
//"sys_financeitemtype",
//"sys_expensetype",
+ 'sys_DonationStatus',
"sys_recordstatus",
"sys_professionaltitle"
],
@@ -1268,9 +1277,12 @@
this.businessType == "2" ||
this.businessType == "3"
) {
+ console.log(this.curCase,'this.curCase');
+
this.form.infoid = this.curCase.id;
this.form.donorname = this.curCase.name;
this.form.donorno = this.curCase.donorno;
+ this.form.invoicecount = this.curCase.recordstate;
}
//鍒濆鍖栨槑缁�
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index 1a30802..208cc78 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -545,7 +545,7 @@
id: 0,
businessType: "3",
operationType: "add",
- curCase: this.curCase
+ curCase: this.curCase,
}
});
} else {
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 20ed01f..5454ea9 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -661,16 +661,18 @@
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">
- <i class="el-icon-picture-outline"></i>
- </div> -->
- </el-image>
+ @click="handleImageClick(0)"
+ />
+ <custom-image-viewer
+ :url-list="pdfimgsrcList"
+ :initial-index="currentIndex"
+ :visible="viewerVisible"
+ @update:visible="viewerVisible = $event"
+ @close="handleViewerClose"
+ />
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
</div>
@@ -764,16 +766,18 @@
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>
+ @click="invoiceHandleImageClick(0)"
+ />
+ <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>
@@ -872,12 +876,14 @@
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import { getToken } from "@/utils/auth";
+import CustomImageViewer from "@/components/CustomImageViewer";
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter
+ OrgSelecter,
+ CustomImageViewer
},
name: "fundApply",
@@ -1178,6 +1184,10 @@
pdfimgsrcList: [],
pdfVisible: false,
previewpdf: false,
+ viewerVisible: false,
+ currentIndex: 0,
+ invoiceViewerVisible: false,
+ invoiceCurrentIndex: 0,
hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
atpresent: "",
Savereminder: false, //鎻愰啋淇濆瓨寮规
@@ -2899,7 +2909,23 @@
destroyed() {
window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ activated() {}, //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+
+ // 鍥剧墖棰勮
+ handleImageClick(index) {
+ this.currentIndex = index;
+ this.viewerVisible = true;
+ },
+ handleViewerClose() {
+ this.viewerVisible = false;
+ },
+ invoiceHandleImageClick(index) {
+ this.invoiceCurrentIndex = index;
+ this.invoiceViewerVisible = true;
+ },
+ invoiceHandleViewerClose() {
+ this.invoiceViewerVisible = false;
+ },
};
</script>
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 48e6a20..e499411 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -12,10 +12,27 @@
</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>
@@ -40,19 +57,62 @@
</el-col>
<el-col :span="5">
<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">
@@ -86,7 +146,7 @@
<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>
@@ -204,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="璇烽�夋嫨">
<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>
@@ -415,9 +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.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>
@@ -602,10 +699,21 @@
<!-- <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" />
@@ -741,7 +849,8 @@
"sys_recordstatus",
"sys_travelexpensebelong",
"sys_traffictype",
- "sys_area_name"
+ "sys_area_name",
+ "sys_DonationStatus"
],
data() {
return {
@@ -1127,6 +1236,15 @@
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);
@@ -1678,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)
},
@@ -2095,6 +2225,7 @@
// return;
// }
+<<<<<<< HEAD
// 1. 鍦� reduce 绱姞鏃讹紝鐩存帴浼犲叆瀛楃涓茬粰 Decimal锛屽苟浣跨敤 .plus() 鏂规硶杩涜绱姞
// 鍒濆鍊艰涓� new Decimal(0)锛岀‘淇濆叏绋嬮珮绮惧害杩愮畻
const addnumber = this.rbPayees.reduce((amount, item) => {
@@ -2106,6 +2237,14 @@
// 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"
--
Gitblit v1.9.3