diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue index 70fe876..7d37f21 100644 --- a/src/renderer/src/App.vue +++ b/src/renderer/src/App.vue @@ -2,7 +2,7 @@
- + @@ -42,6 +42,9 @@ export default { watch: {}, computed: {}, methods: { + updateData(name) { + this.tabName = name + } }, async mounted() { let fiveDay = dayjs('2025-01-15T00:00:00').valueOf() diff --git a/src/renderer/src/views/shujuchuli.vue b/src/renderer/src/views/shujuchuli.vue index 3eb2322..c516f0b 100644 --- a/src/renderer/src/views/shujuchuli.vue +++ b/src/renderer/src/views/shujuchuli.vue @@ -86,6 +86,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' export default { name: 'shujuchuli', components: { tablecomponent, formcomponent }, + emits: ["updateData"], watch: { count: { handler: function (val) { @@ -273,7 +274,13 @@ export default { for (let key in skuObj) { let value = skuObj[key] let ziliaoItem = _.find(ziliaoList, { SKU: key }) - let chimaItem = _.find(chimaList, { 尺码代码: ziliaoItem.尺码代码 }) + if (!ziliaoItem) { + ElMessage.error(`资料表中找不到SKU为${key}的数据,请先完善资料数据`) + // 设置父组件的data变量信息 + this.$emit("updateData", "chima") + return + } + let chimaItem = _.find(chimaList, { 尺码代码: ziliaoItem.尺码代码 }) || {} let valueLength = value.length for (let i = 0; i < valueLength; i++) { let element = value[i]; @@ -459,7 +466,7 @@ export default { let findIndex = _.findIndex(ziliaoList, o => o["SKU"] === chimaKey) if (findIndex !== -1) { let ziliaoItem = ziliaoList[findIndex] - ziliaoItem["位置"] = `${pre} - ${next-1}` + ziliaoItem["位置"] = `${pre} - ${next - 1}` } } } @@ -535,7 +542,7 @@ export default { next += chimaValue.length listTemp.push({ 唯一码: chimaKey, - 防伪码: `${pre} - ${next-1}`, + 防伪码: `${pre} - ${next - 1}`, }) } let jsonWorkSheet = XLSX.utils.json_to_sheet(listTemp)