wangfukang 3 years ago
parent
commit
92e92a3611
  1. 10
      package1/AI/AIHangOrderList.vue
  2. 6
      package1/AI/AIInventoryList.vue
  3. 34
      package1/AI/AIPicture.vue
  4. 12
      package1/inventory/batchPrint.vue
  5. 4
      package1/inventory/inventoryConfirm.vue
  6. 133
      package1/other/logistics.vue
  7. 8
      package1/other/logisticsAddress.vue
  8. 10
      package1/staff/addStaff.vue

10
package1/AI/AIHangOrderList.vue

@ -179,10 +179,10 @@
<view class="shop-purchase-price" v-if="storageType == 0">
<view style="margin-right: 20rpx;">实际价格</view>
<uni-easyinput type="text" v-model="purchasePrice" @blur="checkPay(purchasePrice)" placeholder="请输入实际价格" />
<uni-easyinput type="digit" v-model="purchasePrice" @blur="checkPay(purchasePrice)" placeholder="请输入实际价格" />
</view>
<view @tap="saveCheck"
style="position: absolute;top: 120rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">
style="position: absolute;top: 110rpx;right: 20rpx;color: #088FEB;text-decoration: underline;">
保存已选
</view>
<ul style="border-top:20rpx;">
@ -1540,7 +1540,7 @@
.shop-title-fur {
width: 95%;
height: 70rpx;
height: 50rpx;
margin: 0 auto;
}
@ -1548,7 +1548,7 @@
font-size: 30rpx;
width: 50%;
float: left;
height: 70rpx;
height: 50rpx;
line-height: 70rpx;
}
@ -1557,6 +1557,8 @@
display: inline-block;
border: 1px solid #5fd9ee;
margin: 20rpx;
margin-bottom: 0;
margin-left: 0;
background-color: #fff;
color: #5fd9ee;
min-width: 100rpx;

6
package1/AI/AIInventoryList.vue

@ -43,7 +43,7 @@
<text class="blink" v-if="item.inStorageStatus==2">识别中...</text>
<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.inStorageStatus == 3 || (item.inStorageStatus == 4 && item.ocrCount > 0)">识别完成</text>
<text style="position: absolute;top: 40rpx;right: 20rpx;" v-if="item.ocrCount == 0 && item.inStorageStatus == 4">识别失败</text>
<view class="btn" @tap="montageData(item.id)">去入库</view>
<view class="btn" v-if="item.inStorageStatus != 2 && item.ocrCount > 0" @tap="montageData(item.id)">去入库</view>
<view @tap="delItem(item.id)" class="btn" style="background:linear-gradient(90deg, #FF9797, #FFC1E0);position: absolute;bottom: 20rpx;" :style="{right:item.ocrCount == 0 && item.inStorageStatus == 4?'20rpx':'160rpx'}">
删除
</view>
@ -185,8 +185,8 @@
if (res2.confirm) {
that.tui.request("/app/purchase/delById", "POST", {
id:id
}, false, false).then((res) => {
if(res.code == 200){
}, false, true).then((res) => {
if(res.code == 500 && res.message == '删除成功!'){
that.pageNum = 1
that.aiList = []
that.getList()

34
package1/AI/AIPicture.vue

@ -190,7 +190,10 @@
}
});
},
upLoadImg(type) {
upLoadImg(type) {
uni.showLoading({
title: '加载中...'
})
let that = this;
if(type == 'ios'){
uni.chooseMedia({
@ -209,14 +212,18 @@
sourceType: ['camera'],
camera: 'back',
success(res) {
uni.chooseMedia({
count: 1,
mediaType: ['image'],
sourceType: ['album'],
success(res1) {
that.upLoadFile(res1.tempFiles[0].tempFilePath)
}
})
console.log('拍照',res)
setTimeout(res=>{
uni.chooseMedia({
count: 1,
mediaType: ['image'],
sourceType: ['album'],
success(res1) {
console.log('选图',res1)
that.upLoadFile(res1.tempFiles[0].tempFilePath)
}
})
},300)
}
})
}else if(type == 'xuan'){
@ -229,10 +236,14 @@
}
})
}
this.$refs.popup.close()
this.$refs.popup.close()
uni.hideLoading();
},
upLoadFile(path){
let that = this;
uni.showLoading({
title: '加载中...'
})
let hiver_token = uni.getStorageSync("hiver_token")
uni.uploadFile({
url: 'https://dev.xenjoyou.com/hiver/upload/file',
@ -280,6 +291,9 @@
})
}
});
setTimeout(res=>{
uni.hideLoading();
},500)
},
delImage(index) {
let that = this;

12
package1/inventory/batchPrint.vue

@ -13,13 +13,13 @@
<view class="box-right">
<view class="box-right-name">{{item.productName}}</view>
<view class="box-right-num">{{item.productSn}}</view>
<view class="box-right-price" v-if="item.wholesalePrice !=''">
<view class="box-right-price">
<view class="price-box">
<text>{{item.wholesalePrice}}</text>
<text>{{item.wholesalePrice == null ?'暂无':item.wholesalePrice}}</text>
<text>批发价</text>
</view>
<view class="price-box">
<text>{{item.lsprice}}</text>
<text>{{item.lsprice || item.price}}</text>
<text>零售价</text>
</view>
</view>
@ -153,11 +153,9 @@
if(options.purchase){
this.purchase = JSON.parse(options.purchase)
this.goodsList = JSON.parse(options.purchaseDetails)
console.log(JSON.parse(options.purchase))
console.log(JSON.parse(options.purchaseDetails))
}else{
this.type = uni.getStorageSync('type')
this.getGategoryList()
}

4
package1/inventory/inventoryConfirm.vue

@ -103,6 +103,9 @@
})
if(this.aiinventory == 1){
url = '/app/stock/putInPriceOfAi'
for(let i=0;i<this.purchaseDetails.length;i++){
delete this.purchaseDetails[i].id;
}
}else{
url = '/app/stock/putInOfProduct'
}
@ -132,6 +135,7 @@
}, 2000)
},
batchPrint(){
console.log(this.purchaseDetails);
uni.navigateTo({
url: "/package1/inventory/batchPrint?purchase=" + JSON.stringify(this.purchase) + '&purchaseDetails=' + JSON.stringify(this.purchaseDetails)
})

133
package1/other/logistics.vue

@ -23,13 +23,16 @@
<view class="ulList" v-if="bList.length > 0">
<ul>
<li v-for="(item,index ) in bList" :key="index">
<uni-card :title="'店铺名称:'+item.shopName" :sub-title="item.getOrderAddress+'('+item.mobile+')'">
<uni-card :title="item.shopName" :sub-title="item.getOrderAddress+'('+item.mobile+')'">
<view v-if="this.current != 3 && item.workerMobile" @tap="daCall(item.workerMobile)" style="width: 150rpx;font-size: 26rpx;text-decoration-line: underline;color: blue;position: absolute;top: 20rpx;right: 10rpx;">
联系拉包工
</view>
<view v-if="this.current == 3 && item.createByPhone" @tap="daCall(item.createByPhone)" style="width: 125rpx;font-size: 26rpx;text-decoration-line: underline;color: blue;position: absolute;top: 20rpx;right: 0;">
联系店铺
</view>
<view @tap="toggle('zhuan',item.orderId)" style="width: 110rpx;font-size: 26rpx;text-decoration-line: underline;color: blue;position: absolute;top: 20rpx;right: 160rpx;">
转单
</view>
<view class="uni-body">
<text class="cardText">{{item.orderAddress}}</text>
</view>
@ -121,6 +124,32 @@
</view>
</view>
</view>
</uni-popup>
<!-- 转单弹窗 -->
<uni-popup ref="zhuanPopup" background-color="#fff" :is-mask-click="true">
<view class="type-popup" style="margin-bottom: 0;border-radius: 0;">
<view style="height: 80rpx;font-size: 36rpx;font-weight: bold;line-height: 80rpx;text-align: center;">
请选择要转单的公司
</view>
<view class="title-box">
<uni-search-bar class="uni-mt-10" radius="5" placeholder="请输入物流名称" cancelButton="none"
@confirm="search" @clear="clearSearch" />
</view>
<u-subsection :list="logistics" :current="logisticsCurrent" @change="logisticsChange"></u-subsection>
<view class="ulList">
<ul>
<li v-for="(item,index) in logisticsList" :key="index" style="height: 120rpx;display: flex;flex-direction: column;line-height: 60rpx;padding-left: 20rpx;border-bottom: 1px solid #eee;position: relative;">
<view>
公司名称:{{item.companyName}}
</view>
<view>
公司电话:{{item.mobile}}
</view>
<view @tap="zhuandan(item)" style="position: absolute;top: 30rpx;right: 10px;height: 30px;font-size: 15px;width: 40px;background: #5fd9ee;color: #fff;text-align: center;border-radius: 5px;">转单</view>
</li>
</ul>
</view>
</view>
</uni-popup>
</view>
</template>
@ -131,17 +160,20 @@
export default {
data() {
return {
list: ['待接单', '待取货', '待送达','店铺自送'],
list: ['待接单', '待取货', '待送达','店铺自送'],
logistics:['长途物流','短途物流'],
modalShow: false,
content:'地址',
orderStatus:0,
status: 'loadmore',
endDate: '',
endDate: '',
saleId:'',
startDate: '',
transCompany: '',
totalPages:0,
pages:1,
bList: [],
bList: [],
logisticsList:[],
horizontal: 'right',
content: [{
iconPath: '/static/images/tabbar/home.png',
@ -168,10 +200,12 @@
type:'',
companyName:'',
current:0,
logisticsCurrent:0,
waitUpDoorNum:0,
upDoorList:[],
copyType:'',
copyItem:[]
copyItem:[],
searchName:''
}
},
created() {
@ -235,8 +269,14 @@
}
})
},
toggle(){
this.$refs.popup.open()
toggle(type,saleId){
if(type=='zhuan'){
this.logisticsChange(0)
this.saleId = saleId
this.$refs.zhuanPopup.open()
}else{
this.$refs.popup.open()
}
},
getSale(item){
uni.request({
@ -346,6 +386,46 @@
uni.makePhoneCall({
phoneNumber: phone
});
},
logisticsChange(index){
let that = this
this.logisticsCurrent = index
this.logisticsList = []
this.pages = 1
let data = {}
if(index == 0){
data = {
pageNumber: 1,
pageSize: 100,
signCompany: 0,
companyName: this.searchName
}
}else if(index == 1){
data = {
pageNumber: 1,
pageSize: 100,
signCompany: 4,
companyName: this.searchName
}
}
uni.request({
url: that.tui.interfaceUrl() + '/app/logitics/getByCondition',
data: data,
header: {
'content-type': 'application/x-www-form-urlencoded',
'appWLToken': that.tui.getToken()
},
method: 'GET', //'GET','POST'
dataType: 'json',
success: (res) => {
if (res.data.code == 200){
that.logisticsList = res.data.result.content
}
},
fail: (res) => {
that.tui.toast("网络不给力,请稍后再试~")
}
})
},
sectionChange(index) {
this.current = index
@ -360,6 +440,44 @@
this.orderStatus = index
this.getList()
}
},
zhuandan(item){
let that = this;
uni.request({
url: that.tui.interfaceUrl() + '/app/sale/changeCompany',
data: {
saleId:that.saleId,
companyId:item.id
},
header: {
'content-type': 'application/x-www-form-urlencoded',
'appWLToken': that.tui.getToken()
},
method: 'POST', //'GET','POST'
dataType: 'json',
success: (res) => {
if (res.data.code == 200){
that.$refs.zhuanPopup.close()
that.getList()
setTimeout(res=>{
that.tui.toast("转单成功")
},500)
}
},
fail: (res) => {
that.tui.toast("网络不给力,请稍后再试~")
}
})
},
//顶部搜索框
search(res) {
this.searchName = res.value
this.logisticsChange(this.logisticsCurrent)
},
clearSearch(){
this.searchName = ''
this.logisticsChange(this.logisticsCurrent)
},
trigger(e) {
let that = this;
@ -367,7 +485,6 @@
uni.navigateTo({
url: `/package1/other/logisticsAddress`
})
// that.tui.toast("线路配置暂不可用")
}else if(e.index == 1){
uni.navigateTo({
url: `/package1/other/companyLog`

8
package1/other/logisticsAddress.vue

@ -1,8 +1,8 @@
<template>
<view class="">
<view>
<!-- <view>
<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="name-tel" style="width: 80%;overflow: hidden;">
<text style="line-height: 75rpx;">{{item.province +'-'+ item.city+'-'+item.area}}</text>
@ -16,10 +16,10 @@
<view class="name-edit" style="height: 50%;position: absolute;bottom: 0;right: 20%;">
<text @tap.stop="priceDetail(item)" style='line-height: 75rpx;color: #088FEB;'>费用说明</text>
</view>
<view class="name-edit">
<!-- <view class="name-edit">
<text @tap.stop="addAddress(item)" v-if="type!='kaidan'" style='line-height: 75rpx;color: #088FEB;'>编辑</text>
<text @tap.stop="delAddress(item)" v-if="type!='kaidan'" style='color:red;line-height: 75rpx;'>删除</text>
</view>
</view> -->
</view>
<u-loadmore :status="status" />
<!-- 弹出输入框 -->

10
package1/staff/addStaff.vue

@ -23,12 +23,12 @@
data() {
return {
addForm: {
nickname: '',
username:'',
nickname: '',
mobile: '',
type: '',
password:'123456'
},
},
username:'',
id: '',
typeList: [{
value: 0,
@ -66,8 +66,7 @@
const item = JSON.parse(options.item)
this.type = options.type
if (type === 'edit') {
this.addForm.nickname = item.nickname
this.addForm.username = item.mobile
this.addForm.nickname = item.nickname
this.addForm.mobile = item.mobile
this.addForm.type = Number(item.type)
this.id = item.id
@ -82,6 +81,7 @@
let url;
if(this.type=='edit'){
url = '/app/common/user/edit'
this.addForm.username = this.mobile
this.addForm.id = this.id
}else{
url = '/app/common/user/add'

Loading…
Cancel
Save