From 6a3c01ca719426c713dca0ad1037df8e1a74404e Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Tue, 20 Feb 2024 18:47:09 +0800
Subject: [PATCH] 11
---
pages/billing/changeGoods1.vue | 10 ++---
pages/index/addHangOrder.vue | 4 +-
pages/index/downStearmList.vue | 22 ++++-------
pages/index/index.vue | 4 +-
pages/index/order.vue | 16 --------
pages/index/orderDetail.vue | 2 +-
pages/index/shareStyle.vue | 10 ++---
pages/index/waitStorage.vue | 61 +++++++++++++++++--------------
pages/index/waitStorageDetail.vue | 2 +-
pages/inventory/goodsList1.vue | 4 +-
pages/login/register.vue | 30 ++++++++++++++-
11 files changed, 84 insertions(+), 81 deletions(-)
diff --git a/pages/billing/changeGoods1.vue b/pages/billing/changeGoods1.vue
index 5c91160..086fc63 100644
--- a/pages/billing/changeGoods1.vue
+++ b/pages/billing/changeGoods1.vue
@@ -15,7 +15,7 @@
-
+
![]()
@@ -419,13 +419,9 @@
this.getShareList()
},
//未入库遮罩
- clickMask(item) {
- let title = ''
- if (item.delFlag == 0) {
- title = '请将商品上架后再操作！'
- }
+ clickMask() {
uni.showToast({
- title: title,
+ title: '请将商品上架或入库后再操作！',
icon: 'none'
})
},
diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index 2fb6883..1fb0fd5 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -498,8 +498,8 @@
getById(id) {
this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
if (res.code == 200) {
- if(res.result.delFlag ==0){
- this.tui.toast("请将商品上架后再操作！")
+ if(res.result.delFlag ==0 || res.result.purchasePrice==null || res.result.inStorageStatus == 0){
+ this.tui.toast("请将商品上架或入库后再操作！")
return
}
this.goodsDetail = res.result;
diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue
index 73656cb..4602a37 100644
--- a/pages/index/downStearmList.vue
+++ b/pages/index/downStearmList.vue
@@ -14,22 +14,14 @@
{{item.productName == null ?'暂无':item.productName}}
{{item.productSn == null ?'暂无':item.productSn}}
-
-
+
+
{{item.price == null ?'暂无':item.price}}
零售价
-
@@ -185,7 +177,8 @@
searchName: '', //搜索框输入值
shopId: '', //店铺id,
checkbox: [], //需要分享的商品id
- temporaryNum: 0,
+ temporaryNum: 0,
+ priceType:'',
goodsDetail: [],
attrNameList: [],
temporaryList: [],
@@ -579,7 +572,8 @@
pageSize: '10'
}, false, true).then((res) => {
if (res.code == 200) {
- this.shopList = res.result.records
+ this.shopList = res.result.records
+ this.priceType = res.result.priceType
this.shopId = res.result.records[0].shopId
} else {
this.tui.toast(res.message)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3b99606..b48aa53 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,9 @@
class="red-circle">{{waitCount.waitAddProductCount > 99 ? '99+' :waitCount.waitAddProductCount}}
- 挂单
+ 挂单
+ {{waitCount.registrationCount > 99 ? '99+' :waitCount.registrationCount}}
推款
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 8e29c1b..9349053 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -49,7 +49,6 @@
},
onShow(){
- // this.getMonth();
this.getOrderInfoList()
},
onReachBottom() {
@@ -120,21 +119,6 @@
uni.switchTab({
url: '/pages/inventory/goodsList1'
})
- },
- //获取当月1日到当前时间
- getMonth() {
- //获取新的时间
- let date = new Date()
- //获取当前时间的年份转为字符串
- let year = date.getFullYear().toString() //'年'
- //获取月份，由于月份从0开始，此处要加1，判断是否小于10，如果是在字符串前面拼接'0'
- let month = date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1).toString():(date.getMonth()+1).toString() //'月'
- //获取天，判断是否小于10，如果是在字符串前面拼接'0'
- let da = date.getDate() < 10 ? '0'+date.getDate().toString():date.getDate().toString() //'日'
- //字符串拼接，开始时间，结束时间
- let end = year + '-' + month + '-' + da //当天
- let beg = year + '-' + month + '-01' //当月第一天
- this.range = [beg,end]
}
}
}
diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index d67bbcf..5289fda 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -369,7 +369,7 @@
strCmd += blesdk.addCPCLSETMAG(2, 2)
strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
strCmd += blesdk.addCPCLText('50', '730', '24', '0', 0, '店铺：'+this.sales.shopName)
- strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, '13521030702')
+ strCmd += blesdk.addCPCLText('50', '810', '24', '0', 0, this.sales.createByPhone)
strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：'+this.shopData.shopAddress)
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
diff --git a/pages/index/shareStyle.vue b/pages/index/shareStyle.vue
index bea1d43..78c936d 100644
--- a/pages/index/shareStyle.vue
+++ b/pages/index/shareStyle.vue
@@ -14,7 +14,7 @@
-
+
![]()
@@ -221,13 +221,9 @@
this.getShareList()
},
//未入库遮罩
- clickMask(item) {
- let title = ''
- if (item.delFlag == 0) {
- title = '请将商品上架后再操作！'
- }
+ clickMask() {
uni.showToast({
- title: title,
+ title: '请将商品上架或入库后再操作！',
icon: 'none'
})
},
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index b96b20a..beb8659 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -1,7 +1,8 @@
-
-
+
+
@@ -46,7 +47,7 @@
},
data() {
return {
- keyword: '',
+ searchStr: '',
list: [],
inStorageStatus: '',
supplierName: '',
@@ -55,7 +56,8 @@
type: '',
pages: 1,
pageNum:1,
- status: 'loadmore'
+ status: 'loadmore',
+ range:[]
}
},
onShow(){
@@ -71,39 +73,42 @@
this.pageNum += 1;
this.getList();
},
- methods: {
- getList() {
- this.tui.request("/app/purchase/list", "POST", {
- inStorageStatus: this.inStorageStatus,
- supplierName: this.supplierName,
- startDate: this.startDate,
- endDate: this.endDate,
- pageNum:this.pageNum,
- pageSize:10,
- }, false, false).then((res) => {
+ methods: {
+ searchList() {
+ this.pages = 1;
+ this.list = [];
+ this.getList()
+ },
+ getList() {
+ var url,data
+ if(this.inStorageStatus == 0){
+ url = "/app/purchase/list";
+ data = {
+ inStorageStatus: this.inStorageStatus
+ }
+ }else{
+ url = "/app/purchase/getPurchaseList";
+ data = {
+ 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
} else {
this.list = [...this.list, ...res.result.records]
- }
- } else {
- this.tui.toast(res.message)
- }
- })
- },
- //搜索
- searchList() {
- this.tui.request("/app/purchase/getPurchaseList", "POST", {
- searchStr:this.keyword
- }, false, false).then((res) => {
- if (res.code == 200) {
- this.list = res.result
+ }
} else {
this.tui.toast(res.message)
}
- })
+ })
},
returnPrice(item) {
uni.navigateTo({
diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue
index d4d9f1d..6506fbf 100644
--- a/pages/index/waitStorageDetail.vue
+++ b/pages/index/waitStorageDetail.vue
@@ -254,7 +254,7 @@
that.goodsList.forEach(function(value, key) {
that.shouldPay += value.price
})
-
+ that.noPay = that.shouldPay
}
},
}
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index 0f9babe..dda105a 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -790,8 +790,8 @@
getById(id) {
this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
if (res.code == 200) {
- if (res.result.delFlag == 0) {
- this.tui.toast("请将商品上架后再操作！")
+ if (res.result.delFlag ==0 || res.result.purchasePrice==null || res.result.inStorageStatus == 0) {
+ this.tui.toast("请将商品上架或入库后再操作！")
return
}
this.goodsDetail = res.result;
diff --git a/pages/login/register.vue b/pages/login/register.vue
index d24cf05..359e74a 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -16,6 +16,12 @@
+
+
+
+
+
+