diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index a5ba3b0..01fcba9 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -192,7 +192,6 @@
return this.$msg('您未选择物资')
}
let is_empty = false;
- console.log("总的", this.contents)
let list = this.contents.map(item => {
if(!item.delivery_number.value){
is_empty = true;
@@ -249,11 +248,6 @@
}
});
if(this.isStock) {
- let _api = this.API.API_CANTEEN_WAREHOUSEOUT;
- if(this.enter_type == 1){
- _api = this.API.API_EDITOUTORDER;
- }
- let state = ['待确认', '已确认'][_t]; // 传入状态
if(is_empty){
uni.showModal({
title: '温馨提示',
@@ -263,10 +257,17 @@
})
return;
}
- this.$http(_api, {
+ let state = ['待确认', '已确认'][_t]; // 传入状态
+ let _api = this.API.API_CANTEEN_WAREHOUSEOUT;
+ let _data = {
data: list,
state: state
- }).then(res => {
+ }
+ if(this.enter_type == 1){
+ _api = this.API.API_EDITOUTORDER;
+ _data.o_sn = this.o_sn;
+ }
+ this.$http(_api, _data).then(res => {
this.$msg('操作成功').then(() => this.$toBack());
})
}
diff --git a/supplier/pages/gonghuo/order.vue b/supplier/pages/gonghuo/order.vue
index 9904d86..da2900d 100644
--- a/supplier/pages/gonghuo/order.vue
+++ b/supplier/pages/gonghuo/order.vue
@@ -17,6 +17,10 @@
采购方
{{ item.canteen.canteen_name }}
+
+ 订单号
+ {{ item.p_sn }}
+
发单时间
{{ item.created_at }}