diff --git a/canteen/common/api.js b/canteen/common/api.js
index a877612..50ec3ec 100644
--- a/canteen/common/api.js
+++ b/canteen/common/api.js
@@ -2,7 +2,7 @@
export const DEV = "dev"; // dev 测试 | prod 正式
export const VERSION = '1.0.0'; // 版本号
// export const DEVURL = 'http://192.168.3.78'; // 测试服请求地址
-export const DEVURL = 'http://192.168.3.5'; // 测试服请求地址
+export const DEVURL = 'http://192.168.3.96'; // 测试服请求地址
export const PRODURL = ''; // 正式服请求地址
export const API_CANTEEN_LOGIN = '/api/canteen/login'; // 登录
diff --git a/canteen/pages.json b/canteen/pages.json
index 40950f7..34cc2bf 100644
--- a/canteen/pages.json
+++ b/canteen/pages.json
@@ -6,14 +6,14 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "食堂端"
+ "navigationBarTitleText": ""
}
},
{
"path": "pages/login/index",
"style": {
"navigationBarTitleText": "登录",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationBarBackgroundColor":"#11D189",
"navigationBarTextStyle": "white"
}
diff --git a/canteen/pages/index/index.vue b/canteen/pages/index/index.vue
index b0d42f1..5e39a1f 100644
--- a/canteen/pages/index/index.vue
+++ b/canteen/pages/index/index.vue
@@ -3,7 +3,8 @@
{{ canteen.name }}
- {{ canteen.user.canteen.remark }}
+ {{ canteen.role }}
+
车辆
-
+ {{order.car_license}}
司机
-
+ {{order.deliver_man}}
联系电话
-
+ {{order.deliver_phone}}
证明材料-供应端
@@ -51,20 +51,20 @@
-
-
+
+
-
-
+
+
-
+
-
+
已完成
@@ -103,7 +103,7 @@
return {
headers: [{
key: 'name',
- label: '菜名'
+ label: '物资名称'
},{
key: 'spec',
label: '规格'
@@ -210,18 +210,19 @@
}).then(res => {
console.log("xxx",res)
this.order = res.data.order;
- let list = res.data.order.sheet || [];
+ let list = res.data.order.items || [];
let contents = list.map(item => {
return {
name: item.material.m_name,
spec: item.spec.name,
- pre_tax_price: {edit: true, value: item.tax_standard_price},
- after_tax_price: {edit: true, value: item.non_tax_standard_price},
+ pre_tax_price: {edit: true, value: item.total_tax_amount},
+ after_tax_price: {edit: true, value: item.total_non_tax_amount},
spec_id: item.spec.id,
material_id: item.material.id
}
})
this.contents = contents;
+ this.type = res.data.order.state
})
},
// 预览图片
@@ -241,7 +242,7 @@
state: state
}).then(res => {
console.log("orderStateChange", res);
- this.$msg('操作成功');
+ this.$msg('操作成功').then(()=>{this.$toBack()});
})
}
}
diff --git a/canteen/pages/purchase/launch.vue b/canteen/pages/purchase/launch.vue
index e9d7e93..deb72ef 100644
--- a/canteen/pages/purchase/launch.vue
+++ b/canteen/pages/purchase/launch.vue
@@ -251,10 +251,10 @@
this.$msg('采购数量需大于起购数量');
return;
}
- let state = ['待发单', '待审核'][_t];
+ // let state = ['待发单', '待审核'][_t];
this.$http(this.API.API_CANTEEN_PURCHASEAPPLY, {
order: list,
- state: state,
+ state: _t,
deadline: deadline
}).then(res => {
console.log("save", res);
diff --git a/canteen/pages/purchase/order.vue b/canteen/pages/purchase/order.vue
index 85177ab..25cd7e1 100644
--- a/canteen/pages/purchase/order.vue
+++ b/canteen/pages/purchase/order.vue
@@ -19,19 +19,23 @@
批次号
-
+ {{item.batch_sn}}
+
+
+ 订单号
+ {{item.p_sn}}
发单时间
- {{ item.receiving_start }}
+ {{ item.send_time }}
送达时间
- {{ item.receiving_end }}
+ {{ item.receive_time }}
商品种类
-
+ {{item.items_count}}类
订单状态
@@ -110,10 +114,22 @@
// 获取数据
getData(options){
let item = this.tab_list[this.current];
+ let tabType = 0
+ if(this.current == 2) {
+ tabType = 3
+ }else if(this.current == 3){
+ tabType = 4
+ }else if(this.current == 4){
+ tabType = 5
+ }else if(this.current == 5){
+ tabType = 7
+ }else {
+ tabType = this.current
+ }
this.$http(this.API.API_CANTEEN_PURCHASEORDERLIST, {
page: item.page,
page_size: this.page_size,
- state: ''
+ state: tabType || ''
}).then(res => {
console.log("getData", res);
let list = res.data.list || {};
diff --git a/supplier/pages.json b/supplier/pages.json
index ce58dad..e3fb38a 100644
--- a/supplier/pages.json
+++ b/supplier/pages.json
@@ -6,7 +6,7 @@
{
"path": "pages/index/index",
"style": {
- "navigationBarTitleText": "供应端",
+ "navigationBarTitleText": "",
"enablePullDownRefresh": true
}
},
diff --git a/supplier/pages/index/index.vue b/supplier/pages/index/index.vue
index 2460ad0..f5ba168 100644
--- a/supplier/pages/index/index.vue
+++ b/supplier/pages/index/index.vue
@@ -3,6 +3,7 @@
{{ supplier.name }}
+ {{ supplier.role }}