diff --git a/package.json b/package.json index c2601b1..fb3289b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "1.0.2", + "version": "1.0.3", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "lichong", diff --git a/src/main/index.js b/src/main/index.js index 775ebb3..ebf96d7 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -9,8 +9,8 @@ let mainWindow function createWindow() { mainWindow = new BrowserWindow({ minWidth: 1366, - minHeight: 900, - height: 1020, + minHeight: 960, + height: 960, width: 1499, show: false, autoHideMenuBar: true, diff --git a/src/renderer/src/assets/js/db.js b/src/renderer/src/assets/js/db.js index bfbc915..ac62886 100644 --- a/src/renderer/src/assets/js/db.js +++ b/src/renderer/src/assets/js/db.js @@ -3,7 +3,7 @@ import Dexie from 'dexie'; export const myDatabase = new Dexie('myDatabase'); // 定义数据库版本 -myDatabase.version(1).stores({ +myDatabase.version(2).stores({ chima: '++id, 性别, US, 尺码2, 尺码1, 型号, &尺码代码, create_at, update_at', ziliao: '++id, 品名, 货号, 商品, 颜色, 颜色描述, 尺码代码, 尺码2, 型号, 国标码, 款号, 零售价, 性别, 鞋面材料, 鞋底材料, 执行标准, 等级, 本厂分区, &SKU, create_at, update_at', shujuchuli: '++id, &uniqyKey, 唯一码, 防伪码, 品名, 货号, 颜色, 颜色代码, 尺码1, 型号, 尺码2, 尺码代码, SKU, 零售价, 等级, 鞋面材料, 执行标准, 国际码, 数量, 图片名称, 本厂分区, 下单数, create_at, update_at', diff --git a/src/renderer/src/views/shujuchuli.vue b/src/renderer/src/views/shujuchuli.vue index ff59e29..f5c50c4 100644 --- a/src/renderer/src/views/shujuchuli.vue +++ b/src/renderer/src/views/shujuchuli.vue @@ -25,7 +25,7 @@ - + @@ -90,9 +90,25 @@ export default { emits: ["updateData"], watch: { count: { - handler: function (val) { + handler: function (val, ovl) { if (val == 0) { + ElMessage.closeAll() + ElMessage({ + message: `正在将${this.fileData.length}数据存入数据库中,请稍后`, + type: "info", + grouping: true, + showClose: true, + duration: 0, + }) this.submitImport() + } else if (val <= ovl) { + ElMessage({ + message: `正在处理,请稍后`, + type: "warning", + grouping: true, + showClose: true, + duration: 0, + }) } } } @@ -210,6 +226,8 @@ export default { ElMessage({ message: `Error reading file:, ${error}`, type: 'error', + duration: 0, + showClose: true, }) } fileReader.readAsText(file, 'UTF-8') @@ -256,7 +274,8 @@ export default { //确认提交 async submitImport() { let that = this - let skuObj = _.groupBy(this.fileData, 'SKU') + let fileDataTemp = _.unionBy(this.fileData, o => `${o["唯一码"]}${o.SKU}`) + let skuObj = _.groupBy(fileDataTemp, 'SKU') let skuList = _.keys(skuObj) let ziliaocollection = myDatabase.ziliao if (skuList.length) { @@ -276,7 +295,12 @@ export default { let value = skuObj[key] let ziliaoItem = _.find(ziliaoList, { SKU: key }) || {} if (_.isEmpty(ziliaoItem)) { - ElMessage.error(`资料表中找不到SKU为${key}的数据,请先完善资料数据`) + ElMessage({ + message: `资料表中找不到SKU为${key}的数据,请先完善资料数据`, + type: "error", + duration: 0, + showClose: true, + }) this.fileData = [] this.$emit("updateData", "ziliao") return @@ -342,15 +366,16 @@ export default { } } try { - console.log(346, allList); await myDatabase.shujuchuli.bulkAdd(allList) this.cancelDialog() + ElMessage.closeAll() await that.updateSeach() } catch (error) { - console.log(351, error); ElMessage({ message: `销售数据重复,error:${error}`, type: 'error', + duration: 0, + showClose: true, }) } await that.updateSeach() @@ -367,7 +392,9 @@ export default { ElMessage( { type: "error", - message: "时间不允许重复,请重新设置时间" + message: "时间不允许重复,请重新设置时间", + duration: 0, + showClose: true, } ) } @@ -590,6 +617,8 @@ export default { ElMessage({ type: 'error', message: '当前表格无数据,请有数据后在导出', + duration: 0, + showClose: true, }) } },