From 4555d41a66b83c8eb61bd99faf473985aeffda1f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 01 二月 2024 09:11:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 company/src/views/business/settleClaims.vue |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/company/src/views/business/settleClaims.vue b/company/src/views/business/settleClaims.vue
index ff71af1..480ee90 100644
--- a/company/src/views/business/settleClaims.vue
+++ b/company/src/views/business/settleClaims.vue
@@ -9,7 +9,7 @@
                 <el-input v-model="searchForm.memberIdcardNo" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <el-form-item label="鎶ユ鍗曚綅" prop="companyId" v-if="userInfo.type === 0">
-                <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in companyList"
                         :key="item.id"
@@ -19,7 +19,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="淇濋櫓鏂规" prop="baseSolutionId">
-                <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                <el-select v-model="searchForm.baseSolutionId" placeholder="璇烽�夋嫨" @change="search">
                     <el-option
                         v-for="item in solutionList"
                         :key="item.id"
@@ -29,7 +29,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="妗堜欢鐘舵��" prop="status">
-                <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
+                <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨" @change="search">
                     <el-option label="澶勭悊涓�" value="0"></el-option>
                     <el-option label="宸叉挙妗�" value="1"></el-option>
                     <el-option label="宸茬粨妗�" value="2"></el-option>
@@ -45,6 +45,9 @@
         </el-form>
         <!-- 琛ㄦ牸鍜屽垎椤� -->
         <template v-slot:table-wrap>
+            <ul class="toolbar" v-if="userInfo.type === 1">
+                <li><el-button type="primary" @click="$refs.onlineReporting.open('鎻愪氦鎶ユ')">鍦ㄧ嚎鎶ユ</el-button></li>
+            </ul>
             <el-table
                 v-loading="isWorking.search"
                 :data="tableData.list"
@@ -78,7 +81,7 @@
                     fixed="right"
                 >
                     <template slot-scope="{row}">
-                        <el-button type="text" @click="$refs.operaSettleClaimsWindow.open('鎶ユ鐞嗚禂鐢宠琛�', row)" icon="el-icon-view" v-permissions="['business:settleclaims:update']">鏌ョ湅璇︽儏</el-button>
+                        <el-button type="text" @click="$refs.operaSettleClaimsWindow.open('鎶ユ璇︽儏', row)" v-permissions="['business:settleclaims:update']">鏌ョ湅璇︽儏</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -89,8 +92,10 @@
             >
             </pagination>
         </template>
-        <!-- 鏂板缓/淇敼 -->
+        <!-- 璇︽儏 -->
         <OperaSettleClaimsWindow ref="operaSettleClaimsWindow" @success="handlePageChange"/>
+        <!--    鍦ㄧ嚎鎶ユ    -->
+        <onlineReporting ref="onlineReporting" @success="handlePageChange" />
     </TableLayout>
 </template>
 
@@ -99,13 +104,14 @@
     import TableLayout from '@/layouts/TableLayout'
     import Pagination from '@/components/common/Pagination'
     import OperaSettleClaimsWindow from '@/components/business/OperaSettleClaimsWindow'
+    import onlineReporting from '@/components/enterprise/onlineReporting'
     import {all as solutionAll} from '@/api/business/solutions'
     import {pageAll as companyAll} from '@/api/business/company'
     import { mapState } from 'vuex'
     export default {
         name: 'SettleClaims',
         extends: BaseTable,
-        components: { TableLayout, Pagination, OperaSettleClaimsWindow },
+        components: { TableLayout, Pagination, OperaSettleClaimsWindow, onlineReporting },
         data () {
             return {
                 // 鎼滅储

--
Gitblit v1.9.3