diff --git a/package.json b/package.json index 47fe92f..c2601b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "electron", - "version": "1.0.1", + "version": "1.0.2", "description": "An Electron application with Vue", "main": "./out/main/index.js", "author": "lichong", diff --git a/src/renderer/src/views/shujuchuli.vue b/src/renderer/src/views/shujuchuli.vue index 96f1220..3eb2322 100644 --- a/src/renderer/src/views/shujuchuli.vue +++ b/src/renderer/src/views/shujuchuli.vue @@ -281,9 +281,10 @@ export default { ...element, ...ziliaoItem, ...chimaItem, - "鞋面材料": `${_.trim(chimaItem["性别"])} ${_.trim(ziliaoItem["鞋面材料"])}/大底材质`, + "鞋面材料": `${_.trim(ziliaoItem["鞋面材料"])}/大底材质:${_.trim(ziliaoItem["鞋底材料"])}`, "颜色": ziliaoItem["颜色描述"], - "执行标准": `${ziliaoItem["执行标准"]} `, + "品名": `${_.trim(chimaItem["性别"])} ${_.trim(ziliaoItem["品名"]).slice(1)}`, + "执行标准": `${ziliaoItem["执行标准"]}`, "颜色代码": ziliaoItem["颜色"], "图片名称": `${ziliaoItem["货号"]}.jpg`, "国际码": ziliaoItem["国标码"], @@ -458,7 +459,7 @@ export default { let findIndex = _.findIndex(ziliaoList, o => o["SKU"] === chimaKey) if (findIndex !== -1) { let ziliaoItem = ziliaoList[findIndex] - ziliaoItem["位置"] = `${pre} - ${next}` + ziliaoItem["位置"] = `${pre} - ${next-1}` } } } @@ -534,7 +535,7 @@ export default { next += chimaValue.length listTemp.push({ 唯一码: chimaKey, - 防伪码: `${pre} - ${next}`, + 防伪码: `${pre} - ${next-1}`, }) } let jsonWorkSheet = XLSX.utils.json_to_sheet(listTemp)