From 861cfded06227d02ae7c4715d4595e028ddf0fce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 5 Jul 2023 07:49:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/CodeGenTemplate/app/form.txt      |  4 +--
 .../wwwroot/CodeGenTemplate/app/vue2.txt      | 34 +++++++++++--------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
index 0a713e72..3cf58444 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/form.txt
@@ -73,7 +73,7 @@ $end
       <view class="btn-item">
         <u-button text="取消" shape="circle" icon="close" type="info" @click="handleCancel"></u-button>
       </view>
-      <view class="btn-item">
+      <view class="btn-item" v-if="opertype != 3">
         <u-button text="确定" shape="circle" icon="checkmark" type="primary" @click="submit"></u-button>
       </view>
     </view>
@@ -92,7 +92,7 @@ $if(replaceDto.ShowBtnEdit)
 $end
 }
 from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
- 
+
   export default {
     dicts: [
 $foreach(item in genTable.Columns)
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
index 0be29b77..8bcd1247 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/app/vue2.txt
@@ -37,6 +37,12 @@ $end
 $end
 $end
       <view class="info-btn-wrap justify-end">
+$if(replaceDto.ShowBtnView)
+        <view class="tag-item">
+          <u-tag text="详情" plain shape="circle" type="info" icon="eye" @click="handleView(item)"
+            v-if="checkPermi(['${replaceDto.PermissionPrefix}:query'])"></u-tag>
+        </view>
+$end
 $if(replaceDto.ShowBtnEdit)
         <view class="tag-item">
           <u-tag text="编辑" plain shape="circle" icon="edit-pen" @click="handleEdit(item)"
@@ -128,25 +134,12 @@ $end
   import "@/static/scss/page.scss";
   import { 
     list${genTable.BusinessName},
-    get${genTable.BusinessName},
-$if(replaceDto.ShowBtnAdd) 
-    add${genTable.BusinessName},
-$end
 $if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
     del${genTable.BusinessName},
-$end 
-$if(replaceDto.ShowBtnEdit) 
-    update${genTable.BusinessName},
 $end
-$if(replaceDto.ShowBtnTruncate) 
-    clear${genTable.BusinessName},
-$end
-$if(showCustomInput) 
-    changeSort 
-$end 
 } 
-from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
-  
+  from '@/api/${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName.ToLower()}.js'
+
   import {
     getDate
   } from '@/utils/common.js'
@@ -216,12 +209,22 @@ $end
           }
         })
       },
+$if(replaceDto.ShowBtnAdd)
       handleAdd() {
         this.${tab}tab.navigateTo('./edit?opertype=1')
       },
+$end
+$if(replaceDto.ShowBtnEdit)
       handleEdit(e) {
         this.${tab}tab.navigateTo('./edit?opertype=2&${replaceDto.FistLowerPk}=' + e.id)
       },
+$end
+$if(replaceDto.ShowBtnView)
+      handleView(e) {
+        this.${tab}tab.navigateTo('./edit?opertype=3&${replaceDto.FistLowerPk}=' + e.id)
+      },
+$end
+$if(replaceDto.ShowBtnDelete || replaceDto.ShowBtnMultiDel)
       handleDelete(row) {
         const Ids = row.${replaceDto.FistLowerPk};
         
@@ -234,6 +237,7 @@ $end
         })
         .catch(() => {});
       },
+$end
       resetQuery() {
         this.${refs}refs.uForm.resetFields()
 $foreach(column in genTable.Columns)