From 3b2b93544bd48b23ff755493a6e14eb5e561db70 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 17:13:58 +0800
Subject: [PATCH] 1/10

---
 src/views/main/PrintingNew/index.vue | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/views/main/PrintingNew/index.vue b/src/views/main/PrintingNew/index.vue
index c96454b..ed7c4bd 100644
--- a/src/views/main/PrintingNew/index.vue
+++ b/src/views/main/PrintingNew/index.vue
@@ -158,7 +158,7 @@
         :edit-config="{ trigger: 'click', mode: 'row', icon: 'vxe-icon-edit', showStatus: true }"
       >
         <vxe-column type="checkbox" width="60"></vxe-column>
-        <vxe-column field="field" title="字段名称" :edit-render="{}">
+        <vxe-column field="fieldName" title="字段名称" :edit-render="{}">
           <template #edit="{ row }">
             <!-- <vxe-input v-model="row.field" type="text"></vxe-input> -->
             <!-- <a-select v-model="row.field" style="width: 100%" placeholder="请选择分类" allow-clear>
@@ -177,7 +177,7 @@
             <vxe-pulldown v-model="visible1">
               <template #default>
                 <vxe-input
-                  v-model="row.field"
+                  v-model="row.fieldName"
                   placeholder="请选择分类"
                   @focus="focusEvent1"
                   @keyup="keyupEvent1(row)"
@@ -295,10 +295,11 @@ export default {
       }, 200)
     },
     keyupEvent1(data) {
-      this.fieldData = data.field ? this.data1.filter(item => item.name.indexOf(data.field) > -1) : this.data1
+      this.fieldData = data.fieldName ? this.data1.filter(item => item.name.indexOf(data.fieldName) > -1) : this.data1
     },
     selectEvent1(item, data) {
-      data.field = item.name
+      data.fieldName = item.name
+      data.field = item.code
       this.visible1 = false
       this.fieldData = this.data1
     },
@@ -342,6 +343,13 @@ export default {
       this.ExcelPid = data.id
       this.tableData = []
       BookingTemplateBookingExcelTemplateList({ id: this.ExcelPid }).then(res => {
+        res.data.forEach(item => {
+          this.data1.forEach(ele => {
+            if (item.field == ele.code) {
+              item.fieldName = ele.name
+            }
+          })
+        })
         this.tableData = res.data
       })
       this.ExcelVisible = true