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/fundApply/index.vue | 227 ++++++++++++++++++++++++++++----------------------------
1 files changed, 115 insertions(+), 112 deletions(-)
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index a475f27..dfee463 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -17,14 +17,12 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="6">
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-col>
</el-row>
</el-form>
-
<el-row>
<el-col :span="8">
<el-card shadow="never">
@@ -59,12 +57,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> </el-col>
@@ -81,27 +79,26 @@
<el-table-column label="绋庡墠閲戦鍚堣" align="center" prop="pretaxcost" width="120px" />
<el-table-column label="绋庡悗閲戦鍚堣" align="center" prop="taxedcost" width="120px" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="150px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" />
+ <!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
-
<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">
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ " size="mini" type="text" icon="el-icon-edit" @click="handleup(scope.row)">涓婃姤</el-button>
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+ " size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
v-hasPermi="['project:ethicalfund:edit']">淇敼</el-button>
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
- <el-button v-if="
- scope.row.recordstatus == -1 ||
+ <el-button v-if="scope.row.recordstatus == -1 ||
scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
v-hasPermi="['project:ethicalfund:delete']">鍒犻櫎</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
v-hasPermi="['project:ethicalfund:download']">涓嬭浇</el-button>
@@ -119,35 +116,72 @@
style="text-align: center" v-loading="loading">
<el-form 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="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</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-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 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 style="text-align: left">
- <el-col :span="7">
- <el-form-item label="鐢宠浜�" prop="username">
- <el-select v-model="form.username" placeholder="鐢宠浜�" clearable filterable allow-create style="width: 100%">
+ <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-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="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="5">
+ <el-form-item label="鐢宠绫诲瀷">
+ <el-radio v-model="form.applytype" label="2">浼︾悊瀹℃煡涓撳璐圭敵璇�</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="5">
+ <el-form-item label="鎹愮尞鑰�" prop="name">
+ <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ </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-col :span="7">
<el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
<el-input v-model="form.phone" placeholder="璇疯緭鍏ョ敵璇疯�呯殑鑱旂郴鏂瑰紡" clearable />
@@ -158,20 +192,7 @@
<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-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-form-item>
- </el-col>
+-->
</el-row>
<el-row style="margin-bottom: 10px">
<el-col :span="4">
@@ -209,7 +230,7 @@
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
- <!-- <el-input
+ <!-- <el-input
v-model="scope.row.beneficiaryname"
placeholder="濮撳悕"
/> -->
@@ -226,21 +247,19 @@
</el-table-column>
<el-table-column prop="amount" align="center" label="绋庡墠閲戦" width="120" v-if="form.applytype != 3">
<template slot-scope="scope">
- <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.amount" placeholder="绋庡墠閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="taxedamount" align="center" label="绋庡悗閲戦" width="120" v-if="form.applytype != '3'">
<template slot-scope="scope">
- <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="
- (val) => {
- sumTotalFee();
- }
- " />
+ <el-input v-model="scope.row.taxedamount" placeholder="绋庡悗閲戦" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
<el-table-column prop="unitno" align="center" label="鍗曚綅" width="220">
@@ -252,21 +271,19 @@
<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();
- }
- " />
+ <el-input v-model="scope.row.quantity" placeholder="鏁伴噺" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</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();
- }
- " />
+ <el-input v-model="scope.row.price" placeholder="浠锋牸" @blur="(val) => {
+ sumTotalFee();
+ }
+ " />
</template>
</el-table-column>
@@ -302,29 +319,16 @@
<el-button type="text" size="mini" @click="addRow(scope.$index)">鏂板</el-button>
<el-button @click.native.prevent="
deleteRows(scope.row, scope.$index, fundDetailArr)
- " type="text" size="small">
+ " type="text" size="small">
鍒犻櫎
</el-button>
</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-col :span="7">
<el-form-item label="棰勬敮閲戦" prop="prepaidamount">
<el-input v-model="form.prepaidamount" placeholder="鐢宠閲戦" />
@@ -360,16 +364,15 @@
<el-input v-model="form.financechecher" placeholder="璇疯緭鍏ヨ储鍔″鏍�" />
</el-form-item>
</el-col>
- -->
</el-row>
+ -->
<el-row>
<el-col :span="24">
<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)
- " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
+ :headers="headers" :on-success="(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>
</el-upload>
@@ -552,6 +555,9 @@
createTime: [
{ required: true, message: "璇疯緭鍏ョ敵璇锋棩鏈�", trigger: "blur" },
],
+ deptmentname: [
+ { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" },
+ ],
amountrequested: [
{ required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
],
@@ -665,8 +671,6 @@
this.detailInfoDialogShow = false;
},
handleup(row) {
- console.log("rowrowrowrow", row);
-
this.$confirm("鏄惁纭灏嗙櫥璁拌褰曚笂鎶ワ紵", "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
@@ -701,7 +705,6 @@
},
getUsermsg() {
getUserProfile().then((response) => {
- console.log("鐧诲綍鐢ㄦ埛淇℃伅", response.data);
this.defaultperson = response.data;
this.standardlevel = response.data.standardlevel;
});
@@ -755,6 +758,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();
@@ -804,7 +811,6 @@
}
getdetailsByItemId(row.itemid).then((res) => {
- console.log("璐圭敤鏁版嵁", res.data);
let fundmsg = res.data;
let fundblock = [];
fundmsg.forEach((item) => {
@@ -815,7 +821,7 @@
servicesscope: item.id,
});
});
- console.log("缁勮鍚庣殑鏁版嵁", fundblock);
+
row.fundblock = fundblock;
row.servicesscope = null;
row.servicesscopename = "";
@@ -830,10 +836,10 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
+ id: null,
recordstatus: "-1",
username: null,
userno: null,
- id: null,
infoid: null,
donorno: null,
delFlag: null,
@@ -1066,7 +1072,6 @@
});
},
selectremark(row) {
- console.log("row", row.amount, this.fundblock);
this.fundblock.forEach((item, i) => {
if (item.expensedescribe === row.servicesscopename) {
row.servivesscope = item.servivesscope;
@@ -1083,7 +1088,6 @@
});
},
selectamount(row) {
- console.log("row", row.amount);
this.fundblock.forEach((item, i) => {
if (item.expense === row.amount) {
row.remark = item.expensedescribe;
@@ -1169,7 +1173,6 @@
servicesscope: this.fundDetailArr[m].servicesscope,
});
}
- // console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
});
});
},
@@ -1215,14 +1218,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 {
@@ -1279,7 +1280,6 @@
this.form.pretaxcost = preTaxSum.toFixed(2);
this.form.taxedcost = taxedSum.toFixed(2);
this.$forceUpdate();
- console.log(this.form);
},
//鑾峰彇璐圭敤绫诲瀷
@@ -1294,7 +1294,6 @@
label: dataList[m].itemTypeName,
});
}
- console.log(this.fundtypeArr);
});
},
@@ -1367,19 +1366,16 @@
listReportname(arr[i]).then((res) => {
this.arrr2 = res.data;
this.arrr3 = this.arrr3.concat(this.arrr2);
- console.log("adadadadasdsad", this.arrr3, this.userlist);
});
}
},
getlistExternalperson() {
listExternalperson().then((res) => {
- console.log("浜哄憳琛細", res.rows);
this.personlist = res.rows;
});
},
selectpersonmsg(row, rowindex) {
- console.log("row", row);
this.personlist.map((res) => {
if (row.beneficiaryno === res.userno) {
row.beneficiaryname = res.username;
@@ -1402,7 +1398,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]);
}
@@ -1419,7 +1414,6 @@
getUnitList() {
listOrganization(3).then((response) => {
- console.log("鏈烘瀯鍒楄〃锛�" + JSON.stringify(response));
for (let i = 0; i < response.rows.length; i++) {
this.unitList.push({
organizationid: response.rows[i].organizationid,
@@ -1481,7 +1475,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);
},
},
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
--
Gitblit v1.9.3