root
/
kuaiyidian-HD
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1

master
tianyi@bogon 3 years ago
parent
8a0d57a7b8
commit
0d5a451234
14 changed files with 189 additions and 165 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      pages/.DS_Store
  2. 6
      pages/index/downStearmList.vue
  3. 17
      pages/index/downarrears.vue
  4. 4
      pages/index/downstream.vue
  5. 14
      pages/index/index.vue
  6. 10
      pages/index/order.vue
  7. 104
      pages/index/orderDetail.vue
  8. 8
      pages/index/uparrears.vue
  9. 4
      pages/index/upstream.vue
  10. 10
      pages/index/waitStorage.vue
  11. 29
      pages/index/waitStorageDetail.vue
  12. 60
      pages/inventory/goodsList1.vue
  13. 6
      pages/inventory/inventory.vue
  14. 82
      pages/inventory/inventoryDetail.vue

BIN
pages/.DS_Store
View File

Binary file not shown.

6
pages/index/downStearmList.vue
View File

@ -11,8 +11,8 @@
<img :src="item.productPicture" alt="">
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
<view class="box-right-num">{{item.productSn}}</view>
<view class="box-right-name">{{item.productName == null ?'暂无':item.productName}}</view>
<view class="box-right-num">{{item.productSn == null ?'暂无':item.productSn}}</view>
<view class="box-right-price">
<!-- <view class="price-box">
<text>{{item.purchasePrice}}</text>
@ -23,7 +23,7 @@
<text>批发价</text>
</view> -->
<view class="price-box">
<text>{{item.price}}</text>
<text>{{item.price == null ?'暂无':item.price}}</text>
<text>零售价</text>
</view>
<!-- <view class="price-box">

17
pages/index/downarrears.vue
View File

@ -20,15 +20,15 @@
<view class="ulList" v-if="list.length > 0">
<ul>
<li v-for="item in list" @tap="gotoDetail(item.id)">
<uni-card :title="item.companyName" :sub-title="item.createTime" :extra="'共'+item.totalAmount + '件'"
<uni-card :title="item.companyName == null ?'暂无':item.companyName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'订单金额:￥'+(item.totalAmount == null ?'暂无':item.totalAmount)"
thumbnail="/static/images/dingdan/dd1.png">
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName}}</view>
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
<view class="uni-body"> <text class="cardText"> 销售总额：</text> <text class="priceText">
{{item.shouldPay}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noEarn}}
{{item.totalAmount == null ?'暂无':item.totalAmount}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noEarn == null ?'暂无':item.noEarn}}
</text></view>
<view class="uni-body"> <text class="cardText">
订单状态：</text>{{item.payStatus == 0 ?'待抢单' :item.payStatus == 1 ?'待取货' :item.payStatus == 3 ?'待送达' :item.payStatus == 4 ?'已完成' :item.payStatus == 5 ?'下游客户待退货' :item.payStatus == 00 ?'退货待抢单' :item.payStatus == 01 ?'退货待取货' :item.payStatus == 03 ?'退货待送达' :item.payStatus == 04 ?'待确认退货' :item.payStatus == 6 ?'待配货' :'挂单'}}
订单状态：</text>{{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 ?'待配货' :'挂单'}}
</view>
</uni-card>
</li>
@ -62,10 +62,9 @@
},
methods: {
getList() {
this.tui.request("/app/sale/list", "post", {
// userId: this.userId
userId: '1704126992443641856'
}, false, false).then((res) => {
this.tui.request("/app/sale/customSale", "post", {
userId: this.userId
}, false, true).then((res) => {
if (res.code == 200) {
this.list = res.result
} else {

4
pages/index/downstream.vue
View File

@ -5,11 +5,11 @@
<view class="swipe-action">
<view class="swipe-action__content" @tap="onItemClick(item)" v-for="(item,index) in list" :key="index">
<view class="swipe-action__content__left">
<view class="swipe-action__content__text">{{ item.nickname }}</view>
<view class="swipe-action__content__text">{{ item.nickname == null ?'暂无':item.nickname}}</view>
</view>
<view class="swipe-action__content__right">
<view class="swipe-action__content__right__text">欠款总金额:</view>
<view class="swipe-action__content__right__money">{{ item.no_earn }}</view>
<view class="swipe-action__content__right__money">{{ item.no_earn == null ?'暂无':item.no_earn }}</view>
</view>
</view>
</view>

14
pages/index/index.vue
View File

@ -72,16 +72,16 @@
<view class="contentPadding">
<view class="title">
<i class="iconfont icon-wenjianliebiao"> 近期订单列表
<view class="btn" @tap="gotoOrder">
<!-- <view class="btn" @tap="gotoOrder">
历史订单 >
</view>
</view> -->
</i>
</view>
<ul class="inventoryList" v-if="inventoryList.length > 0">
<li v-for="item in inventoryList" :key="item.id">
<uni-card :title="item.id" :sub-title="'￥'+item.totalAmount" :thumbnail="item.img"
<uni-card :title="item.userName == null ?'暂无':item.userName" :sub-title="'￥'+(item.totalAmount == null ?'暂无':item.totalAmount)" :thumbnail="item.img"
@tap="gotoDetail(item.id)">
<view class="uni-body">{{ item.createByName }} - {{ item.createTime }}</view>
<view class="uni-body">{{ item.createByName == null ?'暂无':item.createByName}} - {{ item.createTime }}</view>
</uni-card>
</li>
</ul>
@ -183,6 +183,12 @@
},
components: {
cmdNavBar
},
filters: {
spliceMsg(val) {
val == null || undefined ? '暂无' : val
return val;
}
},
onLoad() {
this.getSaleInfo()

10
pages/index/order.vue
View File

@ -7,17 +7,17 @@
<view class="ulList" v-if="inventoryList.length > 0">
<ul>
<li v-for="item in inventoryList" @tap="gotoDetail(item.id)">
<uni-card :title="item.id" :sub-title="item.createTime" :extra="'￥'+item.totalAmount"
<uni-card :title="item.userName == null ?'暂无':item.userName" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'数量：'+(item.productCount == null ?'暂无':item.productCount)"
thumbnail="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c09dfa8c61c949f8b0dbb8f041d5a501.png">
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName}}</view>
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createByName == null ?'暂无':item.createByName}}</view>
<view class="uni-body"> <text class="cardText"> 营业额：</text> <text class="priceText">
{{item.realAmount}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noEarn}}
{{item.realAmount == null ?'暂无':item.realAmount}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noEarn == null ?'暂无':item.noEarn}}
</text></view>
<view class="uni-body"> <text class="cardText">
订单状态：</text>{{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 ?'待配货' :'挂单'}}
</view>
<view class="floatRight" @tap.stop="goSaleGoods(item)">去开单</view>
<view class="floatRight" v-if="item.status == 6" @tap.stop="goSaleGoods(item)">去开单</view>
<!-- <view class="floatRight" v-if="type =='order'">物流信息 </view> -->
</uni-card>
</li>

104
pages/index/orderDetail.vue
View File

@ -1,15 +1,15 @@
<template>
<view class="container">
<uni-card :title="sales.userName" thumbnail="/static/images/dingdan/dd0.png">
<view class="uni-body">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
<uni-card :title="sales.userName == null ?'暂无':sales.userName" thumbnail="/static/images/dingdan/dd0.png">
<view class="uni-body" v-if="sales.province != null">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
</uni-card>
<view class="tui-order-item boxbg">
<u-collapse>
<u-collapse-item :open="isReturn" v-for="(item,index) in list" :key="index" :title="item.productName"
:name="item.saleId"
:value="'单价：'+ item.wholesalePrice + ' 折扣： ' + sales.discount + '折'">
<view class="u-collapse-content" v-for="(val, index2) in item.stockLogList1" :key="index2">
:value="'单价：'+ (item.wholesalePrice == null ?'暂无':item.wholesalePrice) + ' 折扣： ' + (item.discount == null ?'暂无':item.discount + '折')">
<view class="u-collapse-content" v-if="item.stockLogList1 != ''" v-for="(val, index2) in item.stockLogList1" :key="index2">
<!-- <u-icon name="checkmark-circle" color="#5fd9ee" size="20" v-if="isReturn"></u-icon>
<u-icon name="checkmark-circle" color="#999" size="20" v-if="isReturn"></u-icon> -->
{{ val.attributeList.substr(1).substring(0,val.attributeList.substr(1).length-1).replace(/\"/g, "") }}
@ -22,57 +22,58 @@
<view class="tui-goods-info">
<view class="tui-price-flex tui-size32 tui-pbtm20">
<view class="tui-flex-shrink">总金额</view>
<view class="tui-goods-price tui-primary-color">
<view class="tui-goods-price">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.totalAmount }}</view>
<view class="tui-price-large">{{ sales.totalAmount == null ?'暂无':sales.totalAmount }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">实收金额</view>
<view class="tui-goods-price tui-primary-color">
<view class="tui-goods-price">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.realAmount }}</view>
<view class="tui-price-large">{{ sales.realAmount == null ?'暂无':sales.realAmount }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">已收金额</view>
<view class="tui-goods-price tui-primary-color">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.alreadyEarn }}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">欠款</view>
<view class="tui-goods-price">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.noEarn}}</view>
<view class="tui-price-large">{{ sales.alreadyEarn == null ?'暂无':sales.alreadyEarn }}</view>
</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">其他费用</view>
<view class="tui-goods-price">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.otherExpense}}</view>
<view class="tui-price-large">{{ sales.otherExpense == null ?'暂无':sales.otherExpense}}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">备注</view>
<view class="tui-goods-price">
<view class="tui-price-large">{{ sales.remark}}</view>
<view class="tui-price-large">{{ sales.remark == null ?'暂无':sales.remark}}</view>
</view>
</view>
<view class="tui-price-flex tui-size32">
<view class="tui-flex-shrink">欠款</view>
<view class="tui-goods-price tui-primary-color">
<view class="tui-size-24">￥</view>
<view class="tui-price-large">{{ sales.noEarn == null ?'暂无':sales.noEarn}}</view>
</view>
</view>
<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>
<view class="tui-price-large">{{ changeAmount }}</view>
<view class="tui-price-large">{{ changeAmount}}</view>
</view>
</view>
<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>
<view class="tui-price-large">{{ returnAmount }}</view>
<view class="tui-price-large">{{ returnAmount}}</view>
</view>
</view>
<view class="tui-price-flex tui-size32" v-if="editNoPrice">
@ -121,7 +122,7 @@
</view>
<view class="tui-order-info boxbg" v-if="isgys">
<view class="tui-order-title">
订单信息
物流信息
</view>
<view class="tui-order-content">
<view class="tui-order-flex">
@ -144,6 +145,24 @@
<view class="tui-item-content">
{{ sales.transportType == 0 ? '物流' : sales.transportType == 1 ? '快递' : sales.transportType == 2 ? '自送' : sales.transportType == 3 ? '拼包':'发车' }}
</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">配送公司:</view>
<view class="tui-item-content">
{{ sales.transportType}}
</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">配送人员:</view>
<view class="tui-item-content">
{{ sales.transportType}}
</view>
</view>
<view class="tui-order-flex">
<view class="tui-item-title">配送状态:</view>
<view class="tui-item-content">
{{ 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 ?'待配货' :'挂单'}}
</view>
</view>
</view>
</view>
@ -153,23 +172,11 @@
</u-popup>
<view class="tui-tabbar">
<view class="tui-btn-mr">
<view class="btn-wrap">
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
</view>
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint"></kk-printer>
</view>
<view class="tui-btn-mr">
<u-button type="error" :plain="true" shape="circle" @click="cancelOrder">取消订单</u-button>
</view>
<view class="tui-btn-mr" v-if="sales.status == 4">
<u-button type="error" :plain="true" shape="circle"
@click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</u-button>
</view>
<view class="tui-btn-mr">
<u-button type="error" :plain="true" shape="circle" @tap="inputDialogToggle()"
v-if="!editNoPrice">回款</u-button>
<!-- <u-button type="error" :plain="true" shape="circle" @click="sureNpPay" v-else>确认</u-button> -->
</view>
<view class="tui-btn-mr" @click="cancelOrder">取消订单</view>
<view class="tui-btn-mr" @click="returnGoods">{{ !isReturn ? '退货' : '确认退货'}}</view>
<view class="tui-btn-mr" @tap="inputDialogToggle()" v-if="!editNoPrice">回款</view>
</view>
<!-- 回款金额输入框 -->
<uni-popup ref="inputDialog" type="dialog">
@ -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;
}

8
pages/index/uparrears.vue
View File

@ -4,12 +4,12 @@
<view class="ulList" v-if="list.length > 0">
<ul>
<li v-for="item in list" @tap="gotoDetail(item.id)">
<uni-card :title="item.id" :sub-title="item.createTime" :extra="'共'+item.totalAmount + '件'"
<uni-card :title="item.id == null ?'暂无':item.id" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
thumbnail="/static/images/dingdan/dd1.png">
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createBy}}</view>
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createBy == null ?'暂无':item.createBy}}</view>
<view class="uni-body"> <text class="cardText"> 总成本：</text> <text class="priceText">
{{item.shouldPay}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noPay}}
{{item.shouldPay == null ?'暂无':item.shouldPay}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noPay == null ?'暂无':item.noPay}}
</text></view>
<view class="uni-body"> <text class="cardText">
订单状态：</text>{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}

4
pages/index/upstream.vue
View File

@ -5,11 +5,11 @@
<view class="swipe-action">
<view class="swipe-action__content" @tap="onItemClick(item)" v-for="(item,index) in list" :key="index">
<view class="swipe-action__content__left">
<view class="swipe-action__content__text">{{ item.supplierName }}</view>
<view class="swipe-action__content__text">{{ item.supplierName == null ?'暂无':item.supplierName }}</view>
</view>
<view class="swipe-action__content__right">
<view class="swipe-action__content__right__text">欠款总金额:</view>
<view class="swipe-action__content__right__money">{{ item.noPay }}</view>
<view class="swipe-action__content__right__money">{{ item.noPay == null ?'暂无':item.noPay }}</view>
</view>
</view>
</view>

10
pages/index/waitStorage.vue
View File

@ -4,17 +4,17 @@
<view class="ulList" v-if="list.length > 0">
<ul>
<li v-for="item in list" @tap="gotoDetail(item.id)">
<uni-card :title="item.id" :sub-title="item.createTime" :extra="'共'+item.totalAmount + '件'"
<uni-card :title="item.id == null ?'暂无':item.id" :sub-title="item.createTime == null ?'暂无':item.createTime" :extra="'共'+(item.totalAmount == null ?'暂无':item.totalAmount) + '件'"
thumbnail="/static/images/dingdan/dd1.png">
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createBy}}</view>
<view class="uni-body"><text class="cardText">销售员：</text> {{item.createBy == null ?'暂无':item.createBy}}</view>
<view class="uni-body"> <text class="cardText"> 总成本：</text> <text class="priceText">
{{item.shouldPay}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noPay}}
{{item.shouldPay == null ?'暂无':item.shouldPay}} </text> <text decode class="cardText">
{{'&nbsp;&nbsp;&nbsp;&nbsp; 欠款： '}} </text> <text class="priceText">{{item.noPay == null ?'暂无':item.noPay}}
</text></view>
<view class="uni-body"> <text class="cardText">
订单状态：</text>{{item.inStorageStatus == 0 ?'未入库' :'已入库'}}
</view>
<view v-if="inStorageStatus== 0" class="return-price" @tap="returnPrice(item)">更新</view>
<view v-if="item.inStorageStatus== 0" class="return-price" @tap="returnPrice(item)">更新</view>
</uni-card>
</li>
</ul>

29
pages/index/waitStorageDetail.vue
View File

@ -1,17 +1,17 @@
<template>
<view class="container">
<uni-card :title="sales.supplierName" thumbnail="/static/images/dingdan/dd0.png">
<view class="uni-body">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
<uni-card :title="sales.supplierName == null ?'暂无':sales.supplierName" thumbnail="/static/images/dingdan/dd0.png">
<view class="uni-body" v-if="sales.province">{{sales.province + sales.area + sales.city + sales.receiveAddress}} </view>
</uni-card>
<view class="tui-order-item boxbg">
<view class="shop-box" style="border-top:5px solid #eee;" v-for="(item,index) in goodsList" :key="key">
<view class="shop-name">
<img :src="item.productPicture" alt=""
<img :src="item.productPicture == null ?'暂无':item.productPicture" alt=""
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;">
<view class="shop-productName">
<view style="color:#FF5809;">品名：{{item.productName}}</view>
<view>货号：{{item.productSn}}</view>
<view>总价：{{item.price}} 数量：{{item.productCount}}</view>
<view style="color:#FF5809;">品名：{{item.productName == null ?'暂无':item.productName}}</view>
<view>货号：{{item.productSn == null ?'暂无':item.productSn}}</view>
<view>总价：{{item.price == null ?'暂无':item.price}} 数量：{{item.productCount == null ?'暂无':item.productCount}}</view>
</view>
<view style="position: absolute;top: 130rpx;right: 40rpx;color: blue;text-decoration: underline;"
@tap="clickCollapse(index)">
@ -22,7 +22,7 @@
<view class="shop-collapse" v-for="items in item.stockLogList1">
<text>{{items.attributeList | sliceMsg}}</text>
<!-- <text style="color: red;">单价：￥{{item.price}}</text> -->
<text>数量：{{items.productCount}}</text>
<text>数量：{{items.productCount == null ?'暂无':item.productCount}}</text>
</view>
</view>
</view>
@ -63,9 +63,7 @@
</view>
</view>
<view class="tui-tabbar">
<view class="tui-btn-mr">
<u-button type="error" :plain="true" shape="circle" @click="inventorySubmit">确认提交</u-button>
</view>
<view class="tui-btn-mr" @click="inventorySubmit">确认提交</view>
</view>
<!-- 弹出输入框 -->
<uni-popup ref="inputDialog" type="dialog">
@ -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%;

60
pages/inventory/goodsList1.vue
View File

@ -33,7 +33,7 @@
</view>
<view class="shop-box">
<view class="content-list">
<view class="list-name" style="width:150rpx">选择价格</view>
<view class="list-name" style="width:150rpx;padding-left:0;">选择价格</view>
<view class="list-val" style="width:560rpx;display: flex;">
<radio-group style="display: flex;">
<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in priceItems"
@ -41,7 +41,7 @@
<view>
<radio :value="item.value" @tap="priceChange(item.value)" :checked="index === priceCurrent" />
</view>
<view>{{item.name}}</view>
<view style="width: 100rpx;">{{item.name}}</view>
</label>
</radio-group>
</view>
@ -49,7 +49,7 @@
</view>
<view class="shop-box">
<view class="content-list">
<view class="list-name" style="width:150rpx">折扣类型</view>
<view class="list-name" style="width:150rpx;padding-left:0;">折扣类型</view>
<view class="list-val" style="width:560rpx;display: flex;">
<radio-group @change="discountChange" style="display: flex;">
<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in items"
@ -57,7 +57,7 @@
<view>
<radio :value="item.value" :checked="index === discountCurrent" />
</view>
<view>{{item.name}}</view>
<view style="width: 100rpx;">{{item.name}}</view>
</label>
</radio-group>
<view class="discount-num" v-if="discountType == '1'">
@ -156,7 +156,7 @@
<view class="shop-box">
<view class="" style="border-bottom: 1px solid #eee;">
<view class="list-name" style="width: 100%;">发货方式</view>
<view class="list-val" style="display: flex;width: 100%;">
<view class="list-val" style="display: flex;width: 100%;padding-left:20rpx;">
<radio-group @change="radioChange" style="display: flex;">
<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in logisticsType"
:key="item.value">
@ -170,17 +170,17 @@
</view>
<view class="">
<view class="content-list" v-if="radioType == '0' || radioType == '1'">
<view class="list-name" style="width:150rpx;">{{radioType == '0'? '选择物流' :'选择快递'}}</view>
<view class="list-name" style="width:150rpx;padding-left: 0;">{{radioType == '0'? '选择物流' :'选择快递'}}</view>
<view class="list-val">
<input type="text" placeholder="请选择" disabled :value="wlName.companyName"
style="border-bottom: 1px solid #fff;text-align: center;"
style="border-bottom: 1px solid #fff;text-align: center;padding-right: 54rpx;"
@tap="goPopleList(radioType == '0'? 'wlName' :'kdName')">
<uni-icons type="right" size="16"
style="margin-left: 80rpx;line-height: 80rpx;"></uni-icons>
</view>
</view>
<view class="content-list" v-if="radioType == '4'">
<view class="list-name" style="width:150rpx;">选择车号</view>
<view class="list-name" style="width:150rpx;padding-left:0;">选择车号</view>
<view class="list-val">
<input type="text" placeholder="请选择" disabled
style="border-bottom: 1px solid #fff;text-align: center;"
@ -190,14 +190,19 @@
</view>
</view>
<view class="content-list" v-if="radioType !=''">
<view class="list-name">配送方式</view>
<view class="list-name" style="padding-left:0;">配送方式</view>
<view class="list-val" style="line-height: 90rpx;">
<uni-data-checkbox v-model="value" :localdata="sex"
@change="checkBoxChange"></uni-data-checkbox>
</view>
<!-- <view class="content-list" style="width: 100%;">
<view class="list-name" style="padding-left: 0;">配送方式</view>
<uni-data-select class="uni-data-select" :localdata="sex" v-model="value"
placeholder="请选择配送方式" :clear="false" @change="checkBoxChange"></uni-data-select>
</view> -->
</view>
<view class="content-list" v-if="radioType1 != '1' && radioType !=''">
<view class="list-name" style="width:150rpx;">{{radioType == '1'? '快递员' :'拉包工'}}</view>
<view class="list-name" style="width:150rpx;padding-left:0;">{{radioType == '1'? '快递员' :'拉包工'}}</view>
<view class="list-val">
<input type="text" placeholder="可指定人员" disabled
:value="radioType == '1'? kdyName.workerName : lbgName.workerName"
@ -208,7 +213,7 @@
</view>
</view>
<view class="content-list" v-if="radioType == '3'">
<view class="list-name">拼包地址</view>
<view class="list-name" style="padding-left:0;">拼包地址</view>
<view class="">
<textarea @input='changePbAddress($event)' :value='pbAddress' />
</view>
@ -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;
}
}
</style>

6
pages/inventory/inventory.vue
View File

@ -52,7 +52,7 @@
</view>
</view>
<view class="content-right">
<view class="right-box" v-for="item in shopList" :key="item" @tap="goDetail(item.id)">
<view class="right-box" v-for="item in shopList" :key="item" @tap="goDetail(item)">
<view class="box-left">
<img :src="item.productPicture" alt="">
</view>
@ -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)
})
},
//点击分类获取商品列表

82
pages/inventory/inventoryDetail.vue
View File

@ -6,36 +6,36 @@
<img src="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c09dfa8c61c949f8b0dbb8f041d5a501.png" alt="">
</view>
<view class="box-right">
<view class="box-right-name">女士裙子（AC1551452）</view>
<view class="box-right-num">供应商：张三</view>
<view class="box-right-name">{{dataList.productName == null ? '暂无':dataList.productName}} ({{dataList.productSn == null ? '暂无':dataList.productSn}})</view>
<view class="box-right-num">供应商：{{dataList.supplierName == null ? '暂无':dataList.supplierName}}</view>
<view class="edit-btn" @tap="goToAddGoods">编辑</view>
<kk-printer ref="kkprinter" :bufferData="bufferData" @onPrint="onPrint" style="width: 100rpx;height: 60rpx;line-height: 60rpx;color: #fff !important;background: #0072E3;position: absolute;top: 30rpx;right: 40rpx;border-radius: 10px;text-align: center;"></kk-printer>
<view class="box-right-num" style="color:#ffa200;">
<text style="padding-right: 20rpx;">已上架</text>
<text>已入库</text>
<text style="padding-right: 20rpx;">{{dataList.delFlag==0?'已上架':'已下架'}}</text>
<!-- <text>{{dataList.delFlag==0?'已上架':'已下架'}}</text> -->
</view>
</view>
</view>
<view class="box-right-price">
<view class="price-box">
<text>100</text>
<text>{{dataList.purchasePrice == null ? '暂无':dataList.purchasePrice}}</text>
<text>平均采购价</text>
</view>
<view class="price-box">
<text>100</text>
<text>{{dataList.wholesalePrice == null ? '暂无':dataList.wholesalePrice}}</text>
<text>批发价</text>
</view>
<view class="price-box">
<text>100</text>
<text>{{dataList.price == null ? '暂无':dataList.price}}</text>
<text>零售价</text>
</view>
<view class="price-box">
<text>10</text>
<text>{{dataList.stockCount == null ? '暂无':dataList.stockCount}}</text>
<text>库存</text>
</view>
</view>
</view>
<view class="container-box">
<view class="container-box" v-for="(item,index) in pecsList" :key='index'>
<view class="prec-list">
<view class="prec-list-box">
颜色：黑色，尺码：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(){

Write Preview
Loading…
Cancel
Save