From 49be3d0b1921172dcbf5aa59749243b9af8a8773 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 24 五月 2023 11:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/cause/Entry.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/cause/Entry.vue b/src/views/cause/Entry.vue
index 17f7665..2cc5a0a 100644
--- a/src/views/cause/Entry.vue
+++ b/src/views/cause/Entry.vue
@@ -194,7 +194,7 @@
           <template slot="header">
             <el-form :inline="true" :model="queryInfoReport" class="demo-form-inline">
               <el-form-item label="鎶ユ浜�:">
-                <el-input placeholder="璇疯緭鍏ュ鍚嶆垨韬唤璇�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
+                <el-input placeholder="璇疯緭鍏ュ鍚�" v-model="queryInfoReport.people" :style="{ width: '180px' }">
                 </el-input>
               </el-form-item>
               <el-form-item label="鎵嬫満鍙风爜:">
@@ -274,7 +274,7 @@
             </el-table-column>
             <el-table-column label="鎿嶄綔">
               <template slot-scope="scope">
-                <el-button type="text" size="medium" @click="updataReport(scope.row)">缂栬緫</el-button>
+<!--                <el-button type="text" size="medium" @click="updataReport(scope.row)">缂栬緫</el-button>-->
 <!--                <el-button type="text" size="medium"-->
 <!--                  @click="leaveReport(scope.row.id, scope.row.causeId, scope.row.groupId)" style="color:#ff0000"-->
 <!--                  :disabled="scope.row.isInGroup == 0">閫�缇� </el-button>-->

--
Gitblit v1.8.0