123

src/views/var/varChange/VarChange.vue

@@ -50,9 +50,11 @@
         <vxe-column type="checkbox" width="50"></vxe-column>
         <vxe-column field="templateFileId" title="模版文件ID" width="180">
           <template #default="{ row }">
-            <el-link target="_blank" :href="'/preview-excel?fileId=' + row.templateFileId + '&type=var'">{{
-              row.templateFileId
-            }}</el-link>
+            <el-link
+              target="_blank"
+              :href="'/preview-excel?fileId=' + row.templateFileId + '&type=var'"
+              >{{ row.templateFileId }}</el-link
+            >
           </template>
         </vxe-column>
         <vxe-column field="customerId_dictText" title="客户" width="300"></vxe-column>
@@ -133,7 +135,7 @@
       <!-- 转换下使用 -->
       <template>
         <vxe-colgroup v-for="item in tableTitle" :key="item" :title="item">
-          <vxe-column :title="item" :field="item" width="200" :key="item">
+          <vxe-colgroup>
             <template #header>
               <div class="header-cell" @click="(e) => showPopover(e, item)">
                 <template v-for="cf in getAllMapConfigs[item].filedConfs">
@@ -143,7 +145,14 @@
                 <el-icon><Setting /></el-icon>
               </div>
             </template>
-          </vxe-column>
+            <vxe-column :title="item" :field="item" width="200" :key="item">
+              <template #header>
+                <template v-for="cf in getAllMapConfigs[item].filedConfs">
+                  <span>{{ cf.filterFiled?.fliedTitle }}</span>
+                </template>
+              </template>
+            </vxe-column>
+          </vxe-colgroup>
         </vxe-colgroup>
       </template>
     </vxe-table>
@@ -192,7 +201,7 @@ import {
   apiVarTemplateConvert,
   apiVarTemplateSaveConf,
   getVarSpecList,
-getFilterMapField
+  getFilterMapField
 } from '@/api/var'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { VxeTableInstance } from 'vxe-table'
@@ -206,7 +215,6 @@ import TemplateVariable from './components/TemplateVariable.vue'
 import { useOrderChangeCopy } from '@/hooks/useOrderChangeCopy'
 import CustomerModal from '@/components/CustomerModal/CustomerModal.vue'
 
-
 const visible = ref(false)
 const loading = ref(false)
 const importVisible = ref(false)
@@ -388,8 +396,7 @@ const toDetail = async (row: any) => {
   const { data: cdata } = await apiVarTemplateGetConf(row.varTemplateDetailId)
   const { data: specData } = await getVarSpecList(row.productCode)
   // 获取过滤字段
-  const {data: filterData } = await getFilterMapField()
-
+  const { data: filterData } = await getFilterMapField()
 
   const { res, titles, configs } = filterRunData2(data.result, true)