From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/applyDetail/index.vue | 1360 ++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 967 insertions(+), 393 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 46b670c..b4b6494 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -12,7 +12,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="applyTime">
- <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date"
+ <el-date-picker clearable :disabled="true" style="width: 100%" v-model="form.applyTime" type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss" placeholder="鏃� 鏈�">
</el-date-picker>
</el-form-item>
@@ -33,7 +33,7 @@
</el-col>
</el-row>
<el-row>
- <!--
+ <!--
<el-col :span="7">
<el-form-item label="宸ヤ綔鍗曚綅" prop="unitno">
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
@@ -68,13 +68,13 @@
<el-form-item label="鎹愮尞妗堜緥" prop="name">
<el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
- </el-col>
+ </el-col>
<el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
<el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
</el-form-item>
</el-col>
- <!--
+ <!--
<el-col :span="5">
<el-form-item label="鐢宠鐘舵��" prop="recordstatus">
<el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
@@ -104,14 +104,23 @@
<el-button type="primary" icon="el-icon-download" size="small" @click="Batchentry">鎵归噺褰曞叆涓撳</el-button>
</div>
</el-col>
- <el-col :span="3" v-if="userprofile.nickName == '闄堟厱鍗�' &&
- (businessType == '1' || businessType == '2')
- ">
+ <!-- <el-col
+ :span="3"
+ v-if="
+ userprofile.nickName == '闄堟厱鍗�' &&
+ (businessType == '1' || businessType == '2')
+ "
+ >
<div style="margin-bottom: 15px;">
- <el-button type="success" icon="el-icon-edit-outline" size="small"
- @click="Manualcalculationfn">璁＄畻涓◣</el-button>
+ <el-button
+ type="success"
+ icon="el-icon-edit-outline"
+ size="small"
+ @click="Manualcalculationfn"
+ >璁＄畻涓◣</el-button
+ >
</div>
- </el-col>
+ </el-col> -->
</el-row>
<el-row>
<el-table :data="rbDetails" v-loading="loading" max-height="800" border highlight-current-row>
@@ -120,10 +129,6 @@
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <!--
- <el-table-column prop="itemcode" align="center" label="椤圭洰缂栧彿" show-overflow-tooltip=""
- v-if="form.applytype == '1'">
- </el-table-column>-->
<el-table-column prop="applytype" align="center" label="鏈嶅姟绫诲瀷" width="200">
<template slot-scope="scope">
<el-select v-model="scope.row.applytype" placeholder="璇烽�夋嫨鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
@@ -134,8 +139,8 @@
</el-table-column>
<el-table-column prop="itemid" align="center" label="鏈嶅姟椤圭洰" width="260">
<template slot-scope="scope">
- <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable @change="verifyFeeItem(scope.row)"
- :filter-method="val => searchItemType(val, scope)">
+ <el-select v-model="scope.row.itemid" placeholder="璇烽�夋嫨鏈嶅姟椤圭洰" filterable
+ @change="verifyFeeItem(scope.row)" :filter-method="val => searchItemType(val, scope)">
<el-option v-for="dict in scope.row.itemlist" :key="dict.index" :label="dict.itemName"
:value="dict.id"></el-option>
</el-select>
@@ -152,18 +157,20 @@
</el-table-column>
<el-table-column prop="price" align="center" label="鍗曚环" width="120" v-if="businessType == 4">
<template slot-scope="scope">
- <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="val => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.price" placeholder="鍗曚环" @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="businessType == 4">
<template slot-scope="scope">
- <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="val => {
- sumTotalFee(scope.row);
- }
- " />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="
+ val => {
+ sumTotalFee(scope.row);
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountlabel" width="120">
@@ -171,16 +178,16 @@
<el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
- <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="ismanager == true &&
+ <el-table-column prop="taxamount" align="center" label="鎵ｇ◣閲戦" width="120" v-if="
+ ismanager == true &&
(businessType == '1' || businessType == '2')
- ">
+ ">
<template slot-scope="scope">
<el-input v-model="scope.row.taxamount" placeholder="鎵ｇ◣閲戦" />
</template>
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="ismanager == true &&
- (businessType == '1' || businessType == '2')
- ">
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120"
+ v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
<el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
</template>
@@ -190,8 +197,8 @@
<template slot-scope="scope">
<el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
scope.row.beneficiaryname
- ? scope.row.beneficiaryname
- : "鐐瑰嚮閫夋嫨"
+ ? scope.row.beneficiaryname
+ : "鐐瑰嚮閫夋嫨"
}}</el-button>
</template>
</el-table-column>
@@ -203,33 +210,7 @@
}}</el-button>
</template>
</el-table-column>
- <!--
- <el-table-column prop="unitname" align="center" label="鍗曚綅锛堜釜浜猴級鍚嶇О" width="300"
- v-if="form.applytype == '4' || form.applytype == '3'">
- <template slot-scope="scope">
- <el-button type="primary" plain @click="showSelectionDialog(scope, 'account')">{{
- scope.row.unitname
- ? scope.row.unitname
- : "鐐瑰嚮閫夋嫨"
- }}</el-button>
- <el-select
- v-model="scope.row.unitno"
- placeholder="鍗曚綅"
- clearable
- filterable
- allow-create
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select>
- </template>
- </el-table-column>
- -->
<el-table-column prop="title" align="center" label="鑱岀О" width="120"
v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
@@ -240,14 +221,16 @@
v-if="businessType == '1' || businessType == '2'">
<template slot-scope="scope">
<el-form-item label-width="0">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model.number="scope.row.idcardno"
- @input="tableParValueChange1(scope.row)" placeholder="韬唤璇佸彿" />
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�' || scope.row.isunit == 1"
+ :placeholder="scope.row.isunit == 1 ? '鍗曚綅鏃犻渶濉啓' : '韬唤璇佸彿'"
+ v-model.number="scope.row.idcardno" @input="tableParValueChange1(scope.row)" />
</el-form-item>
</template>
</el-table-column>
<el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200">
<template slot-scope="scope">
- <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
+ <el-input :disabled="userprofile.nickName != '闄堟厱鍗�'" v-model="scope.row.depositbank"
+ placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
<el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210">
@@ -267,22 +250,28 @@
</el-table-column>
<el-table-column fixed="right" align="center" label="鎿嶄綔" width="180">
<template slot-scope="scope">
- <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="operationType == 'add' ||
+ <el-button type="text" size="mini" @click="addRow(scope.$index)" v-if="
+ operationType == 'add' ||
operationType == 'update' ||
operationType == 'check'
- ">鏂板</el-button>
+ ">鏂板</el-button>
<el-button @click.native.prevent="
deleteRows(scope.row, scope.$index, rbDetails)
- " type="text" size="small" v-if="operationType == 'add' ||
- operationType == 'update' ||
- operationType == 'check'
- ">
+ " type="text" size="small" v-if="
+ operationType == 'add' ||
+ operationType == 'update' ||
+ operationType == 'check'
+ ">
鍒犻櫎
</el-button>
<el-button @click.native.prevent="
Filepopup(scope.$index, rbDetails, scope.row)
- " type="text" size="small" v-if="businessType == 2 || businessType == 3 || businessType == 4
- ">绁ㄦ嵁</el-button>
+ " type="text" size="small" v-if="
+ businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ businessType == 1
+ ">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -313,7 +302,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>
@@ -323,10 +312,11 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="operationType == 'detail' ||
+ <el-row v-if="
+ operationType == 'detail' ||
operationType == 'check' ||
operationType == 'update'
- ">
+ ">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
<el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
@@ -342,12 +332,21 @@
<el-row style="margin-top: 25px; margin-bottom: 5px"
v-if="operationType == 'check' && userprofile.nickName == '闄堟厱鍗�'">
- <el-col :span="20">
- <el-form-item label="棰勫鏉愭枡" prop="infoid">
+ <el-col :span="12">
+ <el-form-item label="棰勫鐘舵��" prop="infoid">
<el-radio-group v-model="form.checkstatus" align="left">
- <el-radio :label="1">寰呯敵璇锋潗鏂�</el-radio>
- <el-radio :label="2">瀹℃牳閫氳繃绛夊緟閭瘎绾歌川鏉愭枡</el-radio>
- <el-radio :label="3">宸叉敹鍒版姤閿�鏉愭枡</el-radio>
+ <el-radio :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" v-if="businessType == 1">
+ <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>
@@ -371,10 +370,11 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm" v-if="operationType == 'add' ||
+ <el-button type="primary" @click="submitForm" v-if="
+ operationType == 'add' ||
operationType == 'update' ||
ismanager == true
- ">淇濆瓨</el-button>
+ ">淇濆瓨</el-button>
<el-button type="success" @click="handleup"
v-if="operationType == 'add' || operationType == 'update'">涓婃姤</el-button>
<el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
@@ -427,6 +427,7 @@
</el-form-item>
</el-col>
</el-row>
+
<el-row v-if="selectionType == 'account' && accountfrom == '2'">
<el-col :span="24">
<el-form-item label="璐︽埛鍚嶇О" prop="username">
@@ -434,13 +435,25 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="selectionType == 'account' &&
+ <el-row v-if="
+ selectionType == 'account' &&
+ accountfrom == '2' &&
+ accountselectform.usertype == 'org'
+ ">
+ <el-col :span="24">
+ <el-form-item label="绋庡彿" prop="unitTaxNo">
+ <el-input v-model="accountselectform.unitTaxNo" placeholder="璇疯緭鍏ョ◣鍙�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="
+ selectionType == 'account' &&
accountfrom == '2' &&
accountselectform.usertype != 'org'
- ">
+ ">
<el-col :span="12">
<el-form-item label="韬唤璇佸彿" prop="idcardno">
- <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" />
+ <el-input v-model="accountselectform.idcardno" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @blur="handleIdCardBlur" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="accountselectform.usertype == 'expert'">
@@ -452,10 +465,11 @@
</el-form-item>
</el-col>
</el-row>
- <el-row v-if="selectionType == 'account' &&
+ <el-row v-if="
+ selectionType == 'account' &&
accountfrom == '2' &&
accountselectform.usertype == 'expert'
- ">
+ ">
<el-col>
<el-form-item label="鎵�鍦ㄥ崟浣�" prop="unitno">
<el-select v-model="accountselectform.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
@@ -503,7 +517,7 @@
</el-dialog>
<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 v-if="businessType == 4" prop="price" align="center" label="鍗曚环">
</el-table-column>
@@ -511,9 +525,10 @@
</el-table-column>
<el-table-column prop="amount" align="center" :label="amountlabel">
</el-table-column>
- <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="(this.ismanager == true) &
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" v-if="
+ (this.ismanager == true) &
(form.applytype == '1' || form.applytype == '2')
- ">
+ ">
</el-table-column>
<!-- <el-table-column
prop="beneficiaryname"
@@ -545,9 +560,10 @@
</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">
+ <el-tab-pane label="鏅�氶檮浠�" name="common">
<div class="pdfimg">
<div class="box-pdf">
<div>
@@ -559,7 +575,8 @@
<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">
@@ -572,7 +589,7 @@
<el-table-column prop="name" width="190" :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>
@@ -586,17 +603,19 @@
<div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad" :src="pdfimg"
- :preview-src-list="pdfimgsrcList">
+ <el-image ref="imagePreview" style="width: 95%; height: 90%" :src="pdfimg"
+ @click="handleImageClick(initialIndex)">
<!-- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div> -->
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
</el-image>
+ <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>
</el-tab-pane>
- <el-tab-pane label="鍙戠エ鏂囦欢" :name="2">
+ <el-tab-pane label="鍙戠エ鏂囦欢" name="invoice">
<div class="pdfimg">
<div class="box-pdf">
<div>
@@ -608,7 +627,8 @@
<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">
@@ -635,12 +655,15 @@
<div v-if="this.previewpdf && invoicepdfimgsrcList.length" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image style="width: 95%; height: 90%" @error="handleImageError" @load="handleImageLoad"
- :src="invoicepdfimg" :preview-src-list="invoicepdfimgsrcList">
+ <el-image style="width: 95%; height: 90%" :src="invoicepdfimg"
+ @click="invoicehandleImageClick(initialIndex)">
<!-- <div slot="error" class="image-slot">
- <i class="el-icon-picture-outline"></i>
- </div> -->
+ <i class="el-icon-picture-outline"></i>
+ </div> -->
</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>
@@ -660,13 +683,19 @@
</el-dialog>
<!-- 鎵归噺閫夊彇 -->
- <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="30%">
+ <el-dialog title="鎵归噺鐢熸垚鏄庣粏淇℃伅" :visible.sync="batchdialogVisible" width="35%">
+ <div style="margin-bottom: 12px">
+ <el-input v-model="personKeyword" clearable size="small" prefix-icon="el-icon-search"
+ placeholder="杈撳叆 濮撳悕 / 鍗曚綅 / 宸ュ彿 / 韬唤璇佸悗4浣� 绛涙煡" style="width: 330px" />
+ <span style="margin-left: 10px; color: #909399; font-size: 12px">鍏� {{ filteredCityOptions.length }} 浜�</span>
+ </div>
<div style="max-height: 300px; overflow-y: auto">
- <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ��</el-checkbox>
+ <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">鍏ㄩ�夛紙褰撳墠绛涙煡缁撴灉锛�</el-checkbox>
<div style="margin: 15px 0;"></div>
<el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
- <el-checkbox border v-for="city in cityOptions" :label="city" :key="city.reportNo">{{ city.reportName
- }}</el-checkbox>
+ <el-checkbox border v-for="city in filteredCityOptions" :label="city"
+ :key="city.reportNo + '_' + city.reportName">{{ city.reportName
+ }}{{ city.unitname ? " 路 " + city.unitname : "" }}</el-checkbox>
</el-checkbox-group>
</div>
@@ -679,6 +708,8 @@
</template>
<script>
+import store from "@/store";
+
// 'sdaad2123UD2',1 'wsadadwsad',4 'sdadaddad',3 'ssaaddxs',2
//杩欓噷鍙互瀵煎叆鍏朵粬鏂囦欢锛堟瘮濡傦細缁勪欢锛屽伐鍏穓s锛岀涓夋柟鎻掍欢js锛宩son鏂囦欢锛屽浘鐗囨枃浠剁瓑绛夛級
//渚嬪锛歩mport 銆婄粍浠跺悕绉般�� from '銆婄粍浠惰矾寰勩��';
@@ -703,7 +734,9 @@
getdownloadBX,
addorupdateFund,
ManualCalculation,
- getdetailsByItemId
+ getdetailsByItemId,
+ validateExpertFee,
+ listbypower
} from "@/api/project/fund";
import {
@@ -744,7 +777,7 @@
addExternalperson,
updateExternalperson,
exportExternalperson,
- getOnlyCode
+ getOnlyCode, getInfoByIDCardNo
} from "@/api/project/externalperson";
import { listItemexpense } from "@/api/project/itemexpense";
@@ -753,12 +786,16 @@
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import { getToken } from "@/utils/auth";
+import { moneySum, moneyMul, moneySub, moneyRound } from "@/utils/money";
+import { checkFileName, checkDetails } from "@/utils/fileNameCheck";
+import CustomImageViewer from "@/components/CustomImageViewer"; // 鏍规嵁浣犵殑璺緞璋冩暣
export default {
//import寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
components: {
Li_area_select,
- OrgSelecter
+ OrgSelecter,
+ CustomImageViewer
},
name: "fundApply",
@@ -774,19 +811,41 @@
//"sys_finsubject",
//"sys_financeitemtype",
//"sys_expensetype",
+ 'sys_DonationStatus',
"sys_recordstatus",
"sys_professionaltitle"
],
data() {
- var validatePass = (rule, value, callback) => {
- const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
- if (regex.test(value)) {
- callback();
- } else {
- callback(new Error("韬唤璇佸彿鐮佹牸寮忛敊璇�"));
+ // 鑷畾涔夎韩浠借瘉鍙锋牎楠屽櫒
+ const validateIdCard = (rule, value, callback) => {
+ // 1. 濡傛灉涓虹┖锛屼氦缁� required 瑙勫垯鍘诲鐞嗭紝杩欓噷鐩存帴鏀捐
+ if (!value) {
+ return callback();
}
+ const regex = /^[1-9]\d{5}(19|20)\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}([0-9]|X)$/;
+ // 2026-10-19锛氭牸寮忎笉鍚堟硶绔嬪嵆鏃╅��銆傚師鏉ュ啓鎴� if/else 浣� else 閲屾病鏈� return锛�
+ // 浼氱户缁線涓嬭蛋寮傛鏌ラ噸锛屽鑷� callback 琚皟鐢ㄤ袱娆°��"韬唤璇佸彿鐮佹牸寮忛敊璇�"琚悗缁粨鏋滆鐩栥��
+ if (!regex.test(value)) {
+ return callback(new Error("韬唤璇佸彿鐮佹牸寮忛敊璇�"));
+ }
+
+ // 2. 璋冪敤鍚庣鎺ュ彛杩涜閲嶅鎬ф牎楠�
+ getInfoByIDCardNo(value).then(res => {
+ // 鍋囪鍚庣杩斿洖鐨� res.data 鏄暟缁勶紝涓旈暱搴﹀ぇ浜�0琛ㄧず宸插瓨鍦�
+ if (res.data && res.data.length > 0) {
+ // 鏍￠獙涓嶉�氳繃锛屽皢閿欒淇℃伅浼犵粰 callback
+ callback(new Error("韬唤璇佸彿淇℃伅宸茶鐧昏锛岃妫�鏌ワ紒"));
+ } else {
+ // 鏍￠獙閫氳繃
+ callback();
+ }
+ }).catch(() => {
+ // 鎺ュ彛寮傚父鏃剁殑澶勭悊
+ callback(new Error("鏍￠獙韬唤璇佸彿鏃跺彂鐢熺綉缁滈敊璇�"));
+ });
};
+
//杩欓噷瀛樻斁鏁版嵁
return {
// 閬僵灞�
@@ -825,6 +884,8 @@
// 缃戠粶璇锋眰澶�
Networkheader: null,
batchdialogVisible: false,
+ //鎵归噺褰曞叆寮规鐨勭瓫鏌ュ叧閿瓧
+ personKeyword: "",
itemlist: [],
cityOptions: [],
checkAll: false,
@@ -838,11 +899,11 @@
baselisttages: [
{
id: 1,
- name: "鏉愭枡寰呭鏍�"
+ name: "寰呭鏍�"
},
{
id: 2,
- name: "瀹℃煡閫氳繃绛夊緟閭瘎绾歌川鏉愭枡"
+ name: "棰勫閫氳繃绛夊緟绾歌川鏉愭枡"
},
{
id: 3,
@@ -899,16 +960,38 @@
},
dialogrules: {
+ // 2026-10-19锛氳处鎴峰悕绉帮紙璐︽埛鏉ユ簮=浠庤处鎴峰簱 鏃剁殑涓嬫媺锛変篃鏄繀杈撻」
+ accountname: [
+ { required: true, message: "璇烽�夋嫨璐︽埛鍚嶇О", trigger: "change" }
+ ],
usertype: [
{ required: true, message: "璇疯緭鍏ヨ处鎴风被鍨�", trigger: "blur" }
],
username: [
{ required: true, message: "璇疯緭鍏ヨ处鎴峰悕绉�", trigger: "blur" }
],
+ unitTaxNo: [{ required: true, message: "璇疯緭鍏ョ◣鍙�", trigger: "blur" }],
idcardno: [
- { required: true, message: "璇疯緭鍏ヨ韩浠借处鍙�", trigger: "blur" }
+ {
+ // 2026-10-19锛氬姞 required 鏍囪鍙负璁� el-form-item 鏍囧嚭蹇呰緭鏄熷彿锛圗lement 鐨� isRequired 鍙 rule.required锛夈��
+ // 鏈鍒欏甫 validator锛宎sync-validator 鐨� getValidationMethod 浼氱洿鎺ヨ繑鍥炶 validator銆佽烦杩囧唴寤� required 妫�鏌ワ紝
+ // 鎵�浠ユ牎楠岃涓轰笌鏀瑰姩鍓嶅畬鍏ㄤ竴鑷达紱鍙﹀**涓嶈兘鍔� message**锛屽惁鍒欎細瑕嗙洊涓嬮潰鑷畾涔� validator 鐨勬姤閿欐枃妗堛��
+ required: true,
+ // 璐︽埛绫诲瀷閫夋嫨"鍗曚綅鏈烘瀯"鏃朵笉闇�瑕佽韩浠借瘉鍙�
+ validator: (rule, value, callback) => {
+ if (this.hasUserType(this.accountselectform.usertype, "org")) {
+ return callback();
+ }
+ if (!value || !String(value).trim()) {
+ return callback(new Error("璇疯緭鍏ヨ韩浠借瘉鍙�"));
+ }
+ return callback();
+ },
+ trigger: "blur"
+ },
+ // 娣诲姞鑷畾涔夋牎楠岃鍒�
+ { validator: validateIdCard, trigger: 'blur' }
],
- //idcardno: [{ validator: validatePass, trigger: "blur" }],
depositbank: [
{ required: true, message: "璇疯緭鍏ュ紑鎴烽摱琛�", trigger: "change" }
],
@@ -972,6 +1055,8 @@
flowconclusion: null,
fundid: null
},
+ // 杩炵画瀹℃壒锛氬緟瀹℃壒鍗曟嵁鍒楄〃
+ pendingList: [],
// 鏌ヨ鍙傛暟
queryParams: {
@@ -1036,7 +1121,7 @@
invoicepdfimg: "",
invoicepdfimgsrcList: [],
invoDatatop: [],
- activeName: 1, //鏂囦欢绫诲瀷
+ activeName: "common", //鏂囦欢绫诲瀷
//涓婁紶闄勪欢璺緞
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
ICDtoken: getToken(),
@@ -1048,6 +1133,11 @@
pdftitle: "",
pdfimg: "",
pdfimgsrcList: [],
+ currentIndex: 0, // 鍒濆绱㈠紩
+ invoicecurrentIndex: 0, // 鍒濆绱㈠紩
+ initialIndex: 0, // 鍒濆绱㈠紩
+ viewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
+ invoiceviewerVisible: false, // 鎺у埗棰勮缁勪欢鏄剧ず
pdfVisible: false,
previewpdf: false,
hintitle: "璇蜂笂浼犳枃浠跺悗鏌ョ湅",
@@ -1060,7 +1150,16 @@
},
//鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
- computed: {},
+ computed: {
+ //鎵归噺褰曞叆寮规锛氭寜鍏抽敭瀛楋紙濮撳悕/鍗曚綅/宸ュ彿/韬唤璇佸悗4浣嶏級绛涙煡鍚庣殑鍊欓�変汉
+ filteredCityOptions() {
+ const kw = (this.personKeyword || "").trim().toLowerCase();
+ if (!kw) {
+ return this.cityOptions;
+ }
+ return this.cityOptions.filter(item => this.personMatchKeyword(item, kw));
+ }
+ },
//鐩戞帶data涓殑鏁版嵁鍙樺寲
watch: {},
//鏂规硶闆嗗悎
@@ -1215,9 +1314,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;
}
//鍒濆鍖栨槑缁�
@@ -1320,6 +1422,14 @@
handleCheck() {
this.isopen = 0;
this.reset();
+ // 閲嶇疆瀹℃壒淇℃伅锛岄伩鍏嶄笂涓�鍗曠殑瀹℃壒缁撴灉甯﹀叆涓嬩竴鍗�
+ this.checkObj = {
+ flowlevelone: null,
+ flowconclusion: null,
+ fundid: null
+ };
+ // 杩炵画瀹℃壒锛氬姞杞藉綋鍓嶄笟鍔＄被鍨嬩笅鐨勫緟瀹℃壒鍒楄〃
+ this.getPendingList();
getFund(this.curId).then(response => {
this.form = response.data;
@@ -1453,6 +1563,11 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm: debounce(function () {
+ // 2026-10-15锛氫繚瀛樺墠闄勪欢鏂囦欢鍚嶈鑼冩牎楠岋紙浠呮柊澧炲崟鎹紱鑰佸崟鎹殑鍘嗗彶闄勪欢鐢卞悗绔寜"鍙牎楠屾湰娆″彉鏇�"鏀捐锛�
+ if (!this.checkDetailFileNames()) {
+ return;
+ }
+
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -1461,6 +1576,31 @@
this.$refs["form"].validate(valid => {
if (valid) {
this.formData = this.form;
+
+ // 涓撳鍔冲姟璐逛笓鐢細9 鏉¤垂鐢ㄦ帶鍒惰鍒欐牎楠岋紙鏍￠獙涓嶉�氳繃涓嶅厑璁镐繚瀛橈級
+ if (this.businessType == "1") {
+ this.$modal.loading("姝ｅ湪鏍￠獙涓撳鍔冲姟璐圭敤锛岃绋嶅�欙紒");
+ this.checkExpertFeeRules("淇濆瓨").then((allowed) => {
+ this.$modal.closeLoading();
+ if (allowed) {
+ this.doSubmitForm();
+ }
+ });
+ return;
+ }
+
+ this.doSubmitForm();
+ }
+ });
+ }, 500),
+
+ /**
+ * 淇濆瓨鐢宠鍗曠殑瀹為檯钀藉簱閫昏緫銆�
+ *
+ * 浠� submitForm 涓媶鍑猴紝渚夸簬鍦ㄤ笓瀹跺姵鍔¤垂瑙勫垯鏍￠獙閫氳繃鍚庡啀鎵ц锛�
+ * 鍏朵粬涓氬姟绫诲瀷鐢� submitForm 鐩存帴璋冪敤锛岃涓轰笌鎷嗗垎鍓嶄竴鑷淬��
+ */
+ doSubmitForm() {
//淇濆瓨鍓嶆牎楠屾暟鎹�
for (let k = 0; k < this.rbDetails.length; k++) {
@@ -1531,7 +1671,7 @@
let tempDetail = this.rbDetails[j];
if (
isNaN(parseFloat(tempDetail.amount)) ||
- parseFloat(tempDetail.amount) == 0
+ moneyRound(tempDetail.amount) == 0
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
@@ -1546,7 +1686,7 @@
let tempDetail = this.rbDetails[j];
if (
isNaN(parseFloat(tempDetail.amount)) ||
- parseFloat(tempDetail.amount) == 0
+ moneyRound(tempDetail.amount) == 0
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
@@ -1557,7 +1697,7 @@
}
if (
isNaN(parseFloat(tempDetail.taxamount)) ||
- parseFloat(tempDetail.taxamount) == 0
+ moneyRound(tempDetail.taxamount) == 0
) {
tempDetail.taxedamount = parseFloat(tempDetail.amount);
} else {
@@ -1629,7 +1769,7 @@
sessionStorage.setItem("apiform", JSON.stringify(this.form));
addorupdateFund(this.form)
.then(response => {
- if (response.code === 200) {
+ if (response.code == 200) {
if (this.form.id) {
this.$modal.msgSuccess("鐢宠鍗曚慨鏀规垚鍔燂紒");
this.$router.go(-1);
@@ -1640,7 +1780,7 @@
path: "/finance/applyDetail/",
query: {
id: response.data,
- businessType: "2",
+ businessType: this.businessType,
operationType: "update",
curCase: this.curCase
}
@@ -1659,9 +1799,84 @@
//鍏抽棴绐楀彛
this.loading = false;
// this.getfundList();
- }
+ },
+
+ /**
+ * 涓撳鍔冲姟璐� 9 鏉¤垂鐢ㄦ帶鍒惰鍒欐牎楠岋紙鎻愪氦鍓嶆嫤鎴級銆�
+ *
+ * 閫傜敤鑼冨洿锛歜usinessType === '1'锛堜笓瀹跺姵鍔¤垂鐢宠鍗曪級锛屼笌鍚庣 applytype === '1' 瀵瑰簲銆�
+ * 鍏朵粬涓氬姟绫诲瀷锛堜鸡鐞嗕笓瀹惰垂銆佸尰瀛︽垚鏈�佸姙鍏垂鐢級涓嶆牎楠岋紝鐩存帴鏀捐銆�
+ *
+ * 鏍￠獙鍙ｅ緞锛堝悓涓�鎹愮尞妗堜緥 infoid 涓嬬疮璁★級鐢卞悗绔粺涓�瀹炵幇锛�
+ * errors 闃绘柇鍨嬶細鎻愮ず杩濆弽鐨勫叿浣撹鍒欙紝涓嶅厑璁哥户缁繚瀛�/瀹℃牳
+ * warnings 鎻愮ず鍨嬶細浠呮彁閱掔粡鍔炰汉澶勭悊锛堣鍒� 5銆�6锛夛紝闇�浜屾纭鍚庢墠缁х画
+ *
+ * @param {string} action 褰撳墠鍔ㄤ綔锛岀敤浜庢嫾鎺ユ彁绀烘枃妗堬紙濡傗�滀繚瀛樷�濃�滄彁浜ゅ鏍糕�濓級
+ * @returns {Promise<boolean>} true 鍏佽缁х画锛宖alse 闃绘缁х画
+ */
+ checkExpertFeeRules(action) {
+ if (this.businessType != "1") {
+ return Promise.resolve(true);
+ }
+ // 鍚庣鎸夈�屾渚嬪唴宸叉湁鍗曟嵁 + 鏈鎻愪氦鏄庣粏銆嶅悎骞惰绠楋紝纭繚灏氭湭钀藉簱鐨勬槑缁嗕篃鍙備笌鏍￠獙
+ const payload = Object.assign({}, this.form, {
+ applytype: this.form.applytype || "1",
+ serviceFunddetails: this.rbDetails,
});
- }, 500),
+ // 鎺掓煡鐢細鑳界洿鎺ヤ粠鎺у埗鍙扮湅鍒板埌搴曢�佷簡浠�涔堬紝浠ュ強鍚庣鍒ゅ畾浜嗕粈涔�
+ console.log("[涓撳璐规牎楠宂 鎻愪氦鏍￠獙", action, {
+ businessType: this.businessType,
+ applytype: payload.applytype,
+ infoid: payload.infoid,
+ fundId: payload.id,
+ 鏄庣粏: (this.rbDetails || []).map((d) => ({
+ itemid: d.itemid,
+ amount: d.amount,
+ taxedamount: d.taxedamount,
+ 鍦烘櫙: d.servicesscopename,
+ })),
+ });
+
+ return validateExpertFee(payload)
+ .then((res) => {
+ const errors = (res && res.errors) || [];
+ const warnings = (res && res.warnings) || [];
+ console.log("[涓撳璐规牎楠宂 鍚庣杩斿洖", { errors, warnings });
+
+ // 1) 闃绘柇鍨嬶細鍒楀嚭杩濆弽鐨勫叿浣撹鍒欙紝涓嶅厑璁哥户缁�
+ // 鐢ㄥ脊绐楄�岄潪杞绘彁绀猴細閿欒鍙兘鏈夊鏉★紝杞绘彁绀轰細鎸ゆ垚涓�琛屼笖寰堝揩娑堝け
+ if (errors.length > 0) {
+ this.$modal.alertError(
+ "涓撳鍔冲姟璐圭敤涓嶇鍚堜互涓嬭瀹氾紝鏃犳硶" +
+ action +
+ "锛歕n\n" +
+ errors.map((msg, i) => i + 1 + ". " + msg).join("\n\n")
+ );
+ return false;
+ }
+
+ // 2) 鎻愮ず鍨嬶細闇�缁忓姙浜虹‘璁ゅ悗鎵嶈兘缁х画锛堝綋鍓嶈鍒� 5銆�6 宸叉敼涓虹‖鎷︽埅锛屾鍒嗘敮淇濈暀澶囩敤锛�
+ if (warnings.length > 0) {
+ const confirmText =
+ "涓撳鍔冲姟璐圭敤瀛樺湪浠ヤ笅闂锛岃纭鏄惁缁х画" +
+ action +
+ "锛焅n\n" +
+ warnings.map((msg, i) => i + 1 + ". " + msg).join("\n\n");
+ return this.$modal
+ .confirm(confirmText)
+ .then(() => true)
+ .catch(() => false);
+ }
+
+ return true;
+ })
+ .catch((err) => {
+ // 鎺ュ彛寮傚父鏃舵寜鈥滀笉闃绘柇鈥濆鐞嗭紝閬垮厤鏍￠獙鏈嶅姟涓嶅彲鐢ㄥ鑷村畬鍏ㄦ棤娉曟姤閿�锛�
+ // 鍚庣 addOrUpdateNew / checkFund 浠嶆湁鍚屾牱鐨勭‖鎷︽埅鍏滃簳銆�
+ console.error("涓撳鍔冲姟璐硅鍒欐牎楠屾帴鍙ｈ皟鐢ㄥけ璐�", err);
+ return true;
+ });
+ },
checksubmit() {
//妫�鏌ユ槸鍚︽敹鍒扮焊璐ㄦ潗鏂�
@@ -1693,8 +1908,79 @@
return;
}
- this.Savenow();
- console.log("淇濆瓨骞跺鎵�");
+ // 涓撳鍔冲姟璐逛笓鐢細9 鏉¤垂鐢ㄦ帶鍒惰鍒欐牎楠岋紙浠呭鏍搁�氳繃鏃舵嫤鎴級
+ const needExpertFeeCheck = this.checkObj.flowlevelone == 1;
+ const expertFeePromise = needExpertFeeCheck
+ ? this.checkExpertFeeRules("鎻愪氦瀹℃牳")
+ : Promise.resolve(true);
+
+ expertFeePromise.then((allowed) => {
+ if (!allowed) {
+ return;
+ }
+ this.Savenow();
+ console.log("淇濆瓨骞跺鎵�");
+ });
+ },
+
+ // 杩炵画瀹℃壒锛氳幏鍙栧綋鍓嶄笟鍔＄被鍨嬩笅鐨勫緟瀹℃壒鍒楄〃
+ getPendingList() {
+ return listbypower({
+ pageNum: 1,
+ pageSize: 1000,
+ CHECKFLAG: 1,
+ APPLYTYPE: this.businessType
+ })
+ .then(res => {
+ this.pendingList = res.rows || [];
+ })
+ .catch(() => {
+ this.pendingList = [];
+ });
+ },
+
+ // 杩炵画瀹℃壒锛氬鎵瑰畬鎴愬悗璇㈤棶鏄惁缁х画瀹℃壒涓嬩竴鍗�
+ continueOrExit() {
+ // 閲嶆柊鎷夊彇寰呭鎵瑰垪琛紙褰撳墠鍗曟嵁宸插鎵瑰畬鎴愯绉诲嚭鍒楄〃锛�
+ this.getPendingList().then(() => {
+ const list = this.pendingList || [];
+ const next = list[0] || null;
+ if (next) {
+ this.$confirm("瀹℃壒宸插畬鎴愶紝鏄惁缁х画瀹℃壒涓嬩竴寮犲緟瀹℃壒鍗曟嵁锛�", "鎻愮ず", {
+ confirmButtonText: "缁х画瀹℃壒",
+ cancelButtonText: "杩斿洖鍒楄〃",
+ type: "info"
+ })
+ .then(() => {
+ // 鍦ㄥ綋鍓嶉〉闈㈢洿鎺ュ姞杞戒笅涓�寮犲緟瀹℃壒鍗曟嵁
+ this.curId = next.id;
+ this.handleCheck();
+ // 鍚屾鏇存柊鍦板潃鏍忥紝閬垮厤鍒锋柊鍚庡洖鍒颁笂涓�鍗�
+ this.$router
+ .replace({
+ path: this.$route.path,
+ query: {
+ id: next.id,
+ businessType: this.businessType,
+ operationType: "check"
+ }
+ })
+ .catch(() => {});
+ })
+ .catch(() => {
+ this.exitToPage();
+ });
+ } else {
+ this.$modal.msgSuccess("宸叉棤寰呭鎵瑰崟鎹紝杩斿洖鍒楄〃");
+ this.exitToPage();
+ }
+ });
+ },
+
+ // 杩斿洖鍒楄〃椤�
+ exitToPage() {
+ this.$store.dispatch("tagsView/delView", this.$route);
+ this.$router.go(-1);
},
// 鍙栨秷鎸夐挳
@@ -1708,10 +1994,12 @@
getUserProfile().then(res => {
this.userprofile = res.data;
this.standardlevel = res.data.standardlevel;
+
if (
this.userprofile.userName == "admin" ||
- this.userprofile.userName == "001" ||
- this.userprofile.userName == "047"
+ this.userprofile.userName == "053" ||
+ this.userprofile.userName == "047" ||
+ store.getters.rolesor[0].roleSort == "13"
) {
this.ismanager = true;
} else {
@@ -1741,6 +2029,19 @@
});
},
+ /** 浜哄憳绫诲瀷锛堝鍊硷紝閫楀彿鍒嗛殧锛夋槸鍚﹀寘鍚寚瀹氱被鍨嬶紱org = 鍗曚綅鏈烘瀯 */
+ hasUserType(usertype, code) {
+ if (!usertype) {
+ return false;
+ }
+ return (
+ String(usertype)
+ .split(",")
+ .map(t => t.trim())
+ .indexOf(code) > -1
+ );
+ },
+ /** 鍙楃泭浜�/璐︽埛鏄惁涓�"鍗曚綅"锛堜汉鍛樼被鍨嬪惈 org锛� */
//鑾峰彇涓撳銆佸崟浣嶆満鏋勭殑璐︽埛鍒楄〃
getAccountList() {
listExternalperson().then(res => {
@@ -1749,7 +2050,7 @@
for (let j = 0; j < res.rows.length; j++) {
//鍗曚綅璐﹀彿鍒楄〃
if (res.rows[j].userstatus == "1") {
- if (res.rows[j].usertype == "org") {
+ if (this.hasUserType(res.rows[j].usertype, "org")) {
this.accountlist.push({
id: res.rows[j].id,
userno: res.rows[j].userno,
@@ -1760,10 +2061,11 @@
bankcardno: res.rows[j].bankcardno,
unitno: res.rows[j].unitno,
unitname: res.rows[j].unitname,
- userid: res.rows[j].username
+ usertype: res.rows[j].usertype,
+ userid:
+ res.rows[j].username + "锛�" + res.rows[j].bankcardno + "锛�"
});
- }
- else {
+ } else {
this.accountlist.push({
id: res.rows[j].id,
userno: res.rows[j].userno,
@@ -1774,7 +2076,9 @@
bankcardno: res.rows[j].bankcardno,
unitno: res.rows[j].unitno,
unitname: res.rows[j].unitname,
- userid: res.rows[j].username + '锛�' + res.rows[j].idcardno + '锛�'
+ usertype: res.rows[j].usertype,
+ userid:
+ res.rows[j].username + "锛�" + res.rows[j].idcardno + "锛�"
});
}
}
@@ -1966,14 +2270,13 @@
//璁＄畻涓◣锛歵ype(A:宸茬煡绋庡墠閲戦锛岃绠楃◣鍚庨噾棰濓紱B锛氬凡鐭ョ◣鍚庨噾棰濓紝璁＄畻绋庡墠閲戦)
calculateTax(row, type) {
- let targetValue = 0;
for (let i = 0; i < this.rbDetails.length; i++) {
if (!this.rbDetails[i].amount) {
this.rbDetails[i].amount = 0;
}
- targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
}
- this.form.pretaxcost = targetValue;
+ // 鍚堣閲戦蹇呴』绮剧‘绱姞锛屽惁鍒欎細鍐欏叆 form.pretaxcost 骞惰惤搴�
+ this.form.pretaxcost = moneySum(this.rbDetails, "amount");
},
//瀵煎叆鎵�鏈夐」鐩�
@@ -2047,6 +2350,11 @@
},
// 鎺ュ彈鎻愰啋绔嬪埢淇濆瓨
Savenow() {
+ // 2026-10-15锛氫繚瀛樺墠闄勪欢鏂囦欢鍚嶈鑼冩牎楠岋紙浠呮柊澧炲崟鎹紱鑰佸崟鎹殑鍘嗗彶闄勪欢鐢卞悗绔寜"鍙牎楠屾湰娆″彉鏇�"鏀捐锛�
+ if (!this.checkDetailFileNames()) {
+ return;
+ }
+
if (!this.randomnumber) {
this.randomnumber = this.generateRandomString(9);
this.form.randomnumber = this.randomnumber;
@@ -2054,174 +2362,198 @@
this.Savereminder = false;
this.Reminderquantity = 0;
this.totalquantity = 0;
- this.$refs["form"].validate(valid => {
- if (valid) {
- this.formData = this.form;
- //淇濆瓨鍓嶆牎楠屾暟鎹�
- for (let k = 0; k < this.rbDetails.length; k++) {
- let tempDetail = this.rbDetails[k];
- if (tempDetail.itemid == null) {
- this.$modal.msgWarning(
- "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
- );
- return;
- }
-
- if (this.businessType == "1") {
- if (tempDetail.servicesscope == null) {
- this.$modal.msgWarning(
- "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
- );
- return;
- }
-
- if (tempDetail.beneficiaryno == null) {
- this.$modal.msgWarning(
- "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
- );
- return;
- }
- }
- }
-
- //澶勭悊鏄庣粏
- for (let i = 0; i < this.rbDetails.length; i++) {
- let tempDetail = this.rbDetails[i];
- //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
- let tempitemlist = tempDetail.itemlist;
- let itemIndex = tempitemlist.findIndex(
- item => tempDetail.itemid == item.id
- );
- if (itemIndex > -1) {
- tempDetail.itemname = tempitemlist[itemIndex].itemName;
- tempDetail.itemid = tempitemlist[itemIndex].id;
- }
-
- //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫�
- let applytypeIndex = this.rowfeeItemTypes.findIndex(
- item => tempDetail.applytype == item.value
- );
- if (applytypeIndex > -1) {
- tempDetail.applytypename = this.rowfeeItemTypes[
- applytypeIndex
- ].label;
- tempDetail.subjecttype = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttype;
- tempDetail.subjecttypename = this.rowfeeItemTypes[
- applytypeIndex
- ].subjecttypename;
- }
- this.rbDetails[i] = tempDetail;
- }
- //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
- if (this.businessType == "2") {
- for (let j = 0; j < this.rbDetails.length; j++) {
- let tempDetail = this.rbDetails[j];
- if (
- isNaN(parseFloat(tempDetail.amount)) ||
- parseFloat(tempDetail.amount) == 0
- ) {
- this.$modal.msgWarning(
- "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
- );
- return;
- }
- }
- } else if (this.businessType == "3" || this.businessType == "4") {
- for (let j = 0; j < this.rbDetails.length; j++) {
- let tempDetail = this.rbDetails[j];
- if (
- isNaN(parseFloat(tempDetail.amount)) ||
- parseFloat(tempDetail.amount) == 0
- ) {
- this.$modal.msgWarning(
- "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (j + 1).toString() +
- "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
- );
- return;
- }
- if (
- isNaN(parseFloat(tempDetail.taxamount)) ||
- parseFloat(tempDetail.taxamount) == 0
- ) {
- tempDetail.taxedamount = parseFloat(tempDetail.amount);
- } else {
- tempDetail.taxedamount =
- parseFloat(tempDetail.amount) +
- parseFloat(tempDetail.taxamount);
- }
- }
- }
-
- //淇濆瓨鏁版嵁
- this.loading = true;
- this.form.serviceFunddetails = 0;
- this.rbDetails.map(item => {
- this.form.serviceFunddetails += item.amount;
- });
- this.form.serviceFunddetails = this.rbDetails;
-
- if (this.form.id != null) {
- } else {
- this.form.recordstatus = -1;
- }
-
- addorupdateFund(this.form).then(response => {
- if (response.code === 200) {
- this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
- // 闈炴彁閱掔姸鎬佷笅鎵ц瀹℃壒瑙ｅ喅寮傛璋冪敤寤惰繜闂
- if (!this.Savereminder) {
- let checkFundObj = {
- // fundid: this.checkObj.fundid,
- fundid: this.curId,
- flowconclusion: this.checkObj.flowlevelone,
- flowcontent: this.checkObj.flowconclusion
- };
- this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
- checkfund(checkFundObj).then(res => {
- //鍏抽棴绐楀彛
- this.$modal.closeLoading();
- this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
- this.$store.dispatch("tagsView/delView", this.$route);
- this.$router.go(-1);
- });
- }
- this.Getnetworkheader();
- this.getroute();
- this.getAccountList();
- this.getUserList();
- this.getUserProfile();
- } else {
- this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
- }
- });
-
- //鍏抽棴绐楀彛
- this.loading = false;
- // this.getfundList();
+ // 涓撳鍔冲姟璐逛笓鐢細9 鏉¤垂鐢ㄦ帶鍒惰鍒欐牎楠岋紙鏍￠獙涓嶉�氳繃涓嶅厑璁歌惤搴擄級
+ this.checkExpertFeeRules("淇濆瓨").then((allowed) => {
+ if (!allowed) {
+ return;
}
+
+ this.$refs["form"].validate(valid => {
+ if (valid) {
+ this.formData = this.form;
+
+ //淇濆瓨鍓嶆牎楠屾暟鎹�
+ for (let k = 0; k < this.rbDetails.length; k++) {
+ let tempDetail = this.rbDetails[k];
+ if (tempDetail.itemid == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+
+ if (this.businessType == "1") {
+ if (tempDetail.servicesscope == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+
+ if (tempDetail.beneficiaryno == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑浜哄憳濮撳悕涓虹┖,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ if (tempDetail.unitname == null) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (k + 1).toString() +
+ "琛岀殑涓撳鍗曚綅涓虹┖,璇烽�夋嫨鍗曚綅鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ }
+ }
+
+ //澶勭悊鏄庣粏
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ let tempDetail = this.rbDetails[i];
+ //鑾峰彇鏈嶅姟椤圭洰鏄庣粏
+ let tempitemlist = tempDetail.itemlist;
+ let itemIndex = tempitemlist.findIndex(
+ item => tempDetail.itemid == item.id
+ );
+ if (itemIndex > -1) {
+ tempDetail.itemname = tempitemlist[itemIndex].itemName;
+ tempDetail.itemid = tempitemlist[itemIndex].id;
+ }
+
+ //鑾峰彇applytypename銆佹湇鍔¤垂鐢ㄥぇ绫�
+ let applytypeIndex = this.rowfeeItemTypes.findIndex(
+ item => tempDetail.applytype == item.value
+ );
+ if (applytypeIndex > -1) {
+ tempDetail.applytypename = this.rowfeeItemTypes[
+ applytypeIndex
+ ].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[
+ applytypeIndex
+ ].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[
+ applytypeIndex
+ ].subjecttypename;
+ }
+ this.rbDetails[i] = tempDetail;
+ }
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙amount锛夈�佹墸绋庨噾棰濓紙taxamount锛夈�佺◣鍚庨噾棰濓紙taxedamount锛�
+ if (this.businessType == "2") {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (
+ isNaN(parseFloat(tempDetail.amount)) ||
+ moneyRound(tempDetail.amount) == 0
+ ) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ }
+ } else if (this.businessType == "3" || this.businessType == "4") {
+ for (let j = 0; j < this.rbDetails.length; j++) {
+ let tempDetail = this.rbDetails[j];
+ if (
+ isNaN(parseFloat(tempDetail.amount)) ||
+ moneyRound(tempDetail.amount) == 0
+ ) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+ (j + 1).toString() +
+ "琛岀殑閲戦鏈緭鍏ワ紝璇峰厛杈撳叆閲戦鍚庡啀鎻愪氦淇濆瓨锛�"
+ );
+ return;
+ }
+ if (
+ isNaN(parseFloat(tempDetail.taxamount)) ||
+ moneyRound(tempDetail.taxamount) == 0
+ ) {
+ tempDetail.taxedamount = parseFloat(tempDetail.amount);
+ } else {
+ tempDetail.taxedamount =
+ parseFloat(tempDetail.amount) +
+ parseFloat(tempDetail.taxamount);
+ }
+ }
+ }
+
+ //淇濆瓨鏁版嵁
+ this.loading = true;
+ this.form.serviceFunddetails = 0;
+ this.rbDetails.map(item => {
+ this.form.serviceFunddetails += item.amount;
+ });
+ this.form.serviceFunddetails = this.rbDetails;
+
+ if (this.form.id != null) {
+ } else {
+ this.form.recordstatus = -1;
+ }
+
+ addorupdateFund(this.form).then(response => {
+ if (response.code === 200) {
+ this.$modal.msgSuccess("鐢宠鍗曚繚瀛樻垚鍔燂紒");
+ // 闈炴彁閱掔姸鎬佷笅鎵ц瀹℃壒瑙ｅ喅寮傛璋冪敤寤惰繜闂
+ if (!this.Savereminder) {
+ let checkFundObj = {
+ // fundid: this.checkObj.fundid,
+ fundid: this.curId,
+ flowconclusion: this.checkObj.flowlevelone,
+ flowcontent: this.checkObj.flowconclusion
+ };
+ this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
+ checkfund(checkFundObj).then(res => {
+ if (res.code == 200) {
+ //鍏抽棴绐楀彛
+ this.$modal.closeLoading();
+ this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ // 杩炵画瀹℃壒锛氳闂槸鍚︾户缁鎵逛笅涓�鍗�
+ this.continueOrExit();
+ } else {
+ this.$modal.closeLoading();
+
+ this.$modal.msgError(res.msg || "鎿嶄綔澶辫触");
+ }
+ });
+ }
+ this.Getnetworkheader();
+ this.getroute();
+ this.getAccountList();
+ this.getUserList();
+ this.getUserProfile();
+ } else {
+ this.$modal.msgError("鐢宠鍗曚繚瀛樺け璐ワ細" + response.msg);
+ }
+ });
+
+ //鍏抽棴绐楀彛
+ this.loading = false;
+ // this.getfundList();
+ }
+ });
});
},
handleCheckAllChange(val) {
- this.checkedCities = val ? this.cityOptions : [];
+ this.checkedCities = val ? this.filteredCityOptions.slice() : [];
this.isIndeterminate = false;
},
handleCheckedCitiesChange(value) {
let checkedCount = value.length;
- this.checkAll = checkedCount === this.cityOptions.length;
+ this.checkAll =
+ this.filteredCityOptions.length > 0 &&
+ checkedCount === this.filteredCityOptions.length;
this.isIndeterminate =
- checkedCount > 0 && checkedCount < this.cityOptions.length;
+ checkedCount > 0 && checkedCount < this.filteredCityOptions.length;
},
// 鎵嬪姩璁＄畻
Manualcalculationfn() {
@@ -2257,19 +2589,85 @@
// 鎵归噺褰曞叆鐐瑰嚮
Batchentry() {
// ethical
+ this.personKeyword = "";
+ this.checkedCities = [];
+ this.checkAll = false;
+ this.isIndeterminate = false;
listReportname("ethical").then(res => {
this.cityOptions = res.data;
});
this.batchdialogVisible = true;
},
+ /**
+ * 鏄庣粏琛屾槸鍚︿负銆岀┖璁板綍銆嶏細鏈嶅姟椤圭洰銆佷笓瀹躲�佷笓瀹舵墍鍦ㄥ崟浣� 鏄惁閮戒负绌�
+ * 鐢ㄤ簬鎵归噺褰曞叆涓撳鏃跺垽鏂�"澶嶇敤鏈�鍚庝竴琛�"杩樻槸"杩藉姞鏂拌"
+ */
+ isBlankDetailRow(row) {
+ if (!row) {
+ return false;
+ }
+ const isEmpty = v =>
+ v === null || v === undefined || String(v).trim() === "";
+ return (
+ isEmpty(row.itemid) &&
+ isEmpty(row.beneficiaryname) &&
+ isEmpty(row.unitno) &&
+ isEmpty(row.unitname)
+ );
+ },
+ /** 鎵归噺褰曞叆寮规锛氬鍚�/鍗曚綅/宸ュ彿/韬唤璇佸悗4浣� 鍛戒腑鍒ゆ柇 */
+ personMatchKeyword(item, kw) {
+ const idcard = String(item.idcrad || "");
+ return (
+ String(item.reportName || "")
+ .toLowerCase()
+ .indexOf(kw) > -1 ||
+ String(item.unitname || "")
+ .toLowerCase()
+ .indexOf(kw) > -1 ||
+ String(item.reportNo || "")
+ .toLowerCase()
+ .indexOf(kw) > -1 ||
+ (idcard.length >= 4 && idcard.slice(-4).indexOf(kw) > -1)
+ );
+ },
// 纭褰曞叆
BatchentryFn() {
+ // 鏄庣粏涓凡鏈夌殑浜哄憳濮撳悕锛岀敤浜庨噸澶嶆彁閱�
+ const existed = {};
+ this.rbDetails.forEach(row => {
+ if (row.beneficiaryname) {
+ existed[String(row.beneficiaryname).trim()] = true;
+ }
+ });
+
+ // 2026-10-22锛氫慨姝�"瀵煎叆鍚庤〃鏍煎鍑轰竴琛岀┖璁板綍"銆�
+ // 瑙勫垯锛氬厛鐪嬫渶鍚庝竴鏉¤褰曪紝鑻ュ畠鐨�"鏈嶅姟椤圭洰 / 涓撳 / 涓撳鎵�鍦ㄥ崟浣�"閮芥槸绌虹殑锛�
+ // 璇存槑鏄竴鏉＄┖璁板綍锛屽氨浠庤繖涓�琛屽紑濮嬪～锛涘惁鍒欒拷鍔犳柊琛屻��
+ let writeIndex = this.rbDetails.length;
+ if (
+ writeIndex > 0 &&
+ this.isBlankDetailRow(this.rbDetails[writeIndex - 1])
+ ) {
+ writeIndex -= 1;
+ }
+
+ const duplicated = [];
this.checkedCities.forEach(item => {
+ const nameKey = String(item.reportName || "").trim();
+ if (nameKey && existed[nameKey]) {
+ duplicated.push(item.reportName);
+ return;
+ }
+ if (nameKey) {
+ existed[nameKey] = true;
+ }
let rowData = {
orderno: null,
fundid: null,
beneficiaryname: item.reportName,
beneficiaryno: item.reportNo,
+ isunit: 0,
unitname: item.unitname,
unitno: null,
uintuserno: null,
@@ -2312,13 +2710,25 @@
annexfiles: null
};
- this.rbDetails.push(rowData);
+ if (writeIndex < this.rbDetails.length) {
+ // 澶嶇敤鏈�鍚庨偅鏉＄┖璁板綍
+ this.rbDetails.splice(writeIndex, 1, rowData);
+ } else {
+ this.rbDetails.push(rowData);
+ }
+ writeIndex++;
});
- for (let i = 0; i < this.checkedCities.length + 1; i++) {
+ for (let i = 0; i < this.rbDetails.length; i++) {
this.rbDetails[i].orderno = i + 1;
}
this.calculateTax();
this.batchdialogVisible = false;
+ this.checkedCities = [];
+ if (duplicated.length) {
+ this.$modal.msgWarning(
+ "浠ヤ笅浜哄憳鍦ㄦ槑缁嗕腑宸插瓨鍦紝宸茶烦杩囬噸澶嶆坊鍔狅細" + duplicated.join("銆�")
+ );
+ }
},
//鏂板涓�琛�
addRow(rowIndex) {
@@ -2328,6 +2738,7 @@
fundid: null,
beneficiaryname: null,
beneficiaryno: null,
+ isunit: 0,
unitname: null,
itemdescribe: null,
unitno: null,
@@ -2422,37 +2833,34 @@
.catch(() => {
//鍑犵偣鍙栨秷鐨勬彁绀�
});
-
//鍏ㄩ儴鍒犻櫎鍚庢坊鍔犱竴鏉℃柊琛�
},
-
- //璁＄畻鎬婚噾棰�
+ //璁＄畻鎬婚噾棰濓紙閲戦涓�寰嬭蛋绮剧‘杩愮畻锛岀姝� parseFloat 绱姞锛�
sumTotalFee(row) {
- let allSum = 0;
+ const detailsArr = [];
if (this.form.applytype != null) {
for (let i = 0; i < this.rbDetails.length; i++) {
+ const detail = this.rbDetails[i];
let totalFee = 0;
let taxFee = 0;
if (this.form.applytype == 1 || this.form.applytype == 2) {
- //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣
- if (!isNaN(parseFloat(this.rbDetails[i].amount))) {
- totalFee += parseFloat(this.rbDetails[i].amount);
- taxFee += parseFloat(this.rbDetails[i].amount);
+ //璁＄畻褰撳墠鎶ラ攢鍐呭璐圭敤鍚堣锛氱◣鍓� - 鎵ｇ◣
+ if (!isNaN(parseFloat(detail.amount))) {
+ totalFee = moneySub(totalFee, -parseFloat(detail.amount));
+ taxFee = moneySub(taxFee, -parseFloat(detail.amount));
}
- if (!isNaN(parseFloat(this.rbDetails[i].taxamount))) {
- totalFee -= parseFloat(this.rbDetails[i].taxamount);
- taxFee -= parseFloat(this.rbDetails[i].taxamount);
+ if (!isNaN(parseFloat(detail.taxamount))) {
+ totalFee = moneySub(totalFee, detail.taxamount);
+ taxFee = moneySub(taxFee, detail.taxamount);
}
} else if (this.form.applytype == 3 || this.form.applytype == 4) {
//鍗曚环*鏁伴噺=绋庡墠閲戦
if (
- !isNaN(parseFloat(this.rbDetails[i].price)) &&
- !isNaN(parseFloat(this.rbDetails[i].quantity))
+ !isNaN(parseFloat(detail.price)) &&
+ !isNaN(parseFloat(detail.quantity))
) {
- totalFee +=
- parseFloat(this.rbDetails[i].price) *
- parseFloat(this.rbDetails[i].quantity);
- this.rbDetails[i].amount = totalFee;
+ totalFee = moneyMul(detail.price, detail.quantity);
+ detail.amount = totalFee;
}
}
@@ -2461,9 +2869,10 @@
// this.rbDetails[i].taxedamount = taxFee.toFixed(2);
// }
- allSum += totalFee;
+ detailsArr.push(totalFee);
}
}
+ const allSum = moneyRound(moneySum(detailsArr));
// this.form.amountrequested = allSum.toFixed(2);
// this.$forceUpdate();
},
@@ -2538,10 +2947,24 @@
// 鍥剧墖鍔犺浇鎴愬姛鏃舵墽琛岀殑鎿嶄綔
console.log("Image loaded successfully");
},
+ handleImageClick(index) {
+ this.currentIndex = index;
+ this.viewerVisible = true;
+ },
+ invoicehandleImageClick(index) {
+ this.invoicecurrentIndex = index;
+ this.invoiceviewerVisible = true;
+ },
+ handleViewerClose() {
+ this.viewerVisible = false;
+ },
+ invoicehandleViewerClose() {
+ this.invoiceviewerVisible = false;
+ },
handleUploadError() { },
remove(file, fileList) {
const rbDetails = [...this.rbDetails];
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.fileListto.splice(this.fileListto.indexOf(file), 1);
rbDetails[this.atpresent].annexfilesList = this.fileListto;
} else {
@@ -2550,14 +2973,50 @@
}
},
+ /**
+ * 2026-10-15锛氫笂浼犳椂鏍￠獙闄勪欢鏂囦欢鍚嶏紙涓氬姟瑕佹眰锛氫笉鍚堟牸绔嬪嵆鎻愮ず涓斾笉鍔犲叆鍒楄〃锛夈��
+ * 瑙勫垯涓庡悗绔� AttachmentNameValidator 鍚屽彛寰勶細蹇呴』鍚腑鏂� / 鍘绘帀鎵╁睍鍚嶅悗涓诲共 鈮�20 瀛� /
+ * 涓嶅惈绌烘牸鍙� / \ : * ? " < > | # % 绛夌壒娈婂瓧绗︺��
+ */
+ checkUploadFileName(file) {
+ const raw = file && file.raw ? file.raw.name : file && file.name;
+ const r = checkFileName(raw);
+ if (!r.ok) {
+ this.$modal.msgError(r.msg);
+ return false;
+ }
+ return true;
+ },
+
+ /**
+ * 2026-10-15锛氫繚瀛樺墠鏍￠獙鏁村崟鏄庣粏闄勪欢鏂囦欢鍚嶏紙鍚悓涓�琛屽唴閲嶅悕锛夈��
+ * 鍙ｅ緞锛堜笟鍔＄‘璁わ級锛氬彧鏍￠獙"鏈鍙樻洿"鐨勯檮浠垛�斺�旇�佸崟鎹噷宸插瓨鍦ㄧ殑涓嶅悎瑙勯檮浠跺悕涓嶈兘鎶婁繚瀛樺崱姝�
+ * 锛堝惁鍒欒�佸崟鎹敼涓�涓噾棰濋兘瀛樹笉杩涘幓锛夈�傚悗绔寜 id 璇绘棫璁板綍鏀捐鍘嗗彶闄勪欢锛涘墠绔嬁涓嶅埌"鍝簺鏄巻鍙�"
+ * 鐨勬潈濞佷俊鎭紝鍥犳**浠呮柊澧炲崟鎹�**鍋氫繚瀛樺墠鎷︽埅锛岀紪杈戣�佸崟鎹椂鏂板鐨勪笉鍚堣闄勪欢鐢卞悗绔簩娆℃牎楠屾嫤涓嬨��
+ */
+ checkDetailFileNames() {
+ if (this.form && this.form.id) {
+ return true;
+ }
+ const c = checkDetails(this.rbDetails);
+ if (!c.ok) {
+ this.$modal.msgError(c.msg);
+ return false;
+ }
+ return true;
+ },
+
uploadSccess(response, file, fileList) {
+ if (!this.checkUploadFileName(file)) {
+ return;
+ }
this.rbDetails;
const config = {
headers: { Authorization: "Bearer " + this.ICDtoken }
};
const pdfimg = this.Networkheader + "/prod-api" + response.fileName;
//鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
if (response.code == 200) {
this.previewpdf = true;
@@ -2634,36 +3093,61 @@
this.tableDatatop = [];
this.fileListto = [];
this.invoicefileListto = [];
- this.pdfimg = '';
+ this.pdfimg = "";
this.invoicepdfimg = [];
this.pdfimgsrcList = [];
this.invoicepdfimgsrcList = [];
this.tableDatatop.push(row);
this.atpresent = index;
this.pdfVisible = true;
- console.log(this.fileListto, "this.fileListto");
- console.log(this.invoicefileListto, "this.invoicefileListto");
+
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)
+ // 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)
+ // });
+ // 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;
+ // });
+ // });
+
+ 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 = [];
@@ -2672,26 +3156,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 = [];
@@ -2699,16 +3192,18 @@
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) {
+ if (this.activeName == "common") {
this.pdftitle =
"鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
let name = item.name.split(".");
@@ -2756,7 +3251,7 @@
},
// 鍙戠エ鍒囨崲
handleClick(tab, event) {
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
} else {
this.pdftitle = "鍏�" + this.invoicepdfimgsrcList.length + "椤�";
@@ -2766,16 +3261,14 @@
deletedowfile(row) {
console.log(row);
let indexvalue = "";
- if (this.activeName == 1) {
+ if (this.activeName == "common") {
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;
- }
+ indexvalue = this.rbDetails[this.atpresent].annexfilesList.findIndex(
+ item => item.name == row.name
);
console.log(indexvalue, "鍒犻櫎绱㈠紩");
this.rbDetails[this.atpresent].annexfilesList.splice(indexvalue, 1);
@@ -2788,10 +3281,8 @@
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;
- }
+ indexvalue = this.rbDetails[this.atpresent].invoicefilesList.findIndex(
+ item => item.name == row.name
);
console.log(indexvalue, "鍒犻櫎绱㈠紩");
this.rbDetails[this.atpresent].invoicefilesList.splice(indexvalue, 1);
@@ -2799,15 +3290,52 @@
},
// 鐐瑰嚮涓婄Щ
moveupdowfile(row) {
- if (this.activeName == 1) {
- const index = this.getIndexInArray(this.fileListto, row);
+ if (this.activeName == "common") {
+ const index = this.fileListto.findIndex(item => item.name == row.name);
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鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+ console.log(indexann, "indexann");
+ console.log(index, "index");
} else {
- const index = this.getIndexInArray(this.invoicefileListto, row);
+ const index = this.invoicefileListto.findIndex(
+ item => item.name == row.name
+ );
+
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鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
}
+ console.log(
+ this.rbDetails[this.atpresent].annexfilesList,
+ "annexfilesList"
+ );
+ console.log(this.fileListto, "fileListto");
+ // console.log(this.rbDetails[this.atpresent].invoicefilesList,'invoicefilesList');
},
Downloadfile(row) {
window.location.href = row.url;
@@ -2822,11 +3350,12 @@
if (this.selectionType == "account") {
//榛樿浠庤处鎴峰簱閫夋嫨锛�1,璐︽埛搴擄紱2锛屾柊寤鸿处鎴�
this.accountfrom = "1";
- if (scope.row.idcardno == undefined || scope.row.idcardno == null) {
- this.accountselectform.accountname = scope.row.beneficiaryname;
- }
- else {
- this.accountselectform.accountname = scope.row.beneficiaryname + '锛�' + scope.row.idcardno + '锛�';
+ if (scope.row.idcardno) {
+ this.accountselectform.accountname =
+ scope.row.beneficiaryname + "锛�" + scope.row.idcardno + "锛�";
+ } else {
+ this.accountselectform.accountname =
+ scope.row.beneficiaryname + "锛�" + scope.row.bankcardno + "锛�";
}
this.accountselectform.accountno = scope.row.beneficiaryno;
this.accountselectform.expertunitname = "";
@@ -2854,13 +3383,30 @@
//涓撳/鍖荤枟鏈烘瀯/璐圭敤鎶ラ攢鏈烘瀯閫夋嫨
confirmSelectionDialog() {
this.$refs["accountselectform"].validate(valid => {
+ // 2026-10-19锛氬師鏉ユ病鏈夊垽鏂� valid锛屾牎楠屽け璐ヤ篃鐓ф牱寰�涓嬭蛋銆佺収鏍蜂繚瀛橈紙鏄熷彿/绾㈠瓧褰㈠悓铏氳锛�
+ if (!valid) {
+ return;
+ }
let tempIndex = this.accountselectform.index;
if (this.selectionType == "account") {
if (this.accountfrom == "1") {
//璧嬪�间俊鎭�
- if (this.rbDetails[tempIndex].userno != this.accountselectform.userno) {
+ if (
+ this.rbDetails[tempIndex].userno != this.accountselectform.userno
+ ) {
this.accountlist.map(res => {
if (res.id == this.accountselectform.accountname) {
+ console.log(res, "res");
+ const hasIdOne = this.rbDetails.some(
+ obj => obj.beneficiaryname == res.username
+ );
+ if (hasIdOne) {
+ this.$modal.msgWarning(
+ "鏈嶅姟椤圭洰琛ㄤ腑锛屼汉鍛樺悕绉帮細" +
+ res.username +
+ "閲嶅锛岃娉ㄦ剰鏍稿淇℃伅锛�"
+ );
+ }
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
@@ -2869,11 +3415,13 @@
this.rbDetails[tempIndex].phone = res.telephone;
if (res.usertype == "org") {
+ this.$set(this.rbDetails[tempIndex], "isunit", 1);
this.rbDetails[tempIndex].idcardno = "";
this.rbDetails[tempIndex].title = "";
this.rbDetails[tempIndex].unitno = "";
this.rbDetails[tempIndex].unitname = "";
} else {
+ this.$set(this.rbDetails[tempIndex], "isunit", 0);
this.rbDetails[tempIndex].idcardno = res.idcardno;
this.rbDetails[tempIndex].title = res.title;
this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
@@ -2913,13 +3461,12 @@
this.accountform.unitname = res.organizationname;
}
});
- }
- else {
+ } else {
this.accountform.userstatus = 1;
}
addExternalperson(this.accountform).then(response => {
- if (response.code == 200) {
+ if (response.code == 200) {
// //閲嶆柊鑾峰彇璐︽埛鍒楄〃
// listExternalperson().then(res => {
// this.accountlist = res.rows;
@@ -2937,7 +3484,11 @@
bankcardno: this.accountform.bankcardno,
unitno: this.accountform.unitno,
unitname: this.accountform.unitname,
- userid: this.accountform.username
+ userid:
+ this.accountform.username +
+ "锛�" +
+ this.accountform.bankcardno +
+ "锛�"
});
this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭紒");
} else {
@@ -2951,9 +3502,15 @@
bankcardno: this.accountform.bankcardno,
unitno: this.accountform.unitno,
unitname: this.accountform.unitname,
- userid: this.accountform.username + '锛�' + this.accountform.idcardno + '锛�'
+ userid:
+ this.accountform.username +
+ "锛�" +
+ this.accountform.idcardno +
+ "锛�"
});
- this.$modal.msgSuccess("鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒");
+ this.$modal.msgSuccess(
+ "鎮ㄥ凡娣诲姞鎴愬姛鏂拌处鎴蜂俊鎭�,闇�瑕佸湪璐﹀彿鐘舵�佸惎鐢ㄥ悗鎵嶈兘琚娇鐢紒"
+ );
return;
}
this.accountselectform.accountno = this.accountform.userno;
@@ -2965,16 +3522,19 @@
this.rbDetails[tempIndex].beneficiaryno = res.userno;
this.rbDetails[tempIndex].beneficiaryname = res.username;
this.rbDetails[tempIndex].depositbank = res.depositbank;
- this.rbDetails[tempIndex].branchbankname = res.branchbankname;
+ this.rbDetails[tempIndex].branchbankname =
+ res.branchbankname;
this.rbDetails[tempIndex].bankcardno = res.bankcardno;
this.rbDetails[tempIndex].phone = res.telephone;
- if (res.usertype == "org") {
+ if (this.hasUserType(res.usertype, "org")) {
+ this.$set(this.rbDetails[tempIndex], "isunit", 1);
this.rbDetails[tempIndex].idcardno = "";
this.rbDetails[tempIndex].title = "";
this.rbDetails[tempIndex].unitno = "";
this.rbDetails[tempIndex].unitname = "";
} else {
+ this.$set(this.rbDetails[tempIndex], "isunit", 0);
this.rbDetails[tempIndex].idcardno = res.idcardno;
this.rbDetails[tempIndex].title = res.title;
this.rbDetails[tempIndex].unitno = parseInt(res.unitno);
@@ -3020,11 +3580,14 @@
return;
}
- if (regex.test(row.idcardno)) {
- row.error = "";
- } else {
- row.error = "韬唤璇佸彿鐮佹牸寮忛敊璇�";
- }
+ //韬唤璇侀噸澶嶉獙璇�
+ getInfoByIDCardNo(idcardno).then(res => {
+ if (res.data.length > 1) {
+ this.$modal.msgWarning("韬唤璇佸彿淇℃伅宸茶鐧昏锛岃妫�鏌ヨ韩浠借瘉鍙凤紒"
+ );
+ return;
+ }
+ });
},
//璐︽埛绫诲瀷閫夋嫨鍙樺寲
@@ -3039,6 +3602,12 @@
}
},
+ // 澶辩劍鏃舵墜鍔ㄨЕ鍙戞牎楠岋紙鍙�夛紝閫氬父閰嶇疆浜� trigger: 'blur' 鍚庝細鑷姩瑙﹀彂锛�
+ handleIdCardBlur() {
+ // 鎵嬪姩鏍￠獙鍗曚釜瀛楁锛岀‘淇濆け鐒︽椂绔嬪埢鐪嬪埌缁撴灉
+ this.$refs.showselectiondialog.validateField('idcardno');
+ },
+
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
//鑾峰彇璺敱鍙傛暟
@@ -3050,7 +3619,9 @@
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
- window.addEventListener("beforeunload", e => this.beforeunloadHandler(e));
+ // 瀛樹綇鍚屼竴涓紩鐢紝鍚﹀垯 removeEventListener 浼犳柊绠ご鍑芥暟鏃犳硶鐪熸绉婚櫎锛屼細娉勬紡鐩戝惉鍣�
+ this._beforeUnloadHandler = e => this.beforeunloadHandler(e);
+ window.addEventListener("beforeunload", this._beforeUnloadHandler);
this.getUserList();
let apiaccountselectform = this.accountselectform;
let apiform = this.form;
@@ -3066,7 +3637,10 @@
updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
destroyed() {
- window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ if (this._beforeUnloadHandler) {
+ window.removeEventListener("beforeunload", this._beforeUnloadHandler);
+ this._beforeUnloadHandler = null;
+ }
}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
--
Gitblit v1.9.3