Browse Source

出库订单详情

master
Enzo 5 years ago
parent
commit
b4b7ca8c7c
  1. 3
      canteen/common/api.js
  2. 1
      canteen/pages/classification/warehouse.vue
  3. 71
      canteen/pages/delivery/apply.vue
  4. 66
      canteen/pages/delivery/detail.vue

3
canteen/common/api.js

@ -29,4 +29,7 @@ export const API_CONFIRM = '/api/canteen/purchaseConfirm'; // 食堂采购详情
export const API_BUYREUSE= '/api/canteen/purchaseReuse'; // 食堂采购复用订单
export const API_EDITOUTORDER = '/api/canteen/warehouseSave'; // 编辑出库订单

1
canteen/pages/classification/warehouse.vue

@ -55,6 +55,7 @@
return;
}
this.checked_list = prevPage.$data.warehouse_list;
console.log('onload',this.checked_list )
this.getData();
},
methods: {

71
canteen/pages/delivery/apply.vue

@ -22,7 +22,11 @@
v-if="contents.length"></wyb-table>
</view>
<!-- 操作按钮 -->
<view class="fixed-bottom">
<view class="fixed-bottom lf-p-l-32 lf-p-r-32" style="justify-content: space-between;" v-if="enter_type == 1">
<view></view>
<button class="btn btn2" @click="editOrder()">立即申请</button>
</view>
<view class="fixed-bottom" v-else>
<button class="btn btn1" @click="save(0)">临时保存</button>
<button class="btn btn2" @click="save(1)">直接申请</button>
</view>
@ -64,28 +68,69 @@
label: '出库数量'
}],
contents: [],
warehouse_list: {}
warehouse_list: {},
enter_type: '',
o_sn: ''
}
},
onLoad(){
onLoad(e){
this.o_sn = e.o_sn
this.enter_type = e.enter_type
// warehouse_list
uni.$on('addWarehouseList', res => {
this.warehouse_list = res;
console.log(this.warehouse_list)
})
},
onShow(){
let contents = [];
let warehouse_list = this.warehouse_list;
for(let i in warehouse_list){
warehouse_list[i].delivery_number = {edit: true, value: '1'}
warehouse_list[i].brand = i.brand
warehouse_list[i].quality_level = i.quality_level
contents.push(warehouse_list[i]);
onShow(e){
if(this.enter_type == 1 || this.enter_type == 2) {
this.getData()
}else {
let contents = [];
let warehouse_list = this.warehouse_list;
for(let i in warehouse_list){
warehouse_list[i].delivery_number = {edit: true, value: '1'}
warehouse_list[i].brand = i.brand
warehouse_list[i].quality_level = i.quality_level
contents.push(warehouse_list[i]);
}
this.contents = contents;
}
this.contents = contents;
},
methods: {
getData(){
this.$http(this.API.API_CANTEEN_OUTDETAIL, {
o_sn: this.o_sn
}).then(res => {
let list = res.data.sheet || [];
let contents = list.map(item => {
return {
material_name: item.material.m_name,
spec_name: item.spec.name,
brand: item.material.brand,
quality_level: item.material.quality_level,
m_sn: item.material.m_sn,
supplier_name: item.purchase.supplier.supplier_name,
purchase_id: item.purchase_id,
delivery_number: {edit: true, value: item.out_number},
order_id: item.material.id
}
})
console.log(contents)
this.contents = contents;
this.warehouse_list = contents
})
},
//
editOrder() {
this.$http(this.API.API_EDITOUTORDER, {
data: list
}).then(res => {
console.log("save", res);
this.$msg('操作成功');
})
},
// todo table
onInputChange(event){
console.log("检测到table input被更改", event);

66
canteen/pages/delivery/detail.vue

@ -1,22 +1,23 @@
<template>
<view>
<view v-if="$isRight(order)">
<view class="head">
<view class="lf-row-between lf-color-gray list">
<view>采购单 492461046128742764</view>
<view>采购单 {{order.sheet[0].purchase.p_sn}}</view>
</view>
<view class="list">
<lf-ysteps :stepList="stepList" color="#11D189"></lf-ysteps>
<!-- <lf-ysteps :stepList="stepList" color="#11D189"></lf-ysteps> -->
<lf-stepbar :list="stepList"></lf-stepbar>
</view>
</view>
<self-line></self-line>
<view class="head">
<view class="lf-row-between list">
<view>申请人</view>
<view class="lf-font-bold">李清玉</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.contact_name}}</view>
</view>
<view class="lf-row-between list">
<view>联系电话</view>
<view class="lf-font-bold">13200000000</view>
<view class="lf-font-bold">{{order.sheet[0].purchase.contact_phone}}</view>
</view>
</view>
<self-line></self-line>
@ -26,24 +27,20 @@
</view>
<view style="height: 100rpx;"></view>
<!-- 操作按钮 -->
<!-- <view class="fixed-bottom" v-if="type != '备货中'">
<view v-if="type == '待发单'" class="lf-row-flex-end">
<button class="btn btn1" @click="$url('/pages/purchase/launch?o_sn='+ order.o_sn+'&enter_type=1')">编辑</button>
<button class="btn btn2">立即发单</button>
<view class="fixed-bottom">
<view v-if="type == '待确认'" class="lf-row-flex-end" style="justify-content: space-between;width: 100%;">
<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=1')">编辑</button>
<button class="btn btn2">立即申请</button>
</view>
<view v-else-if="type == '待接单'" class="lf-row-flex-end">
<button class="btn btn2" style="background-color: #FF0000;" @click="orderStateChange('已撤销')">撤销订单</button>
<view v-else-if="type == '已出库'" class="lf-row-between" style="justify-content: space-between;width: 100%;">
<button class="btn btn1" @click="$url('/pages/delivery/apply?o_sn='+ o_sn+'&enter_type=2')">复用出库单</button>
<view class="lf-font-32" style="color: #11D189;">已出库</view>
</view>
<view v-else-if="type == '已发货'" class="lf-row-flex-end">
<button class="btn btn1">退单</button>
<button class="btn btn1 lf-m-l-20" @click="is_show_voucher = true">上传凭证</button>
<button class="btn btn2" @click="$url('/pages/purchase/receipt?o_sn='+ order.o_sn)">确认收货</button>
<view v-else class="lf-row-between">
<view></view>
<view class="lf-font-32" style="color: #1833F2;">{{type}}</view>
</view>
<view v-else-if="type == '已收货' || type == '已入库'" class="lf-row-between">
<button class="btn btn1" @click="$url('/pages/purchase/launch?o_sn='+ order.o_sn+'&enter_type=2')">复用采购单</button>
<view class="lf-font-32" style="color: #11D189;">已完成</view>
</view>
</view> -->
</view>
</view>
</template>
@ -95,24 +92,35 @@
getData(){
this.$http(this.API.API_CANTEEN_OUTDETAIL, {
o_sn: this.o_sn
// o_sn: '802316269455228606'
}).then(res => {
console.log("xxx",res)
this.order = res.data
let list = res.data || [];
this.stepList = this.order.state_log.map((item, index) => {
item.isFinished = false;
if(index == this.order.state_log.length - 1){
if(item.action == '订单已完成' || item.action == '订单已退款'){
item.isFinished = true;
}
}
return item;
})
let list = res.data.sheet || [];
let contents = list.map(item => {
console.log(item)
return {
material_name: item.material.m_name,
spec: item.spec.name,
pre_tax_price: item.total_tax_amount,
after_tax_price: item.total_non_tax_amount,
spec_id: item.spec.id,
material_id: item.material.id
spec_name: item.spec.name,
brand: item.material.brand,
quality_level: item.material.quality_level,
m_sn: item.material.m_sn,
supplier_name: item.purchase.supplier.supplier_name,
purchase_id: item.purchase_id,
delivery_number: item.out_number
}
})
this.contents = contents;
console.log(this.contents)
this.type = res.data.material.state
this.type = res.data.state
})
},
onButtonClick(event){

Loading…
Cancel
Save