Leadfyy.co
/
uniapp-supplychain
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain 

# Conflicts:
#	canteen/pages/purchase/detail.vue
master
邓平艺 5 years ago
parent
eeed2e13b4 0660ce2ae3
commit
59f79750cd
7 changed files with 59 additions and 30 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. 9
      canteen/pages/delivery/detail.vue
  2. 2
      canteen/pages/delivery/order.vue
  3. 38
      canteen/pages/purchase/detail.vue
  4. 4
      canteen/pages/purchase/launch.vue
  5. 20
      canteen/pages/purchase/order.vue
  6. 14
      supplier/pages/gonghuo/order.vue
  7. 2
      supplier/pages/order/index.vue

9
canteen/pages/delivery/detail.vue
View File

@ -14,9 +14,9 @@
<view>申请人</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.contact_name}}</view>
</view>
<view class="lf-row-between list">
<view class="lf-row-between list" @click="call(order.sheet[0].purchase.contact_phone)">
<view>联系电话</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.contact_phone}}</view>
<view class="lf-font-bold" style="color: rgb(17, 209, 137);">{{order.sheet[0].purchase.contact_phone}}</view>
</view>
</view>
<self-line></self-line>
@ -94,6 +94,11 @@
}
},
methods: {
call(phone) {
uni.makePhoneCall({
phoneNumber: phone //仅为示例
});
},
getData(){
this.$http(this.API.API_CANTEEN_OUTDETAIL, {
o_sn: this.o_sn

2
canteen/pages/delivery/order.vue
View File

@ -175,7 +175,7 @@
padding: 20rpx 0;
box-sizing: border-box;
width: 100%;
border-bottom: 1rpx solid #E5E5E5;
// border-bottom: 1rpx solid #E5E5E5;
font-size: 28rpx;
&:last-child{
border-bottom: none;

38
canteen/pages/purchase/detail.vue
View File

@ -31,9 +31,13 @@
<view>司机</view>
<view class="lf-font-bold">{{order.deliver_man}}</view>
</view>
<view class="lf-row-between list">
<view class="lf-row-between list" @click="call(order.deliver_phone)">
<view>联系电话</view>
<view class="lf-font-bold">{{order.deliver_phone}}</view>
<view class="lf-font-bold" style="color: rgb(17, 209, 137);">{{order.deliver_phone}}</view>
</view>
<view class="lf-row-between list">
<view>收货时间</view>
<view class="lf-font-bold">{{order.deadline}}</view>
</view>
</block>
<view class="list" v-if="supplier_voucher.length">
@ -168,6 +172,11 @@
}
},
methods: {
call(phone) {
uni.makePhoneCall({
phoneNumber: phone //仅为示例
});
},
// 移除图片
removeInage(current){
this.voucher_list.splice(current, 1);
@ -241,7 +250,8 @@
let actionState = [
'订单已完成',
'订单已退款',
'订单已撤销'
'订单已撤销',
'订单已确认，物资入库'
];
if(actionState.includes(item.action)){
item.isFinished = true;
@ -293,12 +303,22 @@
},
// 改变订单状态
orderStateChange(state){
this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, {
p_sn: this.p_sn,
state: state
}).then(res => {
console.log("orderStateChange", res);
this.$msg('操作成功').then(()=> this.getData());
uni.showModal({
title: '温馨提示',
content: '确定继续退单吗？',
confirmColor: '#FF0000',
cancelColor: '#11D189',
success: result => {
if(result.confirm){
this.$http(this.API.API_CANTEEN_PURCHASEUPDATE, {
p_sn: this.p_sn,
state: state
}).then(res => {
console.log("orderStateChange", res);
this.$msg('操作成功').then(()=> this.getData());
})
}
}
})
}
}

4
canteen/pages/purchase/launch.vue
View File

@ -25,8 +25,8 @@
<view class="lf-row-between lf-p-30 lf-p-l-32 lf-p-r-32 lf-font-28">
<view class="lf-color-black">收货时间</view>
<picker mode="date" :value="date" @change="pickerChange">
<view class="lf-color-555 lf-text-right" style="width: 400rpx;" v-if="first_time">{{ '请选择收货时间...' }}</view>
<view class="lf-color-555 lf-text-right" style="width: 400rpx;" v-else>{{ date }}</view>
<!-- <view class="lf-color-555 lf-text-right" style="width: 400rpx;">{{ '请选择收货时间...' }}</view> -->
<view class="lf-color-555 lf-text-right" style="width: 400rpx;">{{ date }}</view>
</picker>
</view>
<self-line></self-line>

20
canteen/pages/purchase/order.vue
View File

@ -13,31 +13,35 @@
:refresher-triggered="tabItem.isRefresher"
@refresherrefresh="onRefresherrefresh">
<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/purchase/detail?p_sn='+ item.p_sn)">
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.supplier.supplier_name">
<view class="lf-color-gray">供应商</view>
<view class="lf-color-black">{{ item.supplier.supplier_name }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.batch_sn">
<view class="lf-color-gray">批次号</view>
<view class="lf-color-black">{{item.batch_sn}}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.p_sn">
<view class="lf-color-gray">订单号</view>
<view class="lf-color-black">{{item.p_sn}}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.send_time">
<view class="lf-color-gray">发单时间</view>
<view class="lf-color-black">{{ item.send_time }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.deadline">
<view class="lf-color-gray">收货时间</view>
<view class="lf-color-black">{{ item.deadline }}</view>
</view>
<view class="lf-row-between item" v-if="item.receive_time">
<view class="lf-color-gray">送达时间</view>
<view class="lf-color-black">{{ item.receive_time }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.cate_number">
<view class="lf-color-gray">商品种类</view>
<view class="lf-color-black">{{item.cate_number}}类</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.state">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
</view>
@ -216,7 +220,7 @@
padding: 20rpx 0;
box-sizing: border-box;
width: 100%;
border-bottom: 1rpx solid #E5E5E5;
// border-bottom: 1rpx solid #E5E5E5;
font-size: 28rpx;
&:last-child{
border-bottom: none;

14
supplier/pages/gonghuo/order.vue
View File

@ -13,27 +13,27 @@
:refresher-triggered="tabItem.isRefresher"
@refresherrefresh="onRefresherrefresh">
<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/gonghuo/detail?p_sn='+ item.p_sn)">
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.canteen.canteen_name">
<view class="lf-color-gray">采购方</view>
<view class="lf-color-black">{{ item.canteen.canteen_name }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.created_at">
<view class="lf-color-gray">发单时间</view>
<view class="lf-color-black">{{ item.created_at }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.deadline_text">
<view class="lf-color-gray">预计收货时间</view>
<view class="lf-color-black">{{ item.deadline_text }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.receive_time">
<view class="lf-color-gray">送达时间</view>
<view class="lf-color-black">{{ item.receive_time }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.cate_number">
<view class="lf-color-gray">商品种类</view>
<view class="lf-color-black">{{ item.cate_number }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-row-between item" v-if="item.state">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
</view>
@ -194,7 +194,7 @@
padding: 20rpx 0;
box-sizing: border-box;
width: 100%;
border-bottom: 1rpx solid #E5E5E5;
// border-bottom: 1rpx solid #E5E5E5;
font-size: 28rpx;
&:last-child{
border-bottom: none;

2
supplier/pages/order/index.vue
View File

@ -167,7 +167,7 @@
.upper{
width: 100%;
padding: 20rpx 0;
border-bottom: 1rpx solid #e5e5e5;
// border-bottom: 1rpx solid #e5e5e5;
box-sizing: border-box;
.order-btn{
width: max-content;

Write Preview
Loading…
Cancel
Save