From 128aec95c834751e587e7f6615310ffbe3b13b64 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期三, 27 九月 2023 16:37:53 +0800
Subject: [PATCH] 11
---
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 86 ++++++++++++++++++++++++++++++-------------
1 files changed, 60 insertions(+), 26 deletions(-)
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index f59155b..f9798b0 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -84,7 +84,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="10">
+ <el-col :span="7">
<el-form-item label="澶у啓閲戦" prop="bigstrmoney">
<el-input
:disabled="true"
@@ -92,7 +92,7 @@
placeholder="鎶ラ攢澶у啓閲戦"
/>
</el-form-item> </el-col
- ><el-col :span="5">
+ ><el-col :span="4">
<el-form-item label="瀹℃牳鐘舵��" prop="flowlevel">
<el-select
v-model="form.recordstatus"
@@ -107,6 +107,23 @@
:label="dict.label"
:value="dict.value"
/>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="棰勫鐘舵��" prop="infoid">
+ <el-select
+ v-model="form.checkstatus"
+ filterable
+ placeholder="璇烽�夋嫨棰勫鐘舵��"
+ >
+ <el-option
+ v-for="item in baselisttages"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ >
+ </el-option>
</el-select>
</el-form-item>
</el-col>
@@ -920,13 +937,13 @@
<el-button
type="primary"
@click="submitForm"
- v-if="operationType == 'edit'"
+ v-if="operationType == 'edit'||beforehandType=='1'"
>淇� 瀛�</el-button
>
<el-button
type="primary"
@click="checksubmit"
- v-if="operationType == 'check'"
+ v-if="operationType == 'check'&& beforehandType!='1'"
>鎻� 浜�</el-button
>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
@@ -946,8 +963,7 @@
<el-table-column prop="orderno" label="搴忓彿"> </el-table-column>
<el-table-column prop="personname" label="璐圭敤浜哄憳">
</el-table-column>
- <el-table-column prop="createTime" label="寮�濮嬫棩鏈�">
- </el-table-column>
+ <el-table-column prop="starttime" label="寮�濮嬫棩鏈�"> </el-table-column>
<el-table-column prop="endtime" label="缁撴潫鏃ユ湡"> </el-table-column>
<el-table-column prop="departure" label="鍑哄彂鍦�"> </el-table-column>
<el-table-column prop="destination" label="鍒拌揪鍦�"> </el-table-column>
@@ -1090,7 +1106,8 @@
import {
listReimbursementpayee,
addReimbursementpayee,
- updateReimbursementpayee
+ updateReimbursementpayee,
+ delReimbursementpayee
} from "@/api/project/reimbursementpayee";
import {
listReimbursement,
@@ -1253,6 +1270,20 @@
rbDetails: [],
rbPayees: [],
arrr2: [],
+ baselisttages: [
+ {
+ id: 1,
+ name: "寰呴瀹�"
+ },
+ {
+ id: 2,
+ name: "棰勫閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ id: 3,
+ name: "宸叉敹鍒版姤閿�鏉愭枡"
+ },
+ ],
baselist: [],
donatorList: [],
standardlevel: 0,
@@ -1270,7 +1301,7 @@
persontype: null,
//鍒拌揪鍦�
arriveAddr: null,
-
+ beforehandType:null,
headers: {
Authorization: "Bearer " + getToken()
},
@@ -1332,6 +1363,7 @@
let curId = this.$route.query.id;
let pos = this.$route.query.pos;
this.defaultperson = this.$route.query.routerparam;
+ this.beforehandType = this.$route.query.beforehandType;
if (pos == 1) {
this.handleAdd(curId);
} else if (pos == 2) {
@@ -1347,10 +1379,13 @@
this.$refs["table"].doLayout();
});
},
+ destroyed() {
+ window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
+ }, //鐢熷懡鍛ㄦ湡 - 閿�姣佸畬鎴�
methods: {
- // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
- beforeunloadHandler(e) {
+ // 娴忚鍣ㄩ〉闈㈠叧闂垨鍒锋柊鎻愮ず
+ beforeunloadHandler(e) {
if (
(JSON.stringify(this.form) == sessionStorage.getItem("apiform") &&
JSON.stringify(this.rbDetails) ==
@@ -2188,17 +2223,15 @@
*/
//绁ㄦ嵁鏂囦欢澶勭悊
+ const addnumber = this.rbPayees.reduce(
+ (amount, item) => amount + Number(item.amount),
+ 0
+ );
let list = this.fileListto;
console.log(list);
//鏍￠獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰�
- if (
- this.form.amountrequested !=
- this.rbPayees.reduce(
- (amount, item) => amount + Number(item.amount),
- 0.0
- )
- ) {
+ if (this.form.amountrequested != addnumber) {
this.$message({
message:
"鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
@@ -2210,7 +2243,7 @@
const rbDetails = [...this.rbDetails];
const rbPayees = [...this.rbPayees];
if (this.form.id != null) {
- console.log(this.form);
+ console.log(this.form);
updateReimbursement(this.form);
// .then(res => {
//淇濆瓨鏄庣粏
@@ -2327,6 +2360,11 @@
this.Savereminder = false;
this.Reminderquantity = 0;
this.totalquantity = 0;
+ const addnumber = this.rbPayees.reduce(
+ (amount, item) => amount + Number(item.amount),
+ 0
+ );
+ console.log(addnumber, "addnumber");
this.$refs["form"].validate(valid => {
if (valid) {
//绁ㄦ嵁鏂囦欢澶勭悊
@@ -2334,13 +2372,7 @@
console.log(list);
//鏍￠獙璇锋閲戦鍚堣鏄惁绛変簬鎶ラ攢鍗曢噾棰�
- if (
- this.form.amountrequested !=
- this.rbPayees.reduce(
- (amount, item) => amount + Number(item.amount),
- 0.0
- )
- ) {
+ if (this.form.amountrequested != addnumber) {
this.$message({
message:
"鎶ラ攢璇锋琛ㄤ腑鍚堣閲戦涓嶇瓑浜庢姤閿�鍗曠殑鎶ラ攢閲戦锛岃鏇存鍚庡啀淇濆瓨锛�",
@@ -2543,8 +2575,10 @@
})
.then(() => {
console.log(row);
+ let arrow = [];
+ arrow.push(row.id);
if (row.id !== null) {
- delReimbursementdetail(row.id).then(res => {
+ delReimbursementpayee(arrow).then(res => {
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
rows.splice(index, 1);
this.recountOrderNo2();
--
Gitblit v1.9.3