From 41fce36fe12cb0b782d5f9a5d0eb51d12e954713 Mon Sep 17 00:00:00 2001 From: wangfukang <15630117759@163.com> Date: Wed, 21 Feb 2024 16:27:06 +0800 Subject: [PATCH] 11 --- pages/billing/addUser.vue | 2 +- pages/billing/changeGoods1.vue | 18 +++++-- pages/index/addHangOrder.vue | 41 ++++++++++------ pages/index/index.vue | 5 +- pages/index/orderDetail.vue | 12 ++++- pages/index/shareStyle.vue | 14 +++++- pages/index/waitStorage.vue | 65 +++++++++++++++----------- pages/index/waitStorageDetail.vue | 12 ++++- pages/inventory/addinventory.vue | 12 ++++- pages/inventory/changeGoods1.vue | 18 +++++-- pages/inventory/getProductIdToList.vue | 5 +- pages/inventory/goodsList1.vue | 15 +++++- pages/inventory/inventory.vue | 12 ++++- pages/inventory/inventoryDetail.vue | 12 ++++- pages/other/custom.vue | 19 ++++++-- 15 files changed, 195 insertions(+), 67 deletions(-) diff --git a/pages/billing/addUser.vue b/pages/billing/addUser.vue index 50dc5a5..02a43d9 100644 --- a/pages/billing/addUser.vue +++ b/pages/billing/addUser.vue @@ -142,7 +142,7 @@ }) }else{ this.tui.request("/app/supplier/delByIds", "post", { - id: this.formData.id, + ids: this.formData.id, }, false, true).then((res) => { if (res.code == 200) { uni.showToast({ diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue index 086fc63..3e0f194 100644 --- a/pages/billing/changeGoods1.vue +++ b/pages/billing/changeGoods1.vue @@ -17,7 +17,8 @@ - + + 暂无图片 {{item.productName}} @@ -63,7 +64,8 @@ - + + 暂无图片 {{goodsDetail.productName}} @@ -113,7 +115,8 @@ - + + 暂无图片 {{item.productName}} @@ -906,5 +909,14 @@ top: 0; left: 0; background: rgba(0, 0, 0, 0.1); + } + .noPic{ + width: 150rpx; + height: 150rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue index 1fb0fd5..e930070 100644 --- a/pages/index/addHangOrder.vue +++ b/pages/index/addHangOrder.vue @@ -84,7 +84,8 @@ - + + 暂无图片 {{goodsDetail.productName}} @@ -175,7 +176,7 @@ export default { data() { return { - voiceText: '', + voiceText: ' ', recordState: false, pageNumber: 1, regList: [], @@ -224,7 +225,8 @@ } }, onLoad() { - this.getRegList(); + this.getRegList(); + this.initRecord(); }, methods: { //挂单列表 @@ -278,26 +280,26 @@ }) }, //语音识别功能初始化 - initRecord() { + initRecord() { + let that = this; manager.stop() - //有新的识别内容返回，则会调用此事件 - manager.onRecognize = (res) => { - // this.voiceText = res.result - } - manager.onStart = function(res) { - // this.voiceText = "onStart:" + res.msg + "正在录音" - } // 识别结束事件 manager.onStop = (res) => { if (res.result == '') { - this.showRecordEmptyTip() + that.showRecordEmptyTip() return } - if(this.voiceText == ''){ - this.voiceText = res.result + console.log('55555',res) + console.log('11111',that.voiceText) + if(that.voiceText == ''){ + that.voiceText = res.result + console.log('22222',that.voiceText) + }else if(that.voiceText == null){ + that.voiceText = res.result }else{ res.result = '\n' + res.result - this.voiceText += res.result + that.voiceText += res.result + console.log('33333',that.voiceText) } } @@ -1088,5 +1090,14 @@ height: 200rpx; background: #eee; border-radius: 50%; + } + .noPic{ + width: 150rpx; + height: 150rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/index/index.vue b/pages/index/index.vue index b48aa53..eabd850 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -111,7 +111,7 @@ clickable isLink arrow-direction="left"> - @@ -220,6 +220,9 @@ }, onLoad() { + }, + onTabItemTap(e){ + this.getSaleInfo() }, methods: { getSaleInfo() { diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue index 5289fda..278a96d 100644 --- a/pages/index/orderDetail.vue +++ b/pages/index/orderDetail.vue @@ -9,7 +9,8 @@ + style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="item.productPicture"> + 暂无图片 {{item.productName}} （{{item.productSn == null ? '暂无':item.productSn}}） 单价:{{item.purchasePrice == null ? '暂无':item.purchasePrice}} 数量:{{item.productCount == null ? '暂无':item.productCount}} 总价:{{item.discountAmount == null ? '暂无':item.discountAmount}} @@ -872,5 +873,14 @@ text-align: center; padding-right: 40rpx; border-right: 1px solid #eee; + } + .noPic{ + width: 140rpx; + height: 140rpx; + margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue index 78c936d..dbb5974 100644 --- a/pages/index/shareStyle.vue +++ b/pages/index/shareStyle.vue @@ -16,7 +16,8 @@ - + + 暂无图片 {{item.productName}} @@ -86,7 +87,8 @@ - + + 暂无图片 {{item.productName}} @@ -637,5 +639,13 @@ border-bottom: 1px solid #eee; border-top: 1px solid #eee; color: #fff; + } + .noPic{ + width: 150rpx; + height: 150rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue index beb8659..ba0b60b 100644 --- a/pages/index/waitStorage.vue +++ b/pages/index/waitStorage.vue @@ -59,19 +59,21 @@ status: 'loadmore', range:[] } - }, - onShow(){ - this.getList() }, - onLoad(option) { + onLoad(option) { + console.log(option) this.inStorageStatus = option.inStorageStatus || '' - this.type = uni.getStorageSync('type') + this.type = uni.getStorageSync('type') + console.log(this.inStorageStatus) + this.getList() }, onReachBottom() { - if (this.pageNum >= this.pages) return; - this.status = 'loading'; - this.pageNum += 1; - this.getList(); + if(this.inStorageStatus != 0){ + if (this.pageNum >= this.pages) return; + this.status = 'loading'; + this.pageNum += 1; + this.getList(); + } }, methods: { searchList() { @@ -80,35 +82,44 @@ this.getList() }, getList() { - var url,data + var url,data; + console.log(this.inStorageStatus == 0) if(this.inStorageStatus == 0){ - url = "/app/purchase/list"; - data = { + this.tui.request("/app/purchase/list", "POST", { inStorageStatus: this.inStorageStatus - } + }, false, false).then((res) => { + if (res.code == 200) { + this.pages = res.result.pages + if (this.pages == 1) { + this.list = res.result.records + } else { + this.list = [...this.list, ...res.result.records] + } + } else { + this.tui.toast(res.message) + } + }) }else{ - url = "/app/purchase/getPurchaseList"; - data = { + this.tui.request("/app/purchase/getPurchaseList", "POST", { inStorageStatus: this.inStorageStatus, supplierName: this.supplierName, startDate: this.range[0], endDate: this.range[1], pageNum:this.pageNum, pageSize:10, - } - } - this.tui.request(url, "POST", data, false, false).then((res) => { - if (res.code == 200) { - this.pages = res.result.pages - if (this.pages == 1) { - this.list = res.result.records + }, false, false).then((res) => { + if (res.code == 200) { + this.pages = res.result.pages + if (this.pages == 1) { + this.list = res.result + } else { + this.list = [...this.list, ...res.result] + } } else { - this.list = [...this.list, ...res.result.records] + this.tui.toast(res.message) } - } else { - this.tui.toast(res.message) - } - }) + }) + } }, returnPrice(item) { uni.navigateTo({ diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue index 6506fbf..8aa8d3a 100644 --- a/pages/index/waitStorageDetail.vue +++ b/pages/index/waitStorageDetail.vue @@ -6,8 +6,8 @@ - + + 暂无图片 {{item.productName == null ?'暂无':item.productName}} 货号：{{item.productSn == null ?'暂无':item.productSn}} @@ -445,5 +445,13 @@ border: 1px solid #eee; height: 150rpx; width: 500rpx; + } + .noPic{ + width: 140rpx; + height: 140rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue index 3777c36..ee94030 100644 --- a/pages/inventory/addinventory.vue +++ b/pages/inventory/addinventory.vue @@ -109,7 +109,8 @@ - + + 暂无图片 {{goodsDetail.productName}} @@ -986,5 +987,14 @@ background: linear-gradient(90deg, #60F3FF, #088FEB); border-radius: 70rpx; } + } + .noPic{ + width: 150rpx; + height: 150rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/inventory/changeGoods1.vue b/pages/inventory/changeGoods1.vue index b8b79f5..ae2275a 100644 --- a/pages/inventory/changeGoods1.vue +++ b/pages/inventory/changeGoods1.vue @@ -16,7 +16,8 @@ - + + 暂无图片 {{item.productName}} @@ -62,7 +63,8 @@ - + + 暂无图片 {{goodsDetail.productName}} @@ -113,7 +115,8 @@ - + + 暂无图片 {{item.productName}} @@ -876,5 +879,14 @@ top: 0; left: 0; background: rgba(0, 0, 0, 0.1); + } + .noPic{ + width: 150rpx; + height: 150rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/inventory/getProductIdToList.vue b/pages/inventory/getProductIdToList.vue index 2ebb606..5ac35de 100644 --- a/pages/inventory/getProductIdToList.vue +++ b/pages/inventory/getProductIdToList.vue @@ -10,8 +10,9 @@ - - + + + diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue index dda105a..d40152b 100644 --- a/pages/inventory/goodsList1.vue +++ b/pages/inventory/goodsList1.vue @@ -75,7 +75,8 @@ :key="key"> + style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="value[1].productPicture"> + 暂无图片 {{value[1].productName}} （{{value[1].productSn}}） 单价：{{value[1].discountAmount}} 数量：{{value[1].productCount}} 总价：{{value[1].price}} @@ -280,7 +281,8 @@ - + + 暂无图片 {{goodsDetail.productName}} @@ -1781,5 +1783,14 @@ input { padding-left: 0; } + } + .noPic{ + width: 140rpx; + height: 140rpx; + margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue index eafc74e..560b64e 100644 --- a/pages/inventory/inventory.vue +++ b/pages/inventory/inventory.vue @@ -54,7 +54,8 @@ - + + 暂无图片 {{item.productName}} @@ -419,5 +420,14 @@ background: #088FEB; padding: 10rpx 10rpx; border-radius: 10px; + } + .noPic{ + width: 140rpx; + height: 140rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/inventory/inventoryDetail.vue b/pages/inventory/inventoryDetail.vue index 87119a3..646198d 100644 --- a/pages/inventory/inventoryDetail.vue +++ b/pages/inventory/inventoryDetail.vue @@ -3,7 +3,8 @@ - + + 暂无图片 {{dataList.productName == null ? '暂无':dataList.productName}} ({{dataList.productSn == null ? '暂无':dataList.productSn}}) @@ -271,5 +272,14 @@ line-height: 70rpx; padding: 0 30rpx; overflow: hidden; + } + .noPic{ + width: 150rpx; + height: 150rpx; + // margin: 30rpx 0 0 30rpx; + text-align: center; + line-height: 140rpx; + color: #777; + background: #eee; } \ No newline at end of file diff --git a/pages/other/custom.vue b/pages/other/custom.vue index d54e161..c481fb6 100644 --- a/pages/other/custom.vue +++ b/pages/other/custom.vue @@ -8,18 +8,18 @@ 门店 - +
  • - 销售员： - {{ item.createBy }} + {{ item.createByName== null ?'暂无': item.createByName }} 营业额： @@ -33,8 +33,8 @@ item.status == 1 ? '拣货中' : item.status == 2 ? '已预定' : item.status == 3 ? '已作废' : item.status == 4 ? '已取货' :item.status == 6 ? '待配货': '已送达' }} - 采购退货 - 物流信息 + + 查看详情
@@ -128,6 +128,15 @@ } this.sectionChange(this.current) + }, + kehuList(id){ + uni.navigateTo({ + url: '/pages/other/customDetail?id='+id + }) + }, + //门店下拉选择 + change(e){ + this.getAllList() }, formatDate(date, fmt) { var o = {