From 681bd876235ddb2a73fc218c64d0cf174b38d666 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 31 七月 2023 13:24:45 +0800
Subject: [PATCH] yxh
---
src/utils/request.js | 2
src/views/project/fund/expertFeeFundApply/index.vue | 22 +++--
src/views/project/travelexpenseslist/Modifydetails/index.vue | 192 ++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 177 insertions(+), 39 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 93e7229..078d22e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -98,7 +98,7 @@
Message({
message: message,
type: 'error',
- duration: 5 * 1000
+ duration: 30* 1000
})
return Promise.reject(error)
}
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 3ece74b..d92089c 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -402,7 +402,7 @@
</el-form-item>
</el-col>
</el-row>
- -->
+
<el-row>
<el-col :span="12">
<el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
@@ -415,7 +415,7 @@
</el-upload>
</el-form-item>
</el-col>
- </el-row>
+ </el-row> -->
<el-row v-if="dialogType == 'detail'">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
@@ -801,12 +801,18 @@
//鏂规硶闆嗗悎
methods: {
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
- created() {
+ created() {
+ console.log("getUnitList", 1);
this.getUnitList();
- this.getList();
+ console.log("getBaseInfoList", 2);
this.getBaseInfoList();
+ console.log("getlistUser", 3);
this.getlistUser();
+ console.log("getCurFundType", 4);
this.getCurFundType();
+ console.log("getList", 5);
+ this.getList();
+ console.log("last", 6);
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
@@ -1032,7 +1038,7 @@
});
});
},
-
+
/** 鎻愪氦鎸夐挳 */
submitForm() {
this.$refs["form"].validate((valid) => {
@@ -1658,7 +1664,7 @@
// row.itemArr = res.data;
// this.$forceUpdate();
// });
- },
+ },
//鑾峰彇涓撳鍒楄〃
getlistExternalperson() {
@@ -1710,7 +1716,7 @@
console.log("listUser", res);
this.userlist = res.data;
});
- },
+ },
deleteRows(row, index, rows) {
this.$confirm("鏄惁纭鍒犻櫎?", "鎻愮ず", {
@@ -1912,7 +1918,7 @@
} else {
this.$modal.msgError(response.msg);
}
- },
+ },
},
diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseslist/Modifydetails/index.vue
index be3fc18..6555bac 100644
--- a/src/views/project/travelexpenseslist/Modifydetails/index.vue
+++ b/src/views/project/travelexpenseslist/Modifydetails/index.vue
@@ -439,7 +439,7 @@
</el-table>
</el-row>
- <el-row v-if="dialogType == 'detail'">
+ <el-row v-if="dialogType == 'detail' || dialogType == 'check'">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳浜�" align="center" width="120" prop="checkusername" />
<el-table-column label="瀹℃牳鏃ユ湡" align="center" width="160" prop="createTime" />
@@ -450,9 +450,27 @@
<el-table-column label="瀹℃牳澶囨敞" align="center" prop="flowcontent" />
</el-table>
</el-row>
+ <el-row style="margin-top: 25px; margin-bottom: 5px" v-if="dialogType == 'check'">
+ <el-col :span="7">
+ <el-form-item label="瀹℃牳缁撴灉" align="left">
+ <el-radio-group v-model="checkObj.flowlevelone" align="left">
+ <el-radio label="1">閫氳繃</el-radio>
+ <el-radio label="2">涓嶉�氳繃</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-if="dialogType == 'check'">
+ <el-col :span="17">
+ <el-form-item label="瀹℃牳澶囨敞" align="left">
+ <el-input v-model="checkObj.flowconclusion" placeholder="澶囨敞" />
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm" v-if="dialogType == 'edit'">淇� 瀛�</el-button>
+ <el-button type="primary" @click="checksubmit" v-if="dialogType == 'check'">鎻� 浜�</el-button>
<!--<el-button @click="cancel">閫� 鍑�</el-button>-->
</div>
</div>
@@ -511,6 +529,7 @@
updateReimbursement,
exportReimbursement,
getdownload,
+ checkfund,
fundSubmit
} from "@/api/project/reimbursement";
import {
@@ -666,7 +685,18 @@
headers: {
Authorization: "Bearer " + getToken()
- }
+ },
+
+ //瀹℃壒淇℃伅
+ checkObj: {
+ flowlevelone: null,
+ flowconclusion: null,
+ fundid: null,
+ },
+
+ //淇濆瓨鎸夐挳鎺у埗
+ idisabled: false,
+
};
},
@@ -719,6 +749,9 @@
}
else if (pos == 3) {
this.handleDetail(ids);
+ }
+ else if (pos == 4) {
+ this.handleCheck(ids);
}
},
@@ -901,34 +934,36 @@
//璁＄畻琛ュ姪
this.getallowance(row);
+
},
//璁＄畻琛ュ姪
getallowance(row) {
- console.log("ro", row);
- //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
- if (row.destination != "") {
- var tempStr = row.destination;
+ if (row.persontype == "涓撹亴浜哄憳" || row.persontype == "鍗忚皟鍛�" || row.persontype == "绠＄悊浜哄憳") {
+ //鍏潅璐硅ˉ鍔╋細鏉窞妗愬簮锛屽缓寰凤紝娣冲畨60锛屾澀宸炲叾浠栧湴鍖�0锛岄潪鏉窞鍦板尯80
+ if (row.destination != "") {
+ var tempStr = row.destination;
- //楠岃瘉鍩庡競
- if (tempStr == "鏉窞") {
- row.otherexpense = "";
- } else if (
- tempStr == "鏉窞-妗愬簮" ||
- tempStr == "鏉窞-寤哄痉" ||
- tempStr == "鏉窞-娣冲畨"
- ) {
- row.otherexpense = (parseInt(row.days) * 60).toString();
- } else {
- row.otherexpense = (parseInt(row.days) * 80).toString();
+ //楠岃瘉鍩庡競
+ if (tempStr == "鏉窞") {
+ row.otherexpense = "";
+ } else if (
+ tempStr == "鏉窞-妗愬簮" ||
+ tempStr == "鏉窞-寤哄痉" ||
+ tempStr == "鏉窞-娣冲畨"
+ ) {
+ row.otherexpense = (parseInt(row.days) * 60).toString();
+ } else {
+ row.otherexpense = (parseInt(row.days) * 80).toString();
+ }
}
+
+ //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
+ row.foodallowance = (parseInt(row.days) * 100).toString();
+
+ //璁＄畻鍚堣
+ this.sumRowFee(row);
}
-
- //浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
- row.foodallowance = (parseInt(row.days) * 100).toString();
-
- //璁＄畻鍚堣
- this.sumRowFee(row);
},
getStandard(row) {
@@ -1210,11 +1245,12 @@
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
getReimbursementdetaillist(ids).then(res => {
this.rbDetails = res.data;
- console.log(this.rbDetails);
if (this.rbDetails.length == 0) {
this.addDetailRow(0);
}
+ //瀹炴椂鍚堣閲戦
+ //this.sumTotalFee();
for (let i = 0; i < this.rbDetails.length; i++) {
this.sumRowFee(this.rbDetails[i]);
//瑙ｆ瀽鍑哄樊鍦板潃
@@ -1226,9 +1262,6 @@
qu: this.rbDetails[i].traveltownname,
}; */
}
-
- //瀹炴椂鍚堣閲戦
- //this.sumTotalFee();
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
@@ -1250,6 +1283,67 @@
this.reset();
this.open = true;
const id = ids || this.ids;
+
+ getReimbursement(id).then(response => {
+ this.form = response.data;
+ //绁ㄦ嵁
+ this.fileListto = this.form.annexfiles
+ ? this.form.annexfiles
+ .split(",")
+ .map(item => ({ url: item, name: item }))
+ : [];
+
+ //瀹℃牳鐘舵��
+ this.form.recordstatus = response.data.recordstatus + "";
+ let ids = response.data.id;
+ let listFundflowparams = {
+ fundid: ids,
+ fundtype: 1
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+
+ //鎶ラ攢鏄庣粏
+ getReimbursementdetaillist(ids).then(res => {
+ this.rbDetails = res.data;
+ /*
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ this.rbDetails[i].index = i;
+ this.rbDetails[i].searchAddress = {
+ sheng: this.rbDetails[i].travelprovincename,
+ shi: this.rbDetails[i].travelcityname,
+ qu: this.rbDetails[i].traveltownname,
+ };
+ }
+ */
+ //鍚堣璐圭敤
+ // if (this.rbDetails.length > 0) this.sumTotalFee();
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ this.sumRowFee(this.rbDetails[i]);
+ }
+ });
+
+ //浠樻淇℃伅
+ this.queryParamsPayee.rbid = ids;
+ listReimbursementpayee(this.queryParamsPayee).then(res => {
+ this.rbPayees = res.rows;
+ if (this.rbPayees.length == 0) {
+ this.addPayeeRow(0);
+ }
+ });
+ });
+ },
+
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ handleCheck(ids) {
+ this.dialogType = "check";
+ this.title = "鎶ラ攢鐢宠璇︽儏";
+
+ this.reset();
+ this.open = true;
+ const id = ids || this.ids;
+ this.checkObj.fundid = id;
getReimbursement(id).then(response => {
this.form = response.data;
@@ -1285,9 +1379,13 @@
};
}
*/
- });
- if (this.rbDetails.length > 0) this.sumTotalFee();
+ //鍚堣璐圭敤
+ // if (this.rbDetails.length > 0) this.sumTotalFee();
+ for (let i = 0; i < this.rbDetails.length; i++) {
+ this.sumRowFee(this.rbDetails[i]);
+ }
+ });
//浠樻淇℃伅
this.queryParamsPayee.rbid = ids;
@@ -1300,10 +1398,36 @@
});
},
+ //鎻愪氦瀹℃牳鎰忚
+ checksubmit() {
+ let checkfundobj = {
+ flowconclusion: this.checkObj.flowlevelone,
+ flowcontent: this.checkObj.flowconclusion,
+ fundid: this.checkObj.fundid,
+ };
+
+ if (
+ checkfundobj.flowconclusion == null ||
+ checkfundobj.flowconclusion == undefined ||
+ checkfundobj.flowconclusion == ""
+ ) {
+ this.$modal.msgError("璇烽�夋嫨瀹℃牳缁撹鍚庡啀鎻愪氦瀹℃壒缁撴灉!");
+ return;
+ }
+
+ checkfund(checkfundobj).then((res) => {
+ this.reset();
+ this.open = false;
+ this.getList();
+ this.$modal.msgSuccess("鎻愪氦瀹℃牳鎴愬姛!");
+ });
+ },
+
/** 鎻愪氦淇濆瓨鎸夐挳 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
+ // idisabled=true;
/**
let indexErrTime = this.rbDetails.findIndex((item) => {
if (item.endtime && item.starttime) {
@@ -1412,6 +1536,9 @@
this.$modal.msgSuccess("淇敼鎶ラ攢鍗曚繚瀛樻垚鍔�!");
this.open = false;
+
+ // 鍏抽棴绐楀彛
+ this.$router.go(-1);
// this.getList();
// })
// .catch(err => {
@@ -1438,11 +1565,16 @@
this.$modal.msgSuccess("鏂板鎶ラ攢鍗曚繚瀛樻垚鍔�!");
this.open = false;
// this.getList();
+ // 鍏抽棴绐楀彛
+ this.$router.go(-1);
+
})
.catch(err => {
this.$modal.msgError("鏂板鎶ラ攢鍗曚繚瀛樺け璐ワ紒");
});
}
+
+
}
});
},
@@ -1940,7 +2072,7 @@
border: 1px solid #dcdfe6;
-webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
0 0 6px 0 rgba(0, 0, 0, 0.04);
- box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix.
+ box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix.
}
.pdftit {
--
Gitblit v1.9.3