diff --git a/pages/.DS_Store b/pages/.DS_Store
index e101687..f595488 100644
Binary files a/pages/.DS_Store and b/pages/.DS_Store differ
diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue
index 9f0b8d8..3711a34 100644
--- a/pages/index/downStearmList.vue
+++ b/pages/index/downStearmList.vue
@@ -11,8 +11,8 @@
![]()
- {{item.productName}}
- {{item.productSn}}
+ {{item.productName == null ?'暂无':item.productName}}
+ {{item.productSn == null ?'暂无':item.productSn}}
- {{item.price}}
+ {{item.price == null ?'暂无':item.price}}
零售价
-
-
- {{ item.createByName }} - {{ item.createTime }}
+ {{ item.createByName == null ?'暂无':item.createByName}} - {{ item.createTime }}
@@ -183,6 +183,12 @@
},
components: {
cmdNavBar
+ },
+ filters: {
+ spliceMsg(val) {
+ val == null || undefined ? '暂无' : val
+ return val;
+ }
},
onLoad() {
this.getSaleInfo()
diff --git a/pages/index/order.vue b/pages/index/order.vue
index b430ca1..1d0b941 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -7,17 +7,17 @@
-
-
- 销售员： {{item.createByName}}
+ 销售员： {{item.createByName == null ?'暂无':item.createByName}}
营业额：
- {{item.realAmount}}
- {{' 欠款： '}} {{item.noEarn}}
+ {{item.realAmount == null ?'暂无':item.realAmount}}
+ {{' 欠款： '}} {{item.noEarn == null ?'暂无':item.noEarn}}
订单状态：{{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/orderDetail.vue b/pages/index/orderDetail.vue
index 4001cd3..664050e 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -1,15 +1,15 @@
-
- {{sales.province + sales.area + sales.city + sales.receiveAddress}}
+
+ {{sales.province + sales.area + sales.city + sales.receiveAddress}}
-
+ :value="'单价：'+ (item.wholesalePrice == null ?'暂无':item.wholesalePrice) + ' 折扣： ' + (item.discount == null ?'暂无':item.discount + '折')">
+
{{ val.attributeList.substr(1).substring(0,val.attributeList.substr(1).length-1).replace(/\"/g, "") }}
@@ -22,57 +22,58 @@
总金额
-
+
￥
- {{ sales.totalAmount }}
+ {{ sales.totalAmount == null ?'暂无':sales.totalAmount }}
实收金额
-
+
￥
- {{ sales.realAmount }}
+ {{ sales.realAmount == null ?'暂无':sales.realAmount }}
已收金额
-
- ￥
- {{ sales.alreadyEarn }}
-
-
-
- 欠款
￥
- {{ sales.noEarn}}
+ {{ sales.alreadyEarn == null ?'暂无':sales.alreadyEarn }}
-
+
+
其他费用
￥
- {{ sales.otherExpense}}
+ {{ sales.otherExpense == null ?'暂无':sales.otherExpense}}
备注
- {{ sales.remark}}
+ {{ sales.remark == null ?'暂无':sales.remark}}
+
+
+
+ 欠款
+
+ ￥
+ {{ sales.noEarn == null ?'暂无':sales.noEarn}}
已选金额
￥
- {{ changeAmount }}
+ {{ changeAmount}}
退货金额
￥
- {{ returnAmount }}
+ {{ returnAmount}}
@@ -121,7 +122,7 @@
- 订单信息
+ 物流信息
@@ -144,6 +145,24 @@
{{ sales.transportType == 0 ? '物流' : sales.transportType == 1 ? '快递' : sales.transportType == 2 ? '自送' : sales.transportType == 3 ? '拼包':'发车' }}
+
+
+ 配送公司:
+
+ {{ sales.transportType}}
+
+
+
+ 配送人员:
+
+ {{ sales.transportType}}
+
+
+
+ 配送状态:
+
+ {{ sales.status == 0 ?'待抢单' :sales.status == 1 ?'待取货' :sales.status == 3 ?'待送达' :sales.status == 4 ?'已完成' :sales.status == 5 ?'下游客户待退货' :sales.status == 00 ?'退货待抢单' :sales.status == 01 ?'退货待取货' :sales.status == 03 ?'退货待送达' :sales.status == 04 ?'待确认退货' :sales.status == 6 ?'待配货' :'挂单'}}
+
@@ -153,23 +172,11 @@
-
-
-
+
-
- 取消订单
-
-
- {{ !isReturn ? '退货' : '确认退货'}}
-
-
- 回款
-
-
-
+ 取消订单
+ {{ !isReturn ? '退货' : '确认退货'}}
+ 回款
@@ -302,22 +309,22 @@
strCmd += blesdk.addCPCLText('40', '30', '24', '0', 0, '沧州明珠商贸城--快衣店')
strCmd += blesdk.addCPCLSETMAG(3, 3)
blesdk.addCPCLSETBOLD('bold')
- strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + this.order.name)
+ strCmd += blesdk.addCPCLText('50', '120', '24', '0', 0, '收：' + this.sales.userName)
strCmd += blesdk.addCPCLSETMAG(1, 1)
- strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, this.order.phone)
+ strCmd += blesdk.addCPCLText('50', '250', '24', '0', 0, "15257485325")
strCmd += blesdk.addCPCLSETMAG(2, 2)
blesdk.addCPCLSETBOLD('bold')
- strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.order.province + '/' + this.order.city + '/' +
- this.order.area)
+ strCmd += blesdk.addCPCLText('50', '330', '24', '0', 0, this.sales.province + '/' + this.sales.city + '/' +
+ this.sales.area)
strCmd += blesdk.addCPCLSETMAG(1, 1)
- strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.order.address)
+ strCmd += blesdk.addCPCLText('50', '410', '24', '0', 0, this.sales.receiveAddress)
strCmd += blesdk.addCPCLSETMAG(2, 2)
blesdk.addCPCLSETBOLD('bold')
strCmd += blesdk.addCPCLText('0', '490', '24', '0', 0, '——————————————————————————————')
- strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：虚拟物流')
+ strCmd += blesdk.addCPCLText('50', '570', '24', '0', 0, '发货方式：'+ this.sales.companyName)
strCmd += blesdk.addCPCLSETMAG(2, 2)
strCmd += blesdk.addCPCLText('0', '650', '24', '0', 0, '——————————————————————————————')
- strCmd += blesdk.addCPCLText('50', '730', '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', '890', '24', '0', 0, '地址：早市10059')
// strCmd += blesdk.addCPCLText(200,0,'24','5',0,'收件联');// 文字
@@ -761,6 +768,13 @@
}
.tui-btn-mr {
+ width:130rpx;
+ height: 60rpx;
+ background: #088FEB;
+ color: #fff;
+ border-radius: 10px;
+ line-height: 60rpx;
+ text-align: center;
margin-right: 30rpx;
}
diff --git a/pages/index/uparrears.vue b/pages/index/uparrears.vue
index 5a36e5e..a6c17a5 100644
--- a/pages/index/uparrears.vue
+++ b/pages/index/uparrears.vue
@@ -4,12 +4,12 @@
-
-
- 销售员： {{item.createBy}}
+ 销售员： {{item.createBy == null ?'暂无':item.createBy}}
总成本：
- {{item.shouldPay}}
- {{' 欠款： '}} {{item.noPay}}
+ {{item.shouldPay == null ?'暂无':item.shouldPay}}
+ {{' 欠款： '}} {{item.noPay == null ?'暂无':item.noPay}}
订单状态：{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}
diff --git a/pages/index/upstream.vue b/pages/index/upstream.vue
index 08ed71c..7c39377 100644
--- a/pages/index/upstream.vue
+++ b/pages/index/upstream.vue
@@ -5,11 +5,11 @@
- {{ item.supplierName }}
+ {{ item.supplierName == null ?'暂无':item.supplierName }}
欠款总金额:
- {{ item.noPay }}
+ {{ item.noPay == null ?'暂无':item.noPay }}
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index 82a4cfe..e21a001 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -4,17 +4,17 @@
-
-
- 销售员： {{item.createBy}}
+ 销售员： {{item.createBy == null ?'暂无':item.createBy}}
总成本：
- {{item.shouldPay}}
- {{' 欠款： '}} {{item.noPay}}
+ {{item.shouldPay == null ?'暂无':item.shouldPay}}
+ {{' 欠款： '}} {{item.noPay == null ?'暂无':item.noPay}}
订单状态：{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}
- 更新
+ 更新
diff --git a/pages/index/waitStorageDetail.vue b/pages/index/waitStorageDetail.vue
index 1c52029..e86fa2c 100644
--- a/pages/index/waitStorageDetail.vue
+++ b/pages/index/waitStorageDetail.vue
@@ -1,17 +1,17 @@
-
- {{sales.province + sales.area + sales.city + sales.receiveAddress}}
+
+ {{sales.province + sales.area + sales.city + sales.receiveAddress}}
- ![]()
- 品名：{{item.productName}}
- 货号：{{item.productSn}}
- 总价：{{item.price}} 数量：{{item.productCount}}
+ 品名：{{item.productName == null ?'暂无':item.productName}}
+ 货号：{{item.productSn == null ?'暂无':item.productSn}}
+ 总价：{{item.price == null ?'暂无':item.price}} 数量：{{item.productCount == null ?'暂无':item.productCount}}
@@ -22,7 +22,7 @@
{{items.attributeList | sliceMsg}}
- 数量：{{items.productCount}}
+ 数量：{{items.productCount == null ?'暂无':item.productCount}}
@@ -63,9 +63,7 @@
-
- 确认提交
-
+ 确认提交
@@ -290,8 +288,15 @@
z-index: 996;
}
- .tui-btn-mr {
- margin-right: 30rpx;
+ .tui-btn-mr {
+ width:130rpx;
+ height: 60rpx;
+ background: #088FEB;
+ color: #fff;
+ border-radius: 10px;
+ line-height: 60rpx;
+ text-align: center;
+ margin-right: 30rpx;
}
.shop-box {
width: 95%;
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index c05b9d2..46e0871 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -33,7 +33,7 @@
- 选择价格
+ 选择价格
- {{item.name}}
+ {{item.name}}
@@ -49,7 +49,7 @@
- 折扣类型
+ 折扣类型
- {{item.name}}
+ {{item.name}}
@@ -156,7 +156,7 @@
发货方式
-
+
- {{radioType == '0'? '选择物流' :'选择快递'}}
+ {{radioType == '0'? '选择物流' :'选择快递'}}
- 选择车号
+ 选择车号
- 配送方式
+ 配送方式
+
- {{radioType == '1'? '快递员' :'拉包工'}}
+ {{radioType == '1'? '快递员' :'拉包工'}}
- 拼包地址
+ 拼包地址
@@ -400,13 +405,18 @@
this.wlName = JSON.parse(JSON.stringify(this.wlName))
this.kdyName = JSON.parse(JSON.stringify(this.kdyName))
this.lbgName = JSON.parse(JSON.stringify(this.lbgName))
- if(uni.getStorage('carList1')){
+ if(uni.getStorageSync('carList1') != ''){
+ this.carList.clear()
this.carList1 = JSON.parse(uni.getStorageSync('carList1'))
this.remark = this.carList1[0].remark
this.saleId = this.carList1[0].saleId
}else{
this.carList1 = this.carList1
}
+ if(this.carList1 == ''){
+ this.carList.clear()
+ this.remark = ''
+ }
this.totalAmount = 0;
this.shouldPay = 0
if (this.carList.size == 0) { //当前页没有数据
@@ -514,7 +524,7 @@
}
}
},
- onLoad() {
+ onLoad(option) {
this.xsyList();
},
methods: {
@@ -895,7 +905,7 @@
// relPrice:,
alreadyEarn: this.priceOk, //已付金额
realAmount: this.relPrice, //实收金额
- noEarn: this.noPay, //欠款
+ noEarn: this.relPrice - this.priceOk, //欠款
totalAmount: this.shouldPay, //总金额
area: this.khName.area,
city: this.khName.city,
@@ -1106,7 +1116,8 @@
.uni-select__input-box {
.uni-icons {
- margin-left: 100rpx;
+ margin-left: 50rpx;
+ margin-right: 5px;
}
}
@@ -1356,5 +1367,24 @@
background: linear-gradient(90deg, #60F3FF, #088FEB);
border-radius: 70rpx;
}
+ }
+ // .uni-select__input-text{
+ // text-align: center !important;
+ // padding-left: 80rpx;
+ // }
+ .uni-data-checklist{
+ .checklist-box {
+ margin-left: 100rpx !important;
+ }
+
+ .checklist-box:last-child{
+ margin-left: 46rpx !important;
+ }
+ }
+
+ .uni-numbox{
+ input{
+ padding-left: 0;
+ }
}
\ No newline at end of file
diff --git a/pages/inventory/inventory.vue b/pages/inventory/inventory.vue
index b85f5c3..7c4e9e3 100644
--- a/pages/inventory/inventory.vue
+++ b/pages/inventory/inventory.vue
@@ -52,7 +52,7 @@
-
+
![]()
@@ -182,9 +182,9 @@
this.getShareList(this.indexList[index].id)
},
//入库单详情
- goDetail(id) {
+ goDetail(item) {
uni.navigateTo({
- url: '/pages/inventory/inventoryDetail?id=' + id
+ url: '/pages/inventory/inventoryDetail?item=' + JSON.stringify(item)
})
},
//点击分类获取商品列表
diff --git a/pages/inventory/inventoryDetail.vue b/pages/inventory/inventoryDetail.vue
index 31fc52e..b2b078a 100644
--- a/pages/inventory/inventoryDetail.vue
+++ b/pages/inventory/inventoryDetail.vue
@@ -6,36 +6,36 @@
- 女士裙子（AC1551452）
- 供应商：张三
+ {{dataList.productName == null ? '暂无':dataList.productName}} ({{dataList.productSn == null ? '暂无':dataList.productSn}})
+ 供应商：{{dataList.supplierName == null ? '暂无':dataList.supplierName}}
编辑
- 已上架
- 已入库
+ {{dataList.delFlag==0?'已上架':'已下架'}}
+
- 100
+ {{dataList.purchasePrice == null ? '暂无':dataList.purchasePrice}}
平均采购价
- 100
+ {{dataList.wholesalePrice == null ? '暂无':dataList.wholesalePrice}}
批发价
- 100
+ {{dataList.price == null ? '暂无':dataList.price}}
零售价
- 10
+ {{dataList.stockCount == null ? '暂无':dataList.stockCount}}
库存
-
+
颜色：黑色，尺码：S码，规格：童装
@@ -61,62 +61,32 @@
data() {
return {
pageNum: 1, //分页的页码
- shopList: [],
- goodsDetail: [],
- temporaryList: [],
- carList: [],
- bufferData: '',
+ dataList: [],
+ bufferData: '',
+ pecsList:[]
}
},
components: {
kkPrinter
},
- onLoad(options) {
- this.id = options.id;
+ onLoad(option) {
+ this.dataList = JSON.parse(option.item);
+ console.log(option.item)
this.getShareList();
},
methods: {
//库存商品详情
- getShareList() {
-
- },
- //弹出购物车或者商品规格选择弹窗
- toggle(type, item) {
- this.type = type
- // open 方法传入参数 等同在 uni-popup 组件上绑定 type属性
- if (type == 'carPopup') {
- this.$refs.carPopup.open('bottom')
-
- } else {
- this.checkGoods(item);
- this.$refs.popup.open('bottom')
- }
-
- },
- //临时改价
- changePrice(val) {
- this.goodsDetail.price = this.temporaryList[0].price = val
- },
- //删除商品下的某一个规格
- delShopSpec(name) {
- var that = this;
- console.log(this.carList)
- for (let i = 0; i < this.carList.length; i++) {
- for (let m = 0; m < this.carList[i].saleDetailQueryDTO.length; m++) {
- if (this.carList[i].saleDetailQueryDTO[m].name == name) {
- uni.showModal({
- title: "提示",
- content: "确定删除此条商品吗？",
- success: function(res) {
- that.carList[i].saleDetailQueryDTO.splice(m, 1)
- if (that.carList[i].saleDetailQueryDTO.length == 0) {
- that.carList.splice(i, 1)
- }
- }
- })
- }
- }
- }
+ getShareList() {
+ this.tui.request("/app/stock/productCount", "POST", {
+ productId: this.dataList.id
+ }, false, true).then((res) => {
+ if (res.code == 200) {
+ this.pecsList = res.result
+ } else {
+ this.tui.toast(res.message)
+ }
+ }).catch((res) => {})
+
},
//去新增商品页编辑
goToAddGoods(){