wangfukang 3 years ago
parent
commit
edabf49987
  1. 15
      pages/index/addStock.vue
  2. 75
      pages/index/orderDetail.vue
  3. 31
      pages/index/shopInfo.vue
  4. 7
      pages/inventory/goodsList1.vue

15
pages/index/addStock.vue

@ -218,10 +218,17 @@
}, },
//点击底部选好了,返回上一页 //点击底部选好了,返回上一页
backPrevPage() { backPrevPage() {
let pages = getCurrentPages(); var data = []
let prevPage = pages[pages.length - 2]; this.carList.forEach(item => {
prevPage.$vm.carList1 = this.carList console.log(item)
prevPage.$vm.clearMsg = '1' data.push(item)
item.stockLogList1 = []
item.stockLogList.forEach(item1 => {
item.stockLogList1.push(item1)
})
})
uni.navigateBack({ uni.navigateBack({
delta: 1 delta: 1
}) })

75
pages/index/orderDetail.vue

@ -234,7 +234,10 @@
</u-popup> </u-popup>
<view class="tui-tabbar"> <view class="tui-tabbar">
<view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2"> <view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2">
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer> <kk-printer ref="kkprinter" :bufferData="bufferData" :defaultText="'贴包单'" @onPrint="onPrint"></kk-printer>
</view>
<view class="tui-btn-mr" v-if="sales.status != 6 && sales.status != 2">
<kk-printer ref="kkprinter" :bufferData="bufferData" :defaultText="'打印小票'" @onPrint="onPrintSmall"></kk-printer>
</view> </view>
<view class="tui-btn-mr" v-if="sales.status == 0 || sales.status == 1" @click="cancelOrder">取消订单</view> <view class="tui-btn-mr" v-if="sales.status == 0 || sales.status == 1" @click="cancelOrder">取消订单</view>
<view class="tui-btn-mr" v-if="sales.status == 4" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</view> <view class="tui-btn-mr" v-if="sales.status == 4" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</view>
@ -264,6 +267,7 @@
export default { export default {
data() { data() {
return { return {
defaultText:'贴包单',
radio1: 0, radio1: 0,
sex: [{ sex: [{
text: '是', text: '是',
@ -402,6 +406,75 @@
this.collection = res.result this.collection = res.result
}).catch(res => {}); }).catch(res => {});
}, },
//打印小票
onPrintSmall(){
// this.sales = res.result.sale
// this.list = res.result.saleDetailDTOList
// this.order = res.result.customer
// this.orderXd = res.result.orderXd
// this.shopData = res.result.shop
let that = this;
that.yNum = 150
let heightNum = 300
heightNum += this.carList.length * 40
for(var i=0;i<this.list.length;i++){
heightNum += this.list[i].stockLogList.length * 30
}
let strCmd = blesdk.CreatCPCLPage(600, heightNum, 1, 0);
strCmd += blesdk.addCPCLSETMAG(2, 2)
blesdk.addCPCLSETBOLD('bold')
strCmd += blesdk.addCPCLLocation(2);
strCmd += blesdk.addCPCLText('0', '30', '24', '0', 0, uni.getStorageSync('shopName'))
strCmd += blesdk.addCPCLSETMAG(1, 1)
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLText('0', '100', '24', '0', 0, '客户:' + this.order.name)
strCmd += blesdk.addCPCLText('0', '130', '24', '0', 0, '销售:' + this.sales.createByName)
strCmd += blesdk.addCPCLText('280', '130', '24', '0', 0, '日期:' + this.sales.createTime) //+
strCmd += blesdk.addCPCLText('0', '150', '24', '0', 0,
'=========================================================')
this.carList.forEach(function(value, key) {
strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, value.productName + '(' +
value.productSn + ')')
value.stockLogList.forEach(function(value1, key1) {
strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, (that.slicePrint(
key1)) + '*' + value1)
strCmd += blesdk.addCPCLText('280', that.yNum, '24', '0', 0, '单价:' + value.discountAmount)
strCmd += blesdk.addCPCLText('440', that.yNum, '24', '0', 0, '总价:' + (value
.discountAmount * value1))
})
})
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,
'===============================================================')
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '总数量:' + this.totalAmount)
strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '总金额' + this.shouldPay)
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '应收:' + this.relPrice)
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '实收:' + this.priceOk)
strCmd += blesdk.addCPCLText('200', this.yNum, '24', '0', 0, '欠款:' + (this.relPrice - this.priceOk))
strCmd += blesdk.addCPCLText('400', this.yNum, '24', '0', 0, '其他费用:' + (this.otherExpense == '' ? 0 : this.otherExpense))
if(this.remark.length >20){
let position = 20;
let part1 = this.remark.substring(0, position);
let part2 = this.remark.substring(position);
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, '备注:' + part1)
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, part2)
}else{
strCmd += blesdk.addCPCLText('0', 3000, '24', '0', 0, '备注:' + this.remark)
}
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
this.bufferData = strCmd;
this.$nextTick(()=>{
uni.redirectTo({
url: "/pages/index/order"
})
})
},
//打印贴包单
onPrint(opt) { onPrint(opt) {
let strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 1); let strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 1);
strCmd += blesdk.addCPCLSETMAG(2, 2) strCmd += blesdk.addCPCLSETMAG(2, 2)

31
pages/index/shopInfo.vue

@ -1,7 +1,8 @@
<template> <template>
<view> <view>
<view class="formBox"> <view class="formBox">
<uni-forms :modelValue="addForm" ref="addForm" validateTrigger="bind" :rules="rules" label-width="160rpx" label-align="right"> <uni-forms :modelValue="addForm" ref="addForm" validateTrigger="bind" :rules="rules" label-width="160rpx"
label-align="right">
<uni-forms-item label="手机号" required name="mobile"> <uni-forms-item label="手机号" required name="mobile">
<uni-easyinput type="text" v-model="addForm.mobile" placeholder="请输入登录手机号" /> <uni-easyinput type="text" v-model="addForm.mobile" placeholder="请输入登录手机号" />
</uni-forms-item> </uni-forms-item>
@ -41,13 +42,22 @@ export default {
shopList: [], shopList: [],
rules: { rules: {
mobile: { mobile: {
rules:[{required:true,errorMessage:'手机号不能为空'}] rules: [{
required: true,
errorMessage: '手机号不能为空'
}]
}, },
password: { password: {
rules:[{required:true,errorMessage:'密码不能为空'}] rules: [{
required: true,
errorMessage: '密码不能为空'
}]
}, },
confirm: { confirm: {
rules:[{required:true,errorMessage:'确认密码不能为空'}] rules: [{
required: true,
errorMessage: '确认密码不能为空'
}]
}, },
} }
} }
@ -58,8 +68,12 @@ export default {
}, },
methods: { methods: {
onFormSubmit() { onFormSubmit() {
if(this.addForm.mobile == '' &&this.addForm.newPass == ''){
this.tui.toast("不能为空")
return;
}
if (this.addForm.confirm !== this.addForm.newPass) return this.tui.toast('两次密码不一致', 2000, ) if (this.addForm.confirm !== this.addForm.newPass) return this.tui.toast('两次密码不一致', 2000, )
this.$refs.addForm.validate().then(async () => { // this.$refs.addForm.validate().then(async () => {
this.tui.request("/user/modifyPassAndMobile", "post", { this.tui.request("/user/modifyPassAndMobile", "post", {
mobile: this.addForm.mobile, mobile: this.addForm.mobile,
password: this.addForm.password, password: this.addForm.password,
@ -67,17 +81,17 @@ export default {
userId: this.userId userId: this.userId
}, false, true).then((res) => { }, false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.tui.toast("修改手机号密码成功!") this.tui.toast("修改成功!")
setTimeout(() => { setTimeout(() => {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/login/login'
}) })
}, 200) }, 200)
} else { } else {
this.tui.toast(res.message) this.tui.toast(res.message)
} }
}) })
}) // })
} }
} }
} }
@ -88,6 +102,7 @@ export default {
padding: 0 25upx; padding: 0 25upx;
background-color: #fff; background-color: #fff;
} }
.formBox { .formBox {
margin: 20rpx; margin: 20rpx;
padding: 20rpx 26rpx; padding: 20rpx 26rpx;

7
pages/inventory/goodsList1.vue

@ -1106,6 +1106,7 @@
//点击底部开单按钮 //点击底部开单按钮
goSell() { goSell() {
let that = this; let that = this;
console.log(this.carList)
if (this.khName == '') { if (this.khName == '') {
this.tui.toast('请选择客户!') this.tui.toast('请选择客户!')
return return
@ -1230,7 +1231,7 @@
heightNum += value.stockLogList.size * 30 heightNum += value.stockLogList.size * 30
}) })
let strCmd = blesdk.CreatCPCLPage(600, 5000, 1, 0); let strCmd = blesdk.CreatCPCLPage(600, heightNum, 1, 0);
strCmd += blesdk.addCPCLSETMAG(2, 2) strCmd += blesdk.addCPCLSETMAG(2, 2)
blesdk.addCPCLSETBOLD('bold') blesdk.addCPCLSETBOLD('bold')
strCmd += blesdk.addCPCLLocation(2); strCmd += blesdk.addCPCLLocation(2);
@ -1251,9 +1252,9 @@
value.stockLogList.forEach(function(value1, key1) { value.stockLogList.forEach(function(value1, key1) {
strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, (that.slicePrint( strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, (that.slicePrint(
key1)) + '*' + value1) key1)) + '*' + value1)
strCmd += blesdk.addCPCLText('280', that.yNum, '24', '0', 0, '单价:' + value.lsprice) strCmd += blesdk.addCPCLText('280', that.yNum, '24', '0', 0, '单价:' + value.discountAmount)
strCmd += blesdk.addCPCLText('440', that.yNum, '24', '0', 0, '总价:' + (value strCmd += blesdk.addCPCLText('440', that.yNum, '24', '0', 0, '总价:' + (value
.lsprice * value1)) .discountAmount * value1))
}) })
}) })
strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0, strCmd += blesdk.addCPCLText('0', this.countPrint(), '24', '0', 0,

Loading…
Cancel
Save