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/fund/officeExpenseApply/index.vue |  103 +++++++++++++++++++++++++++------------------------
 1 files changed, 54 insertions(+), 49 deletions(-)

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() {

--
Gitblit v1.9.3