From cb0f8790dc1f81ea0fb60ba043dea12e8d4bae4e Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Thu, 31 Jul 2025 17:20:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(qms):=20=E9=87=8D=E7=BD=AE=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=A8=A1=E6=9D=BF=E8=A1=A8=E5=8D=95=E6=97=B6=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E3=80=81=E5=B7=A5=E5=BA=8F=E5=92=8C=E7=AB=99=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在重置表单时添加了清除 selectedStaionId、selectedProcessId 和 selectedSupplierId 的逻辑
- 确保用户在重置表单后能够正确地重新选择这些关联项
---
 src/views/qms/qcInspectionTemplate/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/qms/qcInspectionTemplate/index.vue b/src/views/qms/qcInspectionTemplate/index.vue
index fc80cd9..463d205 100644
--- a/src/views/qms/qcInspectionTemplate/index.vue
+++ b/src/views/qms/qcInspectionTemplate/index.vue
@@ -600,6 +600,9 @@ const reset = () => {
   form.value = {...initFormData};
   qcInspectionTemplateFormRef.value?.resetFields();
   selectedMaterialId.value = null;
+  selectedStaionId.value = null;
+  selectedProcessId.value = null;
+  selectedSupplierId.value = null;
 }
 
 /** 子表取消按钮 */

From 7cdd31bf27fe58c50ea1ca078e9764d6570b9b89 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Thu, 31 Jul 2025 17:50:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20sys=E6=B7=BB=E5=8A=A0=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/printTemplateInfo/index.vue | 258 ++++++++++---------
 src/views/system/printTemplateList/index.vue |  16 +-
 src/views/system/printTemplateNode/index.vue |  22 +-
 3 files changed, 161 insertions(+), 135 deletions(-)

diff --git a/src/views/system/printTemplateInfo/index.vue b/src/views/system/printTemplateInfo/index.vue
index eafc2bd..15b1227 100644
--- a/src/views/system/printTemplateInfo/index.vue
+++ b/src/views/system/printTemplateInfo/index.vue
@@ -1,115 +1,129 @@
 <template>
-  <div class="p-2">
-    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true" >
-            <el-form-item label="纸张类型" prop="paperType">
-              <el-select v-model="queryParams.paperType" placeholder="请选择纸张类型" clearable >
-                <el-option v-for="dict in mes_paper_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+  <div class='p-2'>
+    <transition :enter-active-class='proxy?.animate.searchAnimate.enter'
+                :leave-active-class='proxy?.animate.searchAnimate.leave'>
+      <div v-show='showSearch' class='mb-[10px]'>
+        <el-card shadow='hover'>
+          <el-form ref='queryFormRef' :model='queryParams' :inline='true'>
+            <el-form-item label='纸张类型' prop='paperType'>
+              <el-select v-model='queryParams.paperType' placeholder='请选择纸张类型' clearable>
+                <el-option v-for='dict in mes_paper_type' :key='dict.value' :label='dict.label' :value='dict.value' />
               </el-select>
             </el-form-item>
-            <el-form-item label="纸张宽度" prop="width">
-              <el-input v-model="queryParams.width" placeholder="请输入纸张宽度" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='纸张宽度' prop='width'>
+              <el-input v-model='queryParams.width' placeholder='请输入纸张宽度' clearable @keyup.enter='handleQuery' />
             </el-form-item>
-            <el-form-item label="激活标识" prop="activeFlag">
-              <el-input v-model="queryParams.activeFlag" placeholder="请输入激活标识" clearable @keyup.enter="handleQuery" />
+            <el-form-item label='激活标识' prop='activeFlag'>
+              <el-input v-model='queryParams.activeFlag' placeholder='请输入激活标识' clearable
+                        @keyup.enter='handleQuery' />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              <el-button type='primary' icon='Search' @click='handleQuery'>搜索</el-button>
+              <el-button icon='Refresh' @click='resetQuery'>重置</el-button>
             </el-form-item>
           </el-form>
         </el-card>
       </div>
     </transition>
 
-    <el-card shadow="never">
+    <el-card shadow='never'>
       <template #header>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:printTemplateInfo:add']">新增</el-button>
+        <el-row :gutter='10' class='mb8'>
+          <el-col :span='1.5'>
+            <el-button type='primary' plain icon='Plus' @click='handleAdd'
+                       v-hasPermi="['system:printTemplateInfo:add']">新增
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:printTemplateInfo:edit']">修改</el-button>
+          <el-col :span='1.5'>
+            <el-button type='success' plain icon='Edit' :disabled='single' @click='handleUpdate()'
+                       v-hasPermi="['system:printTemplateInfo:edit']">修改
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:printTemplateInfo:remove']">删除</el-button>
+          <el-col :span='1.5'>
+            <el-button type='danger' plain icon='Delete' :disabled='multiple' @click='handleDelete()'
+                       v-hasPermi="['system:printTemplateInfo:remove']">删除
+            </el-button>
           </el-col>
-          <el-col :span="1.5">
-            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:printTemplateInfo:export']">导出</el-button>
+          <el-col :span='1.5'>
+            <el-button type='warning' plain icon='Download' @click='handleExport'
+                       v-hasPermi="['system:printTemplateInfo:export']">导出
+            </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" :columns="columns" :search="true" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch='showSearch' :columns='columns' :search='true'
+                         @queryTable='getList'></right-toolbar>
         </el-row>
       </template>
 
-      <el-table v-loading="loading" :data="printTemplateInfoList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="模板列表" align="center" prop="templateInfoId" v-if="columns[0].visible"/>
-        <el-table-column label="模板列表" align="center" prop="templateListId" v-if="columns[2].visible"/>
-        <el-table-column label="纸张类型" align="center" prop="paperType" v-if="columns[3].visible">
-          <template #default="scope">
-            <dict-tag :options="mes_paper_type" :value="scope.row.paperType"/>
+      <el-table v-loading='loading' :data='printTemplateInfoList' @selection-change='handleSelectionChange'>
+        <el-table-column type='selection' width='55' align='center' />
+        <el-table-column label='模板信息ID' align='center' prop='templateInfoId' v-if='columns[0].visible' />
+        <el-table-column label='模板列表' align='center' prop='templateName' v-if='columns[2].visible' />
+        <el-table-column label='纸张类型' align='center' prop='paperType' v-if='columns[3].visible'>
+          <template #default='scope'>
+            <dict-tag :options='mes_paper_type' :value='scope.row.paperType' />
           </template>
         </el-table-column>
-        <el-table-column label="纸张宽度" align="center" prop="width" v-if="columns[4].visible"/>
-        <el-table-column label="纸张高度" align="center" prop="height" v-if="columns[5].visible"/>
-        <el-table-column label="背景颜色" align="center" prop="backgroundColor" v-if="columns[6].visible"/>
-        <el-table-column label="纸张方向" align="center" prop="orientation" v-if="columns[7].visible"/>
-        <el-table-column label="激活标识" align="center" prop="activeFlag" v-if="columns[9].visible">
+        <el-table-column label='纸张宽度' align='center' prop='width' v-if='columns[4].visible' />
+        <el-table-column label='纸张高度' align='center' prop='height' v-if='columns[5].visible' />
+        <el-table-column label='背景颜色' align='center' prop='backgroundColor' v-if='columns[6].visible' />
+        <el-table-column label='纸张方向' align='center' prop='orientation' v-if='columns[7].visible' />
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[9].visible'>
           <template #default='scope'>
             <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-          <template #default="scope">
-            <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:printTemplateInfo:edit']"></el-button>
+        <el-table-column label='备注' align='center' prop='remark' v-if='columns[10].visible' />
+        <el-table-column label='操作' align='center' class-name='small-padding fixed-width'>
+          <template #default='scope'>
+            <el-tooltip content='修改' placement='top'>
+              <el-button link type='primary' icon='Edit' @click='handleUpdate(scope.row)'
+                         v-hasPermi="['system:printTemplateInfo:edit']"></el-button>
             </el-tooltip>
-            <el-tooltip content="删除" placement="top">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:printTemplateInfo:remove']"></el-button>
+            <el-tooltip content='删除' placement='top'>
+              <el-button link type='primary' icon='Delete' @click='handleDelete(scope.row)'
+                         v-hasPermi="['system:printTemplateInfo:remove']"></el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+      <pagination v-show='total > 0' :total='total' v-model:page='queryParams.pageNum'
+                  v-model:limit='queryParams.pageSize' @pagination='getList' />
     </el-card>
     <!-- 添加或修改打印模板信息对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="printTemplateInfoFormRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="模板列表" prop="templateListId">
-          <el-select v-model="form.templateListId" placeholder="请选择模板列表">
+    <el-dialog :title='dialog.title' v-model='dialog.visible' width='500px' append-to-body>
+      <el-form ref='printTemplateInfoFormRef' :model='form' :rules='rules' label-width='120px'>
+        <el-form-item label='模板列表' prop='templateListId'>
+          <el-select v-model='form.templateListId' placeholder='请选择模板列表'>
             <el-option
-              v-for="item in printTemplateList"
-              :key="item.templateListId"
-              :label="item.templateName"
-              :value="item.templateListId"
+              v-for='item in printTemplateList'
+              :key='item.templateListId'
+              :label='item.templateName'
+              :value='item.templateListId'
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="纸张类型" prop="paperType">
-          <el-select v-model="form.paperType" placeholder="请选择纸张类型">
+        <el-form-item label='纸张类型' prop='paperType'>
+          <el-select v-model='form.paperType' placeholder='请选择纸张类型'>
             <el-option
-                v-for="dict in mes_paper_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
+              v-for='dict in mes_paper_type'
+              :key='dict.value'
+              :label='dict.label'
+              :value='dict.value'
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="纸张宽度" prop="width">
-          <el-input v-model="form.width" placeholder="请输入纸张宽度" />
+        <el-form-item label='纸张宽度' prop='width'>
+          <el-input v-model='form.width' placeholder='请输入纸张宽度' />
         </el-form-item>
-        <el-form-item label="纸张高度" prop="height">
-          <el-input v-model="form.height" placeholder="请输入纸张高度" />
+        <el-form-item label='纸张高度' prop='height'>
+          <el-input v-model='form.height' placeholder='请输入纸张高度' />
         </el-form-item>
-        <el-form-item label="背景颜色" prop="backgroundColor">
-          <el-input v-model="form.backgroundColor" placeholder="请输入背景颜色" />
+        <el-form-item label='背景颜色' prop='backgroundColor'>
+          <el-input v-model='form.backgroundColor' placeholder='请输入背景颜色' />
         </el-form-item>
-        <el-form-item label="纸张方向" prop="orientation">
-          <el-input v-model="form.orientation" placeholder="请输入纸张方向" />
+        <el-form-item label='纸张方向' prop='orientation'>
+          <el-input v-model='form.orientation' placeholder='请输入纸张方向' />
         </el-form-item>
         <el-form-item label='激活标识' prop='activeFlag'>
           <el-radio-group v-model='form.activeFlag'>
@@ -121,23 +135,33 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
+        <el-form-item label='备注' prop='remark'>
+          <el-input v-model='form.remark' placeholder='请输入备注' />
         </el-form-item>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+        <div class='dialog-footer'>
+          <el-button :loading='buttonLoading' type='primary' @click='submitForm'>确 定</el-button>
+          <el-button @click='cancel'>取 消</el-button>
         </div>
       </template>
     </el-dialog>
   </div>
 </template>
 
-<script setup name="PrintTemplateInfo" lang="ts">
-import { listPrintTemplateInfo, getPrintTemplateInfo, delPrintTemplateInfo, addPrintTemplateInfo, updatePrintTemplateInfo } from '@/api/system/printTemplateInfo';
-import { PrintTemplateInfoVO, PrintTemplateInfoQuery, PrintTemplateInfoForm } from '@/api/system/printTemplateInfo/types';
+<script setup name='PrintTemplateInfo' lang='ts'>
+import {
+  listPrintTemplateInfo,
+  getPrintTemplateInfo,
+  delPrintTemplateInfo,
+  addPrintTemplateInfo,
+  updatePrintTemplateInfo
+} from '@/api/system/printTemplateInfo';
+import {
+  PrintTemplateInfoVO,
+  PrintTemplateInfoQuery,
+  PrintTemplateInfoForm
+} from '@/api/system/printTemplateInfo/types';
 import { getSysPrintTemplateListList } from '@/api/system/printTemplateList';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -169,22 +193,22 @@ const getPrintTemplateList = async () => {
 
 // 列显隐信息
 const columns = ref<FieldOption[]>([
-        { key: 0, label: `模板列表`, visible: false },
-        { key: 1, label: `租户编号`, visible: false },
-        { key: 2, label: `模板列表`, visible: true },
-        { key: 3, label: `纸张类型`, visible: true },
-        { key: 4, label: `纸张宽度`, visible: true },
-        { key: 5, label: `纸张高度`, visible: true },
-        { key: 6, label: `背景颜色`, visible: true },
-        { key: 7, label: `纸张方向`, visible: true },
-        { key: 8, label: `版本号`, visible: true },
-        { key: 9, label: `激活标识`, visible: true },
-        { key: 10, label: `备注`, visible: true },
-        { key: 11, label: `创建部门`, visible: false },
-        { key: 12, label: `创建人`, visible: false },
-        { key: 13, label: `创建时间`, visible: false },
-        { key: 14, label: `更新人`, visible: false },
-        { key: 15, label: `更新时间`, visible: false },
+  { key: 0, label: `模板信息ID`, visible: true },
+  { key: 1, label: `租户编号`, visible: false },
+  { key: 2, label: `模板列表`, visible: true },
+  { key: 3, label: `纸张类型`, visible: true },
+  { key: 4, label: `纸张宽度`, visible: true },
+  { key: 5, label: `纸张高度`, visible: true },
+  { key: 6, label: `背景颜色`, visible: true },
+  { key: 7, label: `纸张方向`, visible: true },
+  { key: 8, label: `版本号`, visible: true },
+  { key: 9, label: `激活标识`, visible: true },
+  { key: 10, label: `备注`, visible: true },
+  { key: 11, label: `创建部门`, visible: false },
+  { key: 12, label: `创建人`, visible: false },
+  { key: 13, label: `创建时间`, visible: false },
+  { key: 14, label: `更新人`, visible: false },
+  { key: 15, label: `更新时间`, visible: false }
 ]);
 
 const initFormData: PrintTemplateInfoForm = {
@@ -196,10 +220,10 @@ const initFormData: PrintTemplateInfoForm = {
   backgroundColor: undefined,
   orientation: undefined,
   activeFlag: undefined,
-  remark: undefined,
-}
+  remark: undefined
+};
 const data = reactive<PageData<PrintTemplateInfoForm, PrintTemplateInfoQuery>>({
-  form: {...initFormData},
+  form: { ...initFormData },
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -211,11 +235,9 @@ const data = reactive<PageData<PrintTemplateInfoForm, PrintTemplateInfoQuery>>({
     backgroundColor: undefined,
     orientation: undefined,
     activeFlag: undefined,
-    params: {
-    }
+    params: {}
   },
-  rules: {
-  }
+  rules: {}
 });
 
 const { queryParams, form, rules } = toRefs(data);
@@ -227,55 +249,55 @@ const getList = async () => {
   printTemplateInfoList.value = res.rows;
   total.value = res.total;
   loading.value = false;
-}
+};
 
 /** 取消按钮 */
 const cancel = () => {
   reset();
   dialog.visible = false;
-}
+};
 
 /** 表单重置 */
 const reset = () => {
-  form.value = {...initFormData};
+  form.value = { ...initFormData };
   printTemplateInfoFormRef.value?.resetFields();
-}
+};
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
   getList();
-}
+};
 
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
   handleQuery();
-}
+};
 
 /** 多选框选中数据 */
 const handleSelectionChange = (selection: PrintTemplateInfoVO[]) => {
   ids.value = selection.map(item => item.templateInfoId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
-}
+};
 
 /** 新增按钮操作 */
 const handleAdd = () => {
   reset();
   dialog.visible = true;
-  dialog.title = "添加打印模板信息";
-}
+  dialog.title = '添加打印模板信息';
+};
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: PrintTemplateInfoVO) => {
   reset();
-  const _templateInfoId = row?.templateInfoId || ids.value[0]
+  const _templateInfoId = row?.templateInfoId || ids.value[0];
   const res = await getPrintTemplateInfo(_templateInfoId);
   Object.assign(form.value, res.data);
   dialog.visible = true;
-  dialog.title = "修改打印模板信息";
-}
+  dialog.title = '修改打印模板信息';
+};
 
 /** 提交按钮 */
 const submitForm = () => {
@@ -283,32 +305,32 @@ const submitForm = () => {
     if (valid) {
       buttonLoading.value = true;
       if (form.value.templateInfoId) {
-        await updatePrintTemplateInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await updatePrintTemplateInfo(form.value).finally(() => buttonLoading.value = false);
       } else {
-        await addPrintTemplateInfo(form.value).finally(() =>  buttonLoading.value = false);
+        await addPrintTemplateInfo(form.value).finally(() => buttonLoading.value = false);
       }
-      proxy?.$modal.msgSuccess("操作成功");
+      proxy?.$modal.msgSuccess('操作成功');
       dialog.visible = false;
       await getList();
     }
   });
-}
+};
 
 /** 删除按钮操作 */
 const handleDelete = async (row?: PrintTemplateInfoVO) => {
   const _templateInfoIds = row?.templateInfoId || ids.value;
   await proxy?.$modal.confirm('是否确认删除打印模板信息编号为"' + _templateInfoIds + '"的数据项？').finally(() => loading.value = false);
   await delPrintTemplateInfo(_templateInfoIds);
-  proxy?.$modal.msgSuccess("删除成功");
+  proxy?.$modal.msgSuccess('删除成功');
   await getList();
-}
+};
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('system/printTemplateInfo/export', {
     ...queryParams.value
-  }, `printTemplateInfo_${new Date().getTime()}.xlsx`)
-}
+  }, `printTemplateInfo_${new Date().getTime()}.xlsx`);
+};
 
 onMounted(() => {
   getPrintTemplateList();
diff --git a/src/views/system/printTemplateList/index.vue b/src/views/system/printTemplateList/index.vue
index 464f277..51dc9d0 100644
--- a/src/views/system/printTemplateList/index.vue
+++ b/src/views/system/printTemplateList/index.vue
@@ -51,9 +51,9 @@
         <el-table-column label="模板列表ID" align="center" prop="templateListId" v-if="columns[0].visible"/>
         <el-table-column label="模板编号" align="center" prop="templateCode" v-if="columns[2].visible"/>
         <el-table-column label="模板名称" align="center" prop="templateName" v-if="columns[3].visible"/>
-        <el-table-column label="模板类型" align="center" prop="templateType" v-if="columns[4].visible">
+        <el-table-column label="模板类型2" align="center" prop="templateType" v-if="columns[4].visible">
           <template #default="scope">
-            <dict-tag :options="sys_template_type" :value="scope.row.templateType"/>
+            <dict-tag :options="sys_template_type" :value="scope.row.templateType ? scope.row.templateType.split(',') : []"/>
           </template>
         </el-table-column>
         <el-table-column label="纸张尺寸" align="center" prop="paperSize" v-if="columns[5].visible"/>
@@ -88,13 +88,14 @@
           <el-input v-model="form.templateName" placeholder="请输入模板名称" />
         </el-form-item>
         <el-form-item label="模板类型" prop="templateType">
-          <el-radio-group v-model="form.templateType">
-            <el-radio
+          <el-checkbox-group v-model="form.templateType">
+            <el-checkbox
               v-for="dict in sys_template_type"
               :key="dict.value"
-              :value="dict.value"
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
+              :label="dict.value">
+              {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
         </el-form-item>
         <el-form-item label="纸张尺寸" prop="paperSize">
           <el-input v-model="form.paperSize" placeholder="请输入纸张尺寸" />
@@ -271,6 +272,7 @@ const submitForm = () => {
   printTemplateListFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       buttonLoading.value = true;
+      form.value.templateType = form.value.templateType.join(",");
       if (form.value.templateListId) {
         await updatePrintTemplateList(form.value).finally(() =>  buttonLoading.value = false);
       } else {
diff --git a/src/views/system/printTemplateNode/index.vue b/src/views/system/printTemplateNode/index.vue
index 0ba4c57..b99481b 100644
--- a/src/views/system/printTemplateNode/index.vue
+++ b/src/views/system/printTemplateNode/index.vue
@@ -8,8 +8,8 @@
             <!--            <el-form-item label="模板节点ID" prop="templateNodeId">-->
             <!--              <el-input v-model="queryParams.templateNodeId" placeholder="请输入模板节点ID" clearable @keyup.enter="handleQuery" />-->
             <!--            </el-form-item>-->
-            <!--            <el-form-item label="模板信息ID" prop="templateInfoId">-->
-            <!--              <el-input v-model="queryParams.templateInfoId" placeholder="请输入模板信息ID" clearable @keyup.enter="handleQuery" />-->
+            <!--            <el-form-item label="模板列表" prop="templateInfoId">-->
+            <!--              <el-input v-model="queryParams.templateInfoId" placeholder="请输入模板列表" clearable @keyup.enter="handleQuery" />-->
             <!--            </el-form-item>-->
             <el-form-item label='节点名称' prop='name'>
               <el-input v-model='queryParams.name' placeholder='请输入节点名称' clearable @keyup.enter='handleQuery' />
@@ -61,17 +61,18 @@
       <el-table v-loading='loading' :data='printTemplateNodeList' @selection-change='handleSelectionChange'>
         <el-table-column type='selection' width='55' align='center' />
         <el-table-column label='模板节点ID' align='center' prop='templateNodeId' v-if='columns[0].visible' />
-        <el-table-column label='模板信息ID' align='center' prop='templateInfoId' v-if='columns[2].visible' />
+        <el-table-column label='模板信息ID' align='center' prop='templateInfoId' v-if='columns[1].visible' />
+        <el-table-column label='模板列表' align='center' prop='templateName' v-if='columns[2].visible' />
         <el-table-column label='节点名称' align='center' prop='name' v-if='columns[3].visible' />
         <el-table-column label='节点类型' align='center' prop='type' v-if='columns[4].visible' />
         <el-table-column label='节点宽度' align='center' prop='width' v-if='columns[5].visible' />
         <el-table-column label='节点高度' align='center' prop='height' v-if='columns[6].visible' />
-        <el-table-column label='x轴位置' align='center' prop='x' v-if='columns[7].visible' />
-        <el-table-column label='y轴位置' align='center' prop='y' v-if='columns[8].visible' />
-        <el-table-column label='内部属性' align='center' prop='data' v-if='columns[9].visible' />
-        <el-table-column label='节点ID' align='center' prop='id' v-if='columns[10].visible' />
+        <el-table-column label='x轴位置' align='center' prop='x' v-if='columns[7].visible' show-overflow-tooltip />
+        <el-table-column label='y轴位置' align='center' prop='y' v-if='columns[8].visible' show-overflow-tooltip />
+        <el-table-column label='内部属性' align='center' prop='data' v-if='columns[9].visible' show-overflow-tooltip />
+        <el-table-column label='节点ID' align='center' prop='id' v-if='columns[10].visible' show-overflow-tooltip />
         <el-table-column label='父节点ID' align='center' prop='parentNode' v-if='columns[11].visible' />
-        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[12].visible' >
+        <el-table-column label='激活标识' align='center' prop='activeFlag' v-if='columns[12].visible'>
           <template #default='scope'>
             <dict-tag :options='active_flag' :value='scope.row.activeFlag' />
           </template>
@@ -164,6 +165,7 @@ import {
   PrintTemplateNodeQuery,
   PrintTemplateNodeForm
 } from '@/api/system/printTemplateNode/types';
+
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@@ -189,8 +191,8 @@ const dialog = reactive<DialogOption>({
 // 列显隐信息
 const columns = ref<FieldOption[]>([
   { key: 0, label: `模板节点ID`, visible: false },
-  { key: 1, label: `租户编号`, visible: false },
-  { key: 2, label: `模板信息ID`, visible: true },
+  { key: 1, label: `模板信息ID`, visible: true },
+  { key: 2, label: `模板列表`, visible: true },
   { key: 3, label: `节点名称`, visible: true },
   { key: 4, label: `节点类型`, visible: true },
   { key: 5, label: `节点宽度`, visible: true },