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 | 145 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 142 insertions(+), 3 deletions(-)
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