19

src/renderer/src/views/shujuchuli.vue

@@ -82,7 +82,8 @@ let isBetween = require('dayjs/plugin/isBetween')
 dayjs.extend(isBetween)
 import tablecomponent from "../components/tablecomponent.vue"
 import formcomponent from "../components/formcomponent.vue"
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { h, ref } from 'vue'
+import { ElMessage, ElMessageBox, ElSwitch } from 'element-plus'
 export default {
   name: 'shujuchuli',
   components: { tablecomponent, formcomponent },
@@ -273,14 +274,48 @@ export default {
       let allList = []
       for (let key in skuObj) {
         let value = skuObj[key]
-        let ziliaoItem = _.find(ziliaoList, { SKU: key })
+        let ziliaoItem = _.find(ziliaoList, { SKU: key }) || {}
-        if (!ziliaoItem) {
+        if (_.isEmpty(ziliaoItem)) {
           ElMessage.error(`资料表中找不到SKU为${key}的数据，请先完善资料数据`)
-          // 设置父组件的data变量信息
+          this.fileData = []
-          this.$emit("updateData", "chima")
+          this.$emit("updateData", "ziliao")
           return
         }
         let chimaItem = _.find(chimaList, { 尺码代码: ziliaoItem.尺码代码 }) || {}
+        if (_.isEmpty(chimaItem)) {
+          let isReturn = true
+          let checked = ref(false)
+          await ElMessageBox({
+            title: `尺码表中找不到尺码代码为${ziliaoItem.尺码代码}的数据，是否完善尺码表`,
+            type: 'danger',
+            showCancelButton: true,
+            showConfirmButton: true,
+            cancelButtonText: "跳转到尺码表",
+            confirmButtonText: "确认",
+            message: () => h(ElSwitch, {
+              "active-text": "导入数据",
+              "inactive-text": "取消导入",
+              modelValue: checked.value,
+              'onUpdate:modelValue': (val) => {
+                checked.value = val
+              },
+            })
+          }).then(async (msVal) => {
+            if (checked.value) {
+              isReturn = false
+            } else {
+              isReturn = true
+            }
+          }).catch((err) => {
+            isReturn = true
+            this.fileData = []
+            this.$emit("updateData", "chima")
+          })
+          if (isReturn) {
+            this.fileData = []
+            return
+          }
+        }
         let valueLength = value.length
         for (let i = 0; i < valueLength; i++) {
           let element = value[i];
@@ -307,11 +342,12 @@ export default {
         }
       }
       try {
+        console.log(346, allList);
         await myDatabase.shujuchuli.bulkAdd(allList)
         this.cancelDialog()
         await that.updateSeach()
-
       } catch (error) {
+        console.log(351, error);
         ElMessage({
           message: `销售数据重复,error:${error}`,
           type: 'error',