From 933d15907e2f4d5f600f5c8aa0d39e846ad67f7a Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 5 Aug 2021 16:30:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=87=BA=E5=BA=93?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=93=E5=AD=98=E6=95=B0=E9=87=8F=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=20=E4=BF=AE=E6=94=B9=E5=8F=91=E8=B5=B7=E9=87=87?=
=?UTF-8?q?=E8=B4=AD=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
canteen/common/api.js | 4 ++--
canteen/pages/delivery/apply.vue | 7 +++++++
canteen/pages/purchase/launch.vue | 2 +-
supplier/common/api.js | 4 ++--
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/canteen/common/api.js b/canteen/common/api.js
index 343d2c9..f45c0f1 100644
--- a/canteen/common/api.js
+++ b/canteen/common/api.js
@@ -2,8 +2,8 @@
export const DEV = "dev"; // dev 测试 | prod 正式
export const VERSION = '1.0.0'; // 版本号
// export const DEVURL = 'http://192.168.3.78'; // 测试服请求地址
-export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
-// export const DEVURL = 'http://192.168.43.78'; // 测试服请求地址
+// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
+export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
export const PRODURL = ''; // 正式服请求地址
export const API_CANTEEN_LOGIN = '/api/canteen/login'; // 登录
diff --git a/canteen/pages/delivery/apply.vue b/canteen/pages/delivery/apply.vue
index 01fcba9..9b525cc 100644
--- a/canteen/pages/delivery/apply.vue
+++ b/canteen/pages/delivery/apply.vue
@@ -72,6 +72,9 @@
},{
label: '批次',
key: 'batch_sn'
+ },{
+ key: 'stock_number',
+ label: '库存数量'
},{
key: 'delivery_number',
label: '出库数量'
@@ -112,6 +115,7 @@
warehouse_list[i].operation = {button: true, key: 'delete', value: '删除'};
warehouse_list[i].unit = warehouse_list[i].unit.unit_name;
warehouse_list[i].category = warehouse_list[i].category.m_cate_name;
+ warehouse_list[i].stock_number = warehouse_list[i].stock;
contents.push(warehouse_list[i]);
}
this.contents = contents;
@@ -129,10 +133,13 @@
let list = res.data.sheet || [];
let warehouse_list = {};
list.map(item => {
+ console.log('======',item)
+ console.log('===库存===',item.warehouse.stock)
warehouse_list[item.id] = {
batch_sn: item?.purchase?.batch_sn || '',
brand: item?.material?.brand || '',
checked: true,
+ stock: item.warehouse.stock,
m_sn: item?.material?.m_sn || '',
material_id: item?.material?.id || 0,
material_name: item?.material?.m_name || '',
diff --git a/canteen/pages/purchase/launch.vue b/canteen/pages/purchase/launch.vue
index c48e314..3d9ff7a 100644
--- a/canteen/pages/purchase/launch.vue
+++ b/canteen/pages/purchase/launch.vue
@@ -23,7 +23,7 @@
- 收货时间
+ 预计收货时间
{{ date }}
diff --git a/supplier/common/api.js b/supplier/common/api.js
index 4a70d2e..6878b15 100644
--- a/supplier/common/api.js
+++ b/supplier/common/api.js
@@ -1,8 +1,8 @@
// appId: 正式 null | 测试 null
export const DEV = "dev"; // dev 测试 | prod 正式
export const VERSION = '1.0.0'; // 版本号
-// export const DEVURL = 'http://192.168.3.5'; // 测试服请求地址
-export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
+export const DEVURL = 'http://192.168.3.133'; // 测试服请求地址
+// export const DEVURL = 'http://fsc.lanzulive.com'; // 测试服请求地址
export const PRODURL = ''; // 正式服请求地址
export const API_SUPPLIER_INDEX = '/api/supplier/index'; // 落地页
From 47f47eab6e4372156d15e63c47f3e078e5f1ac9e Mon Sep 17 00:00:00 2001
From: Enzo <1284707383@qq.com>
Date: Thu, 5 Aug 2021 17:20:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=B1=E6=95=88=E6=97=A5=E6=9C=9F?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
supplier/pages/offer/index.vue | 24 ++++++++++++++++--------
1 file changed, 16 insertions(+), 8 deletions(-)
diff --git a/supplier/pages/offer/index.vue b/supplier/pages/offer/index.vue
index d5bc772..32865ae 100644
--- a/supplier/pages/offer/index.vue
+++ b/supplier/pages/offer/index.vue
@@ -70,10 +70,6 @@
wybTable
},
data(){
- // PS 获取30天后日期
- var date1 = new Date();
- var date2 = new Date(date1);
- date2.setDate(date1.getDate() + 30);
return {
headers: [{
label: '物资名称',
@@ -167,6 +163,22 @@
}
},
methods: {
+ // 日期选择器值被改变
+ pickerChange(event, current_name){
+ console.log(current_name)
+ if(current_name == 'deadline_start') {
+ // PS 获取30天后日期
+ var date1 = new Date(event.detail.value);
+ var date2 = new Date(date1);
+ date2.setDate(date1.getDate() + 30);
+ console.log(this.$shared.recordTime(date2, '-', 'date'))
+ this[current_name] = event.detail.value;
+ this.deadline_end = this.$shared.recordTime(date2, '-', 'date')
+ }else {
+ this[current_name] = event.detail.value;
+ }
+
+ },
// 获取物资列表
getMaterialList(){
this.$http(this.API.API_SUPPLIER_MATERIALLIST).then(res => {
@@ -318,10 +330,6 @@
})
}
},
- // 日期选择器值被改变
- pickerChange(event, current_name){
- this[current_name] = event.detail.value;
- },
// 切换显示关联食堂modal
switchRelation(){
if(this.type == 1) return this.$msg('编辑不可更换关联食堂哦');