From de9308daec6fb3f32d3a73fe89b76e1ffc1ef8e7 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 25 八月 2023 12:20:49 +0800
Subject: [PATCH] yxh
---
src/views/project/fund/applyDetail/index.vue | 48 ++++++------
src/views/project/fundcheck/medicalCostCheck/index.vue | 4
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 69 ++++++++++------
src/views/project/fundcheck/expertFeeCheck/index.vue | 32 +++++--
src/views/project/fundcheck/officeExpenseCheck/index.vue | 56 ++++++++++----
5 files changed, 129 insertions(+), 80 deletions(-)
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index c78600e..a7fa0aa 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -74,13 +74,12 @@
<el-form-item label="鐢宠閲戦" prop="pretaxcost">
<el-input v-model="form.pretaxcost" placeholder="绋庡墠閲戦鍚堣" :disabled="true" />
</el-form-item>
- </el-col>
+ </el-col> <!--
<el-col :span="5">
<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>
- <!--
<el-col :span="5">
<el-form-item label="绋庡悗閲戦" prop="pretaxcost">
<el-input v-model="form.taxedcost" placeholder="绋庡悗閲戦鍚堣" :disabled="true" />
@@ -93,7 +92,7 @@
</el-col>
<el-col :span="5">
<el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input :disabled="true" v-model="form.name" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+ <el-input :disabled="true" v-model="form.donorname" placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
</el-form-item>
</el-col>
<!--
@@ -167,8 +166,8 @@
" />
</template>
</el-table-column>
- <el-table-column v-if="businessType == 3 || businessType == 4 || ismanager == true" prop="amount"
- align="center" :label=amountLabel width="120">
+ <el-table-column v-if="businessType == 2 || businessType == 3 || businessType == 4 || ismanager == true"
+ prop="amount" align="center" :label=amountLabel width="120">
<template slot-scope="scope">
<!--
<el-select v-model="scope.row.amount" placeholder="绋庡墠閲戦" clearable filterable allow-create
@@ -667,7 +666,7 @@
selectionType: "",
showSelectionDialog: false,
//绋庡墠閲戦鏍囬锛氫笓瀹惰垂-绋庡墠閲戦锛涘尰瀛︽垚鏈�佸姙鍏垂鐢�-閲戦
- amountLabel:"绋庡墠閲戦",
+ amountLabel: "绋庡墠閲戦",
// 琛ㄥ崟鏍￠獙
rules: {
@@ -857,33 +856,32 @@
// if (!this.businessType && !this.operationType) {
if (this.businessType == "1") {
- this.curCase = this.$route.query.curCase;
this.businessName = "涓撳鍔冲姟璐圭敵璇峰崟"
- this.amountLabel="绋庡墠閲戦"
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "2") {
- this.curCase = this.$route.query.curCase;
this.businessName = "浼︾悊涓撳鍔冲姟璐圭敵璇峰崟";
- this.amountLabel="绋庡墠閲戦"
+ this.amountLabel = "绋庡墠閲戦"
this.getUnitList();
}
else if (this.businessType == "3") {
- if (this.operationType != "check") {
- this.curCase = this.$route.query.curCase;
- }
this.businessName = "鍖诲鎴愭湰鎶ラ攢鍗�";
- this.amountLabel="閲戦"
+ this.amountLabel = "閲戦"
}
else if (this.businessType == "4") {
this.businessName = "鍔炲叕璐圭敤鎶ラ攢鍗�";
- this.amountLabel="閲戦"
+ this.amountLabel = "閲戦"
// this.getBaseInfoList();
}
if (this.operationType == "add") {
this.title = this.businessName + "鏂板缓";
+ if (this.operationType != "4") {
+ this.curCase = this.$route.query.curCase;
+ console.log("this.curCase",this.curCase);
+ }
this.handleAdd();
}
else if (this.operationType == "update") {
@@ -981,6 +979,7 @@
getFund(this.curId).then(response => {
this.form = response.data;
+ console.log("response.data",response.data);
//闄勪欢澶勭悊
// this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -1032,13 +1031,18 @@
for (let m = 0; m < this.rbDetails.length; m++) {
this.rbDetails[m].itemlist = [];
this.getFeeItems(m, this.rbDetails[m]);
+
this.rbDetails[m].rowfeeblocks = [];
this.rbDetails[m].rowfeeblocks.push({
- expense: this.rbDetails[m].expense,
+ servicesscope: this.rbDetails[m].servicesscope,
expensedescribe: this.rbDetails[m].servicesscopename,
- remark: this.rbDetails[m].servicesscope,
- servicesscope: this.rbDetails[m].servicesscope
+ expense: this.rbDetails[m].expense,
+ remark: this.rbDetails[m].servicesscopename
});
+ }
+
+ if (this.rbDetails.length == 0) {
+ this.addRow(0);
}
});
@@ -1324,16 +1328,12 @@
getUserProfile().then(res => {
this.userprofile = res.data;
this.standardlevel = res.data.standardlevel;
- if (
- this.userprofile.createBy == "admin" ||
- this.userprofile.createBy == "001" ||
- this.userprofile.createBy == "012" ||
- this.userprofile.createBy == "002"
- ) {
+ if (this.userprofile.userName == "admin" || this.userprofile.userName == "001" || this.userprofile.userName == "012" || this.userprofile.userName == "002") {
this.ismanager = true;
} else {
this.ismanager = false;
}
+ console.log(this.userprofile,this.ismanager);
this.form.username = this.userprofile.nickName;
this.form.userno = this.userprofile.userName;
this.form.deptmentname = this.userprofile.dept.deptName;
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 3ded818..d031905 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -32,50 +32,45 @@
</el-form>
<el-form ref="infoform" label-width="100px">
<el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+ <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="donorno" width="240px" />
- <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
- <!-- <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="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="taxedcost" width="120px" />
<el-table-column label="鐢宠閲戦" align="center" prop="amountrequested" 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="prepaidamount" width="120px" />
- <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-
+ <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="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>
+ @click="handleCheck(scope.row)">瀹℃牳</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
+ @click="handleDetail(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>
@@ -867,7 +862,17 @@
}
},
/** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
+ handleCheck(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "2",
+ operationType: "check"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
@@ -1287,7 +1292,17 @@
},
//鏌ョ湅瀹℃牳璇︽儏
- handleShow(row) {
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "2",
+ operationType: "detail"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 5b30798..9e7c574 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -68,7 +68,7 @@
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
<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>
+ @click="handleDetail(scope.row)">璇︽儏</el-button>
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
@click="handleCheck(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
@@ -908,15 +908,15 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleCheck(row) {
- // this.$router.push({
- // path: "/finance/applyDetail/",
- // query: {
- // id: row.id,
- // businessType: "1",
- // operationType: "check"
- // }
- // });
- // return;
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "1",
+ operationType: "check"
+ }
+ });
+ return;
this.isopen = 0;
this.reset();
@@ -958,7 +958,17 @@
},
//鏌ョ湅瀹℃牳璇︽儏
- handleShow(row) {
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "1",
+ operationType: "detail"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
diff --git a/src/views/project/fundcheck/medicalCostCheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
index aad447f..13d61fe 100644
--- a/src/views/project/fundcheck/medicalCostCheck/index.vue
+++ b/src/views/project/fundcheck/medicalCostCheck/index.vue
@@ -47,7 +47,7 @@
</template>
</el-table-column>
<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="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="donorno" />-->
@@ -74,7 +74,7 @@
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
@click="handleCheck(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(scope.row)">鏌ョ湅</el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleDetail(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']" -->
diff --git a/src/views/project/fundcheck/officeExpenseCheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
index 0bcef46..029c053 100644
--- a/src/views/project/fundcheck/officeExpenseCheck/index.vue
+++ b/src/views/project/fundcheck/officeExpenseCheck/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="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="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,17 +62,19 @@
</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="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="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>
+ @click="handleDetail(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>
+ @click="handleCheck(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>
@@ -131,7 +135,7 @@
<el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
<!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
:disabled="form.id != null">{{ dict.label }}</el-radio>-->
- <el-radio v-model="form.applytype" label="3">鍖诲鎴愭湰璐圭敤鐢宠</el-radio>
+ <el-radio v-model="form.applytype" label="4">鍔炲叕璐圭敤鐢宠</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -859,7 +863,7 @@
annexbankcard: null,
annexregistform: null,
consolationmoney: null,
- applytype: "3",
+ applytype: "4",
};
this.resetForm("form");
@@ -908,8 +912,18 @@
});
}
},
- /** 淇敼鎸夐挳鎿嶄綔 */
- handleUpdate(row) {
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
+ handleCheck(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "4",
+ operationType: "check"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
@@ -940,7 +954,17 @@
},
//鏌ョ湅瀹℃牳璇︽儏
- handleShow(row) {
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "4",
+ operationType: "detail"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
--
Gitblit v1.9.3