From d3d255c214d71f33c38c44e8a9fcbd428bbd6a19 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期六, 22 四月 2023 10:49:01 +0800
Subject: [PATCH] yxh
---
src/views/project/travelexpenseslist/index.vue | 377 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 243 insertions(+), 134 deletions(-)
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseslist/index.vue
index bd8c6ec..8a5b2b2 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseslist/index.vue
@@ -45,8 +45,6 @@
</el-form-item>
</el-col>
</el-row>
-
-
</el-form>
<el-row :gutter="10" class="mb8">
@@ -93,15 +91,8 @@
</el-table-column>
<el-table-column label="閾惰鍗″彿" width="180" align="center" prop="bankcardno">
</el-table-column>
- <!-- <el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher">
- </el-table-column> -->
- <!-- <el-table-column
- label="璐㈠姟瀹℃牳"
- width="120"
- align="center"
- prop="financechecher"
- >
- </el-table-column> -->
+ <!-- <el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
+ <!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
<el-table-column label="鎹愮尞鑰�" width="120" align="center" prop="donorname">
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="270">
@@ -131,11 +122,15 @@
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="1400px" append-to-body
@close="reset">
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
- <el-row>
- <el-col :span="7">
- <!-- <el-form-item label="澶囨敞" prop="reason">
- <el-input v-model="form.reason" placeholder="涓撹亴浜哄憳 鍗忚皟鍛�" />
- </el-form-item> --><el-form-item label="鎶ラ攢浜�" prop="username">
+ <el-row><el-col :span="5">
+ <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
+ <el-date-picker 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" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨">
<el-option v-for="item in reporters" :key="item.reportNo" :label="item.reportName"
@@ -143,33 +138,57 @@
</el-option>
</el-select>
</el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
- <el-input disabled v-model="form.donorno" placeholder="鎹愮尞缂栧彿" />
+ </el-col><el-col :span="5">
+ <el-form-item label="鍖哄煙缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
</el-form-item>
</el-col>
- <el-col :span="7">
+
+ <el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="infoid">
- <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
+ <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="璇烽�夋嫨鎹愮尞鑰�">
<el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
+ <el-row style="margin-top: 10px">
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢閲戦" prop="amountrequested">
+ <el-input :disabled="true" v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣閲戦" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="10">
+ <el-form-item label="澶у啓閲戦" prop="bigstrmoney">
+ <el-input :disabled="true" v-model="form.bigstrmoney" placeholder="鎶ラ攢澶у啓閲戦" />
+ </el-form-item>
+ </el-col><el-col :span="5">
+ <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
+ <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
+ :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <!--
<el-row>
- <el-col :span="7">
- <el-form-item label="鍑哄樊浜哄垎绫�" prop="costtype">
+ <el-col :span="15">
+ <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
+ <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢鍒嗙被" prop="costtype">
<el-select v-model="form.costtype" value-key="value" placeholder="璇烽�夋嫨鍑哄樊浜哄垎绫�" @change="getTravelers">
<el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
</el-col>
- <el-col :span="8">
- <el-form-item label="鍑哄樊浜�" prop="travelers">
+ <el-col :span="5">
+ <el-form-item label="鎶ラ攢浜�" prop="travelers">
<el-select v-model="form.travelers" clearable filterable allow-create ref="getReportname"
default-first-option placeholder="璇烽�夋嫨" @change="selectedTraveler">
<el-option v-for="item in travelers" :key="item.reportNo" :label="item.reportName"
@@ -178,34 +197,66 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鍖哄煙缁勯暱" prop="managername">
- <el-input v-model="form.managername" placeholder="鍖哄煙缁勯暱" />
- </el-form-item> </el-col></el-row><el-row>
+ <el-col :span="5">
+ <el-form-item label="鏀舵閾惰" prop="depositbank">
+ <el-input v-model="form.depositbank" placeholder="寮�鎴烽摱琛�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
+ <el-input v-model="form.bankcardno" placeholder="寮�鎴烽摱琛�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+ <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="20"><el-divider></el-divider></el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item label="瀹跺睘璐圭敤" prop="donoramount">
+ <el-input :disabled="true" v-model="form.donoramount" placeholder="瀹跺睘璐圭敤" @blur="
+ (val) => {
+ sumTotalFee();
+ }
+ " onchange="if(/[^0-9.]/.test(this.value)){alert('璇锋纭緭鍏ユ暣鏁版暟瀛楁垨灏忔暟锛�');this.value='';}" />
+ </el-form-item>
+ </el-col>
<el-col :span="15">
- <el-form-item label="鍑哄樊浜嬬敱" prop="reason">
- <el-input v-model="form.reason" placeholder="鍑哄樊浜嬬敱" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="鐢宠鏃ユ湡" prop="createTime">
- <el-date-picker style="width: 100%" v-model="form.createTime" type="date" value-format="yyyy-MM-dd HH:mm:ss"
- placeholder="鐢宠鏃ユ湡">
- </el-date-picker>
+ <el-form-item label="璐圭敤璇存槑" prop="donorremark">
+ <el-input :disabled="true" v-model="form.donorremark" placeholder="瀹跺睘璐圭敤璇存槑" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="22">
- <el-form-item label="澶囨敞" prop="remark">
- <el-input v-model="form.remark" placeholder="澶囨敞" />
+ <el-col :span="5">
+ <el-form-item label="瀹跺睘浜烘暟" prop="donorrelatives">
+ <el-input v-model="form.donorrelatives" placeholder="瀹跺睘浜烘暟" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏀舵浜�" prop="donorpayee">
+ <el-input v-model="form.donorpayee" placeholder="浜插睘鏀舵浜�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鏀舵閾惰" prop="donorbank">
+ <el-input v-model="form.donorbank" placeholder="瀹跺睘閾惰" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閾惰鍗″彿" prop="donorbankcard">
+ <el-input v-model="form.donorbankcard" placeholder="閾惰鍗″彿" />
</el-form-item>
</el-col>
</el-row>
- <el-row>
- <el-col :span="8"> </el-col>
- </el-row>
- <!-- <el-row type="flex" :gutter="10" align="right" class="mb8">
+ -->
+ <!--
+ <el-row type="flex" :gutter="10" align="right" class="mb8">
<el-col :span="6">
<el-button
type="primary"
@@ -216,47 +267,79 @@
>鏂板涓�琛�</el-button
>
</el-col>
- </el-row> -->
+ </el-row>
+ -->
<el-row>
<el-table :data="applicationDetailArr" border highlight-current-row>
- <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="80">
+ <el-table-column prop="orderno" slot="" label="搴忓彿" align="center" fixed width="65">
<template slot-scope="scope">
<el-input v-model="scope.row.orderno" placeholder="搴忓彿" />
</template>
</el-table-column>
- <el-table-column prop="starttime" slot="" label="鍑哄彂鏃ユ湡" fixed align="center" width="150">
+ <el-table-column prop="persontype" slot="" label="浜哄憳绫诲埆" align="center" fixed width="120">
<template slot-scope="scope">
- <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鍑哄彂鏃ユ湡" @change="getStandard(scope.row)">
+ <el-select v-model="form.persontype" value-key="value" placeholder="浜哄憳绫诲埆" @change="getTravelers">
+ <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="personname" slot="" label="鍑哄樊浜�" align="center" fixed width="120">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.personname" placeholder="鍑哄樊浜�" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="starttime" slot="" label="寮�濮嬫棩鏈�" fixed align="center" width="150">
+ <template slot-scope="scope">
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.endtime) { return time.getTime() > new Date(scope.row.endtime.replace(/-/g, '/')) }
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="寮�濮嬫棩鏈�" @blur="getallowance(scope.row)">
</el-date-picker>
</template>
</el-table-column>
-
- <el-table-column prop="departure" slot="" label="鍑哄彂鍦扮偣" align="center" width="200" fixed>
+ <el-table-column prop="endtime" slot="" label="缁撴潫鏃ユ湡" align="center" fixed width="150">
<template slot-scope="scope">
- <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦扮偣" />
- </template>
- </el-table-column>
- <el-table-column prop="endtime" slot="" label="鍒拌揪鏃ユ湡" align="center" width="150" fixed>
- <template slot-scope="scope">
- <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
- value-format="yyyy-MM-dd HH:mm:ss" placeholder="鍒拌揪鏃ユ湡">
+ <el-date-picker :picker-options="{
+ disabledDate: time => {
+ if (scope.row.starttime) { return time.getTime() < new Date(scope.row.starttime.replace(/-/g, '/')) }
+ }
+ }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="缁撴潫鏃ユ湡" @blur="getallowance(scope.row)">
</el-date-picker>
</template>
</el-table-column>
- <el-table-column label="鍒拌揪鍦扮偣" prop="destination" align="center" width="200">
+ <el-table-column prop="departure" slot="" label="鍑哄彂鍦�" align="center" fixed width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦扮偣" />
+ <el-input v-model="scope.row.departure" placeholder="鍑哄彂鍦�" />
</template>
</el-table-column>
- <el-table-column prop="days" label="澶╂暟" width="70" align="center">
+ <el-table-column label="鍒拌揪鍦�" prop="destination" align="center" fixed width="100">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.destination" placeholder="鍒拌揪鍦�" @blur="getallowance(scope.row)" />
+ </template>
+ </el-table-column>
+ <el-table-column prop="days" label="澶╂暟" width="65" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="澶╂暟" />
</template>
</el-table-column>
- <el-table-column prop="traffictype" label="浜ら�氬伐鍏�" align="center" width="120">
+ <el-table-column prop="traffictype" label="鍑哄彂浜ら�氬伐鍏�" align="center" width="100">
<template slot-scope="scope">
- <el-input v-model="scope.row.traffictype" placeholder="浜ら�氬伐鍏�" />
+ <el-select v-model="scope.row.traffictype" placeholder="鍑哄彂浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column prop="traffictype2" label="杩斿洖浜ら�氬伐鍏�" align="center" width="100">
+ <template slot-scope="scope">
+ <el-select v-model="scope.row.traffictype2" placeholder="杩斿洖浜ら�氬伐鍏�">
+ <el-option v-for="dict in dict.type.sys_traffictype" :key="dict.value" :label="dict.label"
+ :value="dict.label"></el-option>
+ </el-select>
</template>
</el-table-column>
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
@@ -268,6 +351,7 @@
" />
</template>
</el-table-column>
+ <!--
<el-table-column prop="cityfee" label="甯傚唴浜ら�氳垂" align="center" width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.cityfee" placeholder="甯傚唴浜ら�氳垂" @blur="
@@ -278,6 +362,7 @@
</el-input>
</template>
</el-table-column>
+ -->
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="
@@ -287,16 +372,8 @@
" />
</template>
</el-table-column>
- <el-table-column prop="otherexpense" label="鏉傝垂" align="center" width="80">
- <template slot-scope="scope">
- <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
- </template>
- </el-table-column>
- <el-table-column prop="foodexpenses" label="浼欓璐规姤閿�" align="center" width="100">
+
+ <el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="
(val) => {
@@ -305,7 +382,7 @@
" />
</template>
</el-table-column>
- <el-table-column prop="foodallowance" label="浼欓璐硅ˉ鍔�" align="center" width="100">
+ <el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="
(val) => {
@@ -314,6 +391,16 @@
" />
</template>
</el-table-column>
+ <el-table-column prop="otherexpense" label="鍏潅璐硅ˉ鍔�" align="center" width="80">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.otherexpense" placeholder="鏉傝垂" @blur="
+ (val) => {
+ sumTotalFee();
+ }
+ " />
+ </template>
+ </el-table-column>
+
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="
@@ -328,6 +415,7 @@
<el-input v-model="scope.row.otherfeedesc" placeholder="鍏朵粬璐圭敤璇存槑" />
</template>
</el-table-column>
+
<el-table-column prop="total" label="鍚堣" align="center" width="110">
<template slot-scope="scope">
<el-input v-model="scope.row.total" placeholder="鍚堣" />
@@ -345,81 +433,45 @@
</el-table-column>
</el-table>
</el-row>
- <el-row style="margin-top: 10px">
- <el-col :span="7">
- <el-form-item label="鎶ラ攢鍚堣" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="鎶ラ攢鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="澶у啓" prop="bigstrmoney">
- <el-input v-model="form.bigstrmoney" placeholder="棰嗘閲戦" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="棰嗘閲戦" prop="amountrequested">
- <el-input v-model="form.amountrequested" placeholder="棰嗘閲戦" />
- </el-form-item>
- </el-col>
- </el-row>
+
+ <!--
<el-row>
<el-col :span="7">
- <el-form-item label="寮�鎴烽摱琛�" prop="depositbank">
- <el-input v-model="form.depositbank" placeholder="寮�鎴烽摱琛�" />
- </el-form-item>
- </el-col>
- <el-col :span="8">
- <el-form-item label="閾惰璐﹀彿" prop="bankcardno">
- <el-input v-model="form.bankcardno" placeholder="寮�鎴烽摱琛�" />
+ <el-form-item label="涓績璐熻矗浜�" prop="opochecker">
+ <el-input v-model="form.opochecker" placeholder="涓績璐熻矗浜�" />
</el-form-item>
</el-col>
<el-col :span="7">
- <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
- <el-input v-model="form.phone" placeholder="鑱旂郴鐢佃瘽" />
+ <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
+ <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="7">
+ <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
+ <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
</el-form-item>
</el-col>
</el-row>
- <el-col :span="7">
- <el-form-item label="涓績璐熻矗浜�" prop="opochecker">
- <el-input v-model="form.opochecker" placeholder="涓績璐熻矗浜�" />
- </el-form-item>
- </el-col>
-
- <el-col :span="8">
- <el-form-item label="璐㈠姟鍓櫌闀�" prop="finvicepresident">
- <el-input v-model="form.finvicepresident" placeholder="璐㈠姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="涓氬姟鍓櫌闀�" prop="busvicepresident">
- <el-input v-model="form.busvicepresident" placeholder="涓氬姟鍓櫌闀�" />
- </el-form-item>
- </el-col>
<el-row>
<el-col :span="7">
<el-form-item label="鍔炲叕瀹や富浠�" prop="officedirector">
<el-input v-model="form.officedirector" placeholder="鍔炲叕瀹や富浠�" />
</el-form-item>
</el-col>
- <el-col :span="8">
+ <el-col :span="7">
<el-form-item label="璐㈠姟閮ㄤ富浠�" prop="financedirector">
<el-input v-model="form.financedirector" placeholder="璐㈠姟閮ㄤ富浠�" />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
- <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable :disabled="true" size="small">
- <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
- :value="dict.value" />
- </el-select>
- </el-form-item>
- </el-col>
</el-row>
+ -->
<el-row>
- <el-col :span="24">
- <!-- <el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
+ <el-col :span="14">
+ <!--
+ <el-form-item label="鏂囦欢鍦板潃" prop="fileurl">
<el-input v-model="form.fileurl" placeholder="璇疯緭鍏ユ枃浠跺湴鍧�" />
- </el-form-item> -->
+ </el-form-item>
+ -->
<el-form-item label="鏂囦欢涓婁紶" align="left" prop="annexfiles">
<!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
@@ -500,6 +552,7 @@
"sys_financeitemtype",
"sys_recordstatus",
"sys_travelexpensebelong",
+ "sys_traffictype",
],
data() {
return {
@@ -563,7 +616,13 @@
{ required: true, message: "璇烽�夋嫨鎶ラ攢褰掔被", trigger: "blur" },
],
username: [
- { required: true, message: "璇疯緭鍏ユ姤閿�浜�", trigger: "blur" },
+ { required: true, message: "璇烽�夋嫨濉姤浜�", trigger: "blur" },
+ ],
+ travelers: [
+ { required: true, message: "璇烽�夋嫨鎶ラ攢浜�", trigger: "blur" },
+ ],
+ reason: [
+ { required: true, message: "璇疯緭鍏ュ嚭宸簨鐢�", trigger: "blur" },
],
},
//璐圭敤鐢宠鍗昮orm
@@ -701,6 +760,47 @@
}
});
},
+ //璁＄畻琛ュ姪
+ getallowance(row) {
+ if (
+ row.starttime != "" &&
+ row.starttime != null &&
+ row.endtime != "" &&
+ row.endtime != null
+ ) {
+ //璁＄畻澶╂暟
+ row.days = 1 + Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1099 * 3699 * 24))
+
+ /*let aDate, oDate1, oDate2, Date_end,Date_start;
+ Date_end = row.endtime.split(" "); //灏嗘椂闂翠互绌烘牸鍒掑垎涓轰袱涓暟缁� 绗竴涓暟缁勬槸 2019-05-20 绗簩涓暟缁勬槸 00锛�00锛�00
+ aDate = Date_end[0].split("-"); //鑾峰彇绗竴涓暟缁勭殑鍊�
+ oDate1 = new Date(aDate[0], aDate[1], aDate[2]); //灏嗗墠鍗婁釜鏁扮粍浠�-鎷嗗垎锛屾瘡涓�涓槸涓�涓暟鍊�
+
+ Date_start = row.starttime.split(" ");
+ aDate = Date_start[0].split("-");
+ oDate2 = new Date(aDate[0], aDate[1], aDate[2]);
+ row.days = 1+parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24); //鎶婄浉宸殑姣鏁拌浆鎹负澶╂暟
+ */
+ } else {
+ row.days = ''
+ };
+
+ //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
+ if (row.destination != "") {
+ var str = row.destination;
+ //楠岃瘉鍩庡競
+ ////if (str.indexOf("妗愬簮锛屽缓寰凤紝娣冲畨") !== -1) { };
+ if (str.includes("鏉窞")) { row.otherexpense = parseInt(row.days) * 0 }
+ else if (str.includes("妗愬簮") || str.includes("寤哄痉") || str.includes("娣冲畨")) { row.otherexpense = parseInt(row.days) * 60 }
+ else { row.otherexpense = parseInt(row.days) * 80 };
+ }
+
+ //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
+ row.foodallowance = parseInt(row.days) * 100
+
+ //璁＄畻鍚堣
+ this.sumTotalFee();
+ },
getStandard(row) {
if (
@@ -787,8 +887,8 @@
}
return area;
},
+
selectbaseinfo() {
- console.log("infoid", this.form.infoid);
let list = this.balist;
list.forEach((item) => {
if (item.id == this.form.infoid) {
@@ -798,9 +898,11 @@
}
});
},
+
onpick(e) {
// console.log(e,this.value1)
},
+
gettable(e) {
const id = e.id;
getdownload(e.id).then((res) => {
@@ -829,6 +931,7 @@
// aEle.click();
// });
},
+
/** 鏌ヨ鎶ラ攢鐢宠鍒楄〃 */
getList() {
this.loading = true;
@@ -1108,7 +1211,6 @@
addReimbursementdetail(applicationDetailArr[i]);
}
- console.log("idaaaaaa:", res, id, this.applicationDetailArr);
});
});
}
@@ -1270,6 +1372,12 @@
sumTotalFee() {
// debugger;
let allSum = 0;
+ //鎹愮尞鑰呭灞炶垂鐢�
+ if (!isNaN(parseFloat(this.form.donoramount))) {
+ allSum += parseFloat(this.form.donoramount);
+ }
+
+ //鎶ラ攢鏄庣粏璐圭敤
try {
for (let i = 0; i < this.applicationDetailArr.length; i++) {
let totalFee = 0;
@@ -1301,6 +1409,7 @@
allSum += parseFloat(this.applicationDetailArr[i].total);
}
}
+
this.form.amountrequested = allSum.toFixed(2);
this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
} catch { }
--
Gitblit v1.9.3