diff --git a/api/materialManagement/MaterialProductionInput.js b/api/materialManagement/MaterialProductionInput.js
new file mode 100644
index 0000000..ec88c0d
--- /dev/null
+++ b/api/materialManagement/MaterialProductionInput.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+import upload from '@/utils/upload'
+
+export function achievestartpoints(params) {
+ return request({
+ url: 'mes/mm/materialinput/getstartpoints',
+ method: 'get',
+ params
+ })
+}
+
+export function achievesendpoints(params) {
+ return request({
+ url: 'mes/mm/materialinput/getendpoints',
+ method: 'get',
+ params
+ })
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9bff67d..52e18fd 100644
--- a/pages.json
+++ b/pages.json
@@ -200,6 +200,14 @@
"navigationBarTitleText" : "物料管理",
"enablePullDownRefresh" : false
}
+ },
+ {
+ "path" : "pages/materialManagement/MaterialProductionInput/MaterialProductionInput",
+ "style" :
+ {
+ "navigationBarTitleText" : "仓库配料",
+ "enablePullDownRefresh" : false
+ }
}
]
diff --git a/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
new file mode 100644
index 0000000..aae2222
--- /dev/null
+++ b/pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/materialManagement/materialManagement.vue b/pages/materialManagement/materialManagement.vue
index aba4a2d..5f7d44a 100644
--- a/pages/materialManagement/materialManagement.vue
+++ b/pages/materialManagement/materialManagement.vue
@@ -7,6 +7,15 @@
{{item.name}}
+
+
+
+
+
+ {{item.name}}
+
+
+
@@ -17,12 +26,19 @@
// 页面按钮参数
gridItemList: [
{
- name: '生产投料(RM)',
+ name: '仓库配料',
icon: 'grid-fill',
- url: '/pages/agv/agv-in/agv-in',
+ url: '/pages/materialManagement/MaterialProductionInput/MaterialProductionInput',
type: 1,
index: 1
},
+ {
+ name: 'AGV运输',
+ icon: 'grid-fill',
+ url: 'pages/materialManagement/MaterialProductionInput/MaterialProductionInput',
+ type: 1,
+ index: 2
+ },
]
}
},
diff --git a/utils/request.js b/utils/request.js
index b9f827e..069f3c6 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -53,8 +53,9 @@ const request = config => {
// console.log('token:','Bearer ' + getToAccess-Control-Allow-Originken());
// console.log('request:',storageBaseUrl + config.url,response);
if (error) {
+ debugger;
console.log(error)
- toast('后端接口连接异常')
+ toast('后端接口连接异常1')
reject('后端接口连接异常')
return
}
@@ -85,7 +86,7 @@ const request = config => {
message
} = error
if (message === 'Network Error') {
- message = '后端接口连接异常'
+ message = '后端接口连接异常,Network Error'
} else if (message.includes('timeout')) {
message = '系统接口请求超时'
} else if (message.includes('Request failed with status code')) {