From 6c6de9a0f4f6bfe8e80292b0bf0bc31d8b63a979 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 10 八月 2023 17:37:28 +0800
Subject: [PATCH] yxh
---
src/views/project/travelexpenseapply/edit.vue | 0
src/views/project/fund/medicalCostApply/index.vue | 18 +++--
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 0
src/views/project/travelexpenseapply/travelexpensedetail/index.vue | 0
src/views/project/fundcheck/officeExpenseCheck/index.vue | 0
src/router/index.js | 2
src/views/project/travelexpensecheck/index.vue | 2
src/views/project/fund/applyDetail/index.vue | 0
src/views/project/fund/expertFeeApply/index.vue | 7 +-
src/views/project/fund/ethicalExpertFeeApply/index.vue | 18 +++--
src/views/project/fundcheck/medicalCostCheck/index.vue | 0
src/views/project/fundcheck/expertFeeCheck/index.vue | 0
src/views/project/fund/officeExpenseApply/index.vue | 103 ++++++++++++++++++----------------
src/views/project/travelexpenseapply/index.vue | 6 +-
14 files changed, 84 insertions(+), 72 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index d3f9ae7..9e670d3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -164,7 +164,7 @@
children: [
{
path: 'edit',
- component: (resolve) => require(['@/views/project/travelexpenseslist/eidt'], resolve),
+ component: (resolve) => require(['@/views/project/travelexpenseapply/edit'], resolve),
name: 'edit',
meta: { title: '淇敼', icon: 'edit' }
}
diff --git a/src/views/project/fund/fundcontext/index.vue b/src/views/project/fund/applyDetail/index.vue
similarity index 100%
rename from src/views/project/fund/fundcontext/index.vue
rename to src/views/project/fund/applyDetail/index.vue
diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
similarity index 98%
rename from src/views/project/fund/fundApply/index.vue
rename to src/views/project/fund/ethicalExpertFeeApply/index.vue
index aa4e074..c3f7c95 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -69,18 +69,22 @@
</el-row>
<el-row>
<el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px" />
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
+ <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="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
+ <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="recordstatus">
<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="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" />
diff --git a/src/views/project/fund/expertFeeFundApply/index.vue b/src/views/project/fund/expertFeeApply/index.vue
similarity index 99%
rename from src/views/project/fund/expertFeeFundApply/index.vue
rename to src/views/project/fund/expertFeeApply/index.vue
index cfeb349..a22f99a 100644
--- a/src/views/project/fund/expertFeeFundApply/index.vue
+++ b/src/views/project/fund/expertFeeApply/index.vue
@@ -79,13 +79,14 @@
</template>
</el-table-column>
<el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
- <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="120px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
<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="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" />
diff --git a/src/views/project/fund/medicalCostFundApply/index.vue b/src/views/project/fund/medicalCostApply/index.vue
similarity index 98%
rename from src/views/project/fund/medicalCostFundApply/index.vue
rename to src/views/project/fund/medicalCostApply/index.vue
index d4b131e..bb076d5 100644
--- a/src/views/project/fund/medicalCostFundApply/index.vue
+++ b/src/views/project/fund/medicalCostApply/index.vue
@@ -77,15 +77,15 @@
}}</span>
</template>
</el-table-column>
- <el-table-column label="鐢宠浜�" align="center" prop="username" width="150px" />
- <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
+ <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="220px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="200px" />
+ <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus">
<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="amountrequested" width="150px" />
- <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="150px" />
@@ -770,7 +770,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.$router.push({
- path: "/finance/fundcontext/",
+ path: "/finance/applyDetail/",
query: {
id: 0,
businessType: "3",
@@ -811,7 +811,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/finance/fundcontext/",
+ path: "/finance/applyDetail/",
query: {
id: row.id,
businessType: "3",
@@ -854,7 +854,7 @@
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.$router.push({
- path: "/finance/fundcontext/",
+ path: "/finance/applyDetail/",
query: {
id: row.id,
businessType: "3",
@@ -1099,6 +1099,7 @@
this.curCase = row;
this.getfundList();
},
+
getfundList() {
this.loading = true;
this.reset();
@@ -1106,6 +1107,7 @@
listFund(this.fundQueryParam).then(response => {
this.loading = false;
this.donateconsolationfundList = response.rows;
+ console.log("donateconsolationfundList",this.donateconsolationfundList);
});
},
diff --git a/src/views/project/fund/overheadcosts/index.vue b/src/views/project/fund/officeExpenseApply/index.vue
similarity index 94%
rename from src/views/project/fund/overheadcosts/index.vue
rename to src/views/project/fund/officeExpenseApply/index.vue
index b570cb3..6afd8ef 100644
--- a/src/views/project/fund/overheadcosts/index.vue
+++ b/src/views/project/fund/officeExpenseApply/index.vue
@@ -23,55 +23,59 @@
</el-col>
</el-row>
</el-form>
- <el-row>
+ <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
- v-hasPermi="['project:medicalfund:add']">鍒涘缓鐢宠鍗�</el-button>
+ <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">鏂板</el-button>
+ <!-- v-hasPermi="['project:medicalfund:add']" -->
</el-col>
+ <el-col :span="1.5">
+ <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
+ @click="handleExport">瀵煎嚭</el-button>
+ </el-col>
+ <!-- v-hasPermi="['project:medicalfund:export']" -->
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-row>
- <el-table v-loading="loading" border :data="donateconsolationfundList">
- <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="150px">
- <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="150px" />
- <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
- <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="amountrequested" width="150px" />
- <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="150px" />
- <el-table-column label="缁勯暱" align="center" prop="managername" width="220px" />
- <!--
+ <el-table v-loading="loading" border :data="donateconsolationfundList">
+ <el-table-column label="鐢宠鏃ユ湡" align="center" prop="createTime" width="180px">
+ <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="150px" />
+ <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="150px" />
+ <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+ <el-table-column label="缁勯暱" align="center" prop="managername" width="150px" />
+ <el-table-column label="瀹℃牳鐘舵��" width="150" align="center" prop="recordstatus">
+ <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="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
-->
- <el-table-column label="澶囨敞" align="center" prop="remark" />
- <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 ||
- 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)"
- v-hasPermi="['project:medicalfund: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 ||
- scope.row.recordstatus == 1
- " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
- v-hasPermi="['project:medicalfund:delete']">鍒犻櫎</el-button>
- <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
- v-hasPermi="['project:medicalfund:download']">涓嬭浇</el-button>
- </template>
- </el-table-column>
- </el-table>
- </el-row>
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <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 ||
+ 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)"
+ v-hasPermi="['project:medicalfund: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 ||
+ scope.row.recordstatus == 1
+ " size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+ v-hasPermi="['project:medicalfund:delete']">鍒犻櫎</el-button>
+ <el-button size="mini" type="text" icon="el-icon-download" @click="mixExport(scope.row.id)"
+ v-hasPermi="['project:medicalfund:download']">涓嬭浇</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
<el-dialog :visible.sync="dialogOpen" :close-on-click-modal="false" width="1400px" :title="title"
style="text-align: center" v-loading="loading">
@@ -184,7 +188,8 @@
</template>
</el-table-column>
- <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype=='1' || form.applytype=='2'">
+ <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120"
+ v-if="form.applytype == '1' || form.applytype == '2'">
<template slot-scope="scope">
<el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
}}</el-button>
@@ -791,7 +796,7 @@
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
this.$router.push({
- path: "/finance/fundcontext/",
+ path: "/finance/applyDetail/",
query: { id: 0, businessType: "4", operationType: "add" }
});
@@ -816,7 +821,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/finance/fundcontext/",
+ path: "/finance/applyDetail/",
query: { id: row.id, businessType: "4", operationType: "update" }
});
@@ -847,8 +852,8 @@
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.$router.push({
- path: "/finance/fundcontext/",
- query: { id: row.id, businessType: "4", operationType: "detail"}
+ path: "/finance/applyDetail/",
+ query: { id: row.id, businessType: "4", operationType: "detail" }
});
this.isopen = 0;
@@ -1038,7 +1043,7 @@
this.total = response.total;
this.loading = false;
});
- },
+ },
// 鍙栨秷鎸夐挳
cancel() {
diff --git a/src/views/project/fund/fundapplycheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
similarity index 100%
rename from src/views/project/fund/fundapplycheck/index.vue
rename to src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
diff --git a/src/views/project/donateconsolationfundlist/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
similarity index 100%
rename from src/views/project/donateconsolationfundlist/index.vue
rename to src/views/project/fundcheck/expertFeeCheck/index.vue
diff --git a/src/views/project/medicalcostfundapplycheck/index.vue b/src/views/project/fundcheck/medicalCostCheck/index.vue
similarity index 100%
rename from src/views/project/medicalcostfundapplycheck/index.vue
rename to src/views/project/fundcheck/medicalCostCheck/index.vue
diff --git a/src/views/project/medicalcostfundapplycheck/index.vue b/src/views/project/fundcheck/officeExpenseCheck/index.vue
similarity index 100%
copy from src/views/project/medicalcostfundapplycheck/index.vue
copy to src/views/project/fundcheck/officeExpenseCheck/index.vue
diff --git a/src/views/project/travelexpenseslist/eidt.vue b/src/views/project/travelexpenseapply/edit.vue
similarity index 100%
rename from src/views/project/travelexpenseslist/eidt.vue
rename to src/views/project/travelexpenseapply/edit.vue
diff --git a/src/views/project/travelexpenseslist/index.vue b/src/views/project/travelexpenseapply/index.vue
similarity index 99%
rename from src/views/project/travelexpenseslist/index.vue
rename to src/views/project/travelexpenseapply/index.vue
index 81e70dc..6342f60 100644
--- a/src/views/project/travelexpenseslist/index.vue
+++ b/src/views/project/travelexpenseapply/index.vue
@@ -1847,7 +1847,7 @@
handleAdd() {
console.log("defaultperson",this.defaultperson);
this.$router.push({
- path: "/finance/travelexpenseslist/Modifydetails/",
+ path: "/finance/travelexpenseapply/travelexpensedetail/",
query: { id: 0, pos: 1,routerparam:this.defaultperson}
});
@@ -1870,7 +1870,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/finance/travelexpenseslist/Modifydetails/",
+ path: "/finance/travelexpenseapply/travelexpensedetail/",
query: { id: row.id, pos: 2 }
});
this.dialogType = "edit";
@@ -1927,7 +1927,7 @@
/** 鏌ョ湅鎸夐挳鎿嶄綔 */
handleDetail(row) {
this.$router.push({
- path: "/finance/travelexpenseslist/Modifydetails/",
+ path: "/finance/travelexpenseapply/travelexpensedetail/",
query: { id: row.id, pos: 3 }
});
diff --git a/src/views/project/travelexpenseslist/Modifydetails/index.vue b/src/views/project/travelexpenseapply/travelexpensedetail/index.vue
similarity index 100%
rename from src/views/project/travelexpenseslist/Modifydetails/index.vue
rename to src/views/project/travelexpenseapply/travelexpensedetail/index.vue
diff --git a/src/views/project/travelexpenseslistrecord/index.vue b/src/views/project/travelexpensecheck/index.vue
similarity index 99%
rename from src/views/project/travelexpenseslistrecord/index.vue
rename to src/views/project/travelexpensecheck/index.vue
index 15cfedf..9c9c07a 100644
--- a/src/views/project/travelexpenseslistrecord/index.vue
+++ b/src/views/project/travelexpensecheck/index.vue
@@ -948,7 +948,7 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.$router.push({
- path: "/finance/travelexpenseslist/Modifydetails/",
+ path: "/finance/travelexpenseapply/travelexpensedetail/",
query: { id: row.id, pos: 4 }
});
this.dialogType = "edit";
--
Gitblit v1.9.3