Merge branch 'master' of https://gitee.com/doan-tech/shanghaiganxiangtuzhuangworkshop_WMS_PDA

# Conflicts:
#	utils/request.js

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
+	})
+}

pages.json

@@ -200,6 +200,14 @@
 				"navigationBarTitleText" : "物料管理",
 				"enablePullDownRefresh" : false
 			}
+		},
+		{
+			"path" : "pages/materialManagement/MaterialProductionInput/MaterialProductionInput",
+			"style" : 
+			{
+				"navigationBarTitleText" : "仓库配料",
+				"enablePullDownRefresh" : false
+			}
 		}
 	]
 

pages/materialManagement/MaterialProductionInput/MaterialProductionInput.vue

@@ -0,0 +1,40 @@
+<!-- 仓库配料 -->
+<template>
+	<view>
+		<u--text text="仓库配料表单" size="50"></u--text>
+		<u-line></u-line>
+		<u-scroll-list>
+			<view v-for="(item, index) in start_point_positions" :key="index">
+				<u-tag :text="item"></u-tag>
+			</view>
+		</u-scroll-list>
+	</view>
+</template>
+
+<script>
+import {achievestartpoints }   from '@/api/materialManagement/MaterialProductionInput.js';
+
+export default {
+	data() {
+		return {
+			start_point_positions: []
+		};
+	},
+	mounted() {
+		this.get_startpoints()
+	},
+	methods: {
+		// todo 获取上料起点
+
+		get_startpoints(){
+			achievestartpoints().then((res)=>{
+				if(res.code==200){
+					this.start_point_positions=red.data;
+				}
+			})
+		}
+	}
+};
+</script>
+
+<style></style>

pages/materialManagement/materialManagement.vue

@@ -7,6 +7,15 @@
 				<text class="grid-text">{{item.name}}</text>
 			</u-grid-item>
 		</u-grid>
+		
+		<u--text text="成品入库" size="36" bold></u--text>
+		<u-grid :border="true" @click="gridCheck" col="4">
+			<u-grid-item v-if="item.type === 1" v-for="(item,index) in gridItemList" :key="index" :name="item.url">
+				<u-icon :customStyle="{paddingTop:20+'rpx'}" :name="item.icon" :size="128"></u-icon>
+				<text class="grid-text">{{item.name}}</text>
+			</u-grid-item>
+		</u-grid>
+		
 	</view>
 </template>
 
@@ -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
+					},
 				]
 			}
 		},

utils/request.js

@@ -87,7 +87,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')) {