调整excel标记数量区域

src/views/comment-excel/components/EditArea/EditArea.vue

@@ -127,6 +127,11 @@
           <template #default="{ row }">
             {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
           </template>
+        </vxe-column>
+        <vxe-column title="是否数量" field="numFlag" width="70">
+        <template #default="{ row }">
+          <el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
+        </template>
       </vxe-column>
         <vxe-column title="操作" field="action" width="50">
           <template #default="{ row, $rowIndex }">
@@ -197,6 +202,11 @@
           <template #default="{ row }">
             {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
           </template>
+        </vxe-column>
+        <vxe-column title="是否数量" field="numFlag" width="70">
+        <template #default="{ row }">
+          <el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
+        </template>
       </vxe-column>
         <vxe-column title="操作" field="action" width="50">
           <template #default="{ row, $rowIndex }">

src/views/comment-excel/components/ExcelOperate/ExcelOperate.vue

@@ -137,20 +137,19 @@
         show-header-overflow="tooltip"
         :data="runResultData"
         border
-        :expand-config="expandConfig"
         height="500"
       >
-        <vxe-column title="行号" type="expand" width="120">
+        <vxe-column title="行号" width="120">
           <template #default="{ row }">{{ row.sortNum }}</template>
-          <template #content="{ row, rowIndex }">
+          <!-- <template #content="{ row, rowIndex }">
             <div style="padding: 10px">
               <template v-for="attchName of filterObjKeys(row.expendData)">
                 <p>{{ attchName }}</p>
                 <vxe-table
                   :data="row.expendData[attchName]"
                   header-row-class-name="expandTableHeader"
-                  min-height="72"
-                  height="72"
+                  min-height="82"
+                  height="82"
                   size="mini"
                   show-overflow="tooltip"
                   show-header-overflow="tooltip"
@@ -164,24 +163,9 @@
                     width="140"
                   ></vxe-column>
                 </vxe-table>
-                <!-- <el-scrollbar>
-                  <el-descriptions
-                    direction="vertical"
-                    border
-                    :column="filterObjKeys(row.expendData[attchName]).length"
-                    size="small"
-                    :title="attchName"
-                  >
-                    <el-descriptions-item
-                      v-for="pro in filterObjKeys(row.expendData[attchName])"
-                      :label="pro"
-                      >{{ row.expendData[attchName][pro] }}</el-descriptions-item
-                    >
-                  </el-descriptions>
-                </el-scrollbar> -->
               </template>
             </div>
-          </template>
+          </template> -->
         </vxe-column>
         <vxe-column title="数据区" width="120">
           <template #default="{ row }">{{ row['数据区'] }}</template>
@@ -221,7 +205,7 @@ import {
   removeExcelAreaConnect
 } from '@/api/excel'
 import type { Recordable } from '@/types/global'
-import { getRangetxt, setRangeBackground } from '@/utils/excel'
+import { filterRunData, getRangetxt, setRangeBackground } from '@/utils/excel'
 import type { VxeTableInstance } from 'vxe-table'
 import EditArea from '../EditArea/EditArea.vue'
 
@@ -661,11 +645,11 @@ const toRun = async () => {
 
     if (!data.result.length) return
 
-    const { res, titles } = filterTableData(data.result)
+    const { res, titles } = filterRunData(data.result)
 
     runResultData.value = res
     runResultTitle.value = titles.filter((field) => {
-      return field != 'sortNum' && field != '数据区' && field != 'expendData'
+      return field != 'sortNum' && field != '数据区'
     })
 
     runResultVisible.value = true
@@ -677,39 +661,6 @@ const toRun = async () => {
   }
 }
 
-const filterTableData = (data: any[]) => {
-  const res: Recordable[] = []
-  const titles: string[] = []
-  data.forEach((row) => {
-    const rw = {}
-    row.order.forEach((itm) => {
-      Reflect.set(rw, itm.title, itm.value)
-      if (!titles.includes(itm.title)) {
-        titles.push(itm.title)
-      }
-    })
-    // 是否有附加信息
-    if (row?.groups?.length) {
-      Reflect.set(rw, 'expendData', {})
-      row.groups.forEach((itm) => {
-        rw['expendData'][itm.title] = []
-        const r = {}
-        itm.item.forEach((v) => {
-          r[v.title] = v.value
-        })
-        rw['expendData'][itm.title].push(r)
-      })
-    }
-
-    res.push(rw)
-  })
-
-  return {
-    res,
-    titles
-  }
-}
-
 const filterObjKeys = (data: any) => {
   return Object.keys(data).filter((v) => v !== '_X_ROW_KEY')
 }

src/views/comment-excel/components/SetAttch/SetAttch.vue

@@ -53,7 +53,12 @@
           {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
         </template>
       </vxe-column>
-      <vxe-column title="操作" field="action" width="90">
+      <vxe-column title="是否数量" field="numFlag" width="70">
+        <template #default="{ row }">
+          <el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
+        </template>
+      </vxe-column>
+      <vxe-column title="操作" field="action" width="50">
         <template #default="{ row, $rowIndex }">
           <el-link style="font-size: 12px" type="danger" @click="delAreaTitle($rowIndex, row)"
             >删除</el-link

src/views/comment-excel/components/SetDataAreaTitle/SetDataAreaTitle.vue

@@ -18,7 +18,12 @@
           {{ getRangetxt(row.row, row.row, row.colum, row.colum) }}
         </template>
       </vxe-column>
-      <vxe-column title="操作" field="action" width="90">
+      <vxe-column title="是否数量" field="numFlag" width="70">
+        <template #default="{ row }">
+          <el-checkbox size="small" true-label="Y" false-label="N" v-model="row.numFlag"></el-checkbox>
+        </template>
+      </vxe-column>
+      <vxe-column title="操作" field="action" width="50">
         <template #default="{ row, $rowIndex }">
           <el-link style="font-size: 12px" type="danger" @click="delAreaTitle($rowIndex, row)"
             >删除</el-link