From 86a98c135c7ebc417f8af2045aa105a94f2ccbeb Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 23 五月 2023 18:45:17 +0800
Subject: [PATCH] 修改了财务和审批
---
src/views/project/fund/expertFeeFundApply/index.vue | 166 ++++++++++++++++++++++++++++--------------------------
1 files changed, 86 insertions(+), 80 deletions(-)
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeFundApply/index.vue
index 96d3ecf..ed687bc 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeFundApply/index.vue
@@ -59,12 +59,12 @@
</el-col>
<el-col :span="9">
<el-form-item label="鎹愮尞缂栧彿">
- <el-input v-model="curCase.donorno" disabled></el-input>
+ <el-input v-model="curCase.donorno" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" disabled></el-input>
+ <el-input v-model="curCase.name" :disabled="true"></el-input>
</el-form-item>
</el-col>
<el-col>
@@ -86,14 +86,16 @@
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
<!-- <el-table-column
label="鐢宠閲戦"
align="center"
prop="amountrequested"
width="120px"
- /> -->
+ />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" /> -->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width"
width="280px">
<template slot-scope="scope">
@@ -132,35 +134,33 @@
<el-form style="height: 550px; overflow-y: auto; overflow-x: hidden" ref="form" :model="form" label-width="120px"
:rules="rules">
<el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="璐圭敤绫诲瀷">
- <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</el-radio>
+ <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>
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input disabled v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ <el-col :span="5">
+ <el-form-item label="鎵�灞炵粍鍒�" prop="deptmentname">
+ <el-input v-model="form.deptmentname" placeholder="璇疯緭鍏ユ墍灞炵粍鍒�" clearable />
</el-form-item>
</el-col>
- <el-col :span="7">
- <el-form-item label="瀹℃牳鐘舵��" prop="recordstatus">
- <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
- <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-col :span="5">
+ <el-form-item label="缁勯暱" prop="managername">
+ <el-input v-model="form.managername" placeholder="璇疯緭鍏ョ粍闀�" clearable />
</el-form-item>
- </el-col>
- </el-row>
- <el-row style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
+ </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-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-row>
+ <el-row style="text-align: left">
+ <!--
<el-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
@@ -171,18 +171,46 @@
<org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
</el-form-item>
</el-col>
- </el-row>
- <el-row style="text-align: left">
- <el-col :span="14">
+ -->
+ <el-col :span="5">
+ <el-form-item label="璐圭敤绫诲瀷">
+ <el-radio v-model="form.applytype" label="1">涓撳璐圭敤鐢宠</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-form-item>
</el-col>
- <el-col :span="7">
- <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>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row style="text-align: left">
+ <el-col :span="5">
+ <el-form-item label="鍚堣閲戦" prop="amountrequested">
+ <el-input v-model="form.amountrequested" placeholder="鐢宠閲戦" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡墠閲戦" prop="pretaxcost">
+ <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="绋庡悗閲戦" prop="pretaxcost">
+ <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="鐢宠鐘舵��" prop="recordstatus">
+ <!-- <el-input v-model="form.recordstatus" placeholder="瀹℃牳鎰忚"/> -->
+ <el-select v-model="form.recordstatus" placeholder="璇烽�夋嫨瀹℃牳鐘舵��" clearable size="small" :disabled="true">
+ <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>
@@ -289,16 +317,16 @@
<el-table-column prop="quantity" align="center" label="鏁伴噺" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
<el-table-column prop="price" align="center" label="浠锋牸" width="120" v-if="form.applytype == '3'">
<template slot-scope="scope">
<el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
- sumTotalFee(scope.row);
- }
+ sumTotalFee(scope.row);
+ }
" />
</template>
</el-table-column>
@@ -341,31 +369,14 @@
</template>
</el-table-column>
</el-table>
- </el-row>
- <el-row>
- <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="7">
- <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
- <el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <el-col :span="7">
- <el-form-item label="绋庡悗鍚堣" prop="pretaxcost">
- <el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
- </el-form-item>
- </el-col>
- <!--
+ </el-row> <!--
+ <el-row>
<el-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
</el-form-item>
- </el-col>
- -->
- </el-row>
- <!--
+ </el-col>
+ </el-row>
<el-row>
<el-col :span="7">
<el-form-item label="OPO涓績绛惧瓧" prop="opochecker">
@@ -404,7 +415,7 @@
<el-form-item label="璐圭敤鐢宠闄勪欢" align="left" prop="annexbankcard">
<el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
: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>
@@ -590,6 +601,9 @@
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炰笟鍔＄粍", trigger: "blur" },
+ ],
// amountrequested: [
// { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
// ],
@@ -705,13 +719,11 @@
singleDetail.unitname = singleDetail.unitno;
}
}
- debugger;
+
this.fundDetailArr[tempIndex] = singleDetail;
this.detailInfoDialogShow = false;
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -753,7 +765,6 @@
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
if (
@@ -803,7 +814,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -814,14 +824,13 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -857,7 +866,6 @@
},
getUnitList() {
listOrganization(3).then((response) => {
- debugger;
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
//organizationid: response.rows[i].organizationid,
@@ -887,6 +895,10 @@
this.form.infoid = this.curCase.id;
this.form.username = this.defaultperson.nickName;
this.form.userno = this.defaultperson.userName;
+
+ this.form.deptmentname = this.defaultperson.dept.deptName;
+ this.form.deptmentno = this.defaultperson.dept.deptId;
+ this.form.managername = this.defaultperson.dept.leader;
// this.form.createTime = nowdate;
//this.open = true;
//this.initFundApplyForm();
@@ -1014,7 +1026,6 @@
// });
},
addAll(row, i, arr) {
- console.log("cecececececececece", row, row.itemArr);
row.itemArr.map((res) => {
if (res.id !== row.itemid) {
let a = arr.length;
@@ -1024,7 +1035,6 @@
arr[a].itemid = res.id;
getdetailsByItemId(arr[a].itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -1035,7 +1045,6 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
row.fundblock = fundblock;
});
}
@@ -1233,7 +1242,6 @@
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res);
this.personlist = res.rows;
});
},
@@ -1251,12 +1259,10 @@
});
}
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
selectpersonmsg(row) {
- console.log("row", row);
// if(row.beneficiaryname)
this.personlist.map((res) => {
if (row.beneficiaryname == res.username) {
@@ -1301,7 +1307,6 @@
this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
getownFundDetail(id).then((res) => {
- console.log("鏌ヨ鏄庣粏璁板綍锛�", res);
this.fundDetailArr = res.data;
for (let m = 0; m < this.fundDetailArr.length; m++) {
this.fundDetailArr[m].itemArr = [];
@@ -1314,7 +1319,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1357,7 +1361,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1403,14 +1406,12 @@
this.$set(this.fundDetailArr, res.data);
this.sumTotalFee();
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
});
});
}
// getownFundDetail(this.form.id).then(res=>{
// this.$set(this.fundDetailArr,res.data)
// this.fundDetailArr = res.data
- // console.log('鍒犻櫎鍚�',this.fundDetailArr)
// })
});
} else {
@@ -1461,13 +1462,11 @@
}
// this.form.amountrequested = allSum.toFixed(2);
// this.$forceUpdate();
- // console.log(this.form);
},
//鑾峰彇璐圭敤绫诲瀷
getCurFundType() {
getFundTypeAll(this.currentApplyType).then((res) => {
- console.log("璐圭敤绫诲瀷", res.data);
let dataList = res.data;
this.fundtypeArrAll = dataList;
this.fundtypeArr = [];
@@ -1493,7 +1492,6 @@
},
mixExport(scope) {
- console.log(scope);
this.dayin(scope.row.id);
//this.totaldayin(id);
},
@@ -1550,7 +1548,6 @@
for (let i = 0; i < tempItemArr.length; i++) {
let pym = tempItemArr[i].itempinyin;
if (pym != null && pym != undefined && pym != "") {
- console.log(pym);
if (pym.indexOf(val) != -1) {
result.push(tempItemArr[i]);
}
@@ -1583,7 +1580,16 @@
} else {
this.$modal.msgError(response.msg);
}
- //console.log("涓婁紶鏂囦欢鍚庯細" + JSON.stringify(this.fileList));
+ },
+
+ // 涓嬭浇鏂囦欢
+ downFile(item) {
+ const url = process.env.VUE_APP_BASE_API + item.url
+ var a = document.createElement('a');
+ var event = new MouseEvent('click');
+ a.download = item.name;
+ a.href = url;
+ a.dispatchEvent(event);
},
},
--
Gitblit v1.9.3