wangfukang 3 years ago
parent
commit
41fce36fe1
  1. 2
      pages/billing/addUser.vue
  2. 18
      pages/billing/changeGoods1.vue
  3. 41
      pages/index/addHangOrder.vue
  4. 5
      pages/index/index.vue
  5. 12
      pages/index/orderDetail.vue
  6. 14
      pages/index/shareStyle.vue
  7. 65
      pages/index/waitStorage.vue
  8. 12
      pages/index/waitStorageDetail.vue
  9. 12
      pages/inventory/addinventory.vue
  10. 18
      pages/inventory/changeGoods1.vue
  11. 5
      pages/inventory/getProductIdToList.vue
  12. 15
      pages/inventory/goodsList1.vue
  13. 12
      pages/inventory/inventory.vue
  14. 12
      pages/inventory/inventoryDetail.vue
  15. 19
      pages/other/custom.vue

2
pages/billing/addUser.vue

@ -142,7 +142,7 @@
})
}else{
this.tui.request("/app/supplier/delByIds", "post", {
id: this.formData.id,
ids: this.formData.id,
}, false, true).then((res) => {
if (res.code == 200) {
uni.showToast({

18
pages/billing/changeGoods1.vue

@ -17,7 +17,8 @@
<!-- 当商品的delFlag=0和未入库状态时,显示此遮罩,点击弹出弹窗提示不能操作 -->
<view class="shop-mask" v-if="item.delFlag == 0 || item.purchasePrice==null || item.inStorageStatus == 0" @tap.stop="clickMask"></view>
<view class="box-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
@ -63,7 +64,8 @@
<view class="popup-content">
<view class="popup-title">
<view class="popup-title-left">
<img :src="goodsDetail.productPicture" alt="">
<img :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@ -113,7 +115,8 @@
<view v-for="(item,index) in carList" :key="index" style="position: relative;">
<view class="popup-title">
<view class="popup-title-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
@ -906,5 +909,14 @@
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.1);
}
.noPic{
width: 150rpx;
height: 150rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

41
pages/index/addHangOrder.vue

@ -84,7 +84,8 @@
<view class="shop-popup-content">
<view class="shop-popup-title">
<view class="shop-popup-title-left">
<img :src="goodsDetail.productPicture" alt="">
<img :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="shop-popup-title-right">
<view class="shop-popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@ -175,7 +176,7 @@
export default {
data() {
return {
voiceText: '',
voiceText: ' ',
recordState: false,
pageNumber: 1,
regList: [],
@ -224,7 +225,8 @@
}
},
onLoad() {
this.getRegList();
this.getRegList();
this.initRecord();
},
methods: {
//挂单列表
@ -278,26 +280,26 @@
})
},
//语音识别功能初始化
initRecord() {
initRecord() {
let that = this;
manager.stop()
//有新的识别内容返回,则会调用此事件
manager.onRecognize = (res) => {
// this.voiceText = res.result
}
manager.onStart = function(res) {
// this.voiceText = "onStart:" + res.msg + "正在录音"
}
// 识别结束事件
manager.onStop = (res) => {
if (res.result == '') {
this.showRecordEmptyTip()
that.showRecordEmptyTip()
return
}
if(this.voiceText == ''){
this.voiceText = res.result
console.log('55555',res)
console.log('11111',that.voiceText)
if(that.voiceText == ''){
that.voiceText = res.result
console.log('22222',that.voiceText)
}else if(that.voiceText == null){
that.voiceText = res.result
}else{
res.result = '\n' + res.result
this.voiceText += res.result
that.voiceText += res.result
console.log('33333',that.voiceText)
}
}
@ -1088,5 +1090,14 @@
height: 200rpx;
background: #eee;
border-radius: 50%;
}
.noPic{
width: 150rpx;
height: 150rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

5
pages/index/index.vue

@ -111,7 +111,7 @@
clickable isLink arrow-direction="left"></u-cell>
<u-cell icon="integral-fill" url="/pages/index/downstream" v-if="type==0" title="客户欠款"
clickable isLink arrow-direction="left"></u-cell>
<u-cell icon="integral-fill" url="/pages/index/waitStorage" title="采购单历史" clickable isLink
<u-cell icon="integral-fill" url="/pages/index/waitStorage?inStorageStatus=1" title="采购单历史" clickable isLink
arrow-direction="left"></u-cell>
<u-cell icon="integral-fill" url="/pages/index/order?type=dingdan" title="销售单历史" clickable
isLink arrow-direction="left"></u-cell>
@ -220,6 +220,9 @@
},
onLoad() {
},
onTabItemTap(e){
this.getSaleInfo()
},
methods: {
getSaleInfo() {

12
pages/index/orderDetail.vue

@ -9,7 +9,8 @@
<view class="shop-box" style="border-top:5px solid #eee;" v-for="(item,index) in list" :key="index">
<view class="shop-name" style="position: relative;">
<img :src="item.productPicture" alt=""
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;">
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="item.productPicture">
<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>
@ -872,5 +873,14 @@
text-align: center;
padding-right: 40rpx;
border-right: 1px solid #eee;
}
.noPic{
width: 140rpx;
height: 140rpx;
margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

14
pages/index/shareStyle.vue

@ -16,7 +16,8 @@
<!-- 当商品的delFlag=0和未入库状态时,显示此遮罩,点击弹出弹窗提示不能操作 -->
<view class="shop-mask" v-if="item.delFlag == 0 || item.purchasePrice==null || item.inStorageStatus == 0" @tap.stop="clickMask"></view>
<view class="box-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
@ -86,7 +87,8 @@
<view v-for="(item,index) in gwcList" style="position: relative;" :key="index">
<view class="popup-title">
<view class="popup-title-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
@ -637,5 +639,13 @@
border-bottom: 1px solid #eee;
border-top: 1px solid #eee;
color: #fff;
}
.noPic{
width: 150rpx;
height: 150rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

65
pages/index/waitStorage.vue

@ -59,19 +59,21 @@
status: 'loadmore',
range:[]
}
},
onShow(){
this.getList()
},
onLoad(option) {
onLoad(option) {
console.log(option)
this.inStorageStatus = option.inStorageStatus || ''
this.type = uni.getStorageSync('type')
this.type = uni.getStorageSync('type')
console.log(this.inStorageStatus)
this.getList()
},
onReachBottom() {
if (this.pageNum >= this.pages) return;
this.status = 'loading';
this.pageNum += 1;
this.getList();
if(this.inStorageStatus != 0){
if (this.pageNum >= this.pages) return;
this.status = 'loading';
this.pageNum += 1;
this.getList();
}
},
methods: {
searchList() {
@ -80,35 +82,44 @@
this.getList()
},
getList() {
var url,data
var url,data;
console.log(this.inStorageStatus == 0)
if(this.inStorageStatus == 0){
url = "/app/purchase/list";
data = {
this.tui.request("/app/purchase/list", "POST", {
inStorageStatus: this.inStorageStatus
}
}, false, false).then((res) => {
if (res.code == 200) {
this.pages = res.result.pages
if (this.pages == 1) {
this.list = res.result.records
} else {
this.list = [...this.list, ...res.result.records]
}
} else {
this.tui.toast(res.message)
}
})
}else{
url = "/app/purchase/getPurchaseList";
data = {
this.tui.request("/app/purchase/getPurchaseList", "POST", {
inStorageStatus: this.inStorageStatus,
supplierName: this.supplierName,
startDate: this.range[0],
endDate: this.range[1],
pageNum:this.pageNum,
pageSize:10,
}
}
this.tui.request(url, "POST", data, false, false).then((res) => {
if (res.code == 200) {
this.pages = res.result.pages
if (this.pages == 1) {
this.list = res.result.records
}, false, false).then((res) => {
if (res.code == 200) {
this.pages = res.result.pages
if (this.pages == 1) {
this.list = res.result
} else {
this.list = [...this.list, ...res.result]
}
} else {
this.list = [...this.list, ...res.result.records]
this.tui.toast(res.message)
}
} else {
this.tui.toast(res.message)
}
})
})
}
},
returnPrice(item) {
uni.navigateTo({

12
pages/index/waitStorageDetail.vue

@ -6,8 +6,8 @@
<view class="tui-order-item boxbg">
<view class="shop-box" style="border-top:5px solid #eee;" v-for="(item,index) in goodsList" :key="index">
<view class="shop-name">
<img :src="item.productPicture == null ?'暂无':item.productPicture" alt=""
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;">
<img :src="item.productPicture" alt="" style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
<view class="shop-productName">
<view style="color:#FF5809;">{{item.productName == null ?'暂无':item.productName}}</view>
<view>货号:{{item.productSn == null ?'暂无':item.productSn}}</view>
@ -445,5 +445,13 @@
border: 1px solid #eee;
height: 150rpx;
width: 500rpx;
}
.noPic{
width: 140rpx;
height: 140rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

12
pages/inventory/addinventory.vue

@ -109,7 +109,8 @@
<view class="shop-popup-content">
<view class="shop-popup-title">
<view class="shop-popup-title-left">
<img :src="goodsDetail.productPicture" alt="">
<img :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="shop-popup-title-right">
<view class="shop-popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@ -986,5 +987,14 @@
background: linear-gradient(90deg, #60F3FF, #088FEB);
border-radius: 70rpx;
}
}
.noPic{
width: 150rpx;
height: 150rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

18
pages/inventory/changeGoods1.vue

@ -16,7 +16,8 @@
<!-- 当商品的delFlag=0和未入库状态时,显示此遮罩,点击弹出弹窗提示不能操作 -->
<view class="shop-mask" v-if="item.delFlag == 0" @tap.stop="clickMask(item)"></view>
<view class="box-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
@ -62,7 +63,8 @@
<view class="popup-content">
<view class="popup-title">
<view class="popup-title-left">
<img :src="goodsDetail.productPicture" alt="">
<img :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@ -113,7 +115,8 @@
<view v-for="(item,index) in carList" :key="index" style="position: relative;">
<view class="popup-title">
<view class="popup-title-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="popup-title-right">
<view class="popup-title-right-box" style="color: #088FEB;">{{item.productName}}</view>
@ -876,5 +879,14 @@
top: 0;
left: 0;
background: rgba(0, 0, 0, 0.1);
}
.noPic{
width: 150rpx;
height: 150rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

5
pages/inventory/getProductIdToList.vue

@ -10,8 +10,9 @@
</view>
</view>
</view>
<u-loadmore :status="status" />
</view>
</view>
<u-loadmore :status="status" />
</view>
</template>

15
pages/inventory/goodsList1.vue

@ -75,7 +75,8 @@
:key="key">
<view class="shop-name" style="position: relative;">
<img :src="value[1].productPicture" alt=""
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;">
style="width: 140rpx;height: 140rpx;margin: 30rpx 0 0 30rpx;" v-if="value[1].productPicture">
<view class="noPic" v-else>暂无图片</view>
<view class="shop-productName">
<view style="color:#FF5809;">{{value[1].productName}} ({{value[1].productSn}})</view>
<view>单价:{{value[1].discountAmount}} 数量:{{value[1].productCount}} 总价:{{value[1].price}}</view>
@ -280,7 +281,8 @@
<view class="shop-popup-content">
<view class="shop-popup-title">
<view class="shop-popup-title-left">
<img :src="goodsDetail.productPicture" alt="">
<img :src="goodsDetail.productPicture" alt="" v-if="goodsDetail.productPicture">
<view class="noPic" style="margin: 0;" v-else>暂无图片</view>
</view>
<view class="shop-popup-title-right">
<view class="shop-popup-title-right-box" style="color: #088FEB;">{{goodsDetail.productName}}
@ -1781,5 +1783,14 @@
input {
padding-left: 0;
}
}
.noPic{
width: 140rpx;
height: 140rpx;
margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

12
pages/inventory/inventory.vue

@ -54,7 +54,8 @@
<view class="content-right">
<view class="right-box" v-for="item in shopList" :key="item" @tap="goDetail(item)">
<view class="box-left">
<img :src="item.productPicture" alt="">
<img :src="item.productPicture" alt="" v-if="item.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
@ -419,5 +420,14 @@
background: #088FEB;
padding: 10rpx 10rpx;
border-radius: 10px;
}
.noPic{
width: 140rpx;
height: 140rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

12
pages/inventory/inventoryDetail.vue

@ -3,7 +3,8 @@
<view class="content-box">
<view class="right-box">
<view class="box-left">
<img :src="dataList.productPicture" alt="">
<img :src="dataList.productPicture" alt="" v-if="dataList.productPicture">
<view class="noPic" v-else>暂无图片</view>
</view>
<view class="box-right">
<view class="box-right-name">{{dataList.productName == null ? '暂无':dataList.productName}} ({{dataList.productSn == null ? '暂无':dataList.productSn}})</view>
@ -271,5 +272,14 @@
line-height: 70rpx;
padding: 0 30rpx;
overflow: hidden;
}
.noPic{
width: 150rpx;
height: 150rpx;
// margin: 30rpx 0 0 30rpx;
text-align: center;
line-height: 140rpx;
color: #777;
background: #eee;
}
</style>

19
pages/other/custom.vue

@ -8,18 +8,18 @@
<view class="shop-name">
门店
</view>
<uni-data-select style="width: 100%" v-model="shopId" :localdata="shopList"></uni-data-select>
<uni-data-select style="width: 100%" v-model="shopId" :localdata="shopList" @change="change"></uni-data-select>
</view>
</uni-section>
<u-subsection :list="list" :current="current" @change="sectionChange"></u-subsection>
<view class="ulList" v-if="bList.length > 0">
<ul>
<li v-for="(item,index ) in bList" :key="index">
<uni-card :title="item.id" :sub-title="item.createTime" :extra="'¥'+item.totalAmount"
<uni-card :title="item.id" :sub-title="item.createTime" :extra="item.totalAmount== null ?'暂无': '¥'+item.totalAmount "
thumbnail="https://jewel-shop.oss-cn-beijing.aliyuncs.com/c09dfa8c61c949f8b0dbb8f041d5a501.png">
<view class="uni-body">
<text class="cardText">销售员:</text>
{{ item.createBy }}
{{ item.createByName== null ?'暂无': item.createByName }}
</view>
<view class="uni-body">
<text class="cardText"> 营业额:</text>
@ -33,8 +33,8 @@
item.status == 1 ? '拣货中' : item.status == 2 ? '已预定' : item.status == 3 ? '已作废' : item.status == 4 ? '已取货' :item.status == 6 ? '待配货': '已送达'
}}
</view>
<view class="floatRight"> 采购退货</view>
<view class="floatRight">物流信息</view>
<!-- <view class="floatRight"> 采购退货</view> -->
<view class="floatRight" @tap="kehuList(item.id)">查看详情</view>
</uni-card>
</li>
</ul>
@ -128,6 +128,15 @@
}
this.sectionChange(this.current)
},
kehuList(id){
uni.navigateTo({
url: '/pages/other/customDetail?id='+id
})
},
//门店下拉选择
change(e){
this.getAllList()
},
formatDate(date, fmt) {
var o = {

Loading…
Cancel
Save