From a031bbf95c3a504f74793fedc14f8ffd9d338cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Thu, 21 Sep 2023 11:25:37 +0800
Subject: [PATCH] up

---
 src/views/activity/drawPrize.vue    | 10 +++++++---
 src/views/activity/drawPrizeLog.vue |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/activity/drawPrize.vue b/src/views/activity/drawPrize.vue
index 581b61a..f3154ae 100644
--- a/src/views/activity/drawPrize.vue
+++ b/src/views/activity/drawPrize.vue
@@ -20,7 +20,7 @@
             <Input v-model="select.keyword" placeholder="请输入关键字" style="width: 180px"></Input>
           </div>
 
-          <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
+          <Button style="margin-left: 10px" type="primary" @click="doRest">重置
           </Button>
           <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
           <Button style="margin-left: 10px" type="primary" @click="add">新增</Button>
@@ -38,12 +38,12 @@
       <template v-slot:btns v-else>
         <el-table-column fixed="right" header-align="center" label="操作" width="200">
           <template #default="{ row }">
-            <Poptip :transfer="true" confirm placement="bottom" title="确认要删除吗" @on-ok="deleteitem(row)">
+            <Poptip :transfer="true" confirm placement="bottom"  v-if='!(row.draw_logs_count > 0)' title="确认要删除吗" @on-ok="deleteitem(row)">
               <Button ghost size="small" type="error">删除
               </Button>
             </Poptip>
 
-            <Button style="margin-left: 4px;" size="small" type="primary" ghost
+            <Button style="margin-left: 4px;" size="small"  v-if='!(row.draw_logs_count > 0)' type="primary" ghost
               @click="$refs['addDrawPrize'].id = row.id,$refs['addDrawPrize'].isShow = true,$refs['addDrawPrize'].type = 'editor'">编辑
             </Button>
 
@@ -142,6 +142,10 @@
       }
     },
     methods: {
+      doRest(){
+        this.select.page=1;
+        this.select.keyword="";
+      },
       toDraw (type = 1, row) {
         if (type === 1) {
           window.open(this.$router.resolve({path: '/mdLotteryDraw/'+row.id}).href,'_blank')
diff --git a/src/views/activity/drawPrizeLog.vue b/src/views/activity/drawPrizeLog.vue
index 92f17fe..f0d46f8 100644
--- a/src/views/activity/drawPrizeLog.vue
+++ b/src/views/activity/drawPrizeLog.vue
@@ -21,7 +21,7 @@
             <Input v-model="select.keyword" placeholder="请输入关键字" style="width: 180px"></Input>
           </div>
 
-          <Button style="margin-left: 10px" type="primary" @click="select={page:1,keyword:''}">重置
+          <Button style="margin-left: 10px" type="primary" @click="doRest">重置
           </Button>
           <Button style="margin-left: 10px" type="primary" @click="doSearch">查询</Button>
           <Button style="margin-left: 10px" type="error" @click="doExcel">导出</Button>
@@ -121,6 +121,10 @@
       }
     },
     methods: {
+      doRest(){
+        this.select.page=1;
+        this.select.keyword="";
+      },
       del () {
         let that = this
         this.$confirm("确认删除吗？",{