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

master
Enzo 5 years ago
parent
6ec601cc12 3ca589605e
commit
2437b5f78c
3 changed files with 80 additions and 75 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. 76
      canteen/pages/purchase/detail.vue
  2. 4
      supplier/pages/order/detail.vue
  3. 75
      supplier/pages/order/index.vue

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

@ -23,26 +23,24 @@
<view class="lf-p-l-32 lf-p-r-32 lf-border-box lf-bg-white">
<lf-stepbar :list="order.state_log" themeColor="#11D189" v-if="order.state_log"></lf-stepbar>
</view>
<self-line v-if="order.car_license || supplier_voucher.length || canteen_voucher.length"></self-line>
<self-line></self-line>
<view class="head">
<block v-if="order.car_license">
<view class="lf-row-between list">
<view>车辆</view>
<view class="lf-font-bold">{{order.car_license}}</view>
</view>
<view class="lf-row-between list">
<view>司机</view>
<view class="lf-font-bold">{{order.deliver_man}}</view>
</view>
<view class="lf-row-between list" @click="call(order.deliver_phone)">
<view>联系电话</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="lf-row-between list" v-if="order.car_license">
<view>车辆</view>
<view class="lf-font-bold">{{order.car_license}}</view>
</view>
<view class="lf-row-between list" v-if="order.deliver_man">
<view>司机</view>
<view class="lf-font-bold">{{order.deliver_man}}</view>
</view>
<view class="lf-row-between list" @click="call(order.deliver_phone)" v-if="order.deliver_phone">
<view>联系电话</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_text}}</view>
</view>
<view class="list" v-if="supplier_voucher.length">
<view>证明材料-供应端</view>
<view class="lf-flex-wrap lf-m-t-10">
@ -306,23 +304,31 @@
},
// 改变订单状态
orderStateChange(state){
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());
})
let that = this;
if(state == '已退单'){
uni.showModal({
title: '温馨提示',
content: '退单前请与供应商协商，以免造成损失！确定继续退单操作吗？',
confirmColor: '#FF0000',
cancelColor: '#11D189',
success: result => {
if(result.confirm){
$change();
}
}
}
})
})
}else{
$change();
}
function $change(){
that.$http(that.API.API_CANTEEN_PURCHASEUPDATE, {
p_sn: that.p_sn,
state: state
}).then(res => {
that.$msg('操作成功').then(()=> that.getData());
})
}
}
}
}

4
supplier/pages/order/detail.vue
View File

@ -21,6 +21,10 @@
<view>关联食堂</view>
<view class="lf-color-black">{{ (order.canteen && order.canteen.canteen_name) || '' }}</view>
</view>
<view class="lf-row-between list">
<view>创建时间</view>
<view class="lf-color-black">{{ order.deadline_text }}</view>
</view>
</view>
<self-line></self-line>
<view class="lf-m-t-30 lf-m-l-32 lf-m-r-32">

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

@ -13,16 +13,21 @@
:refresher-triggered="tabItem.isRefresher"
@refresherrefresh="onRefresherrefresh">
<view class="card" v-for="(item, index) in tabItem.list" :key="item.id" @click="$url('/pages/order/detail?q_sn='+ item.q_sn)">
<view class="lf-row-between upper">
<view class="lf-font-28 lf-color-333">订单状态</view>
<view class="order-btn" :class="stateClass(item.state)">{{ item.state }}</view>
<view class="lf-row-between item">
<view class="lf-color-gray">报价单号</view>
<view class="lf-color-black">{{ item.q_sn }}</view>
</view>
<view class="lf-row-between lower" style="padding-bottom: 0;">
<view>批次号 {{ item.batch_sn }}</view>
<view class="lf-row-between item">
<view class="lf-color-gray">批次号</view>
<view class="lf-color-black">{{ item.batch_sn }}</view>
</view>
<view class="lf-row-between lower">
<view>报价单号 {{ item.q_sn }}</view>
<view>{{ item.deadline }}</view>
<view class="lf-row-between item">
<view class="lf-color-gray">订单状态</view>
<view :class="stateClass(item.state)">{{ item.state }}</view>
</view>
<view class="lf-row-between item">
<view class="lf-color-gray">创建时间</view>
<view class="lf-color-black">{{ item.deadline_text }}</view>
</view>
</view>
<view class="loading-more">
@ -164,41 +169,31 @@
padding: 0 20rpx;
box-sizing: border-box;
margin-bottom: 30rpx;
.upper{
width: 100%;
.item{
padding: 20rpx 0;
// border-bottom: 1rpx solid #e5e5e5;
box-sizing: border-box;
.order-btn{
width: max-content;
height: 62rpx;
border-radius: 32rpx;
// border: 2rpx solid #777777;
// padding: 0 20rpx;
line-height: 60rpx;
font-size: 28rpx;
}
// 已通过
.quoted-price{
color: #777777;
}
// 待发起
.wait{
color: #1833F2;
}
// 待审核
.passed{
color: #0BCE5F;
}
// 未通过
.refuse{
color: #FF0000;
width: 100%;
font-size: 28rpx;
&:last-child{
border-bottom: none;
}
}
.lower{
padding: 20rpx 0;
font-size: 24rpx;
color: #777777;
}
}
// 已通过
.quoted-price{
color: #777777;
}
// 待发起
.wait{
color: #1833F2;
}
// 待审核
.passed{
color: #0BCE5F;
}
// 未通过
.refuse{
color: #FF0000;
}
</style>
Write Preview
Loading…
Cancel
Save