From a58cbd391aa2b58d59c0970f74edf006a03da1d7 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 28 八月 2023 14:10:36 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/ethicalReview/index.vue | 124 ++++---
src/views/project/fund/applyDetail/index.vue | 745 ++++++++++++----------------------------------
src/views/project/donationwitness/index.vue | 48 ++-
3 files changed, 290 insertions(+), 627 deletions(-)
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index 633cbcb..6592a4b 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -161,24 +161,19 @@
</el-form-item>
</el-col>
<el-col :span="6">
+ <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
+ <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
+ <el-row>
+ <el-col :span="6">
<el-form-item label="姘戞棌" prop="nation">
<el-select v-model="curCase.nation" disabled placeholder="璇烽�夋嫨姘戞棌">
<el-option v-for="dict in dict.type.sys_nation" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
- </el-form-item>
- </el-col> </el-row><el-row>
- <el-col :span="6">
- <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
- <el-select v-model="curCase.idcardtype" disabled placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
- <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
- :value="parseInt(dict.value)"></el-option>
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
- <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
</el-form-item>
</el-col>
<el-col :span="6">
@@ -197,8 +192,16 @@
</el-select>
</el-form-item>
</el-col>
+ <el-col :span="6">
+ <el-form-item label="璇佷欢绫诲瀷" prop="idcardtype">
+ <el-select v-model="curCase.idcardtype" disabled placeholder="璇烽�夋嫨璇佷欢绫诲瀷">
+ <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
+ :value="parseInt(dict.value)"></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
</el-row>
-
+ -->
<el-row>
<el-col :span="24">
<el-form-item align="left" label="鎹愮尞鍐冲畾">
@@ -988,13 +991,24 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd(row) {
+ this.reset();
+
+ const id = row.id;
this.curCase = {
id: row.id,
recordstate: null,
donorno: row.donorno,
+ name: row.name,
+ treatmenthospitalname: row.treatmenthospitalname,
+ sex: row.sex,
+ idcardtype: row.idcardtype,
+ idcardno: row.idcardno,
+ education: row.education,
+ nationality: row.nationality,
+ occupation: row.occupation,
+ birthday: row.birthday,
};
- this.reset();
- const id = row.id;
+
getDonatebaseinfo(id).then((res) => {
console.log("鎹愮尞鍩虹琛ㄦ暟鎹�", res);
this.curCase.nation = res.data.nation;
@@ -1002,6 +1016,7 @@
this.curCase.occupation = res.data.occupation;
});
// this.open = true;
+ console.log("row", row);
this.form.infoid = row.id;
this.form.donorno = row.donorno;
this.form.name = row.name;
@@ -1161,6 +1176,7 @@
console.log(
"璋冪敤鍣ㄥ畼鍒楄〃鎺ュ彛锛屽弬鏁帮細" + JSON.stringify(oraganqueryParam)
);
+
listDonateorgan(oraganqueryParam).then((response) => {
this.loading = false;
if (response.code == 200) {
diff --git a/src/views/project/ethicalReview/index.vue b/src/views/project/ethicalReview/index.vue
index efdf86e..32467cd 100644
--- a/src/views/project/ethicalReview/index.vue
+++ b/src/views/project/ethicalReview/index.vue
@@ -61,36 +61,34 @@
</el-form>
<el-table :default-sort="{ prop: 'createTime' }" v-loading="loading" :data="listnews" border>
- <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
- </template>
- </el-table-column>
-
- <el-table-column label="濮撳悕" align="center" prop="name" width="120" />
-
+ <el-table-column label="鎹愮尞鑰�" align="center" prop="name" width="120" />
<el-table-column label="骞撮緞" align="center" prop="age" width="100" />
<el-table-column label="鎬у埆" align="center" prop="sex" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
</template>
</el-table-column>
- <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
<el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
- <el-table-column label="瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
+ <el-table-column label="浼︾悊瀹℃煡缁撹" align="center" prop="flowconclusion" width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_EthicalReview" :value="scope.row.flowconclusion" />
</template>
</el-table-column>
+ <el-table-column label="瀹℃煡鎰忚" align="center" prop="flowcontent" />
<el-table-column label="瀹℃煡鏃堕棿" align="center" prop="createTime" width="160" />
<!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="200" /> -->
<el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
-
+ <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
+ </template>
+ </el-table-column>
+ <!--
<el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column label="鎿嶄綔" align="center" width="150px" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">
@@ -113,7 +111,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="濮撳悕">
+ <el-form-item label="鎹愮尞鑰呭鍚�">
<el-input v-model="curCase.name" placeholder="璇疯緭鍏ュ鍚�" disabled />
</el-form-item>
</el-col>
@@ -216,7 +214,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button type="primary" :loading="loading" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -685,14 +683,15 @@
},
/** 浼︾悊瀹℃煡寮圭獥 */
showDonationEvaluationDialog(dontateInfo) {
- console.log("浼︾悊瀹℃煡11", dontateInfo);
//鏌ユ壘鏄惁瀛樺湪浼︾悊瀹℃煡璁板綍
//this.curCase = dontateInfo;
this.curCase = {
id: dontateInfo.id,
- recordstate: null,
donorno: dontateInfo.donorno,
+ name: dontateInfo.name,
+ recordstate: null,
};
+
this.reset();
this.form.donorno = dontateInfo.donorno;
this.form.infoid = dontateInfo.id;
@@ -733,51 +732,56 @@
},
/** 淇濆瓨鎹愮尞璇勪及 */
submitForm() {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- //鍒ゆ柇瀹℃煡鎰忚褰曞叆
- if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
- var exp = this.form.flowcontent;
- if (typeof exp == "undefined" || exp == null || exp == "") {
- this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
- return;
+ this.loading = true;
+ this.$nextTick(() => {
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ //鍒ゆ柇瀹℃煡鎰忚褰曞叆
+ if (this.form.flowconclusion == 2 || this.form.flowconclusion == 3) {
+ var exp = this.form.flowcontent;
+ if (typeof exp == "undefined" || exp == null || exp == "") {
+ this.$modal.msgError("璇疯緭鍏ュ鏌ユ剰瑙�!");
+ return;
+ }
+ }
+
+ //鍒ゆ柇鏄惁鏄柊绾綍
+ if (this.form.id != null) {
+ // updateEthicalreviewopinions娌℃湁鏉冮檺
+ updateDonateflowchart(this.form).then((response) => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ //鏇存柊鎹愮尞鐘舵��
+ if (this.form.flowconclusion == 1) {
+ this.curCase.recordstate = 8;
+ } else {
+ this.curCase.recordstate = 9;
+ }
+ updateDonatebaseinfo(this.curCase).then((response) => {
+ this.open = false;
+ this.getList();
+ });
+ });
+ } else {
+ addDonateflowchart(this.form).then((response) => {
+ //鏇存柊鎹愮尞鐘舵��
+ if (this.form.flowconclusion == 1) {
+ this.curCase.recordstate = 8;
+ } else {
+ this.curCase.recordstate = 9;
+ }
+ updateDonatebaseinfo(this.curCase).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.getList();
+ });
+ });
}
}
-
- //鍒ゆ柇鏄惁鏄柊绾綍
- if (this.form.id != null) {
- // updateEthicalreviewopinions娌℃湁鏉冮檺
- updateDonateflowchart(this.form).then((response) => {
- this.$modal.msgSuccess("淇敼鎴愬姛");
- //鏇存柊鎹愮尞鐘舵��
- if (this.form.flowconclusion == 1) {
- this.curCase.recordstate = 8;
- } else {
- this.curCase.recordstate = 9;
- }
- updateDonatebaseinfo(this.curCase).then((response) => {
- this.open = false;
- this.getList();
- });
- });
- } else {
- addDonateflowchart(this.form).then((response) => {
- //鏇存柊鎹愮尞鐘舵��
- if (this.form.flowconclusion == 1) {
- this.curCase.recordstate = 8;
- } else {
- this.curCase.recordstate = 9;
- }
- updateDonatebaseinfo(this.curCase).then((response) => {
- this.$modal.msgSuccess("鏂板鎴愬姛");
- this.open = false;
- this.getList();
- });
- });
- }
- }
- });
+ });
+
+ this.loading = false;
+ })
},
+
/** 鑾峰彇鎹愮尞璇勪及 */
getDonationEvaluation(dontateInfo) {
//this.loading = true;
@@ -800,6 +804,7 @@
}
});
},
+
/** 鍒ゆ柇鏂板鎴栨槸缂栬緫 */
checkEditOrAdd(dontateInfo) {
if (dontateInfo.recordstate == 4) {
@@ -813,6 +818,7 @@
handlePreview(file) {
console.log(file);
},
+
//鏄剧ず涓撳鎰忚寮圭獥
showExpertAdviceDialog() {
this.resetExperAdviceForm();
@@ -820,6 +826,7 @@
this.expertAdviceForm.donorno = this.curCase.donorno;
this.isShowExpertAdviceDialog = true;
},
+
//淇濆瓨涓撳鎰忚
saveExpertAdvice() {
this.$refs["expertAdviceForm"].validate((valid) => {
@@ -869,6 +876,7 @@
})
.catch(() => { });
},
+
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdateExpert(row) {
this.reset();
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 7d0a854..09b6479 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -7,53 +7,28 @@
<el-row>
<el-col :span="5">
<el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker
- clearable
- style="width: 100%"
- v-model="form.createTime"
- type="date"
- value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡"
- >
+ <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="鐢宠鏃ユ湡">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁忓姙浜�" prop="username">
- <el-select
- v-model="form.username"
- placeholder="鐢宠浜�"
- clearable
- filterable
- allow-create
- style="width: 100%"
- @change="getUserAccount"
- >
- <el-option
- v-for="dict in userlist"
- :key="dict.index"
- :label="dict.nickname"
- :value="dict.nickname"
- ></el-option>
+ <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%"
+ @change="getUserAccount">
+ <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
+ :value="dict.nickname"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
- <el-input
- v-model="form.deptmentname"
- placeholder="璇疯緭鍏ユ墍灞炵粍鍒�"
- clearable
- />
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="缁勯暱" prop="managername">
- <el-input
- v-model="form.managername"
- placeholder="璇疯緭鍏ョ粍闀�"
- clearable
- />
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
</el-col>
</el-row>
@@ -75,13 +50,9 @@
<el-col :span="5">
<el-form-item label="閾惰鍚嶇О" prop="bankname">
<el-input v-model="form.bankname" placeholder="璇疯緭鍏ラ摱琛屽悕绉�" />
- </el-form-item> </el-col
- ><el-col :span="5">
+ </el-form-item> </el-col><el-col :span="5">
<el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input
- v-model="form.bankcardno"
- placeholder="璇疯緭鍏ラ摱琛岃处鍙�"
- />
+ <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -100,11 +71,7 @@
-->
<el-col :span="5">
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
- <el-input
- v-model="form.pretaxcost"
- placeholder="绋庡墠閲戦鍚堣"
- :disabled="true"
- />
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
</el-col>
<!--
@@ -125,11 +92,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- :disabled="true"
- v-model="form.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- />
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<!--
@@ -145,28 +108,14 @@
<el-row style="margin-top: 5px; margin-bottom: 5px" />
<el-row style="margin-bottom: 10px" v-if="businessType == '1'">
<el-col :span="4">
- <el-button
- @click.native.prevent="importFeeItems"
- type="primary"
- size="small"
- >
+ <el-button @click.native.prevent="importFeeItems" type="primary" size="small">
瀵煎叆鏈嶅姟椤圭洰
</el-button>
</el-col>
</el-row>
<el-row>
- <el-table
- :data="rbDetails"
- v-loading="loading"
- border
- highlight-current-row
- >
- <el-table-column
- prop="orderno"
- align="center"
- label="搴忓彿"
- width="65"
- >
+ <el-table :data="rbDetails" v-loading="loading" border highlight-current-row>
+ <el-table-column prop="orderno" align="center" label="搴忓彿" width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
@@ -175,125 +124,53 @@
<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"
- >
+ <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)"
- >
- <el-option
- v-for="dict in rowfeeItemTypes"
- :key="dict.index"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select v-model="scope.row.applytype" placeholder="鏈嶅姟绫诲瀷" @change="verifyFeeItemType(scope.row)">
+ <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="itemid"
- align="center"
- label="鏈嶅姟椤圭洰"
- width="260"
- >
+ <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-option
- v-for="dict in scope.row.itemlist"
- :key="dict.index"
- :label="dict.itemName"
- :value="dict.id"
- ></el-option>
+ <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>
</template>
</el-table-column>
- <el-table-column
- prop="servicesscope"
- align="center"
- label="鏈嶅姟璇存槑"
- v-if="form.applytype == '1'"
- width="180"
- >
+ <el-table-column prop="servicesscope" align="center" label="鏈嶅姟璇存槑" v-if="form.applytype == '1'" width="180">
<template slot-scope="scope">
- <el-select
- v-model="scope.row.servicesscope"
- placeholder="鏈嶅姟璇存槑"
- clearable
- allow-create
- filterable
- @change="verifyFeeRemark(scope.row)"
- >
- <el-option
- v-for="dict in scope.row.rowfeeblocks"
- :key="dict.servicesscope"
- :label="dict.remark"
- :value="dict.servicesscope"
- ></el-option>
+ <el-select v-model="scope.row.servicesscope" placeholder="鏈嶅姟璇存槑" clearable allow-create filterable
+ @change="verifyFeeRemark(scope.row)">
+ <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
+ :value="dict.servicesscope"></el-option>
</el-select>
</template>
</el-table-column>
- <el-table-column
- prop="price"
- align="center"
- label="鍗曚环"
- width="120"
- v-if="businessType == 4"
- >
+ <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"
- >
+ <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
- v-if="
- businessType == 2 ||
- businessType == 3 ||
- businessType == 4 ||
- ismanager == true
- "
- prop="amount"
- align="center"
- :label="amountLabel"
- width="120"
- >
+ <el-table-column v-if="businessType == 2 ||
+ businessType == 3 ||
+ businessType == 4 ||
+ ismanager == true
+ " prop="amount" align="center" :label="amountLabel" width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -305,37 +182,18 @@
<el-input v-model="scope.row.amount" placeholder="閲戦" />
</template>
</el-table-column>
- <el-table-column
- prop="taxedamount"
- align="center"
- label="绋庡悗閲戦"
- width="120"
- v-if="
- (this.ismanager == true) &
- (form.applytype == '1' || form.applytype == '2')
- "
- >
+ <el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="(this.ismanager == true) &
+ (form.applytype == '1' || form.applytype == '2')
+ ">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.taxedamount"
- placeholder="绋庡悗閲戦"
- />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" />
</template>
</el-table-column>
- <el-table-column
- prop="beneficiaryname"
- align="center"
- label="濮撳悕"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="beneficiaryname" align="center" label="濮撳悕" width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'expert')"
- >{{ scope.row.beneficiaryname }}</el-button
- >
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'expert')">{{ scope.row.beneficiaryname
+ }}</el-button>
<!-- <el-select
filterable
allow-create
@@ -355,19 +213,10 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column
- prop="unitno"
- align="center"
- label="鍗曚綅鍚嶇О"
- width="250"
- >
+ <el-table-column prop="unitno" align="center" label="鍗曚綅鍚嶇О" width="250">
<template slot-scope="scope">
- <el-button
- type="primary"
- plain
- @click="ShowDetailDialog(scope, 'unit')"
- >{{ scope.row.unitname }}</el-button
- >
+ <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
+ }}</el-button>
<!-- <el-select
v-model="scope.row.unitno"
placeholder="鍗曚綅"
@@ -384,54 +233,26 @@
</el-select> -->
</template>
</el-table-column>
- <el-table-column
- prop="title"
- align="center"
- label="鑱岀О"
- width="120"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="title" align="center" label="鑱岀О" width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
<el-input v-model="scope.row.title" placeholder="鑱岀О" />
</template>
</el-table-column>
- <el-table-column
- prop="idcardno"
- align="center"
- label="韬唤璇佸彿"
- width="200"
- v-if="form.applytype == '1' || form.applytype == '2'"
- >
+ <el-table-column prop="idcardno" align="center" label="韬唤璇佸彿" width="200"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
<el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
</template>
</el-table-column>
- <el-table-column
- prop="depositbank"
- align="center"
- label="寮�鎴烽摱琛�"
- width="200"
- v-if="form.applytype != '4'"
- >
+ <el-table-column prop="depositbank" align="center" label="寮�鎴烽摱琛�" width="200" v-if="form.applytype != '4'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.depositbank"
- placeholder="寮�鎴烽摱琛�"
- />
+ <el-input v-model="scope.row.depositbank" placeholder="寮�鎴烽摱琛�" />
</template>
</el-table-column>
- <el-table-column
- prop="bankcardno"
- align="center"
- label="閾惰甯愬彿"
- width="210"
- v-if="form.applytype != '4'"
- >
+ <el-table-column prop="bankcardno" align="center" label="閾惰甯愬彿" width="210" v-if="form.applytype != '4'">
<template slot-scope="scope">
- <el-input
- v-model="scope.row.bankcardno"
- placeholder="閾惰甯愬彿"
- />
+ <el-input v-model="scope.row.bankcardno" placeholder="閾惰甯愬彿" />
</template>
</el-table-column>
<el-table-column prop="remark" align="center" label="澶囨敞">
@@ -439,39 +260,18 @@
<el-input v-model="scope.row.remark" placeholder="澶囨敞" />
</template>
</el-table-column>
- <el-table-column
- fixed="right"
- align="center"
- label="鎿嶄綔"
- width="180"
- >
+ <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' || operationType == 'update'"
- >鏂板</el-button
- >
- <el-button
- @click.native.prevent="
- deleteRows(scope.row, scope.$index, rbDetails)
- "
- type="text"
- size="small"
- v-if="operationType == 'add' || operationType == 'update'"
- >
+ <el-button type="text" size="mini" @click="addRow(scope.$index)"
+ v-if="operationType == 'add' || operationType == 'update'">鏂板</el-button>
+ <el-button @click.native.prevent="
+ deleteRows(scope.row, scope.$index, rbDetails)
+ " type="text" size="small" v-if="operationType == 'add' || operationType == 'update'">
鍒犻櫎
</el-button>
- <el-button
- @click.native.prevent="
- Filepopup(scope.$index, rbDetails, scope.row)
- "
- type="text"
- size="small"
- v-if="businessType == 3 || businessType == 4"
- >绁ㄦ嵁</el-button
- >
+ <el-button @click.native.prevent="
+ Filepopup(scope.$index, rbDetails, scope.row)
+ " type="text" size="small" v-if="businessType == 3 || businessType == 4">绁ㄦ嵁</el-button>
</template>
</el-table-column>
</el-table>
@@ -519,77 +319,31 @@
-->
<el-row>
<el-col :span="12">
- <el-form-item
- label="璐圭敤鐢宠闄勪欢"
- align="left"
- prop="annexbankcard"
- v-if="businessType == 0"
- >
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileList"
- multiple
- :limit="20"
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-exceed="handleExceed"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
- <el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶绁ㄦ嵁</el-button
- >
+ <el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard" v-if="businessType == 0">
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
+ :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+ <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶绁ㄦ嵁</el-button>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="operationType == 'detail' || operationType == 'check'">
<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"
- />
- <el-table-column
- label="瀹℃牳缁撴灉"
- align="center"
- width="200"
- prop="flowconclusion"
- >
+ <el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
+ <el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
+ <el-table-column label="瀹℃牳缁撴灉" align="center" width="200" prop="flowconclusion">
<template slot-scope="scope">
<span v-if="scope.row.flowconclusion == 1">閫氳繃</span>
<span v-if="scope.row.flowconclusion == 2">涓嶉�氳繃</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹℃牳澶囨敞"
- align="center"
- prop="flowcontent"
- />
+ <el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
- <el-row
- style="margin-top: 25px; margin-bottom: 5px"
- v-if="operationType == 'check'"
- >
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType == 'check'">
<el-col :span="7">
<el-form-item label="瀹℃牳缁撴灉" align="left">
<el-radio-group v-model="checkObj.flowlevelone" align="left">
@@ -608,30 +362,15 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
- <el-button
- type="primary"
- @click="submitForm"
- v-if="operationType == 'add' || operationType == 'update'"
- >鎻愪氦淇濆瓨</el-button
- >
- <el-button
- type="primary"
- @click="checksubmit"
- v-if="operationType == 'check'"
- >鎻愪氦瀹℃牳</el-button
- >
+ <el-button type="primary" @click="submitForm"
+ v-if="operationType == 'add' || operationType == 'update'">鎻愪氦淇濆瓨</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="operationType == 'check'">鎻愪氦瀹℃牳</el-button>
<el-button @click="cancel">鍏� 闂�</el-button>
</div>
</div>
- <el-dialog
- :visible.sync="showSelectionDialog"
- :close-on-click-modal="false"
- :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'"
- width="500px"
- style="text-align: center"
- v-loading="loading"
- >
+ <el-dialog :visible.sync="showSelectionDialog" :close-on-click-modal="false" :title="'鍗曚綅/涓撳淇℃伅閫夋嫨'" width="500px"
+ style="text-align: center" v-loading="loading">
<el-form ref="funddetailForm" :model="funddetailForm">
<el-row>
<el-col :span="24" v-if="selectionType == 'expert'">
@@ -642,77 +381,29 @@
</el-radio-group>
</el-form-item>
</el-col>
- <el-col
- :span="24"
- v-if="selectionType == 'expert' && expertfrom == '1'"
- >
- <el-form-item
- label="涓撳濮撳悕"
- prop="beneficiaryname"
- label-width="80px"
- >
- <el-select
- filterable
- allow-create
- ref="beneficiaryname"
- default-first-option
- v-model="funddetailForm.beneficiaryname"
- placeholder="璇烽�夋嫨"
- style="width: 100%"
- >
- <el-option
- v-for="item in expertlist"
- :key="item.expertNo"
- :label="item.exportName"
- :value="item.exportName"
- >
+ <el-col :span="24" v-if="selectionType == 'expert' && expertfrom == '1'">
+ <el-form-item label="涓撳濮撳悕" prop="beneficiaryname" label-width="80px">
+ <el-select filterable allow-create ref="beneficiaryname" default-first-option
+ v-model="funddetailForm.beneficiaryname" placeholder="璇烽�夋嫨" style="width: 100%">
+ <el-option v-for="item in expertlist" :key="item.expertNo" :label="item.exportName"
+ :value="item.exportName">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="selectionType == 'unit'">
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="unitno"
- label-width="120px"
- v-if="businessType == 1 || businessType == 2"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 1 || businessType == 2">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+ :value="spec.organizationid"></el-option>
</el-select>
</el-form-item>
- <el-form-item
- label="鍙戠エ鍗曚綅鍚嶇О"
- prop="unitno"
- label-width="120px"
- v-if="businessType == 3 || businessType == 4"
- >
- <el-select
- v-model="funddetailForm.unitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(item, index) in feeUnitList"
- :key="index"
- :label="item.reportName"
- :value="item.reportNo"
- ></el-option>
+ <el-form-item label="鍙戠エ鍗曚綅鍚嶇О" prop="unitno" label-width="120px" v-if="businessType == 3 || businessType == 4">
+ <el-select v-model="funddetailForm.unitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(item, index) in feeUnitList" :key="index" :label="item.reportName"
+ :value="item.reportNo"></el-option>
</el-select>
</el-form-item>
</el-col>
@@ -720,43 +411,22 @@
<el-row>
<el-col :span="12" v-if="expertfrom == '2'">
<el-form-item label="涓撳濮撳悕" prop="expertname" label-width="80px">
- <el-input
- v-model="funddetailForm.expertname"
- placeholder="蹇呭～椤�"
- />
+ <el-input v-model="funddetailForm.expertname" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
<el-col :span="12" v-if="expertfrom == '2'">
- <el-form-item
- label="鑱� 绉�"
- prop="experttitle"
- label-width="80px"
- >
- <el-select
- v-model="funddetailForm.experttitle"
- placeholder="蹇呭～椤�"
- >
- <el-option
- v-for="dict in dict.type.sys_professionaltitle"
- :key="dict.value"
- :label="dict.label"
- :value="dict.label"
- ></el-option>
+ <el-form-item label="鑱� 绉�" prop="experttitle" label-width="80px">
+ <el-select v-model="funddetailForm.experttitle" placeholder="蹇呭～椤�">
+ <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="韬唤璇佸彿"
- prop="expertidcardno"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertidcardno"
- placeholder="蹇呭～椤�"
- />
+ <el-form-item label="韬唤璇佸彿" prop="expertidcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertidcardno" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
</el-row>
@@ -774,91 +444,41 @@
-->
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="鍗曚綅鍚嶇О"
- prop="expertunitno"
- label-width="80px"
- >
- <el-select
- v-model="funddetailForm.expertunitno"
- placeholder="鍗曚綅鍚嶇О"
- clearable
- filterable
- allow-create
- style="width: 100%"
- >
- <el-option
- v-for="(spec, index) in unitList"
- :key="index"
- :label="spec.organizationname"
- :value="spec.organizationid"
- ></el-option>
- </el-select> </el-form-item
- ></el-col>
+ <el-form-item label="鍗曚綅鍚嶇О" prop="expertunitno" label-width="80px">
+ <el-select v-model="funddetailForm.expertunitno" placeholder="鍗曚綅鍚嶇О" clearable filterable allow-create
+ style="width: 100%">
+ <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
+ :value="spec.organizationid"></el-option>
+ </el-select> </el-form-item></el-col>
</el-row>
<el-row>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="寮�鎴烽摱琛�"
- prop="expertdepositbank"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertdepositbank"
- placeholder="蹇呭～椤�"
- />
+ <el-form-item label="寮�鎴烽摱琛�" prop="expertdepositbank" label-width="80px">
+ <el-input v-model="funddetailForm.expertdepositbank" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="expertfrom == '2'">
- <el-form-item
- label="閾惰鍗″彿"
- prop="expertbankcardno"
- label-width="80px"
- >
- <el-input
- v-model="funddetailForm.expertbankcardno"
- placeholder="蹇呭～椤�"
- />
+ <el-form-item label="閾惰鍗″彿" prop="expertbankcardno" label-width="80px">
+ <el-input v-model="funddetailForm.expertbankcardno" placeholder="蹇呭～椤�" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="showSelectionDialog = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="ConfirmDetailDialog()"
- >纭� 瀹�</el-button
- >
+ <el-button type="primary" @click="ConfirmDetailDialog()">纭� 瀹�</el-button>
</span>
</el-dialog>
<el-dialog :title="pdftitle" :visible.sync="pdfVisible" width="50%">
<div class="pdfimg">
<div class="box-pdf">
<div>
- <el-upload
- size="mini"
- class="upload-demo"
- :action="uploadFileUrl"
- :file-list="fileListto"
- multiple
- :limit="20"
- :headers="headers"
- :on-success="
- (response, file, fileList) =>
- uploadSccess(response, file, fileList)
- "
- :on-preview="downFile"
- :disabled="operationType == 'detail'"
- :on-error="handleUploadError"
- :on-exceed="handleExceed"
- :on-remove="remove"
- accept="image/*,.pdf"
- >
- <el-button
- :disabled="operationType == 'detail'"
- size="small"
- type="primary"
- >涓婁紶绁ㄦ嵁</el-button
- >
+ <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileListto" multiple
+ :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
+ uploadSccess(response, file, fileList)
+ " :on-preview="downFile" :disabled="operationType == 'detail'" :on-error="handleUploadError"
+ :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
+ <el-button :disabled="operationType == 'detail'" size="small" type="primary">涓婁紶绁ㄦ嵁</el-button>
</el-upload>
</div>
<!-- <div
@@ -873,11 +493,7 @@
<div v-if="this.previewpdf" class="pdfimgmin">
<!-- <img :src="pdfimg" /> -->
- <el-image
- style="width: 100px; height: 100px"
- :src="pdfimg"
- :preview-src-list="pdfimgsrcList"
- >
+ <el-image style="width: 100px; height: 100px" :src="pdfimg" :preview-src-list="pdfimgsrcList">
</el-image>
</div>
<div v-else class="pdfimgmins">{{ hintitle }}</div>
@@ -1444,7 +1060,7 @@
handleDelete() {
this.$modal
.confirm("鏄惁纭鍒犻櫎璇ヨ褰曪紵")
- .then(function() {
+ .then(function () {
return delFund(this.curId);
})
.then(() => {
@@ -1459,7 +1075,7 @@
this.getfundList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => {});
+ .catch(() => { });
},
/** 涓婃姤鎸夐挳鎿嶄綔 */
@@ -1512,8 +1128,8 @@
if (tempDetail.itemid == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟椤圭洰鏈�夋嫨锛岃鍏堥�夋嫨鏈嶅姟椤圭洰鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1522,8 +1138,8 @@
if (tempDetail.servicesscope == null) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑璐圭敤璇存槑鏈�夋嫨,璇烽�夋嫨璐圭敤璇存槑鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1534,8 +1150,8 @@
) {
this.$modal.msgWarning(
"鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
- (k + 1).toString() +
- "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
+ (k + 1).toString() +
+ "琛岀殑鏈嶅姟浜哄憳濮撳悕涓洪�夋嫨,璇烽�夋嫨浜哄憳鍚庡啀鎻愪氦淇濆瓨锛�"
);
return;
}
@@ -1562,7 +1178,7 @@
// this.form.annexfiles = list.map(item => item.url).join(",");
// }
- //澶勭悊鏄庣粏
+ //澶勭悊鏄庣粏
for (let i = 0; i < this.rbDetails.length; i++) {
let tempDetail = this.rbDetails[i];
//鑾峰彇鏈嶅姟椤圭洰鏄庣粏
@@ -1580,15 +1196,9 @@
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;
+ tempDetail.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
+ tempDetail.subjecttype = this.rowfeeItemTypes[applytypeIndex].subjecttype;
+ tempDetail.subjecttypename = this.rowfeeItemTypes[applytypeIndex].subjecttypename;
}
this.rbDetails[i] = tempDetail;
/*
@@ -1613,7 +1223,7 @@
});
}
- // 璁＄畻绋庡墠閲戦
+ // 璁＄畻绋庡墠銆佺◣璐广�佺◣鍚庨噾棰�
if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
//鑾峰彇鍙傛暟
this.taxParam.money = tempDetail.taxedamount.toString();
@@ -1629,7 +1239,32 @@
});
}
*/
+
}
+ //璁＄畻褰撳墠琛屾姤閿�鍐呭璐圭敤鍚堣锛岀◣鍓嶉噾棰濓紙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 = tempDetail.amount
+ } else {
+ tempDetail.taxedamount = tempDetail.amount + tempDetail.taxamount
+ }
+ }
+ }
+
//璐圭敤鍚堣
// this.form.pretaxcost = parseFloat(this.totalPreTaxAmount).toFixed(2);
// this.form.taxedcost = parseFloat(this.totalAfterTaxAmount).toFixed(2);
@@ -1681,9 +1316,9 @@
});
//鍏抽棴绐楀彛
- // this.loading = false;
- // this.getfundList();
- this.$store.dispatch("tagsView/delView", this.$route);
+ this.loading = false;
+ // this.getfundList();
+ this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1);
}
});
@@ -1905,7 +1540,7 @@
});
},
- //鏍￠獙鏀惰垂椤圭洰鏄惁閲嶅
+ //鏍￠獙鏀惰垂椤圭洰
verifyFeeItem(row) {
row.itemlist.map(res => {
if (row.itemid === res.id) {
@@ -1913,14 +1548,18 @@
row.itemcode = res.itemCode;
}
});
- var repeatNum = 0;
- this.rbDetails.map(res => {
- if (res.applytype === row.applytype && res.itemid == row.itemid) {
- repeatNum++;
+
+ //鍒ゆ柇鏀惰垂椤圭洰鏄惁閲嶅
+ if (this.businessType == "1") {
+ var repeatNum = 0;
+ this.rbDetails.map(res => {
+ if (res.applytype === row.applytype && res.itemid == row.itemid) {
+ repeatNum++;
+ }
+ });
+ if (repeatNum > 1) {
+ this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔￠」鐩簡");
}
- });
- if (repeatNum > 1) {
- this.$modal.msgWarning("鎮ㄥ凡缁忔彁浜よ繃璇ユ湇鍔￠」鐩簡");
}
//鑾峰彇璐圭敤椤圭洰鐨勮缁嗕俊鎭�
@@ -2162,7 +1801,7 @@
},
//璁＄畻涓◣
- calculateTax() {},
+ calculateTax() { },
//璁＄畻鎬婚噾棰�
sumTotalFee(row) {
@@ -2257,7 +1896,7 @@
},
//鏂囦欢涓婁紶
- handleUploadError() {},
+ handleUploadError() { },
/** 涓嬭浇鏂囦欢鎸夐挳鎿嶄綔 */
downFile(item) {
@@ -2507,13 +2146,13 @@
// this.getFeeUnitList();
},
- beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
- beforeMount() {}, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
- beforeUpdate() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
- updated() {}, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
- beforeDestroy() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
- destroyed() {}, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
- activated() {} //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
+ beforeCreate() { }, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠
+ beforeMount() { }, //鐢熷懡鍛ㄦ湡 - 鎸傝浇涔嬪墠
+ beforeUpdate() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪墠
+ updated() { }, //鐢熷懡鍛ㄦ湡 - 鏇存柊涔嬪悗
+ beforeDestroy() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佷箣鍓�
+ destroyed() { }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
+ activated() { } //濡傛灉椤甸潰鏈塳eep-alive缂撳瓨鍔熻兘锛岃繖涓嚱鏁颁細瑙﹀彂
};
</script>
--
Gitblit v1.9.3