wangfukang 3 years ago
parent
commit
b52c09d08c
  1. 48
      package1/AI/AIHangOrderList.vue
  2. 13
      package1/inventory/batchPrint.vue
  3. 2
      package1/other/custom.vue
  4. 19
      package1/other/customDetail.vue
  5. 3
      package1/other/logistics.vue
  6. 6
      package1/other/logisticsAddress.vue

48
package1/AI/AIHangOrderList.vue

@ -264,6 +264,7 @@
pecsList: [], pecsList: [],
dataObj: new Map(), dataObj: new Map(),
allChangeNum:0, allChangeNum:0,
isPlusAndMinus:false,
shopName:'' shopName:''
} }
}, },
@ -504,16 +505,25 @@
// } // }
// if (this.temporaryList.length == 0) { // if (this.temporaryList.length == 0) {
if (jishuqi == this.goodsList.length) { if (jishuqi == this.goodsList.length) {
console.log(jishuqi) console.log('value',value)
console.log('temporaryList',this.temporaryList)
for (var i = 0; i < value.length; i++) { for (var i = 0; i < value.length; i++) {
this.attributeList = { let isTrue = false
attributeList: value[i], for (var m = 0; m < this.temporaryList.length; m++) {
productCount: this.temporaryNum, if(this.temporaryList[m].attributeList == value[i]){
productNum: this.productNum, isTrue = true
name: evalue[i], }
price: this.purchasePrice }
if(isTrue == false){
this.attributeList = {
attributeList: value[i],
productCount: this.temporaryNum,
productNum: this.productNum,
name: evalue[i],
price: this.purchasePrice
}
this.temporaryList.push(this.attributeList);
} }
this.temporaryList.push(this.attributeList);
} }
} }
this.$forceUpdate() this.$forceUpdate()
@ -738,24 +748,37 @@
} }
}, },
sliceMsg(val) {
var name = ''
if (typeof(val) == 'string') {
let newObj = JSON.parse(val)
for (let as in newObj) {
name += newObj[as] + '/'
}
}
return name;
},
//带参数跳转到开单页 //带参数跳转到开单页
goSaleGoods(item) { goSaleGoods(item) {
let dataList = [] let dataList = []
console.log('11',item);
if(item.saleDetailDTOList){ if(item.saleDetailDTOList){
for (let i = 0; i < item.saleDetailDTOList.length; i++) { for (let i = 0; i < item.saleDetailDTOList.length; i++) {
let obj = {} let obj = {}
let attrMap = new Map() let attrMap = new Map()
let newSaleDetailDTOList = [] let newSaleDetailDTOList = []
let num = 0
for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){ for(let m = 0; m < item.saleDetailDTOList[i].stockLogList1.length; m++){
if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){ if(attrMap.has(item.saleDetailDTOList[i].stockLogList1[m].attributeList) == true){
let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList) let hasCount = attrMap.get(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
let trueCount = hasCount.split('-')[0] newSaleDetailDTOList[hasCount].productCount = Number(newSaleDetailDTOList[hasCount].productCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
let lastConut = Number(trueCount) + Number(item.saleDetailDTOList[i].stockLogList1[m].productCount)
newSaleDetailDTOList[hasCount.split('-')[1]].productCount = lastConut
}else{ }else{
item.saleDetailDTOList[i].stockLogList1[m].name = this.sliceMsg(item.saleDetailDTOList[i].stockLogList1[m].attributeList)
newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m]) newSaleDetailDTOList.push(item.saleDetailDTOList[i].stockLogList1[m])
attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,item.saleDetailDTOList[i].stockLogList1[m].productCount+'-'+m) attrMap.set(item.saleDetailDTOList[i].stockLogList1[m].attributeList,num)
num++
} }
} }
obj.saleDetailQueryDTO = newSaleDetailDTOList obj.saleDetailQueryDTO = newSaleDetailDTOList
@ -843,6 +866,7 @@
}, },
//通过商品id查询商品详细信息 //通过商品id查询商品详细信息
getById(id) { getById(id) {
this.temporaryList = []
this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => { this.tui.request("/app/product/getById/" + id, "POST", {}, false, true).then((res) => {
if (res.code == 200) { if (res.code == 200) {
if(res.result.delFlag ==0 || res.result.purchasePrice==null || res.result.inStorageStatus == 0){ if(res.result.delFlag ==0 || res.result.purchasePrice==null || res.result.inStorageStatus == 0){

13
package1/inventory/batchPrint.vue

@ -79,7 +79,7 @@
<view class="popup-pay-title"> <view class="popup-pay-title">
<text>已选商品</text> <text>已选商品</text>
</view> </view>
<view v-for="(item,index) in carList"> <view v-for="(item,index) in carList" :key="index">
<view class="box-right"> <view class="box-right">
<text class="box-right-name" style="font-size: 24rpx;">{{item.productName}}</text> <text class="box-right-name" style="font-size: 24rpx;">{{item.productName}}</text>
<text class="box-right-num">({{item.productSn}})</text> <text class="box-right-num">({{item.productSn}})</text>
@ -140,7 +140,8 @@
components: { components: {
kkPrinter kkPrinter
}, },
onLoad(options) { onLoad(options) {
wx.openBluetoothAdapter({mode: 'central'})
this.height = wx.getSystemInfoSync().windowHeight this.height = wx.getSystemInfoSync().windowHeight
if (options.khid != undefined) { if (options.khid != undefined) {
uni.redirectTo({ uni.redirectTo({
@ -346,8 +347,14 @@
strCmd += blesdk.addCPCLLocation(0); //对齐指令 0-左对齐 1-右对齐 2-居中 strCmd += blesdk.addCPCLLocation(0); //对齐指令 0-左对齐 1-右对齐 2-居中
strCmd += blesdk.addCPCLPrint(); strCmd += blesdk.addCPCLPrint();
this.bufferData.push(strCmd); this.bufferData.push(strCmd);
this.$refs.payDialog.close();
} }
that.$nextTick(()=>{
that.$refs.payDialog.close();
that.bufferData = []
uni.navigateBack({
delta: 1
})
})
} }
} }
} }

2
package1/other/custom.vue

@ -29,7 +29,7 @@
</view> </view>
<view class="uni-body"> <view class="uni-body">
<text class="cardText"> 订单状态:</text> <text class="cardText"> 订单状态:</text>
{{ item.status == '0' ?'待抢单' :item.status == '1' ?'待取货' :item.status == '2' ?'作废':item.status == '3' ?'待送达' :item.status == '4' ?'已完成' :item.status == '5' ?'下游客户待退货' :item.status == '00' ?'退货待抢单' :item.status == '01' ?'退货待取货' :item.status == '03' ?'退货待送达' :item.status == '04' ?'待确认退货' :item.status == '6' ?'待配货' :'挂单'}} {{item.status == '0' ?'待抢单' :item.status == '2' ?'作废' :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' ?'待配货':item.status == '8' ?'待物流上门':item.status == '9' ?'已完成' :'挂单'}}
</view> </view>
<!-- <view class="floatRight"> 采购退货</view> --> <!-- <view class="floatRight"> 采购退货</view> -->
<view class="floatRight" @tap="kehuList(item.id)">查看详情</view> <view class="floatRight" @tap="kehuList(item.id)">查看详情</view>

19
package1/other/customDetail.vue

@ -13,7 +13,11 @@
<view class="noPic" v-else>暂无图片</view> <view class="noPic" v-else>暂无图片</view>
<view class="shop-productName"> <view class="shop-productName">
<view style="color:#FF5809;">{{item.productName}} ({{item.productSn == null ? '暂无':item.productSn}})</view> <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) == null ?'暂无':(item.productCount * item.discountAmount)}}
</view>
<view v-if="item.supplierName !=undefined">供应商:{{item.supplierName == null ? '暂无':item.supplierName}}</view> <view v-if="item.supplierName !=undefined">供应商:{{item.supplierName == null ? '暂无':item.supplierName}}</view>
</view> </view>
</view> </view>
@ -156,7 +160,7 @@
<view class="tui-order-flex"> <view class="tui-order-flex">
<view class="tui-item-title">配送状态:</view> <view class="tui-item-title">配送状态:</view>
<view class="tui-item-content"> <view class="tui-item-content">
{{ sales.status == '0' ?'待抢单' :sales.status == '1' ?'待取货' :sales.status == '2' ?'作废':sales.status == '3' ?'待送达' :sales.status == '4' ?'已完成' :sales.status == '5' ?'下游客户待退货' :sales.status == '00' ?'退货待抢单' :sales.status == '01' ?'退货待取货' :sales.status == '03' ?'退货待送达' :sales.status == '04' ?'待确认退货' :sales.status == '6' ?'待配货' :'挂单'}} {{sales.status == '0' ?'待抢单' :sales.status == '2' ?'作废' :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' ?'待配货':sales.status == '8' ?'待物流上门':sales.status == '9' ?'已完成' :'挂单'}}
</view> </view>
</view> </view>
</view> </view>
@ -213,7 +217,16 @@
this.tui.request("/app/sale/get/" + option.id, "GET", null, false, false).then((res) => { this.tui.request("/app/sale/get/" + option.id, "GET", null, false, false).then((res) => {
if (res.code == 200 && res.result != null && res.result != undefined) { if (res.code == 200 && res.result != null && res.result != undefined) {
this.sales = res.result.sale 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.order = res.result.customer this.order = res.result.customer
this.orderXd = res.result.orderXd this.orderXd = res.result.orderXd
this.shopData = res.result.shop this.shopData = res.result.shop

3
package1/other/logistics.vue

@ -163,7 +163,8 @@
url: this.tui.interfaceUrl() + '/app/sale/getSaleByCompanyId', url: this.tui.interfaceUrl() + '/app/sale/getSaleByCompanyId',
data: { data: {
companyId:this.id, companyId:this.id,
modeOfService:2 modeOfService:2,
status:8
}, },
header: { header: {
'content-type': 'application/json', 'content-type': 'application/json',

6
package1/other/logisticsAddress.vue

@ -4,11 +4,11 @@
<button size="default" v-if="type!='kaidan'" type="default" @tap="addAddress" hover-class="is-hover">新增线路</button> <button size="default" v-if="type!='kaidan'" type="default" @tap="addAddress" hover-class="is-hover">新增线路</button>
</view> </view>
<view class="list-1" style="display: flex;flex-direction: column;height: 150rpx;" v-for="(item, index) in standardList" :key="index"> <view class="list-1" style="display: flex;flex-direction: column;height: 150rpx;" v-for="(item, index) in standardList" :key="index">
<view class="name-tel" style="width: 75%;overflow: hidden;"> <view class="name-tel" style="width: 80%;overflow: hidden;">
<text style="line-height: 75rpx;">{{item.province +'-'+ item.city+'-'+item.area}}</text> <text style="line-height: 75rpx;">{{item.province +'-'+ item.city+'-'+item.area}}</text>
</view> </view>
<view class="name-tel" style="width: 75%;overflow: hidden;"> <view class="name-tel" style="width: 60%;line-height: 35rpx;">
<text style="line-height: 75rpx;">{{item.network == null ?'':item.network}}</text> <text style="font-size: 22rpx;">{{item.network == null ?'':item.network}}</text>
</view> </view>
<!-- <view class="name-tel" style="width: 75%;overflow: hidden;"> <!-- <view class="name-tel" style="width: 75%;overflow: hidden;">
<text style="line-height: 75rpx;">{{item.chargingStandard}}</text> <text style="line-height: 75rpx;">{{item.chargingStandard}}</text>

Loading…
Cancel
Save