添加尺码组类型数据区域

src/router/index.ts

@@ -187,6 +187,7 @@ export const routes = [
   {
     path: '/preview-excel',
     name: 'PreviewExcel',
+    hidden: true,
     meta: {
       title: '预览'
     },

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

@@ -6,7 +6,12 @@
       <el-step title="附加信息" />
     </el-steps>
 
-    <SetDataArea v-show="activeStep == 0" :areaTypeLen="areaTypeLen" ref="setDataAreaRef" @next="nextStep" />
+    <SetDataArea
+      v-show="activeStep == 0"
+      :areaTypeLen="areaTypeLen"
+      ref="setDataAreaRef"
+      @next="nextStep"
+    />
     <SetDataAreaTitle
       ref="setDataAreaTitleRef"
       v-show="activeStep == 1"
@@ -29,7 +34,7 @@ import SetDataAreaTitle from '../SetDataAreaTitle/SetDataAreaTitle.vue'
 import SetAttch from '../SetAttch/SetAttch.vue'
 import type { Recordable } from '@/types/global'
 import { addExcelArea } from '@/api/excel'
-import { ElMessage } from 'element-plus'
+import { ElLoading, ElMessage } from 'element-plus'
 import { storeToRefs } from 'pinia'
 import { useCommentExcel } from '@/stores/commentExcel'
 
@@ -87,17 +92,23 @@ const nextStep = async (index = 1, data: any) => {
 
 const saveArea = async () => {
   currentAreaMark.fileId = getFileInfo.value.orderFileId
-  const { data } = await addExcelArea(currentAreaMark)
-  if (data.code == 200 && data.result != null) {
-    ElMessage.success('保存成功！')
-    // 保存成功。清空组件状态
-    setDataAreaRef.value.resetFormState()
-    setDataAreaTitleRef.value.resetExcelAreaTitleState()
-    setAttchRef.value.resetFormState()
-    emits('success', data)
-  } else {
-    return ElMessage.error(data.message || '保存失败！')
-  }
+  const loadingInstance = ElLoading.service({
+    fullscreen: true
+  })
+  try {
+    const { data } = await addExcelArea(currentAreaMark)
+    if (data.code == 200 && data.result != null) {
+      ElMessage.success('保存成功！')
+      // 保存成功。清空组件状态
+      setDataAreaRef.value.resetFormState()
+      setDataAreaTitleRef.value.resetExcelAreaTitleState()
+      setAttchRef.value.resetFormState()
+      emits('success', data)
+    } else {
+      return ElMessage.error(data.message || '保存失败！')
+    }
+  } catch {}
+  loadingInstance.close()
 }
 </script>
 <style lang="scss">

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

@@ -84,7 +84,7 @@ const setNumFlag = () => {
 
     if (!cell) return
     Reflect.set(cell, 'numFlag', 'Y')
-    !cell.numTitle && Reflect.set(cell, 'numTitle', '尺码')
+    // !cell.numTitle && Reflect.set(cell, 'numTitle', '尺码')
   }
 }
 
@@ -141,14 +141,28 @@ const setAreaTitle = () => {
 }
 
 const numFlagChange = ([val], row: any) => {
-  if (val == 'Y') {
-    !row.numTitle && (row.numTitle = '尺码')
-  } else {
-    row.numTitle = ''
+  // if (val == 'Y') {
+  //   !row.numTitle && (row.numTitle = '尺码')
+  // } else {
+  //   row.numTitle = ''
+  // }
+}
+
+const validateNumTitle = () => {
+  if (
+    !unref(excelAreaTitle).every(
+      (v) => (!v.numTitle && v.numFlag == 'N') || (v.numTitle && v.numFlag == 'Y')
+    )
+  ) {
+    ElMessage.error('拆分的单元格需要设置特性！')
+    return false
   }
+  return true
 }
 
 const save = () => {
+  // 验证是否标记了拆分，拆分的单元格必须设置numTitle字段
+  if (!validateNumTitle()) return
   emits('next', -2, {
     excelAreaTitle: unref(excelAreaTitle),
     titleArea: unref(titleArea)
@@ -188,8 +202,11 @@ const resetExcelAreaTitleState = () => {
 }
 const nextStep = (index: number = 1) => {
   // 验证是否设置标题区域
-  if (!excelAreaTitle.value.length && index > 0) {
-    return ElMessage.error('请添加标题区！')
+  if (index > 0) {
+    if (!excelAreaTitle.value.length) {
+      return ElMessage.error('请添加标题区！')
+    }
+    if (!validateNumTitle()) return
   }
   emits(
     'next',

src/views/order/orderChange/OrderChange.vue

@@ -492,6 +492,7 @@ const confirmChange = async (row) => {
   if (data.code == 200) {
     ElMessage.success(data.message || '转换成功！')
     detailVisible.value = false
+    onQuery()
     return
   }
   ElMessage.error(data.message || '转换失败！')

vite.config.ts

@@ -13,8 +13,8 @@ export default defineConfig({
   server: {
     proxy: {
       "/api": {
-        target: "http://192.168.222.122:10000",
-        // target: "http://192.168.4.158:8080",
+        target: "http://192.168.23.7:8080",
+        // target: "http://192.168.3.91:10000",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/api/, ""),
       },