From 13ef22cf933cd1d2a4a2ea1d638be61fb7441a29 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Tue, 23 Apr 2024 09:38:23 +0800 Subject: [PATCH] 11 --- package1/AI/AIHangOrderList.vue | 164 ++++++++++++++------ package1/AI/AIInventoryList.vue | 38 +++-- package1/AI/AiChat.vue | 16 +- package1/inventory/batchPrint.vue | 8 +- package1/inventory/getProductIdToList.vue | 14 +- package1/other/logistics.vue | 12 +- package1/other/tutorialDetail.vue | 173 +++++++++++++++++++++ package1/other/tutorialList.vue | 175 ++++++++++++++++++++++ 8 files changed, 525 insertions(+), 75 deletions(-) create mode 100644 package1/other/tutorialDetail.vue create mode 100644 package1/other/tutorialList.vue diff --git a/package1/AI/AIHangOrderList.vue b/package1/AI/AIHangOrderList.vue index 63ae986..edf708c 100644 --- a/package1/AI/AIHangOrderList.vue +++ b/package1/AI/AIHangOrderList.vue @@ -86,14 +86,33 @@ - {{items.productName}}（{{items.productSn}}）单价：{{items.discountAmount || items.wholesalePrice}} - + + + {{items.productName}}（{{items.productSn}}） + + + 单价：{{items.discountAmount || items.wholesalePrice}} + + + + + + + 操作 + 规格 + 数量 - + - {{itemss.attributeList | sliceMsg}} * {{itemss.productCount}} + + {{itemss.attributeList | sliceMsg}} + + + {{itemss.productCount}} + @@ -103,6 +122,7 @@ + @@ -181,18 +201,18 @@ - + 规格 库存 - + - {{item.name}} 库存:{{item.productNum}} + {{item.name}} {{item.productNum==null?'无库存':item.productNum}} @@ -237,6 +257,7 @@ khName:[], regList:[], pageNumber: 1, + status: 'loadmore', recordState: false, voiceText: ' ', list: [], @@ -256,7 +277,7 @@ hangId: '', bigImg: '', productId:'', - productNum:0, + productNum:null, pageOldTemList: [], oldTemList: [], goodsList: [], @@ -265,7 +286,8 @@ dataObj: new Map(), allChangeNum:0, isPlusAndMinus:false, - shopName:'' + shopName:'', + pages:1 } }, filters: { @@ -281,7 +303,15 @@ } }, onPullDownRefresh(){ + this.pageNumber = 1; + this.regList = [] this.getRegList() + }, + onReachBottom() { + if (this.pageNumber >= this.pages) return; + this.status = 'loading'; + this.pageNumber ++ + this.getRegList(); }, onShow() { this.khName = JSON.parse(JSON.stringify(this.khName)) || '' @@ -301,6 +331,8 @@ }) } this.khName = [] + this.pageNumber = 1; + this.regList = [] this.getRegList() }, onLoad() { @@ -319,10 +351,16 @@ } this.tui.request("/app/sale/listPages", "POST", obj, false, false).then((res) => { if (res.code == 200) { + this.status = 'nomore'; for (let i = 0; i < res.result.records.length; i++) { res.result.records[i].isCollapse = false } - this.regList = res.result.records; + if (this.pages == 1) { + this.regList = res.result.records; + } else { + this.regList = [...this.regList, ...res.result.records] + } + this.pages = res.result.pages } else { this.tui.toast(res.message) } @@ -343,6 +381,8 @@ receiveAddress:this.khName.address }, false, false).then((res) => { if (res.code == 200) { + this.pageNumber = 1; + this.regList = [] this.getRegList() } else { this.tui.toast(res.message) @@ -518,7 +558,7 @@ this.attributeList = { attributeList: value[i], productCount: this.temporaryNum, - productNum: this.productNum, + productNum: null, name: evalue[i], price: this.purchasePrice } @@ -580,6 +620,7 @@ for (var i = 0; i < this.temporaryList.length; i++) { for (var m = 0; m < this.pecsList.length; m++) { if (this.temporaryList[i].attributeList == this.pecsList[m].attributeList) { + console.log('走进来',this.pecsList[m].stockCount) this.temporaryList[i].productNum = this.pecsList[m].stockCount } } @@ -656,6 +697,8 @@ saleId: this.hangId }, false, false).then((res) => { if (res.code == 200) { + this.pageNumber = 1; + this.regList = [] this.getRegList() this.carList = [] } else { @@ -705,6 +748,8 @@ id: id, }, false, true).then((res) => { if (res.code == 200) { + that.pageNumber = 1; + that.regList = [] that.getRegList() uni.showToast({ title:"删除成功", @@ -770,34 +815,45 @@ let newSaleDetailDTOList = [] let num = 0 for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){ - - if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){ - let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList) - newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount) - }else{ - item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList) - newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m]) - attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num) - num++ + if(item.saleDetailDTOList[i].stockLogList1[m].stockCount != null){ + if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){ + let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList) + newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount) + }else{ + item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList) + newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m]) + attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num) + num++ + } } + + } + console.log(newSaleDetailDTOList.length) + if(newSaleDetailDTOList.length != 0){ + obj.saleDetailQueryDTO = newSaleDetailDTOList + obj.num = 0 + obj.id = item.saleDetailDTOList[i].productId + obj.price = item.saleDetailDTOList[i].price + obj.lsprice = item.saleDetailDTOList[i].price + obj.categoryId=item.saleDetailDTOList[i].categoryId + obj.zPrice = item.saleDetailDTOList[i].discountAmount + obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i].wholesalePrice + obj.productName = item.saleDetailDTOList[i].productName + obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime() + obj.productSn = item.saleDetailDTOList[i].productSn + obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice + obj.saleId = item.id + obj.remark = item.remark + obj.xsyId = item.createBy + obj.createByName = item.createByName + dataList.push(obj) + }else{ + obj.saleId = item.id + obj.remark = item.remark + obj.xsyId = item.createBy + obj.createByName = item.createByName + dataList.push(obj) } - obj.saleDetailQueryDTO = newSaleDetailDTOList - obj.num = 0 - obj.id = item.saleDetailDTOList[i].productId - obj.price = item.saleDetailDTOList[i].price - obj.lsprice = item.saleDetailDTOList[i].price - obj.categoryId=item.saleDetailDTOList[i].categoryId - obj.zPrice = item.saleDetailDTOList[i].discountAmount - obj.unitPrice = item.saleDetailDTOList[i].discountAmount || item.saleDetailDTOList[i].wholesalePrice - obj.productName = item.saleDetailDTOList[i].productName - obj.productPicture = item.saleDetailDTOList[i].productPicture+'?time='+new Date().getTime() - obj.productSn = item.saleDetailDTOList[i].productSn - obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice - obj.saleId = item.id - obj.remark = item.remark - obj.xsyId = item.createBy - obj.createByName = item.createByName - dataList.push(obj) } }else{ let obj = {} @@ -1017,6 +1073,9 @@ }, //删除商品下的单条规格 delGoodsPrecs(item, index, index1) { + console.log(item); + console.log(index); + console.log(index1); let that = this; this.hangId = item.id; uni.showModal({ @@ -1024,10 +1083,9 @@ content: "确定删除此条规格吗？", success: function(res) { if (res.confirm) { - item.saleDetailDTOList[index].stockLogList1.splice(item.saleDetailDTOList[index] - .stockLogList1[index1], 1) - that.carList = item.saleDetailDTOList - that.setSaleDetail(); + item.saleDetailDTOList[index].stockLogList1.splice(index1, 1) + that.carList = item.saleDetailDTOList + that.setSaleDetail(); } } }) @@ -1284,8 +1342,7 @@ } .shop-list { margin: 10rpx 0; - border-top: 1px solid #eee; - border-bottom: 1px solid #eee; + border-top: 5px solid #eee; position: relative; } @@ -1293,7 +1350,7 @@ border-bottom: none; } .order-name { - height: 80rpx; + height: 160rpx; font-size: 32rpx; font-weight: bold; line-height: 80rpx; @@ -1301,15 +1358,15 @@ img { height: 32rpx; width: 32rpx; - float: left; margin: 24rpx; } } .specs-name { display: flex; padding-bottom: 20rpx; - height: 60rpx; - line-height: 60rpx; + height: 80rpx; + line-height: 80rpx; + text-align: center; } .del-icon { position: absolute; @@ -1502,11 +1559,13 @@ margin: 20rpx; background-color: #fff; color: #5fd9ee; - width: 100rpx; + min-width: 100rpx; + width: auto; line-height: 70rpx; height: 70rpx; text-align: center; border-radius: 20rpx; + padding: 0 20rpx; } .checkedText { @@ -1558,5 +1617,14 @@ line-height: 140rpx; color: #777; background: #eee; + } + .big-img{ + width: 50rpx; + height: 50rpx; + float: left; + background: url(https://jewel-shop.oss-cn-beijing.aliyuncs.com/6b5ab32ff93a4c51b90e562e0b22e850.png); + background-repeat: no-repeat; + background-size: 100%; + margin: 7px; } \ No newline at end of file diff --git a/package1/AI/AIInventoryList.vue b/package1/AI/AIInventoryList.vue index 4c162b2..a683b76 100644 --- a/package1/AI/AIInventoryList.vue +++ b/package1/AI/AIInventoryList.vue @@ -41,11 +41,13 @@ 识别中... - 识别完成 + 识别完成 + 识别失败 去入库 - + + @@ -57,13 +59,26 @@ aiList:[], carList1:[], purchaseDetails:[], - shopName:'' + shopName:'', + status: 'loadmore', + pageNum:1, + pages:1, } }, onPullDownRefresh(){ + this.pageNum = 1 + this.aiList = [] this.getList() + }, + onReachBottom() { + if (this.pageNum >= this.pages) return; + this.status = 'loading'; + this.pageNum ++; + this.getList(); }, onShow() { + this.pageNum = 1 + this.aiList = [] this.carList1 = [] this.getList() }, @@ -73,16 +88,21 @@ methods: { getList(){ this.tui.request("/app/purchase/getPurchaseList", "POST", { - pageNum: 1, + pageNum: this.pageNum, pageSize: 10, isAiList: 1 }, false, false).then((res) => { - this.aiList = res.result.records - setTimeout(function () { - uni.stopPullDownRefresh(); - }, 500); + this.status = 'nomore'; + if (this.pages == 1) { + this.aiList = res.result.records + } else { + this.aiList = [...this.aiList, ...res.result.records] + } + this.pages = res.result.pages }).catch((res) => {}) - uni.stopPullDownRefresh() + setTimeout(function () { + uni.stopPullDownRefresh(); + }, 500); }, backPage(){ uni.navigateBack({ diff --git a/package1/AI/AiChat.vue b/package1/AI/AiChat.vue index 4c6141c..d4e91fe 100644 --- a/package1/AI/AiChat.vue +++ b/package1/AI/AiChat.vue @@ -21,9 +21,13 @@ 欢迎使用Ai助手，为了提高语音及文字识别准确率，建议您按照以下规则操作： - 1.每张图片建议您裁剪到20个规格或以下 - 2.确保最后一款商品规格截取完整 - 3.每张图片输入对应的规格数量 + 1.语音规则：（颜色在前，尺码在后） + 例1：“货号87-12白色M码10件” + 例2：“货号87-12，所有颜色所有尺码10件” + 2.建议您不同商品用“货号”两字分隔 + 例：“货号87-12白色M码10件，货号ZK001黑色L码10件” + 3.如需手动输入，则要点击“确认”按钮发送对话 + 4.录入完成后点击开始识别按钮进行AI识别 @@ -132,9 +136,9 @@ convertChineseToArabic(str) { const chineseNumToArabic = { '零': 0, '一': 1, '二': 2, '两': 2, '三': 3, - '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '九': 9 + '四': 4, '五': 5, '六': 6, '七': 7, '八': 8, '九': 9,'杠':'-','刚':'-' }; - const regex = /(零|一|二|两|三|四|五|六|七|八|九)/g; + const regex = /(零|一|二|两|三|四|五|六|七|八|九|杠|刚)/g; return str.replace(regex, match => chineseNumToArabic[match]); }, inputSaveText(){ @@ -286,7 +290,7 @@ } .prompt { background: #fff; - width: 70%; + width: 75%; height: auto; border-radius: 10px; display: block; diff --git a/package1/inventory/batchPrint.vue b/package1/inventory/batchPrint.vue index a108374..1f6007e 100644 --- a/package1/inventory/batchPrint.vue +++ b/package1/inventory/batchPrint.vue @@ -134,7 +134,8 @@ checked:false, }], multipleList:[], - purchase:'' + purchase:'', + shopId:'' } }, components: { @@ -142,7 +143,8 @@ }, onLoad(options) { wx.openBluetoothAdapter({mode: 'central'}) - this.height = wx.getSystemInfoSync().windowHeight + this.height = wx.getSystemInfoSync().windowHeight + this.shopId = uni.getStorageSync('shopId') if (options.khid != undefined) { uni.redirectTo({ url: "/pages/index/downStearmList?khid=" + options.khid @@ -343,7 +345,7 @@ console.log(this.multipleList.indexOf('零售价')) strCmd += blesdk.addCPCLText('0', '230', '24', '0', 0, '零售价：'+(item.lsprice || item.price)) } - strCmd += blesdk.addCPCLQRCode(200, 140, 'H', '1', 6, [item.id,item.shopId]) //二维码 + strCmd += blesdk.addCPCLQRCode(200, 140, 'H', '1', 6, [this.purchase!=''?item.productId:item.id,this.shopId]) //二维码 strCmd += blesdk.addCPCLLocation(0); //对齐指令 0-左对齐 1-右对齐 2-居中 strCmd += blesdk.addCPCLPrint(); this.bufferData.push(strCmd); diff --git a/package1/inventory/getProductIdToList.vue b/package1/inventory/getProductIdToList.vue index 6b99604..424469e 100644 --- a/package1/inventory/getProductIdToList.vue +++ b/package1/inventory/getProductIdToList.vue @@ -1,7 +1,7 @@