From 21175c385a0c765ac80f0c7e57393050b05a5df9 Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Fri, 24 Nov 2023 18:33:11 +0800
Subject: [PATCH] 11
---
pages/index/addHangOrder.vue | 4 +
pages/index/downarrears.vue | 2 +-
pages/index/index.vue | 20 +-
pages/index/order.vue | 4 +-
pages/index/uparrears.vue | 2 +-
pages/index/waitStorage.vue | 2 +-
pages/index/waitStorageDetail.vue | 14 +-
pages/inventory/addGoods.vue | 42 +-
pages/inventory/addinventory.vue | 70 +-
pages/inventory/goodsList1.vue | 2385 ++++++++++++++-------------
pages/inventory/inventory.vue | 2 +-
pages/inventory/inventoryDetail.vue | 9 +-
12 files changed, 1366 insertions(+), 1190 deletions(-)
diff --git a/pages/index/addHangOrder.vue b/pages/index/addHangOrder.vue
index 8480770..5ee97a0 100644
--- a/pages/index/addHangOrder.vue
+++ b/pages/index/addHangOrder.vue
@@ -633,9 +633,13 @@
obj.wholesalePrice = item.saleDetailDTOList[i].wholesalePrice
obj.saleId = item.saleDetailDTOList[i].saleId
obj.remark = item.remark
+ obj.xsyId = item.createBy
+ obj.createByName = item.createByName
dataList.push(obj)
}
+ console.log(dataList)
uni.setStorageSync('carList1', JSON.stringify(dataList))
+ uni.setStorageSync('khName', '')
}
uni.switchTab({
url: '/pages/inventory/goodsList1'
diff --git a/pages/index/downarrears.vue b/pages/index/downarrears.vue
index fcfcf16..a888aa8 100644
--- a/pages/index/downarrears.vue
+++ b/pages/index/downarrears.vue
@@ -14,7 +14,7 @@
订单状态:{{item.status == 0 ?'待抢单' :item.status == 1 ?'待取货' :item.status == 3 ?'待送达' :item.status == 4 ?'已完成' :item.status == 5 ?'下游客户待退货' :item.status == 00 ?'退货待抢单' :item.status == 01 ?'退货待取货' :item.status == 03 ?'退货待送达' :item.status == 04 ?'待确认退货' :item.status == 6 ?'待配货' :'挂单'}}
- 回款
+ 回款
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 556c625..533e5f3 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -49,7 +49,7 @@
销售笔数
-
+
今日利润
@@ -58,7 +58,7 @@
-
+
本周营收统计
@@ -257,7 +257,7 @@
this.tui.request("/app/sale/getShopWeek", "POST", {}, false, false).then((res) => {
if(res.code == 200){
let dataList = {
- categories: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+ categories: this.getWeek(),
series: [{
name: "周销售额",
linearColor: [
@@ -277,6 +277,20 @@
}
})
},
+ getWeek() {
+ // var date = new Date();
+ // var day = date.getDay();
+ // var names = ["周日","周一","周二","周三","周四","周五","周六"];
+ // return names[day];
+ let days = 7
+ let week = ["周日","周一","周二","周三","周四","周五","周六"];
+ let dateList = Array.from({length:days},(v,i)=> i).map(day =>{
+ let date = new Date();
+ date.setDate(date.getDate() - day);
+ return week[date.getDay()]
+ })
+ return dateList.reverse()
+ },
//跳转订单详情
gotoDetail(id) {
uni.navigateTo({
diff --git a/pages/index/order.vue b/pages/index/order.vue
index 494444b..8cf2d96 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -8,7 +8,7 @@
-
+ :thumbnail="item.saleDetailDTOList[0].productPicture">
销售员: {{item.createByName == null ?'暂无':item.createByName}}
营业额:
{{item.realAmount == null ?'暂无':item.realAmount}}
@@ -114,6 +114,8 @@
obj.remark = item.remark
dataList.push(obj)
}
+ item.name = item.userName;
+ uni.setStorageSync('khName',JSON.stringify(item))
uni.setStorageSync('carList1',JSON.stringify(dataList))
uni.switchTab({
url: '/pages/inventory/goodsList1'
diff --git a/pages/index/uparrears.vue b/pages/index/uparrears.vue
index 4a2ccbd..022dab3 100644
--- a/pages/index/uparrears.vue
+++ b/pages/index/uparrears.vue
@@ -14,7 +14,7 @@
订单状态:{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}
- 回款
+ 回款
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index 881bd97..07a55c2 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -24,7 +24,7 @@
订单状态:{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}
- 更新
+ 更新
diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue
index 9092a0f..30974c9 100644
--- a/pages/index/waitStorageDetail.vue
+++ b/pages/index/waitStorageDetail.vue
@@ -99,7 +99,7 @@
- 回款
+ 回款
确认提交
@@ -156,6 +156,7 @@
}, false, true).then((res) => {
if (res.code == 200) {
this.sales = res.result.purchase
+ this.noPay = res.result.purchase.noPay
this.supplier = res.result.supplier
this.remark = res.result.purchase.remark
this.goodsList = res.result.purchaseDetails
@@ -194,11 +195,18 @@
},
inventorySubmit() {
- if (this.noPay == 0 || this.alreadyPay == 0 || this.shouldPay == 0) {
+ if(this.shouldPay == 0){
uni.showToast({
- title: "信息填写完成后入库!",
+ title: "请维护商品价格后入库!",
icon: 'none'
})
+ return
+ }else if(this.alreadyPay == 0){
+ uni.showToast({
+ title: "管理员必须维护价格后入库!",
+ icon: 'none'
+ })
+ return
}
let that = this;
let purchase = {
diff --git a/pages/inventory/addGoods.vue b/pages/inventory/addGoods.vue
index 4f56294..7f9a83f 100644
--- a/pages/inventory/addGoods.vue
+++ b/pages/inventory/addGoods.vue
@@ -39,7 +39,7 @@
- 保存
+ 保存
@@ -64,7 +64,8 @@
salesWeek: '',
tailWarn: ''
},
- categoryList: [],
+ categoryList: [],
+ productId:'',
arrtList: [],
arrtChange: [],
rules: {
@@ -114,12 +115,24 @@
}
},
onShow() {
- let that = this
- uni.$on('classForm', function(data) {
- that.formData.classification = data
- })
+ // let that = this
+ // uni.$on('classForm', function(data) {
+ // that.formData.classification = data
+ // })
},
- onLoad() {
+ onLoad(option) {
+ console.log(JSON.parse(option.dataList))
+ this.dataList = JSON.parse(option.dataList)
+ this.formData.productName = this.dataList.productName
+ this.formData.price = this.dataList.price
+ this.formData.productSn = this.dataList.productSn
+ this.formData.wholesalePrice = this.dataList.wholesalePrice
+ this.formData.productPicture = this.dataList.productPicture
+ this.formData.productIntro = this.dataList.productIntro
+ this.formData.categoryId = this.dataList.categoryId
+ this.formData.salesWeek = this.dataList.salesWeek
+ this.formData.tailWarn = this.dataList.tailWarn
+
this.tui.request("/app/productCategory/list", "get", {
// shopId: 1,
}, false, true).then((res) => {
@@ -192,12 +205,19 @@
},
// 触发提交表单
- submit() {
- this.$refs.form.validate().then(res => {
- this.tui.request("/app/product/save", "post", res, false, false).then((res1) => {
+ submit() {
+ let url = ''
+ this.$refs.form.validate().then(res => {
+ if(this.dataList.id !=''){
+ url = '/app/product/edit'
+ res.id = this.dataList.id
+ }else{
+ url = '/app/product/save'
+ }
+ this.tui.request(url, "post", res, false, false).then((res1) => {
if (res1.code == 200) {
uni.navigateBack({
- delta: 1
+ delta: 2
})
} else {
uni.showToast({
diff --git a/pages/inventory/addinventory.vue b/pages/inventory/addinventory.vue
index 979b82a..acd6268 100644
--- a/pages/inventory/addinventory.vue
+++ b/pages/inventory/addinventory.vue
@@ -39,15 +39,21 @@
-
+
+
+
+
{{values[0] | sliceMsg}}
- 数量:{{values[1]}}
+ 数量:
维护采购价
+
+
+
@@ -133,14 +139,14 @@
-
+
{{item.name}}
-
-
+
- 品名:{{value[1].productName}} ({{value[1].productSn}})
+ 品名:{{value[1].productName}} ({{value[1].productSn}})
单价:{{value[1].unitPrice}} 数量:{{value[1].productCount}} 总价:{{value[1].price}}
供应商:{{value[1].supplierName}}
-
-
- 改价
-
-
-
+
+
+ 改价
+
+
+
-
-
-
- 单价
-
-
-
- 折扣(0-10)
-
-
-
- 折后价
-
-
-
- 数量
-
-
+
+
+
+ 单价
+
+
+
+ 折扣(0-10)
+
+
+
+ 折后价
+
+
+
+ 数量
+
+
-
-
-
+
+
+
{{values[0] | sliceMsg}}
-
- 数量:{{values[1]}}
+ 数量:
@@ -135,7 +142,7 @@
已收金额
-
+
@@ -153,7 +160,7 @@
备注
-
+
@@ -176,7 +183,8 @@
- {{radioType == '0'? '选择物流' :'选择快递'}}
+
+ {{radioType == '0'? '选择物流' :'选择快递'}}
-
-
- 选择车号
-
-
-
-
-
-
- 配送方式
-
-
-
+
+
+ 选择车号
+
+
+
+
+
+
+ 配送方式
+
+
+
- {{radioType == '1'? '快递员' :'拉包工'}}
+
+ {{radioType == '1'? '快递员' :'拉包工'}}
-
@@ -227,129 +236,135 @@
合计:{{totalAmount}}
¥{{shouldPay}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 提示
-
-
- 需要打印销售小票吗?
-
-
-
- 暂不需要
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 提示
+
+
+ 需要打印销售小票吗?
+
+
+
+ 暂不需要
+
+
+
+
-