wangfukang 3 years ago
parent
commit
87a475c8ca
  1. 11
      pages/index/downStearmList.vue
  2. 24
      pages/index/downarrears.vue
  3. 2
      pages/index/downstream.vue
  4. 8
      pages/index/home.vue
  5. 126
      pages/index/orderDetail.vue
  6. 5
      pages/index/shareStyle.vue
  7. 2
      pages/index/upstream.vue
  8. 10
      pages/index/waitStorage.vue
  9. 102
      pages/index/waitStorageDetail.vue
  10. 2
      pages/inventory/changeGoods1.vue
  11. 14
      pages/inventory/goodsList1.vue
  12. 2
      pages/login/login.vue

11
pages/index/downStearmList.vue

@ -311,7 +311,7 @@
}
this.zPrice = this.zNum * this.purchasePrice
},
//编辑每一个的单价
//点击开单按钮,调起地址输入窗
clickPrice() {
this.$refs.inputDialog.open('bottom')
},
@ -338,8 +338,13 @@
},
//选择商品查询商品规格
checkGoods(item) {
this.purchasePrice = item.price;
checkGoods(item) {
if(this.priceType == 1){ //批发价
this.purchasePrice = item.wholesalePrice;
}else{
this.purchasePrice = item.price;
}
this.goodsDetail = item;
this.temporaryList = []
this.columns = []

24
pages/index/downarrears.vue

@ -18,7 +18,6 @@
</uni-card>
</li>
</ul>
<u-loadmore :status="status" />
</view>
<u-empty v-else mode="order" margin-top="200"></u-empty>
</view>
@ -37,10 +36,7 @@
return {
userId: '',
nickname: '',
list: [],
status: 'loadmore',
pages:1,
pageNumber:1
list: []
}
},
onLoad(options) {
@ -50,26 +46,14 @@
},
onShow(){
this.getList()
},
onReachBottom() {
if (this.pages >= this.pageNum) return;
this.status = 'loading';
this.pages = ++this.pages;
this.getList();
},
methods: {
getList() {
this.tui.request("/app/sale/customSale", "post", {
userId: this.userId
}, false, true).then((res) => {
this.status = 'nomore';
if (res.code == 200) {
if (this.pages == 1) {
this.list = res.result
} else {
this.list = [...this.list, ...res.result]
}
this.pageNumber = res.result.pages
}, false, true).then((res) => {
if (res.code == 200) {
this.list = res.result
} else {
this.tui.toast(res.message)
}

2
pages/index/downstream.vue

@ -45,7 +45,7 @@ export default {
getList() {
this.tui.request("/app/customer/debt", "POST", {}, false, true).then((res) => {
if(res.code == 200){
this.list = res.result
this.list = res.result.records
}else{
this.tui.toast(res.message)
}

8
pages/index/home.vue

@ -9,7 +9,7 @@
}
},
onLoad() {
onLoad(option) {
uni.showLoading({
title: '加载中...'
})
@ -27,7 +27,11 @@
url: '/pages/other/custom'
})
}
} else {
} else if(option.khid){
uni.reLaunch({
url: '/pages/index/downStearmList?khid='+option.khid
})
}else {
uni.reLaunch({
url: '/pages/login/login'
})

126
pages/index/orderDetail.vue

@ -13,7 +13,7 @@
<view class="noPic" v-else>暂无图片</view>
<view class="shop-productName">
<view style="color:#FF5809;">{{item.productName}} ({{item.productSn == null ? '暂无':item.productSn}})</view>
<view>单价:{{item.purchasePrice == null ? '暂无':item.purchasePrice}} 数量:{{item.productCount == null ? '暂无':item.productCount}} 总价:{{item.discountAmount == null ? '暂无':item.discountAmount}}</view>
<view>单价:{{item.discountAmount == null ? '暂无':item.discountAmount}} 数量:{{item.productCount == null ? '暂无':item.productCount}} 总价:{{item.productCount * item.discountAmount}}</view>
<view v-if="item.supplierName !=undefined">供应商:{{item.supplierName == null ? '暂无':item.supplierName}}</view>
</view>
</view>
@ -36,6 +36,13 @@
<view class="tui-price-large">{{ sales.totalAmount == null ?'暂无':sales.totalAmount }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="type == 0">
<view class="tui-flex-shrink">总成本</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{ sales.zongchengben == null ?'暂无':sales.zongchengben }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">实收金额</view>
<view class="tui-goods-price">
@ -72,20 +79,19 @@
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="isReturn">
<view class="tui-flex-shrink">已选金额</view>
<view class="tui-flex-shrink">退货金额</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<view class="tui-price-large">{{ changeAmount}}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="isReturn">
<!-- <view class="tui-price-flex tui-size32" v-if="isReturn">
<view class="tui-flex-shrink">退货金额</view>
<view class="tui-goods-price">
<view class="tui-size-24">¥</view>
<input type="digit" style="width: 150rpx;text-align: right;border-bottom: 1px solid #eee;" v-model='returnAmount' @input="getReturnA">
<!-- <view class="tui-price-large">{{ returnAmount}}</view> -->
</view>
</view>
</view> -->
<!-- <view class="tui-price-flex tui-size32" v-if="isReturn">
<view class="tui-flex-shrink">欠款抵扣</view>
<view class="tui-goods-price">
@ -111,9 +117,14 @@
<view class="tui-price-flex tui-size32" v-if="isReturn && radio1 == 0">
<view class="tui-flex-shrink">配送人员</view>
<view class="tui-goods-price">
<input type="text" v-model="lbgName.workerName" @tap.stop="goPopleList('lbgName')" placeholder="可指定拉包工" disabled style="height:75rpx;line-height:84rpx;border-bottom: 1px solid #088fe0;text-align: center;">
<uni-icons type="right" size="16" style="line-height: 80rpx;"></uni-icons>
<input type="text" v-model="lbgName.workerName" @tap.stop="goPopleList('lbgName')" placeholder="可指定拉包工" disabled style="height:75rpx;line-height:84rpx;border-bottom: 1px solid #088fe0;text-align: center;">
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="isReturn && radio1 == 0">
<view class="tui-flex-shrink">取货地址</view>
<view class="tui-goods-price">
<input type="text" @input="changeAddress" placeholder="请输入取货地址" style="height:75rpx;line-height:84rpx;border-bottom: 1px solid #088fe0;text-align: center;">
</view>
</view>
</view>
</view>
@ -126,7 +137,9 @@
<u-collapse-item v-for="(item,index) in returnList" :key="index" :title="item.returnSale.createTime"
:name="item.returnSale.saleId">
<view class="u-collapse-content" v-for="(val, index2) in item.saleDetailDTOList" :key="index2">
<view>{{val.productName}}</view>
<view>拉包工:{{item.returnSale.workerName == null?'自送':item.returnSale.workerName}}</view>
<view>退货金额:{{item.returnSale.totalAmount}}</view>
<view>{{val.productName}} </view>
<view v-for="(val1, index3) in val.stockLogList1" :key="index3" v-if="val1.productCount!=0">
{{val1.attributeList | sliceMsg}} 数量:{{val1.productCount}}
</view>
@ -183,13 +196,13 @@
<view class="tui-order-flex">
<view class="tui-item-title">配送公司:</view>
<view class="tui-item-content">
{{ sales.companyName == null ?'暂无':sales.companyName}}
{{ sales.companyName == null ?'暂无':sales.companyName}} <text style="color: blue;text-decoration-line: underline;" @tap="makeCall(sales.companyPhone)">({{sales.companyPhone == null ?'':sales.companyPhone}})</text>
</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">配送人员:</view>
<view class="tui-item-content">
{{orderXd.worker.workerName == null ?'暂无':orderXd.worker.workerName}}
{{orderXd.worker.workerName == null ?'暂无':orderXd.worker.workerName }} <text style="color: blue;text-decoration-line: underline;" @tap="makeCall(orderXd.worker.mobile)"> ({{orderXd.worker.mobile == null ?'暂无':orderXd.worker.mobile}})</text>
</view>
</view>
<view class="tui-order-flex">
@ -216,6 +229,11 @@
<uni-popup ref="inputDialog" type="dialog">
<uni-popup-dialog ref="inputClose" mode="input" title="回款金额" placeholder="请输入回款金额"
@confirm="sureNpPay"></uni-popup-dialog>
</uni-popup>
<!-- 退货确认输入框 -->
<uni-popup ref="returnDialog" type="dialog">
<uni-popup-dialog ref="returnClose" v-model="returnAmount" mode="input" title="请再次确认退货金额" placeholder="请输入退货金额"
@confirm="sureReturn"></uni-popup-dialog>
</uni-popup>
</view>
</template>
@ -258,7 +276,8 @@
collection:[],
lbgName:[],
returnAmount:0,
shopData:[]
shopData:[],
changeA:''
}
},
components: {
@ -275,8 +294,8 @@
}
});
})
this.returnAmount = (sum * this.sales.discount * 0.1).toFixed(2)
return (sum * this.sales.discount * 0.1).toFixed(2)
this.returnAmount = sum.toFixed(2)
return this.returnAmount
} else {
return 0
}
@ -303,6 +322,7 @@
},
onShow(){
this.lbgName = JSON.parse(JSON.stringify(this.lbgName))
this.type=uni.getStorageSync('type')
},
onLoad(option) {
if (option.id != null && option.id != undefined && option.id != "") {
@ -324,7 +344,22 @@
this.tui.request("/app/sale/get/" + option.id, "GET", null, false, false).then((res) => {
if (res.code == 200 && res.result != null && res.result != undefined) {
this.sales = res.result.sale
this.list = res.result.saleDetailDTOList
this.list = res.result.saleDetailDTOList
for(var i=0;i<this.list.length;i++){
for(var m=0;m<this.list[i].stockLogList1.length;m++){
if(this.list[i].productCount == null){
this.list[i].productCount = this.list[i].stockLogList1[m].productCount
}else{
this.list[i].productCount += this.list[i].stockLogList1[m].productCount
}
}
this.list[i].chengben = this.list[i].productCount * this.list[i].purchasePrice
}
this.sales.zongchengben = 0
for(var i=0;i<this.list.length;i++){
this.sales.zongchengben += this.list[i].chengben
}
this.sales.zongchengben = this.sales.zongchengben.toFixed(2)
this.order = res.result.customer
this.orderXd = res.result.orderXd
this.shopData = res.result.shop
@ -374,6 +409,14 @@
strCmd += blesdk.addCPCLLocation(0);
strCmd += blesdk.addCPCLPrint();
this.bufferData = strCmd;
},
makeCall(phone){
uni.makePhoneCall({
phoneNumber: phone + ''
});
},
changeAddress(e){
this.changeA = e.detail.value
},
//点击图片放大
showImage() {
@ -415,9 +458,6 @@
//回款按钮 this.type==gys时,是上游客户欠款接口。否则为销售单欠款接口
editnoEarn() {
this.editNoPrice = true;
},
getReturnA(e){
this.returnAmount = e.detail.value
},
getNoPay(en) {
if (en != undefined) {
@ -490,8 +530,9 @@
console.log(that.list)
},
checkBoxChange() {
if (this.radio1 == 1) {
this.lbgName = []
if (this.radio1 == 2) {
this.lbgName = []
this.changeA = ''
}
},
open() {
@ -500,19 +541,39 @@
close() {
this.popupShow = false
},
sureReturn() {
sureReturn() {
console.log(this.$refs.returnClose.val)
if(this.radio1 == 0 && this.changeA == ''){
this.tui.toast("请输入取货地址")
return
}
this.list.forEach(item1 => {
item1.stockLogList1.forEach(item2 => {
item1.stockLogList1.forEach((item2,index) => {
console.log(index)
if (item2.returnCount) {
item2.productCount = item2.returnCount
} else {
item2.productCount = 0
} else {
item1.stockLogList1.splice(index, 1)
}
})
})
this.sales.saleId = this.sales.id;
this.sales.totalAomount = this.returnAmount;
})
for(var i=0;i<this.list.length;i++){
for(var m=0;m<this.list[i].stockLogList1.length;m++){
if(m==0){
this.list[i].productCount = this.list[i].stockLogList1[m].productCount
}else{
this.list[i].productCount += this.list[i].stockLogList1[m].productCount
}
}
}
this.sales.saleId = this.sales.id;
this.sales.province = ''
this.sales.city = ''
this.sales.area = ''
this.sales.receiveAddress = this.changeA
this.sales.totalAmount = this.$refs.returnClose.val;
this.sales.transportType = this.radio1
this.tui.request("/app/return/rtg", "post", {
returnSale: this.sales,
returnSaleDetailList: this.list,
@ -537,8 +598,9 @@
// })
// }
if (this.isReturn) {
this.sureReturn()
if (this.isReturn) {
this.$refs.returnDialog.open()
// this.sureReturn()
} else {
this.isReturn = true;
}
@ -578,7 +640,7 @@
}
</script>
<style lang="scss" scoped>
<style lang="scss">
.btn-wrap {
width: 164rpx;
height: 80rpx;
@ -879,7 +941,7 @@
.shop-collapse text {
flex: 1;
text-align: center;
padding-right: 40rpx;
// padding-right: 40rpx;
border-right: 1px solid #eee;
}
.noPic{
@ -890,5 +952,9 @@
line-height: 140rpx;
color: #777;
background: #eee;
}
.checklist-box{
margin-right: 0 !important;
margin-left: 50rpx !important;
}
</style>

5
pages/index/shareStyle.vue

@ -1,7 +1,7 @@
<template>
<view class="page1">
<view class="title-box">
<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入供应商名称" cancelButton="none" @confirm="search" />
<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入商品名称" cancelButton="none" @confirm="search" />
</view>
<view class="content-box">
<view class="content-left">
@ -210,8 +210,7 @@
this.shopList[i] = []
}
}
console.log(this.shopList)
}
this.goodsList = this.shopList[0]
} else {
this.tui.toast(res.message)

2
pages/index/upstream.vue

@ -48,7 +48,7 @@
getList() {
this.tui.request("/app/purchase/debt", "get", {}, false, true).then((res) => {
if (res.code == 200) {
this.list = res.result
this.list = res.result.records
} else {
this.tui.toast(res.message)
}

10
pages/index/waitStorage.vue

@ -65,7 +65,10 @@
this.inStorageStatus = option.inStorageStatus || ''
this.type = uni.getStorageSync('type')
console.log(this.inStorageStatus)
this.getList()
},
onShow(){
this.getList()
},
onReachBottom() {
if(this.inStorageStatus != 0){
@ -109,11 +112,12 @@
pageSize:10,
}, false, false).then((res) => {
if (res.code == 200) {
this.list = []
this.pages = res.result.pages
if (this.pages == 1) {
this.list = res.result
this.list = res.result.records
} else {
this.list = [...this.list, ...res.result]
this.list = [...this.list, ...res.result.records]
}
} else {
this.tui.toast(res.message)

102
pages/index/waitStorageDetail.vue

@ -97,7 +97,26 @@
</view>
</view>
</view>
</view>
</view>
<view class="tui-order-info boxbg">
<view class="tui-order-title">
回款历史
</view>
<view class="tui-order-content" style="border-bottom: 1px solid #E0E0E0;" v-for="(item,index) in collection" :key="index">
<view class="tui-order-flex">
<view class="tui-item-title">回款金额:</view>
<view class="tui-item-content">{{ item.amount }}</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">操作人:</view>
<view class="tui-item-content">{{ item.createByName }}</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">操作时间:</view>
<view class="tui-item-content">{{ item.createTime }}</view>
</view>
</view>
</view>
<view class="tui-tabbar">
<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 1 && sales.noPay >0" @tap="inputDialogToggle">回款</view>
<view class="tui-btn-mr" v-if="type==0 && sales.inStorageStatus == 0" @click="inventorySubmit">确认提交</view>
@ -129,7 +148,8 @@
remark:'',
id:'',
type:'',
supplier:[]
supplier:[],
collection:[]
}
},
filters: {
@ -147,9 +167,18 @@
onLoad(option) {
this.id = option.id
this.getWaitStorage(option.id)
this.collectionList(option.id)
this.type = uni.getStorageSync('type')
},
methods: {
methods: {
//回款历史
collectionList(id){
this.tui.request('/app/dealingRecord/getDealingsRecordList','post', {
orderId:id
},false,true).then(res => {
this.collection = res.result
}).catch(res => {});
},
getWaitStorage(id) {
this.tui.request("/app/purchase/getPurchaseAllData", "post", {
id: id
@ -262,14 +291,67 @@
<style lang="scss" scoped>
.container {
padding-bottom: 118rpx;
.boxbg {
background-color: #fff;
margin: 30upx;
border-radius: 10upx;
box-shadow: 0px 1px 10px 2px #e2e2e2;
padding-bottom: 118rpx;
.boxbg {
background-color: #fff;
margin: 30upx;
padding: 20upx;
border-radius: 10upx;
box-shadow: 0px 1px 10px 2px #e2e2e2;
}
.tui-order-info {
margin-top: 20rpx;
}
.tui-order-content {
width: 100%;
padding: 24rpx 30rpx;
box-sizing: border-box;
background: #fff;
font-size: 24rpx;
line-height: 30rpx;
}
.tui-order-flex {
display: flex;
padding-top: 18rpx;
}
.tui-order-flex:first-child {
padding-top: 0
}
.tui-item-title {
width: 132rpx;
flex-shrink: 0;
}
.tui-item-content {
color: #666;
line-height: 32rpx;
}
.tui-order-title {
position: relative;
font-size: 28upx;
line-height: 28upx;
padding-left: 16upx;
box-sizing: border-box;
}
.tui-order-title::before {
content: '';
position: absolute;
left: 0;
top: 0;
border-left: 8upx solid $u-primary;
height: 120%;
border-radius: 4upx;
}
// .boxbg {
// background-color: #fff;
// margin: 30upx;
// border-radius: 10upx;
// box-shadow: 0px 1px 10px 2px #e2e2e2;
// }
.tui-order-item {
.u-collapse-content {

2
pages/inventory/changeGoods1.vue

@ -98,7 +98,7 @@
</view>
</view>
</view>
<view class="popup-bottom" v-for="item in temporaryList">
<view class="popup-bottom">
<view class="popup-bottom-left">
<text>数量:{{zNum}} 件</text>
<!-- <text>¥{{zPrice}}</text> -->

14
pages/inventory/goodsList1.vue

@ -577,7 +577,11 @@
})
this.getAllPrice()
this.getAmountAndWho()
// this.noPay = this.shouldPay
// this.noPay = this.shouldPay
if(this.xsyId == ''){
this.xsyId = uni.getStorageSync('id')
this.createByName = uni.getStorageSync('nickname')
}
},
filters: {
sliceMsg(val) {
@ -1099,7 +1103,7 @@
city: this.khName.city,
province: this.khName.province,
payStatus: 1,
receiveAddress: this.khName.address,
receiveAddress: this.khName.address || this.khName.receiveAddress,
userId: this.khName.id,
userName: this.khName.name,
transportType: this.radioType1 == 1 ? 2 : this.radioType, //this.radioType
@ -1162,7 +1166,7 @@
onPrint(opt) {
let that = this;
that.yNum = 150
let strCmd = blesdk.CreatCPCLPage(600, 1040, 1, 0);
let strCmd = blesdk.CreatCPCLPage(600, 2040, 1, 0);
strCmd += blesdk.addCPCLSETMAG(2, 2)
blesdk.addCPCLSETBOLD('bold')
strCmd += blesdk.addCPCLLocation(2);
@ -1183,8 +1187,8 @@
value.stockLogList.forEach(function(value1, key1) {
strCmd += blesdk.addCPCLText('0', that.countPrint(), '24', '0', 0, (that.slicePrint(
key1)) + '*' + value1)
strCmd += blesdk.addCPCLText('200', that.yNum, '24', '0', 0, '单价:' + value.lsprice)
strCmd += blesdk.addCPCLText('360', that.yNum, '24', '0', 0, '总价:' + (value
strCmd += blesdk.addCPCLText('280', that.yNum, '24', '0', 0, '单价:' + value.lsprice)
strCmd += blesdk.addCPCLText('440', that.yNum, '24', '0', 0, '总价:' + (value
.lsprice * value1))
})
})

2
pages/login/login.vue

@ -184,6 +184,8 @@
if (res.code == 200) {
uni.setStorageSync("hiver_token", res.result.accessToken)
uni.setStorageSync("wayValue", this.wayValue)
uni.setStorageSync("nickname", res.result.user.nickname)
uni.setStorageSync("id", res.result.user.id)
//多店铺的时候,在这里加上打开店铺选择弹窗
if(this.wayValue == 2){ //下游客户登录
setTimeout(() => {

Loading…
Cancel
Save