From 86dd450d55be2b87d52278e712e36a6db1605bca Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Mon, 4 Dec 2023 19:11:03 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=91=E5=AE=9A=E6=89=93=E5=8D=B0=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs | 14 +++++++++++
 .../SeedData/SysDictDataSeedData.cs           |  3 +++
 .../SeedData/SysDictTypeSeedData.cs           |  1 +
 .../Service/CodeGen/Dto/CodeGenInput.cs       | 10 ++++++++
 .../Service/CodeGen/Dto/CodeGenOutput.cs      | 10 ++++++++
 .../codeGen/component/editCodeGenDialog.vue   | 24 ++++++++++++++++++-
 6 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs b/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
index c2a9340f7..fd8deca56 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
@@ -16,6 +16,20 @@ namespace Admin.NET.Core;
 [SysTable]
 public class SysCodeGen : EntityBase
 {
+    /// <summary>
+    /// 支持打印类型
+    /// </summary>
+    [SugarColumn(ColumnDescription = "支持打印类型", Length = 32)]
+    [MaxLength(32)]
+    public string? PrintType { get; set; }
+
+    /// <summary>
+    /// 打印模版Id
+    /// </summary>
+    [SugarColumn(ColumnDescription = "打印模版Id", Length = 20)]
+    [MaxLength(20)]
+    public long? PrintId { get; set; }
+
     /// <summary>
     /// 作者姓名
     /// </summary>
diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
index 653aa6142..0aa72bb0b 100644
--- a/Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
+++ b/Admin.NET/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
@@ -74,6 +74,9 @@ public class SysDictDataSeedData : ISqlSugarEntitySeedData<SysDictData>
             new SysDictData{ Id=1300000000603, DictTypeId=1300000000106, Value="部门", Code="301", OrderNo=102, Remark="部门", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
             new SysDictData{ Id=1300000000604, DictTypeId=1300000000106, Value="区域", Code="401", OrderNo=103, Remark="区域", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
             new SysDictData{ Id=1300000000605, DictTypeId=1300000000106, Value="组", Code="501", OrderNo=104, Remark="组", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+
+            new SysDictData{ Id=1300000000701, DictTypeId=1300000000107, Value="不需要", Code="off", OrderNo=100, Remark="不需要打印支持", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
+            new SysDictData{ Id=1300000000702, DictTypeId=1300000000107, Value="绑定打印模版", Code="custom", OrderNo=101, Remark="绑定打印模版", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
         };
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index 695b234fe..6c27ac938 100644
--- a/Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/Admin.NET/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -28,6 +28,7 @@ public class SysDictTypeSeedData : ISqlSugarEntitySeedData<SysDictType>
             new SysDictType{ Id=1300000000104, Name="代码生成方式", Code="code_gen_create_type", OrderNo=103, Remark="代码生成方式", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictType{ Id=1300000000105, Name="代码生成基类", Code="code_gen_base_class", OrderNo=104, Remark="代码生成基类", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2022-02-10 00:00:00") },
             new SysDictType{ Id=1300000000106, Name="机构类型", Code="org_type", OrderNo=105, Remark="机构类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-02-10 00:00:00") },
+            new SysDictType{ Id=1300000000107, Name="代码生成支持打印类型", Code="code_gen_print_type", OrderNo=106, Remark="代码生成支持打印类型", Status=StatusEnum.Enable, CreateTime=DateTime.Parse("2023-12-04 00:00:00") },
         };
     }
 }
\ No newline at end of file
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
index e05211da0..7031e8f80 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
@@ -14,6 +14,16 @@ namespace Admin.NET.Core.Service;
 /// </summary>
 public class CodeGenInput : BasePageInput
 {
+    /// <summary>
+    /// 是否支持打印
+    /// </summary>
+    public virtual string PrintType { get; set; }
+
+    /// <summary>
+    /// 打印模版编号
+    /// </summary>
+    public virtual long PrintId { get; set; }
+
     /// <summary>
     /// 作者姓名
     /// </summary>
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
index 87b5c08f5..d55d17e36 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
@@ -19,6 +19,16 @@ public class CodeGenOutput
     /// </summary>
     public long Id { get; set; }
 
+    /// <summary>
+    /// 是否支持打印
+    /// </summary>
+    public string PrintType { get; set; }
+
+    /// <summary>
+    /// 打印模版编号
+    /// </summary>
+    public long PrintId { get; set; }
+
     /// <summary>
     /// 作者姓名
     /// </summary>
diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index 2b014502e..fd93a1ca3 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -92,6 +92,20 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="支持打印" prop="printType">
+							<el-select v-model="state.ruleForm.printType" filterable class="w100">
+								<el-option v-for="item in state.printTypeList" :key="item.value" :label="item.value" :value="item.code" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.printType == 'custom'">
+						<el-form-item label="打印模版" prop="printId">
+							<el-select v-model="state.ruleForm.printId" filterable class="w100">
+								<el-option v-for="item in state.printIdList" :key="item.id" :label="item.name" :value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
 				</el-row>
 			</el-form>
 			<template #footer>
@@ -108,7 +122,7 @@
 import { onMounted, reactive, ref } from 'vue';
 
 import { getAPI } from '/@/utils/axios-utils';
-import { SysCodeGenApi, SysDictDataApi, SysMenuApi } from '/@/api-services/api';
+import { SysCodeGenApi, SysDictDataApi, SysMenuApi, SysPrintApi } from '/@/api-services/api';
 import { UpdateCodeGenInput, AddCodeGenInput, SysMenu } from '/@/api-services/models';
 
 const props = defineProps({
@@ -124,6 +138,8 @@ const state = reactive({
 	dbData: [] as any,
 	menuData: [] as Array<SysMenu>,
 	codeGenTypeList: [] as any,
+	printTypeList: [] as any,
+	printIdList: [] as any,
 });
 
 onMounted(async () => {
@@ -135,6 +151,12 @@ onMounted(async () => {
 
 	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_create_type');
 	state.codeGenTypeList = resDicData.data.result;
+
+	let printTypeResDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('print_type');
+	state.printTypeList = printTypeResDicData.data.result;
+
+	let resPrintIdData = await getAPI(SysPrintApi).apiSysPrintPagePost();
+	state.printIdList = resPrintIdData.data.result?.items ?? [];
 });
 
 // db改变
-- 
Gitee


From c4103546dbfdabb7dae7ec5f4980c55d98a0dfde Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 11:02:33 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=91=E5=AE=9A?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A8=A1=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs      |  8 ++++----
 .../Service/CodeGen/CustomViewEngine.cs            |  4 ++++
 .../Service/CodeGen/Dto/CodeGenInput.cs            |  6 +++---
 .../Service/CodeGen/Dto/CodeGenOutput.cs           |  6 +++---
 .../Service/CodeGen/SysCodeGenService.cs           |  2 ++
 .../api-services/models/update-code-gen-input.ts   | 14 ++++++++++++++
 .../system/codeGen/component/editCodeGenDialog.vue | 12 ++++++------
 7 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs b/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
index fd8deca56..13c99987f 100644
--- a/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
+++ b/Admin.NET/Admin.NET.Core/Entity/SysCodeGen.cs
@@ -24,11 +24,11 @@ public class SysCodeGen : EntityBase
     public string? PrintType { get; set; }
 
     /// <summary>
-    /// 打印模版Id
+    /// 打印模版名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "打印模版Id", Length = 20)]
-    [MaxLength(20)]
-    public long? PrintId { get; set; }
+    [SugarColumn(ColumnDescription = "打印模版名称", Length = 32)]
+    [MaxLength(32)]
+    public string? PrintName { get; set; }
 
     /// <summary>
     /// 作者姓名
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs
index ebf22e3cd..d0dba185d 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/CustomViewEngine.cs
@@ -27,6 +27,10 @@ public class CustomViewEngine : ViewEngineModel
     /// </summary>
     public string ConfigId { get; set; } = SqlSugarConst.MainConfigId;
 
+    public string PrintType { get; set; }
+
+    public string PrintName { get; set; }
+
     public string AuthorName { get; set; }
 
     public string BusName { get; set; }
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
index 7031e8f80..94d55b15c 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenInput.cs
@@ -15,14 +15,14 @@ namespace Admin.NET.Core.Service;
 public class CodeGenInput : BasePageInput
 {
     /// <summary>
-    /// 是否支持打印
+    /// 支持打印类型
     /// </summary>
     public virtual string PrintType { get; set; }
 
     /// <summary>
-    /// 打印模版编号
+    /// 打印模版名称
     /// </summary>
-    public virtual long PrintId { get; set; }
+    public virtual string PrintName { get; set; }
 
     /// <summary>
     /// 作者姓名
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
index d55d17e36..dd61f0e83 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/Dto/CodeGenOutput.cs
@@ -20,14 +20,14 @@ public class CodeGenOutput
     public long Id { get; set; }
 
     /// <summary>
-    /// 是否支持打印
+    /// 支持打印类型
     /// </summary>
     public string PrintType { get; set; }
 
     /// <summary>
-    /// 打印模版编号
+    /// 打印模版名称
     /// </summary>
-    public long PrintId { get; set; }
+    public string PrintName { get; set; }
 
     /// <summary>
     /// 作者姓名
diff --git a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
index febd77dde..36b094c22 100644
--- a/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
+++ b/Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs
@@ -329,6 +329,8 @@ public class SysCodeGenService : IDynamicApiController, ITransient
         var data = new CustomViewEngine(_db)
         {
             ConfigId = input.ConfigId,
+            PrintType = input.PrintType,
+            PrintName = input.PrintName,
             AuthorName = input.AuthorName,
             BusName = input.BusName,
             NameSpace = input.NameSpace,
diff --git a/Web/src/api-services/models/update-code-gen-input.ts b/Web/src/api-services/models/update-code-gen-input.ts
index 9c0151d74..8175a5cc8 100644
--- a/Web/src/api-services/models/update-code-gen-input.ts
+++ b/Web/src/api-services/models/update-code-gen-input.ts
@@ -64,6 +64,20 @@ export interface UpdateCodeGenInput {
      */
     descStr?: string | null;
 
+    /**
+     * 打印模版名称
+     * @type {number}
+     * @memberof UpdateCodeGenInput
+     */
+    printName?: string | null;
+
+    /**
+     * 支持打印类型
+     * @type {string}
+     * @memberof UpdateCodeGenInput
+     */
+    printType?: string | null;
+    
     /**
      * 作者姓名
      *
diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index fd93a1ca3..8e05d861d 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -100,9 +100,9 @@
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.printType == 'custom'">
-						<el-form-item label="打印模版" prop="printId">
-							<el-select v-model="state.ruleForm.printId" filterable class="w100">
-								<el-option v-for="item in state.printIdList" :key="item.id" :label="item.name" :value="item.id" />
+						<el-form-item label="打印模版" prop="printName">
+							<el-select v-model="state.ruleForm.printName" filterable class="w100">
+								<el-option v-for="item in state.printList" :key="item.id" :label="item.name" :value="item.name" />
 							</el-select>
 						</el-form-item>
 					</el-col>
@@ -123,7 +123,7 @@ import { onMounted, reactive, ref } from 'vue';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysCodeGenApi, SysDictDataApi, SysMenuApi, SysPrintApi } from '/@/api-services/api';
-import { UpdateCodeGenInput, AddCodeGenInput, SysMenu } from '/@/api-services/models';
+import { UpdateCodeGenInput, AddCodeGenInput, SysMenu, SysPrint } from '/@/api-services/models';
 
 const props = defineProps({
 	title: String,
@@ -139,7 +139,7 @@ const state = reactive({
 	menuData: [] as Array<SysMenu>,
 	codeGenTypeList: [] as any,
 	printTypeList: [] as any,
-	printIdList: [] as any,
+	printList: [] as Array<SysPrint>,
 });
 
 onMounted(async () => {
@@ -156,7 +156,7 @@ onMounted(async () => {
 	state.printTypeList = printTypeResDicData.data.result;
 
 	let resPrintIdData = await getAPI(SysPrintApi).apiSysPrintPagePost();
-	state.printIdList = resPrintIdData.data.result?.items ?? [];
+	state.printList = resPrintIdData.data.result?.items ?? [];
 });
 
 // db改变
-- 
Gitee


From 757d1809786df445a492e962d84481a7ca05ed9d Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 11:04:54 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=89=93=E5=8D=B0=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web/src/views/system/codeGen/component/editCodeGenDialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
index 8e05d861d..28a0f54e1 100644
--- a/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
+++ b/Web/src/views/system/codeGen/component/editCodeGenDialog.vue
@@ -152,7 +152,7 @@ onMounted(async () => {
 	let resDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_create_type');
 	state.codeGenTypeList = resDicData.data.result;
 
-	let printTypeResDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('print_type');
+	let printTypeResDicData = await getAPI(SysDictDataApi).apiSysDictDataDataListCodeGet('code_gen_print_type');
 	state.printTypeList = printTypeResDicData.data.result;
 
 	let resPrintIdData = await getAPI(SysPrintApi).apiSysPrintPagePost();
-- 
Gitee


From cf3f310cd5b0b4cdd17756b993dbf6ba8b087492 Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 11:36:51 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/Template/index.vue.vm             | 34 ++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 7902dac5d..1c064c9f0 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -162,6 +162,9 @@
         }
         <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
           <template #default="scope">
+            @if(@Model.PrintType != "off"){
+            @:<el-button icon="ele-Printer" size="small" text="" type="primary" @@click="openPrint@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):print'"> 打印 </el-button>
+            }
             <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):edit'"> 编辑 </el-button>
             <el-button icon="ele-Delete" size="small" text="" type="primary" @@click="del@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):delete'"> 删除 </el-button>
           </template>
@@ -178,6 +181,10 @@
 				@@current-change="handleCurrentChange"
 				layout="total, sizes, prev, pager, next, jumper"
 	/>
+      <printDialog
+        ref="printDialogRef"
+        :title="print@(@Model.ClassName)Title"
+        @@reloadTable="handleQuery" />
       <editDialog
         ref="editDialogRef"
         :title="edit@(@Model.ClassName)Title"
@@ -195,8 +202,14 @@
   @:import { codeToName, getConstType } from "/@@/utils/constHelper";
   } 
   import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
-  //import { formatDate } from '/@@/utils/formatTime';
+  import { formatDate } from '/@@/utils/formatTime';
 
+  @if(@Model.PrintType != "off"){
+  @:import { SysPrintApi } from '/@@/api-services/api';
+  @:import { SysPrint } from '/@@/api-services/models';
+  }
+  
+  import printDialog from '/@@/views/system/print/component/hiprint/preview.vue'
   import editDialog from '/@@/views/main/@(@Model.LowerClassName)/component/editDialog.vue'
   import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.LowerClassName)';
   @foreach (var column in Model.QueryWhetherList){
@@ -224,6 +237,7 @@
   }else {
   @:const showAdvanceQueryUI = ref(true);
   }
+  const printDialogRef = ref();
   const editDialogRef = ref();
   const loading = ref(false);
   const tableData = ref<any>([]);
@@ -233,6 +247,15 @@
     pageSize: 10,
     total: 0,
   });
+  const tooltipParams = ref({
+    @if(@Model.PrintType != "off"){
+    width: 140,
+    }else{
+    width: 200,
+    }
+  });
+
+  const print@(@Model.ClassName)Title = ref("");
   const edit@(@Model.ClassName)Title = ref("");
 
   // 改变高级查询的控件显示状态
@@ -261,6 +284,15 @@
     editDialogRef.value.openDialog({});
   };
 
+  // 打开打印页面
+  const openPrint@(@Model.ClassName) = (row: any) => {
+    print@(@Model.ClassName)Title.value = '打印@(@Model.BusName)';
+    var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
+	  var printTemplate = res.data.result as SysPrint;
+    var template = JSON.parse(printTemplate.template);
+    printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, template.panels[0].width);
+  }
+  
   // 打开编辑页面
   const openEdit@(@Model.ClassName) = (row: any) => {
     edit@(@Model.ClassName)Title.value = '编辑@(@Model.BusName)';
-- 
Gitee


From 2b832ed8fb153f34751c885d94862d53457636f7 Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 11:41:29 +0800
Subject: [PATCH 5/7] add async

---
 Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 1c064c9f0..396367e84 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -208,7 +208,7 @@
   @:import { SysPrintApi } from '/@@/api-services/api';
   @:import { SysPrint } from '/@@/api-services/models';
   }
-  
+
   import printDialog from '/@@/views/system/print/component/hiprint/preview.vue'
   import editDialog from '/@@/views/main/@(@Model.LowerClassName)/component/editDialog.vue'
   import { page@(@Model.ClassName), delete@(@Model.ClassName) } from '/@@/api/main/@(@Model.LowerClassName)';
@@ -285,7 +285,7 @@
   };
 
   // 打开打印页面
-  const openPrint@(@Model.ClassName) = (row: any) => {
+  const openPrint@(@Model.ClassName) = async (row: any) => {
     print@(@Model.ClassName)Title.value = '打印@(@Model.BusName)';
     var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
 	  var printTemplate = res.data.result as SysPrint;
-- 
Gitee


From bc5659c3d8b401a5d2088e61fd3d297484e1fdc1 Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 12:48:33 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 396367e84..723a4f1b6 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -205,6 +205,7 @@
   import { formatDate } from '/@@/utils/formatTime';
 
   @if(@Model.PrintType != "off"){
+  @:import { hiprint } from 'vue-plugin-hiprint';
   @:import { SysPrintApi } from '/@@/api-services/api';
   @:import { SysPrint } from '/@@/api-services/models';
   }
-- 
Gitee


From b1ef1c4c2046c9641dc276872218a783390be547 Mon Sep 17 00:00:00 2001
From: orzMaster <master@orzsoft.com>
Date: Wed, 6 Dec 2023 13:08:51 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/Template/index.vue.vm             | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
index 723a4f1b6..7bd850c09 100644
--- a/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
+++ b/Admin.NET/Admin.NET.Web.Entry/wwwroot/Template/index.vue.vm
@@ -160,11 +160,14 @@
         }
         }
         }
-        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
-          <template #default="scope">
-            @if(@Model.PrintType != "off"){
+        @if(@Model.PrintType == "custom"){
+        @:<el-table-column label="操作" width="200" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
+          @:<template #default="scope">
             @:<el-button icon="ele-Printer" size="small" text="" type="primary" @@click="openPrint@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):print'"> 打印 </el-button>
-            }
+        }else{
+        @:<el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('@(@Model.LowerClassName):edit') || auth('@(@Model.LowerClassName):delete')">
+          @:<template #default="scope">
+        }
             <el-button icon="ele-Edit" size="small" text="" type="primary" @@click="openEdit@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):edit'"> 编辑 </el-button>
             <el-button icon="ele-Delete" size="small" text="" type="primary" @@click="del@(@Model.ClassName)(scope.row)" v-auth="'@(@Model.LowerClassName):delete'"> 删除 </el-button>
           </template>
@@ -204,7 +207,8 @@
   import { getDictDataItem as di, getDictDataList as dl } from '/@@/utils/dict-utils';
   import { formatDate } from '/@@/utils/formatTime';
 
-  @if(@Model.PrintType != "off"){
+  @if(@Model.PrintType == "custom"){
+  @:// 推荐设置操作 width 为 200
   @:import { hiprint } from 'vue-plugin-hiprint';
   @:import { SysPrintApi } from '/@@/api-services/api';
   @:import { SysPrint } from '/@@/api-services/models';
@@ -248,13 +252,6 @@
     pageSize: 10,
     total: 0,
   });
-  const tooltipParams = ref({
-    @if(@Model.PrintType != "off"){
-    width: 140,
-    }else{
-    width: 200,
-    }
-  });
 
   const print@(@Model.ClassName)Title = ref("");
   const edit@(@Model.ClassName)Title = ref("");
@@ -288,10 +285,13 @@
   // 打开打印页面
   const openPrint@(@Model.ClassName) = async (row: any) => {
     print@(@Model.ClassName)Title.value = '打印@(@Model.BusName)';
-    var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
-	  var printTemplate = res.data.result as SysPrint;
-    var template = JSON.parse(printTemplate.template);
-    printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, template.panels[0].width);
+    @if(@Model.PrintType == "custom"){
+    @:var res = await getAPI(SysPrintApi).apiSysPrintPrintNameGet('@Model.PrintName');
+	  @:var printTemplate = res.data.result as SysPrint;
+    @:var template = JSON.parse(printTemplate.template);
+    @:row['printDate'] = formatDate(new Date(), 'YYYY-mm-dd HH:MM:SS')
+    @:printDialogRef.value.showDialog(new hiprint.PrintTemplate({template: template}), row, template.panels[0].width);
+    }
   }
   
   // 打开编辑页面
@@ -335,7 +335,7 @@
     @:@LowerFirstLetter(@column.FkEntityName)@(@column.PropertyName)DropdownList.value = list.data.result ?? [];
   @:};
   @:get@(@column.FkEntityName)@(@column.PropertyName)DropdownList();
-@:
+  @:
   }
 }
   handleQuery();
-- 
Gitee