123

src/utils/excel.ts

@@ -415,7 +415,6 @@ export function filterVarData(data: any) {
   }
   titles
     .add('底图名称')
-    .add('销售单号+行项次')
     .add('工单号')
     .add('参考数')
     .add('品牌名称')
@@ -426,22 +425,21 @@ export function filterVarData(data: any) {
   data.forEach((row: any) => {
     const rw: Recordable = {}
     Reflect.set(rw, '底图名称', row['imageName'])
-    Reflect.set(rw, '销售单号+行项次', row['orderCodeNo'])
     Reflect.set(rw, '工单号', row['workorderCode'])
     Reflect.set(rw, '参考数', row['orderNum'])
     Reflect.set(rw, '品牌名称', row['brandName'])
     Reflect.set(rw, '客户名称', row['customerName'])
     Reflect.set(rw, '季度', row['quarter'])
     Reflect.set(rw, '产品编码', row['productCode'])
-
     // 变量信息
     row.varOrder.order.forEach((itm: any) => {
       Reflect.set(rw, itm.title, itm.value)
       titles.add(itm.title)
     })
-
+   Reflect.set(rw, '销售单号+行项次', row['orderCodeNo'])
     res.push(rw)
   })
+  titles.add('销售单号+行项次')
   return {
     res,
     titles: [...titles]

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

@@ -239,31 +239,6 @@
       >
         <vxe-column title="行号" width="120">
           <template #default="{ row }">{{ row.sortNum }}</template>
-          <!-- <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="82"
-                  height="82"
-                  size="mini"
-                  show-overflow="tooltip"
-                  show-header-overflow="tooltip"
-                  style="width: 70vw;"
-                  border
-                >
-                  <vxe-column
-                    v-for="key in filterObjKeys(row.expendData[attchName][0])"
-                    :title="key"
-                    :field="key"
-                    width="140"
-                  ></vxe-column>
-                </vxe-table>
-              </template>
-            </div>
-          </template> -->
         </vxe-column>
         <vxe-column title="sheet页" width="120">
           <template #default="{ row }">{{ row['sheet页'] }}</template>

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

@@ -105,6 +105,7 @@ const saveArea = async () => {
       setAttchRef.value.resetFormState()
       emits('success', data)
     } else {
+       loadingInstance.close()
       return ElMessage.error(data.message || '保存失败！')
     }
   } catch {}

src/views/order/orderChange/OrderChange.vue

@@ -163,10 +163,6 @@
       :data="detailTable"
     >
 
-      <!-- <vxe-column title="sheet" width="120">
-        <template #default="{ row }">{{ row['sheet页'] }}</template>
-      </vxe-column> -->
-
       <!-- 转换下使用 -->
       <vxe-column title="行号" width="120">
         <template #default="{ row }">{{ row.sortNum }}</template>

src/views/var/varExcel/components/SetArea/SetArea.vue

@@ -105,6 +105,7 @@ const saveArea = async () => {
       setAttchRef.value.resetFormState()
       emits('success', data)
     } else {
+      loadingInstance.close()
       return ElMessage.error(data.message || '保存失败！')
     }
   } catch {}

src/views/var/variables/Variables.vue

@@ -264,7 +264,7 @@ const handleShowVarRun = async (row: any) => {
     return ElMessage.error(data.message || '操作失败！')
   }
   const { res, titles } = filterVarData(data.result.varOrders || [])
-
+  console.log(titles)
   detailVariable.value.titles = titles as any
   detailVariable.value.data = res as any
   detailVariable.value.errors = data.result?.errors || []