From e1e5a9eed0b13ef6c4149d2f2fe66d598cd83fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?= <963808678@qq.com>
Date: Tue, 10 Jan 2023 09:38:11 +0800
Subject: [PATCH] 1/10

---
 src/views/main/PrintingNew/index.vue              | 6 ++++++
 src/views/main/PrinttemplateRightNew/addForm.vue  | 4 ++--
 src/views/main/PrinttemplateRightNew/editForm.vue | 4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/main/PrintingNew/index.vue b/src/views/main/PrintingNew/index.vue
index d81f5cd..c96454b 100644
--- a/src/views/main/PrintingNew/index.vue
+++ b/src/views/main/PrintingNew/index.vue
@@ -80,6 +80,11 @@
       </vxe-toolbar>
       <vxe-table :data="loadData" border :loading="loading" empty-text="没有更多数据了！" v-if="!TableType">
         <vxe-column type="seq" width="40" fixed="left"></vxe-column>
+        <vxe-column title="显示名称" width="200" align="center">
+          <template #default="{ row }">
+            {{ row.displayName }}
+          </template>
+        </vxe-column>
         <vxe-column
           v-for="item in TableColumns"
           :key="`${item.dataIndex}3`"
@@ -232,6 +237,7 @@ const columns = [
   //   align: 'center',
   //   dataIndex: 'CateName'
   // },
+
   {
     title: '租户名称',
     align: 'center',
diff --git a/src/views/main/PrinttemplateRightNew/addForm.vue b/src/views/main/PrinttemplateRightNew/addForm.vue
index 627db62..5636dea 100644
--- a/src/views/main/PrinttemplateRightNew/addForm.vue
+++ b/src/views/main/PrinttemplateRightNew/addForm.vue
@@ -37,7 +37,7 @@
                 v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择打印模板！' }] }]"
               >
                 <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
-                  {{ item.typeName }}
+                  {{ item.displayName }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -93,7 +93,7 @@ export default {
       let Rdata = []
       if (value) {
         this.TemplateList2.forEach(item => {
-          if (item.typeName && item.typeName.indexOf(value) > -1) {
+          if (item.displayName && item.displayName.indexOf(value) > -1) {
             Rdata.push(item)
           }
         })
diff --git a/src/views/main/PrinttemplateRightNew/editForm.vue b/src/views/main/PrinttemplateRightNew/editForm.vue
index 7413024..4b57879 100644
--- a/src/views/main/PrinttemplateRightNew/editForm.vue
+++ b/src/views/main/PrinttemplateRightNew/editForm.vue
@@ -37,7 +37,7 @@
                 v-decorator="['printTemplateId', { rules: [{ required: true, message: '请选择打印模板！' }] }]"
               >
                 <a-select-option v-for="item in TemplateList" :key="item.id" :value="item.id">
-                  {{ item.typeName }}
+                  {{ item.displayName }}
                 </a-select-option>
               </a-select>
             </a-form-item>
@@ -93,7 +93,7 @@ export default {
       let Rdata = []
       if (value) {
         this.TemplateList2.forEach(item => {
-          if (item.typeName && item.typeName.indexOf(value) > -1) {
+          if (item.displayName && item.displayName.indexOf(value) > -1) {
             Rdata.push(item)
           }
         })