From dfe9df350655b09b344f38e099cec95d46a2b48a Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 14 八月 2023 19:32:16 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 39 ++++++++++---
src/views/project/fund/medicalCostApply/index.vue | 1
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 50 +++++++++++-----
src/views/project/fund/officeExpenseApply/index.vue | 11 ---
src/views/project/travelexpenseapply/index.vue | 54 ++++++++++++------
5 files changed, 102 insertions(+), 53 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index 11fdf8e..b6116e3 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -14,7 +14,8 @@
</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%">
+ <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>
@@ -46,9 +47,13 @@
}}</el-radio>
</el-form-item>
</el-col>
- <el-col :span="10">
- <el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input v-model="form.remark" placeholder="鐢宠璇存槑" />
+ <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 label="閾惰璐﹀彿" prop="bankcardno">
+ <el-input v-model="form.bankcardno" placeholder="璇疯緭鍏ラ摱琛岃处鍙�" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -81,6 +86,11 @@
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
</el-form-item>
</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="name">
<el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
@@ -899,7 +909,6 @@
this.businessType == "2" ||
this.businessType == "3"
) {
- console.log("", this.curCase);
this.form.infoid = this.curCase.id;
this.form.donorname = this.curCase.name;
this.form.donorno = this.curCase.donorno;
@@ -1318,12 +1327,13 @@
}
this.form.username = this.userprofile.nickName;
this.form.userno = this.userprofile.userName;
- this.form.phone = this.userprofile.phonenumber;
this.form.deptmentname = this.userprofile.dept.deptName;
this.form.deptmentno = this.userprofile.dept.deptId;
this.form.managername = this.userprofile.dept.leader;
+ this.form.phone = this.userprofile.phonenumber;
// this.form.applytype = this.businessType;
// this.form.createTime = new Date();
+ this.getUserAccount();
});
},
@@ -1357,6 +1367,17 @@
exportName: this.personlist[j].username
});
}
+ }
+ });
+ },
+
+ //鑾峰彇缁忓姙浜鸿处鍙蜂俊鎭�
+ getUserAccount() {
+ this.personlist.map(res => {
+ if (res.username == this.form.username) {
+ this.form.bankname = res.depositbank;//res.branchbankname銆乺es.depositbank;
+ this.form.bankcardno = res.bankcardno;
+ this.form.phone = res.telephone;
}
});
},
@@ -2065,13 +2086,13 @@
created() {
//鑾峰彇璺敱鍙傛暟
this.getroute();
- this.getUserProfile();
- this.getUserList();
+ this.getExternalList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
- this.getExternalList();
+ this.getUserList();
+ this.getUserProfile();
// this.getFeeUnitList();
},
diff --git a/src/views/project/fund/medicalCostApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
index 50cd556..fd3981d 100644
--- a/src/views/project/fund/medicalCostApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -1115,7 +1115,6 @@
listFund(this.fundQueryParam).then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
- console.log("donateconsolationfundList", this.donateconsolationfundList);
});
},
diff --git a/src/views/project/fund/officeExpenseApply/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
index 91215ec..e548b45 100644
--- a/src/views/project/fund/officeExpenseApply/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -666,13 +666,11 @@
});
} else if (this.detailInfoDialogShowType == "unit") {
singleDetail.unitno = this.funddetailForm.unitno;
- console.log("this.funddetailForm", this.funddetailForm);
try {
let unitIndex = this.bankaccountlist.findIndex(
(item) => singleDetail.unitno == item.reportNo
);
- console.log("this.bankaccountlist[unitIndex]", this.bankaccountlist[unitIndex]);
if (unitIndex > -1) {
singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
@@ -684,7 +682,7 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- console.log("singleDetail", singleDetail);
+
this.fundDetails[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
@@ -1190,7 +1188,6 @@
//鑾峰彇閾惰璐﹀彿鍒楄〃锛岀被鍨嬫槸鏈烘瀯
listReportname("org").then((res) => {
this.bankaccountlist = res.data;
- console.log("this.bankaccountlist", this.bankaccountlist);
});
},
@@ -1346,7 +1343,6 @@
getUnitList() {
listOrganization(3).then((res) => {
- console.log("listOrganization", res);
for (let i = 0; i < res.rows.length; i++) {
this.unitList.push({
organizationid: res.rows[i].organizationid,
@@ -1439,9 +1435,6 @@
},
//鏂囦欢涓婁紶鎴愬姛鍥炶皟
uploadSccess(response, file, fileList) {
- console.log("response", response);
- console.log("file", file);
- console.log("fileList", fileList);
//鑾峰彇闄勪欢淇℃伅浣嶇疆
if (response.code == 200) {
this.form.filename = file.raw.name;
@@ -1464,9 +1457,7 @@
// 鐐瑰嚮鏂囦欢
Filepopup(index, rows, row) {
- console.log(index, rows, row);
this.atpresent = index;
- console.log(this.atpresent);
this.pdfVisible = true;
if (this.fundDetails[index].annexfilesList) {
this.fileListto = this.rbDetails[index].annexfilesList;
diff --git a/src/views/project/travelexpenseapply/index.vue b/src/views/project/travelexpenseapply/index.vue
index d5a9478..6104285 100644
--- a/src/views/project/travelexpenseapply/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -44,18 +44,18 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" @click="handleAdd">鏂板</el-button>
<!-- v-hasPermi="['project:funddetail:add']" -->
</el-col>
<el-col :span="1.5">
- <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+ <el-button type="warning" plain icon="el-icon-download" :loading="exportLoading"
@click="handleExport">瀵煎嚭</el-button>
</el-col>
<!-- v-hasPermi="['project:funddetail:export']" -->
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
+ <el-table :row-class-name="rowClassName" v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange" >
<!-- <el-table-column type="selection" width="55" align="center" />
<el-table-column label="鎶ラ攢浜虹被鍒�" width="120" align="center" prop="costtype">
<template slot-scope="scope">
@@ -90,7 +90,7 @@
<el-table-column label="鎶ラ攢鍚堣" align="center" prop="financechecher"/>-->
<!-- <el-table-column label="璐㈠姟瀹℃牳" width="120" align="center" prop="financechecher" /> -->
<el-table-column label="鎹愮尞鑰�" width="150" align="center" prop="donorname" />
- <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width" width="210">
+ <el-table-column label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button v-if="scope.row.recordstatus == -1 || scope.row.recordstatus == 1" size="mini" type="text"
icon="el-icon-upload2" @click="handleup(scope.row)">涓婃姤</el-button>
@@ -388,8 +388,8 @@
<el-table-column prop="trafficexpense" label="浜ら�氳垂" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.trafficexpense" placeholder="浜ら�氳垂" @blur="val => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -408,8 +408,8 @@
<el-table-column prop="hotelexpense" label="浣忓璐�" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.hotelexpense" placeholder="浣忓璐�" @blur="val => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -417,24 +417,24 @@
<el-table-column prop="foodexpenses" label="椁愯垂鎶ラ攢" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodexpenses" placeholder="浼欓璐规姤閿�" @blur="val => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</template>
</el-table-column>
<el-table-column prop="foodallowance" label="浼欓琛ュ姪" align="center" width="80">
<template slot-scope="scope">
<el-input v-model="scope.row.foodallowance" placeholder="浼欓璐硅ˉ鍔�" @blur="val => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</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 => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -442,8 +442,8 @@
<el-table-column prop="otherfeeamount" label="鍏朵粬璐圭敤" align="center" width="90">
<template slot-scope="scope">
<el-input v-model="scope.row.otherfeeamount" placeholder="鍏朵粬璐圭敤" @blur="val => {
- sumRowFee(scope.row);
- }
+ sumRowFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -592,7 +592,7 @@
<!-- <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="20" :headers="headers" :on-success="(response, file, fileList) =>
- uploadSccess(response, file, fileList)
+ uploadSccess(response, file, fileList)
" :on-preview="downFile" :disabled="dialogType == 'detail'" :on-error="handleUploadError"
:on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
<el-button :disabled="dialogType == 'detail'" size="small" type="primary">涓婁紶</el-button>
@@ -1963,7 +1963,25 @@
chineseStr += cnInteger;
}
return chineseStr;
- }
+ },
+
+ //鏄庢樉鎻愮ず瀹℃壒閫�鍥炶褰�
+ rowClassName({ row, column, rowIndex, columnIndex }) {
+ //姝ゅ垽鏂负鏈�鍚庝笁琛�
+ if (row.backflowlevel==199) {
+ return "addClassva";
+ }
+ },
+
}
};
</script>
+<!-- <style scoped> -->
+<!-- 涓嶅彲鍔爏coped,浼氱嫭绔嬫牱寮廵lement璁块棶涓嶅埌 -->
+<style>
+.addClassva {
+ /* background: #10aec2; */
+ background:#10aec2!important;
+ /* color:whitesmoke; */
+}
+</style>
diff --git a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
index 15cffd2..1c5b412 100644
--- a/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
+++ b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
@@ -443,7 +443,7 @@
<el-row style="margin-top: 25px; margin-bottom: 5px" v-if="operationType != 'edit'">
<el-col :span="20">瀹℃牳璁板綍</el-col>
</el-row>
- <el-row v-if="operationType != 'edit'">
+ <el-row v-if="operationType != 'add'">
<el-table :data="fundflowList" border>
<el-table-column label="瀹℃牳浜�" align="center" width="150" prop="checkusername" />
<el-table-column label="瀹℃牳鏃ユ湡" align="center" width="200" prop="createTime" />
@@ -608,6 +608,9 @@
loading: true,
// 瀵煎嚭閬僵灞�
exportLoading: false,
+
+ // 褰撳墠鍗曟嵁ID
+ curId:0,
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -735,17 +738,17 @@
mounted() {
//閫夋嫨涓氬姟绫诲瀷:1銆佹柊澧烇紱2銆佷慨鏀癸紱3銆佹煡鐪�
- let ids = this.$route.query.id;
+ let curId = this.$route.query.id;
let pos = this.$route.query.pos;
this.defaultperson = this.$route.query.routerparam;
if (pos == 1) {
- this.handleAdd(ids);
+ this.handleAdd(curId);
} else if (pos == 2) {
- this.handleUpdate(ids);
+ this.handleUpdate(curId);
} else if (pos == 3) {
- this.handleDetail(ids);
+ this.handleDetail(curId);
} else if (pos == 4) {
- this.handleCheck(ids);
+ this.handleCheck(curId);
}
},
@@ -947,7 +950,16 @@
}
//浼欓璐硅ˉ鍔╋細鍩庡競锛堣タ钘忥紝鏂扮枂锛岄潚娴�.120锛夛紙鍏朵粬100锛�
- row.foodallowance = (parseInt(row.days) * 100).toString();
+ if (tempStr == "鏉窞") {
+ row.foodallowance = "";
+ }
+ else if (tempStr == "瑗胯棌" || tempStr == "鏂扮枂" || tempStr == "闈掓捣") {
+ row.foodallowance = (parseInt(row.days) * 120).toString();
+ }
+ else {
+ row.foodallowance = (parseInt(row.days) * 100).toString();
+ }
+
//璁＄畻鍚堣
this.sumRowFee(row);
@@ -1207,7 +1219,7 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(ids) {
+ handleUpdate(curId) {
// this.$router.push({
// path: "/finance/travelexpenseslist/Modifydetails/",
// query: { id: ids }
@@ -1219,8 +1231,7 @@
this.title = "鎶ラ攢鐢宠淇敼";
//鑾峰彇鎶ラ攢涓讳俊鎭�
- const id = ids || this.ids;
- getReimbursement(id).then(response => {
+ getReimbursement(curId).then(response => {
this.form = response.data;
this.fileListto = this.form.annexfiles
? this.form.annexfiles
@@ -1228,12 +1239,10 @@
.map(item => ({ url: item, name: item }))
: [];
this.form.recordstatus = response.data.recordstatus + "";
-
- let ids = response.data.id;
+
//鑾峰彇鎶ラ攢鏄庣粏淇℃伅
- getReimbursementdetaillist(ids).then(res => {
+ getReimbursementdetaillist(curId).then(res => {
this.rbDetails = res.data;
- console.log(this.rbDetails);
if (this.rbDetails.length == 0) {
this.addDetailRow(0);
}
@@ -1254,13 +1263,24 @@
});
//鑾峰彇鎶ラ攢鎵撴淇℃伅
- this.queryParamsPayee.rbid = ids;
+ this.queryParamsPayee.rbid = curId;
listReimbursementpayee(this.queryParamsPayee).then(res => {
this.rbPayees = res.rows;
if (this.rbPayees.length == 0) {
this.addPayeeRow(0);
}
});
+
+ //瀹℃牳鐘舵��
+ this.form.recordstatus = response.data.recordstatus + "";
+ let listFundflowparams = {
+ fundid: curId,
+ fundtype: 1
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+
});
},
--
Gitblit v1.9.3