From 40111ac19b97cac1e3784f3cc7819f13d7a25ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 4 Aug 2021 18:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E8=B4=A7=E8=AE=A2=E5=8D=95=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=B7=EF=BC=8C?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=87=BA=E5=BA=93=E7=BC=96=E8=BE=91=E6=97=B6?=
=?UTF-8?q?=E4=BF=9D=E5=AD=98(=E7=9B=AE=E5=89=8D=E6=8A=A5=E9=94=99?=
=?UTF-8?q?=EF=BC=8Cid=E4=B8=8D=E5=AF=B9=E5=BE=85=E5=AF=B9=E6=8E=A5)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/pages/delivery/apply.vue | 17 +++++++++--------
supplier/pages/gonghuo/order.vue | 4 ++++
2 files changed, 13 insertions(+), 8 deletions(-)
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 }}