diff --git a/src/renderer/src/views/shujuchuli.vue b/src/renderer/src/views/shujuchuli.vue
index b9a668d..96f1220 100644
--- a/src/renderer/src/views/shujuchuli.vue
+++ b/src/renderer/src/views/shujuchuli.vue
@@ -32,7 +32,7 @@
上传txt
-
reg.test(equip.SKU))
}
if (!_.isEmpty(this.shujuchuliObj.time)) {
@@ -432,13 +432,12 @@ export default {
// 导出数据
async exportData() {
let collection = myDatabase.shujuchuli
- if (_.isEmpty(_.trim(this.shujuchuliObj.sku))) {
- let reg = new RegExp(this.shujuchuliObj.sku, "i")
+ if (_.isEmpty(_.trim(this.shujuchuliObj.SKU))) {
+ let reg = new RegExp(this.shujuchuliObj.SKU, "i")
collection = collection.filter((equip) => reg.test(equip.SKU))
}
- if (!_.isEmpty(this.shujuchuliObj.time)) {
- collection = collection.filter((equip) => dayjs(equip.create_at).isBetween(this.shujuchuliObj.time[0], this.shujuchuliObj.time[1], null, '[)'))
- }
+ let ziliaoCollection = myDatabase.ziliao
+ let ziliaoList = await ziliaoCollection.toArray()
let listCopy = await collection.toArray()
let groupByData = _.groupBy(listCopy, "货号")
let workBook = {
@@ -446,6 +445,51 @@ export default {
Sheets: {}
}
if (listCopy.length) {
+ for (let key in groupByData) {
+ let value = groupByData[key]
+ let listTemp = _.sortBy(value, "尺码代码")
+ let chimaObj = _.groupBy(listTemp, o => `${o["SKU"]}`)
+ let pre = 1
+ let next = 1
+ for (let chimaKey in chimaObj) {
+ let chimaValue = chimaObj[chimaKey]
+ pre = next
+ next += chimaValue.length
+ let findIndex = _.findIndex(ziliaoList, o => o["SKU"] === chimaKey)
+ if (findIndex !== -1) {
+ let ziliaoItem = ziliaoList[findIndex]
+ ziliaoItem["位置"] = `${pre} - ${next}`
+ }
+ }
+ }
+ let ziliaoListTemp = []
+ for (let i = 0; i < ziliaoList.length; i++) {
+ let element = ziliaoList[i];
+ ziliaoListTemp.push({
+ 品名: element["品名"],
+ 货号: element["货号"],
+ 商品: element["商品"],
+ 颜色: element["颜色"],
+ 颜色描述: element["颜色描述"],
+ 尺码代码: element["尺码代码"],
+ 尺码2: element["尺码2"],
+ 型号: element["型号"],
+ 位置: element["位置"],
+ 国标码: element["国标码"],
+ 款号: element["款号"],
+ 零售价: element["零售价"],
+ 性别: element["性别"],
+ 鞋面材料: element["鞋面材料"],
+ 鞋底材料: element["鞋底材料"],
+ 执行标准: element["执行标准"],
+ 等级: element["等级"],
+ 本厂分区: element["本厂分区"],
+ SKU: element["SKU"],
+ })
+ }
+ let jsonWorkSheet = XLSX.utils.json_to_sheet(ziliaoListTemp)
+ workBook.SheetNames.push("资料")
+ workBook.Sheets["资料"] = jsonWorkSheet
for (let key in groupByData) {
let list = []
let value = groupByData[key]