version/0412
fanfan 1 year ago
parent 65072c1147
commit a8ad8c7c97
  1. 15
      pages/news3/LogisticsInquiry.vue
  2. 133
      pages/news3/ManualEntry.vue
  3. 377
      pages/news3/seasoningCondimentsRecord.vue
  4. 48
      pages/news3/setOutRecords.vue

@ -49,8 +49,7 @@
scanCode() { scanCode() {
uni.scanCode({ uni.scanCode({
success: (res) => { success: (res) => {
this.logisticsNum = res.result this.logisticsNum = res.result;
console.log(res);
}, },
fail: (res) => { fail: (res) => {
console.log(res) console.log(res)
@ -158,17 +157,17 @@
} }
.footerBtn { .footerBtn {
width: 80%; width: 86%;
height: 88upx;
height: 100upx;
background: #FF5050; background: #FF5050;
border-radius: 6px 6px 6px 6px; border-radius: 36px 36px 36px 36px;
opacity: 1;
font-size: 28upx; font-size: 28upx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 100upx; line-height: 88upx;
text-align: center; text-align: center;
margin: 70upx auto; margin: 96upx auto 0 auto;
} }
</style> </style>

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<view class="section"> <view class="section">
<u-field v-model="form.config" label="商品型号" placeholder="请输入商品型号"> <u-field v-model="form.shopModel" label="商品型号" placeholder="请输入商品型号">
</u-field> </u-field>
<u-field v-model="form.shopNum" label="商品数量" placeholder="请输入商品数量"> <u-field v-model="form.shopNum" label="商品数量" placeholder="请输入商品数量">
</u-field> </u-field>
@ -20,7 +20,7 @@
</u-field> </u-field>
<u-field v-model="form.getPeoplePhone" label="手机号" placeholder="请输入收货人手机号"> <u-field v-model="form.getPeoplePhone" label="手机号" placeholder="请输入收货人手机号">
</u-field> </u-field>
<u-field @click="cityShow=true" v-model="form.city" :disabled="true" label="所属城市" placeholder="请选择" <u-field @click="cityShow=true" v-model="form.city" :disabled="true" label="所属城市" placeholder="请选择所属城市"
right-icon="arrow-right"> right-icon="arrow-right">
</u-field> </u-field>
<u-picker mode="region" v-model="cityShow" @confirm="regionChage">{{form.city}}</u-picker> <u-picker mode="region" v-model="cityShow" @confirm="regionChage">{{form.city}}</u-picker>
@ -32,30 +32,33 @@
</view> </view>
</view> </view>
<view class="section"> <view class="section">
<u-field @click="modeShow=true" v-model="form.setGoodsMode" :disabled="true" label="发货模式" placeholder="待选择" <picker @change="changeMode" mode="selector" range-key="text" :value="index" :range="modeList">
right-icon="arrow-right"> <u-field v-model="form.setGoodsMode" :disabled="true" label="发货模式" placeholder="请选择发货模式"
</u-field> right-icon="arrow-right">
</u-field>
</picker>
<u-action-sheet :list="modeList" v-model="modeShow"></u-action-sheet> <u-action-sheet :list="modeList" v-model="modeShow"></u-action-sheet>
<u-field v-model="form.setGoodsCompany" label="发货公司" placeholder="请输入上游公司名字"> <u-field v-model="form.setGoodsCompany" label="发货公司" placeholder="请输入发货公司">
</u-field>
<u-field v-model="form.setGoodsName" label="发货人" placeholder="请输入上游渠道商名字">
</u-field> </u-field>
<u-field v-model="form.setGoodsPhone" label="发货人电话" placeholder="请输入上游渠道商电话"> <u-field v-model="form.setGoodsName" label="发货人" placeholder="请输入发货人">
</u-field> </u-field>
<u-field @click="goodsShow=true" v-model="form.wuliuCompany" :disabled="true" label="物流公司" <u-field v-model="form.setGoodsPhone" label="发货人电话" placeholder="请输入发货人电话">
placeholder="请选择物流公司" right-icon="arrow-right">
</u-field> </u-field>
<u-action-sheet :list="kuaidiList" v-model="goodsShow"></u-action-sheet> <picker @change="changeOption" mode="selector" range-key="express_name" :value="index" :range="expressList">
<u-field v-model="form.orderNum" label="物流单号" placeholder="请输入物流单号"> <u-field v-model="form.logisticsName" :disabled="true" label="物流公司" placeholder="请选择物流公司"
right-icon="arrow-right">
</u-field>
</picker>
<u-field v-model="form.logisticsNo" label="物流单号" placeholder="请输入物流单号">
</u-field> </u-field>
</view> </view>
<view class="recordList"> <view class="recordList">
<view class="recordItem c"> <view class="recordItem c">
<view class="recordTitle"> <view class="recordTitle">
转账记录<text class="intro">最多上传5</text> 转账记录<text class="intro">最多上传6</text>
</view> </view>
<u-upload :action="action" :header="header" @on-uploaded="transferSuccess" width="180" height="180" <u-upload :action="action" :header="header" @on-uploaded="transferSuccess" width="180" height="180"
:file-list="transferList" :custom-btn="true" max-count="1"> :file-list="transferList" :custom-btn="true" max-count="6">
<template v-slot:addBtn> <template v-slot:addBtn>
<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150"> <view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<image src="/static/news/icon-upload.png"></image> <image src="/static/news/icon-upload.png"></image>
@ -66,10 +69,10 @@
</view> </view>
<view class="recordItem c"> <view class="recordItem c">
<view class="recordTitle"> <view class="recordTitle">
聊天记录<text class="intro">最多上传5</text> 聊天记录<text class="intro">最多上传6</text>
</view> </view>
<u-upload :action="action" :header="header" @on-uploaded="chatSuccess" width="180" height="180" <u-upload :action="action" :header="header" @on-uploaded="chatSuccess" width="180" height="180"
:file-list="chatList" :custom-btn="true" max-count="1"> :file-list="chatList" :custom-btn="true" max-count="6">
<template v-slot:addBtn> <template v-slot:addBtn>
<view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150"> <view class="slot-btn" hover-class="slot-btn__hover" hover-stay-time="150">
<image src="/static/news/icon-upload.png"></image> <image src="/static/news/icon-upload.png"></image>
@ -95,7 +98,7 @@
data() { data() {
return { return {
form: { form: {
config: '', shopModel: '',
shopNum: null, shopNum: null,
auto: '', auto: '',
getPeopleName: '', getPeopleName: '',
@ -106,23 +109,20 @@
setGoodsCompany: '', setGoodsCompany: '',
setGoodsName: '', setGoodsName: '',
setGoodsPhone: '', setGoodsPhone: '',
wuliuCompany: '', logisticsName: '',
orderNum: '', logisticsId:'',
transferImgId:'', logisticsNo: '',
chatImgId:'' transferImgId: '',
chatImgId: ''
}, },
content: '', content: '',
modeList: [{ modeList: [{
text: '店内现货', text: '店内现货',
}], }],
kuaidiList: [{
text: '顺丰快递',
}],
cityShow: false, cityShow: false,
modeShow: false,
goodsShow: false,
transferList: [], transferList: [],
chatList: [], chatList: [],
expressList: [],
action: '', action: '',
} }
}, },
@ -133,6 +133,7 @@
'Access-Token': uni.getStorageSync('AccessToken'), 'Access-Token': uni.getStorageSync('AccessToken'),
'platform': "MP-WEIXIN", 'platform': "MP-WEIXIN",
} }
this.getExpressAll()
}, },
methods: { methods: {
// //
@ -169,21 +170,69 @@
// //
onSubmit() { onSubmit() {
const that = this; const that = this;
that.uploadFile() if (!that.form.shopModel) {
that.uploadFileRecord() return that.$toast('请选择商品名称')
if (!that.form.name) { }
return that.$toast('请输入商品名称') if (!that.form.shopNum) {
return that.$toast('请输入商品数量')
}
if (!that.form.getPeopleName) {
return that.$toast('请输入收货人姓名')
}
if (!that.form.getPeoplePhone) {
return that.$toast('请输入收货人手机号')
}
if (!that.form.city) {
return that.$toast('请选择所属城市')
}
if (!that.form.address) {
return that.$toast('请输入详细地址')
}
if (!that.form.setGoodsMode) {
return that.$toast('请选择发货模式')
}
if (!that.form.setGoodsCompany) {
return that.$toast('请输入发货公司')
}
if (!that.form.setGoodsName) {
return that.$toast('请输入发货人')
}
if (!that.form.setGoodsPhone) {
return that.$toast('请输入发货电话号')
}
if (!that.form.express_name) {
return that.$toast('请选择物流公司')
}
if (!that.form.logisticsNo) {
return that.$toast('请输入物流单号')
}
if (!that.form.transferImgId) {
return that.$toast('请上传转账记录')
} }
let params = { let params = {
...that.imgage_ids,
...that.imgage2_ids
} }
}, },
showAction() { changeMode(e) {
this.modeShow = true; this.form.setGoodsMode = this.modeList[e.detail.value].text;
}, },
showgoodsAction() { //
this.goodsShow = true; changeOption(e) {
this.form.logisticsName = this.expressList[e.detail.value].express_name;
this.form.logisticsId = this.expressList[e.detail.value].express_id
},
/**
* 物流
*/
async getExpressAll() {
let {
status,
message,
data
} = await newFunApi.expressAll();
if (status == 200) {
this.expressList = data.list;
}
}, },
regionChage(e) { regionChage(e) {
this.form.city = e.province.name + e.city.name + e.area.name; this.form.city = e.province.name + e.city.name + e.area.name;
@ -198,7 +247,6 @@
uni.showToast({ uni.showToast({
title: "上传成功" title: "上传成功"
}) })
console.log(response.data.fileInfo.file_id)
this.form.transferImgId = response.data.fileInfo.file_id this.form.transferImgId = response.data.fileInfo.file_id
} }
} }
@ -296,6 +344,10 @@
text-align: right; text-align: right;
} }
::v-deep .u-label {
flex: auto !important
}
.recordList { .recordList {
padding: 30upx; padding: 30upx;
background-color: #fff; background-color: #fff;
@ -339,12 +391,11 @@
} }
.footerBtn { .footerBtn {
width: 80%; width: 86%;
height: 88upx; height: 88upx;
background: #FFAAA4; background: #FF5050;
border-radius: 36px 36px 36px 36px; border-radius: 36px 36px 36px 36px;
opacity: 1; opacity: 1;
font-size: 28upx; font-size: 28upx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;

@ -1,213 +1,218 @@
<template> <template>
<view> <view>
<view class="selectContent" style="border:none;background-color: #fff;"> <view class="selectContent" style="border:none;background-color: #fff;">
<u-field @click="showAction" v-model="form.mode" <picker @change="changeMode" mode="selector" range-key="text" :value="index" :range="modeList">
:disabled="true" label="发货模式" placeholder="请选择" <u-field v-model="form.setGoodsMode" :disabled="true" label="发货模式" placeholder="请选择"
right-icon="arrow-right" right-icon="arrow-right">
> </u-field>
</u-field> </picker>
<u-action-sheet :list="modeList" v-model="modeShow"></u-action-sheet> <u-field v-model="form.company" label="发货公司" placeholder="请输入">
<u-field
v-model="form.company"
label="发货公司"
placeholder="请输入"
>
</u-field>
<u-field
v-model="form.name"
label="发货人"
placeholder="请输入"
>
</u-field>
<u-field
v-model="form.phone"
label="发货人电话"
placeholder="请输入"
>
</u-field>
<u-field @click="showgoodsAction" v-model="form.kuaidi"
:disabled="true" label="快递" placeholder="请选择"
right-icon="arrow-right"
>
</u-field>
<u-action-sheet :list="kuaidiList" v-model="goodsShow"></u-action-sheet>
<view class="wuliu">
<u-field
style="flex: 1;padding:30upx 0 30upx 30upx"
v-model="codeNum"
label="物流单号"
placeholder="请填写物流单号"
>
</u-field> </u-field>
<view class="getWuliu" @click="onLogistics"> <u-field v-model="form.name" label="发货人" placeholder="请输入">
查看物流 </u-field>
</view> <u-field v-model="form.phone" label="发货人电话" placeholder="请输入">
</view> </u-field>
<view class="recordList"> <picker @change="changeOption" mode="selector" range-key="express_name" :value="index" :range="expressList">
<view class="recordItem"> <u-field v-model="form.logisticsName" :disabled="true" label="物流公司" placeholder="请选择物流公司"
<view class="recordTitle"> right-icon="arrow-right">
转账记录 </u-field>
</view> </picker>
<view class="picList"> <u-action-sheet :list="kuaidiList" v-model="goodsShow"></u-action-sheet>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> <view class="wuliu">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> <u-field style="flex: 1;padding:30upx 0 30upx 30upx" v-model="form.logisticsNo" label="物流单号"
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> placeholder="请填写物流单号">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> </u-field>
<view class="getWuliu" @click="onLogistics">
查看物流
</view> </view>
</view> </view>
<view class="recordItem"> <view class="recordList">
<view class="recordTitle"> <view class="recordItem">
聊天记录 <view class="recordTitle">
转账记录
</view>
<view class="picList">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
</view>
</view> </view>
<view class="picList"> <view class="recordItem">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> <view class="recordTitle">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> 聊天记录
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> </view>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image> <view class="picList">
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
<image :src="$picUrl+'/static/news3/filter.png'" mode="aspectFit"></image>
</view>
</view> </view>
</view> </view>
<view class="footerBtn">
保存
</view>
</view> </view>
<view class="footerBtn">
保存
</view>
</view> </view>
</view>
</template> </template>
<script> <script>
import * as newFunApi from '@/api/newFun' import * as newFunApi from '@/api/newFun'
export default{ export default {
data(){ data() {
return{ return {
form:{ form: {
mode:'', setGoodsMode: '',
company:'', company: '',
name:'', name: '',
phone:'', phone: '',
kuaidi:'', kuaidi: '',
logisticsName: '',
}, logisticsNo: '',
modeList:[ logisticsId:'',
{ },
modeList: [{
text: '店内现货', text: '店内现货',
} }],
], expressList: [],
kuaidiList:[ modeShow: false,
{ goodsShow: false,
text: '顺丰快递', }
}
],
modeShow:false,
goodsShow:false,
// newPrice:null,
// wuliu:'',
// codeNum:''
}
},
methods:{
showAction(){
this.modeShow = true;
},
showgoodsAction(){
this.goodsShow = true;
}, },
onLogistics(){ onReady() {
uni.navigateTo({ this.getExpressAll()
url: "/pages/news3/LogisticsInquiry"
})
}, },
methods: {
changeMode(e) {
this.form.setGoodsMode = this.modeList[e.detail.value].text;
},
//
changeOption(e) {
this.form.logisticsName = this.expressList[e.detail.value].express_name;
this.form.logisticsId = this.expressList[e.detail.value].express_id
},
/**
* 物流
*/
async getExpressAll() {
let {
status,
message,
data
} = await newFunApi.expressAll();
if (status == 200) {
this.expressList = data.list;
}
},
onLogistics() {
uni.navigateTo({
url: "/pages/news3/LogisticsDetails?logisticsNum=" + this.form.logisticsNo
})
},
}
} }
}
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
page{ page {
min-height: 100%; min-height: 100%;
background-color: #F7F8FA; background-color: #F7F8FA;
}
.selectContent{
border-top:1px solid transparent;
margin-top:6upx;
padding-bottom: 100upx;
}
::v-deep .u-border-bottom:after{
border:none;
}
::v-deep .u-field{
padding:30upx;
}
::v-deep .uni-input-wrapper{
text-align: right;
}
.wuliu{
display: flex;
align-items: center;
.getWuliu{
width: 130upx;
height: 56upx;
background: #FFFFFF;
border-radius: 19px 19px 19px 19px;
opacity: 1;
border: 1px solid #F55349;
font-size: 24upx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #F55349;
line-height: 52upx;
text-align: center;
margin-right:30upx;
} }
}
.recordList{ .selectContent {
padding:30upx; border-top: 1px solid transparent;
.recordItem{ margin-top: 6upx;
.recordTitle{ padding-bottom: 100upx;
}
font-size: 28upx;
::v-deep .u-border-bottom:after {
border: none;
}
::v-deep .u-field {
padding: 30upx;
}
::v-deep .uni-input-wrapper {
text-align: right;
}
::v-deep .u-label {
flex: auto !important
}
.wuliu {
display: flex;
align-items: center;
.getWuliu {
width: 130upx;
height: 56upx;
background: #FFFFFF;
border-radius: 19px 19px 19px 19px;
opacity: 1;
border: 1px solid #F55349;
font-size: 24upx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 400; font-weight: 400;
color: #353535; color: #F55349;
line-height: 52upx;
}
.picList{
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
margin:12upx 0;
text-align: center; text-align: center;
image{ margin-right: 30upx;
width: 200upx;
height: 160upx; }
}
.recordList {
padding: 30upx;
.recordItem {
.recordTitle {
font-size: 28upx;
font-family: PingFang SC, PingFang SC;
font-weight: 400;
color: #353535;
}
.picList {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: space-between;
margin: 12upx 0;
text-align: center;
image {
width: 200upx;
height: 160upx;
}
} }
} }
} }
}
.footerBtn{ .footerBtn {
width: 80%; width: 86%;
height: 88upx;
height: 100rpx; background: #FF5050;
background: #FFAAA4; border-radius: 36px 36px 36px 36px;
border-radius: 6px 6px 6px 6px; opacity: 1;
opacity: 1; font-size: 28upx;
margin:0 auto; font-family: PingFang SC, PingFang SC;
margin-top:40upx; font-weight: 500;
font-size: 28upx; color: #FFFFFF;
font-family: PingFang SC, PingFang SC; line-height: 88upx;
font-weight: 500; text-align: center;
color: #FFFFFF; margin: 96upx auto 0 auto;
text-align: center;
line-height: 100upx; }
</style>
}
</style>

@ -3,9 +3,8 @@
<view class="head-info"> <view class="head-info">
<!-- 搜索 --> <!-- 搜索 -->
<view class="searchContent"> <view class="searchContent">
<u-input v-model="searchText" placeholder="商品名称/编码" /> <u-input v-model="searchText" confirm-type="search" @confirm="getOrderList(1)" placeholder="商品名称/编码" />
<u-icon name="search" class="search" @click="getOrderList(1)"></u-icon> <u-icon name="search" class="search" @click="getOrderList(1)"></u-icon>
</view> </view>
</view> </view>
<view class="bg"> <view class="bg">
@ -24,9 +23,6 @@
<view class="title"> <view class="title">
{{item1.goods.goods_name}} {{item1.goods.goods_name}}
</view> </view>
<!-- <view class="subTitle">
{{item1.goods.goods_name}}
</view> -->
<view style="display: flex;align-items: center;justify-content: space-between;"> <view style="display: flex;align-items: center;justify-content: space-between;">
<view class="num"> <view class="num">
x{{item1.goods.total_num}} x{{item1.goods.total_num}}
@ -40,9 +36,9 @@
</view> </view>
</view> </view>
<view class="totalNum"> <view class="totalNum">
<text>含运费¥5</text> <text>含运费¥{{item.orderData.express_price}}</text>
<text>共计</text> <text>共计</text>
<text>¥2500</text> <text>¥{{item.orderData.total_price}}</text>
</view> </view>
<view class="footerBtn"> <view class="footerBtn">
<view class="wuliuBtn" @click="onCondiments"> <view class="wuliuBtn" @click="onCondiments">
@ -70,8 +66,7 @@
onLoad(o) { onLoad(o) {
this.getOrderList(1) this.getOrderList(1)
}, },
onShow() { onShow() {},
},
onPullDownRefresh() { onPullDownRefresh() {
this.pageNum = 1; this.pageNum = 1;
this.goodsList = []; this.goodsList = [];
@ -114,7 +109,8 @@
data data
} = await newFunApi.deliveryList({ } = await newFunApi.deliveryList({
page: this.pageNum, page: this.pageNum,
searchText:this.searchText searchValue: this.searchText,
searchType: 10
}); });
if (status == 200) { if (status == 200) {
this.goodsList = this.goodsList.concat(data.list.data) this.goodsList = this.goodsList.concat(data.list.data)
@ -203,10 +199,9 @@
.dispatchContent { .dispatchContent {
margin: 20upx 0; margin: 20upx 0;
background: #FFFFFF; background: #FFF;
// border-radius: 6px 6px 6px 6px; border-radius: 6px;
opacity: 1; padding: 20upx 30upx 10upx 30upx;
padding: 20upx 10upx;
} }
.dispatchItem { .dispatchItem {
@ -269,7 +264,7 @@
.totalNum { .totalNum {
text-align: right; text-align: right;
margin-top: 70upx; margin-top: 40upx;
text:first-child { text:first-child {
font-size: 24upx; font-size: 24upx;
@ -298,7 +293,7 @@
} }
.footerBtn { .footerBtn {
padding: 30upx; padding: 20upx 0 15upx 30upx;
display: flex; display: flex;
align-items: center; align-items: center;
border-top: 1px solid #F0F0F0; border-top: 1px solid #F0F0F0;
@ -309,7 +304,7 @@
.wuliuBtn { .wuliuBtn {
// padding:8upx 46upx; // padding:8upx 46upx;
text-align: center; text-align: center;
height: 70upx; height: 66upx;
line-height: 66upx; line-height: 66upx;
border: 1px solid #F63116; border: 1px solid #F63116;
font-size: 28upx; font-size: 28upx;
@ -317,24 +312,23 @@
font-weight: 500; font-weight: 500;
color: #F83F11; color: #F83F11;
border-radius: 20px; border-radius: 20px;
width: 200upx; width: 180upx;
} }
.footerBtns { .footerBtns {
width: 94%; width: 86%;
height: 100rpx; height: 88upx;
background: #F55349; background: #F55349;
border-radius: 6px 6px 6px 6px; border-radius: 36px 36px 36px 36px;
position: fixed; opacity: 1;
bottom: 20rpx;
margin: 0 auto;
margin-top: 40upx;
font-size: 28upx; font-size: 28upx;
font-family: PingFang SC, PingFang SC; font-family: PingFang SC, PingFang SC;
font-weight: 500; font-weight: 500;
color: #FFFFFF; color: #FFFFFF;
line-height: 88upx;
text-align: center; text-align: center;
line-height: 100upx; position: fixed;
bottom: 20rpx;
left: 7%;
} }
</style> </style>

Loading…
Cancel
Save