From f894e1b53bcc948cb1fc9aecd2c01a77d7a1db03 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 11 八月 2023 18:34:46 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 82 +++++++++++++++++++++++---
src/views/project/fundcheck/medicalCostCheck/index.vue | 39 ++++++++----
src/views/project/fundcheck/expertFeeCheck/index.vue | 38 ++++++------
3 files changed, 117 insertions(+), 42 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index bb5fe50..f640a34 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -71,7 +71,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="搴旂即绋�" prop="taxcost">
+ <el-form-item label="搴旂即绋�" prop="taxcost" v-if="businessType == '1' || businessType == '2'">
<el-input v-model="form.taxcost" placeholder="搴旂即绋庨噾棰濆悎璁�" :disabled="true" />
</el-form-item>
</el-col>
@@ -86,15 +86,15 @@
<el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</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>-->
</el-row>
<el-row style="margin-top: 5px; margin-bottom: 5px" />
<el-row style="margin-bottom: 10px" v-if="businessType == '1'">
@@ -156,8 +156,8 @@
" />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount" align="center"
- label="绋庡墠閲戦" width="120">
+ <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
+ align="center" label="绋庡墠閲戦" width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -505,6 +505,7 @@
getdownloadSH,
getdownloadSS,
getdownloadYX,
+ checkfund,
getdownloadBX,
addorupdateFund,
getdetailsByItemId
@@ -706,6 +707,12 @@
usertype: null,
wbm: null
},
+ //瀹℃壒鍙傛暟
+ checkObj: {
+ flowlevelone: null,
+ flowconclusion: null,
+ fundid: null,
+ },
// 鏌ヨ鍙傛暟
queryParams: {
@@ -851,6 +858,7 @@
this.curId = this.$route.query.id;
this.businessType = this.$route.query.businessType;
this.operationType = this.$route.query.operationType;
+ console.log(this.businessType, this.operationType);
//鑾峰彇璐圭敤椤圭洰绫诲瀷
this.getFundType();
@@ -863,7 +871,7 @@
this.curCase = this.$route.query.curCase;
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
} else if (this.businessType == "3") {
- this.curCase = this.$route.query.curCase;
+ if (this.operationType != "check") { this.curCase = this.$route.query.curCase; }
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
} else if (this.businessType == "4") {
this.businessName = "鏉傞」璐圭敤鎶ラ攢鍗�";
@@ -961,6 +969,44 @@
});
});
},
+ /** 淇敼鎸夐挳鎿嶄綔 */
+ handleCheck() {
+ this.isopen = 0;
+ this.reset();
+
+ getFund(this.curId).then(response => {
+ this.form = response.data;
+ //闄勪欢澶勭悊
+ // this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
+
+ //涓氬姟鏄庣粏
+ getownFundDetail(this.curId).then(res => {
+ console.log(res);
+ this.rbDetails = res.data;
+ for (let m = 0; m < this.rbDetails.length; m++) {
+ this.rbDetails[m].itemlist = [];
+ this.getitemlist(m, this.rbDetails[m]);
+ this.rbDetails[m].rowfeeblocks = [];
+ this.rbDetails[m].rowfeeblocks.push({
+ expense: this.rbDetails[m].expense,
+ expensedescribe: this.rbDetails[m].servicesscopename,
+ remark: this.rbDetails[m].servicesscope,
+ servicesscope: this.rbDetails[m].servicesscope
+ });
+ }
+ });
+
+ //涓氬姟娴佺▼
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
+ listFundflow(listFundflowparams).then(res => {
+ this.fundflowList = res.rows;
+ });
+ });
+
+ },
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail() {
@@ -969,10 +1015,6 @@
getFund(this.curId).then(response => {
this.form = response.data;
- let listFundflowparams = {
- fundid: this.curId,
- fundtype: this.businessType
- };
//闄勪欢澶勭悊
// this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -997,7 +1039,11 @@
}
});
- //涓氬姟娴佺▼
+ //涓氬姟娴佺▼
+ let listFundflowparams = {
+ fundid: this.curId,
+ fundtype: 2
+ };
listFundflow(listFundflowparams).then(res => {
this.fundflowList = res.rows;
});
@@ -1250,6 +1296,20 @@
});
},
+ //瀹℃壒鎻愪氦
+ checksubmit() {
+ let checkFundObj = {
+ // fundid: this.checkObj.fundid,
+ fundid: this.curId,
+ flowconclusion: this.checkObj.flowlevelone,
+ flowcontent: this.checkObj.flowconclusion,
+ };
+ checkfund(checkFundObj).then((res) => {
+ this.reset();
+ this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+ });
+ },
+
// 鍙栨秷鎸夐挳
cancel() {
// this.reset();
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 39fb306..f5ab0e0 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -33,33 +33,36 @@
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <!--
<el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
<template slot-scope="scope">
<span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
style="color: #5fb878; font-weight: bold"></i></span>
- <!-- <span v-else>寰呭鏍�</span> -->
+ <span v-else>寰呭鏍�</span>
</template>
</el-table-column>
+ -->
<el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="缁忓姙浜�" align="center" prop="username" width="120px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="160px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
<!-- <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" /> -->
<!-- <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" /> -->
- <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="taxedcost" width="120px" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
- <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
- <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="180">
+ <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> -->
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="200">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
<el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
<!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />-->
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
@@ -124,7 +127,7 @@
</el-form-item></el-col>
<el-col :span="10">
<el-form-item label="鐢宠璇存槑" prop="remark">
- <el-input disabled v-model="form.remark" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" clearable />
+ <el-input disabled v-model="form.remark" placeholder="璇疯緭鍏ョ敵璇疯鏄�" clearable />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -151,30 +154,29 @@
-->
</el-row>
<el-row>
- <el-col :span="5">
- <el-form-item label="鍚堣閲戦" prop="amountrequested">
+ <!-- <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> -->
<el-col :span="5">
- <el-form-item label="绋庡墠閲戦" prop="amountrequested">
+ <el-form-item label="绋庡墠鍚堣" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" />
</el-form-item>
</el-col>
<el-col :span="5">
- <el-form-item label="绋庡悗閲戦" prop="amountrequested">
+ <el-form-item label="绋庡悗鍚堣" prop="taxedcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" />
</el-form-item>
- </el-col>
+ </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-form-item>
+ </el-col>-->
</el-row>
<el-row>
<el-col :span="4">
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index 0bcef46..97a0d55 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -32,26 +32,28 @@
<el-form ref="infoform" label-width="100px">
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <!--
<el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
<template slot-scope="scope">
<span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
style="color: #5fb878; font-weight: bold"></i></span>
- <!-- <span v-else>寰呭鏍�</span> -->
+ <span v-else>寰呭鏍�</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
+ -->
+ <el-table-column label="鐢宠鏃ユ湡" width="180" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="140px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
+ <el-table-column label="缁忓姙浜�" align="center" prop="username" width="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="200px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
<!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />-->
- <el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" width="120px" />
+ <!--
<el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
- <!--<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" />
+ <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="230px" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="160" />
<el-table-column label="褰撳墠瀹℃牳绾у埆" width="180" align="center" prop="flowlevel">
<template slot-scope="scope">
@@ -60,20 +62,21 @@
</el-table-column>
<el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-->
- <el-table-column label="璁板綍鐘舵��" align="center" prop="recordstatus" width="180">
+ <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="150px" />
+ <el-table-column label="瀹℃壒鐘舵��" align="center" prop="recordstatus" width="180">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
</template>
</el-table-column>
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
<template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
- @click="handleShow(scope.row)">璇︽儏</el-button>
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
@click="handleUpdate(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
- <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)"
- v-hasPermi="['project:donateconsolationfund:download']">涓嬭浇</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleShow(scope.row)">璇︽儏</el-button>
+ <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)">涓嬭浇</el-button>
+ <!-- v-hasPermi="['project:donateconsolationfund:download']" -->
<!-- 鏂板瀹℃牳椤甸潰 -->
<!-- <el-button
@@ -910,6 +913,16 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "3",
+ operationType: "check"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
--
Gitblit v1.9.3