Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev

README.en.md

-# ktg-mes-pad
+# mes-pad
 
 #### Description
 MES系统触控屏端

README.md

-# ktg-mes-pad
+# mes-pad
 
 #### 介绍
 MES系统触控屏端

common/config.js

 const config = {
-	
+
 	// 产品名称
-	productName: 'ktg-mes-pad',
-	
+	productName: 'mes-pad',
+
 	// 公司名称
-	companyName: 'ktg',
-	
+	companyName: '',
+
 	// 产品版本号
 	productVersion: 'V0.1.0',
-	
+
 	// 版本检查标识
 	appCode: 'android',
-	
+
 	// 内部版本号码
 	appVersion: 1,
-	
+
 	// 管理基础路径
 	adminPath: ''
-	
+
 }
 
 // 设置后台接口服务的基础地址
@@ -26,4 +26,4 @@ config.baseUrl = 'http://192.168.25.105:8080';
 //config.baseUrl = "/api";
 //config.baseUrl = "http://101.200.162.168:8080";
 
-export default config;
\ No newline at end of file
+export default config;

common/http.api.js

@@ -26,6 +26,8 @@ const install = (Vue, vm) => {
             params),
         getWorkstationList: (params = {}) => vm.$u.get(config.adminPath +
             '/mobile/md/workstation/getWorkstationList', params),
+        getWorkUnitList: (params = {}) => vm.$u.get(config.adminPath +
+            '/md/workunit/getListByUser', params),
         /**
          * 生产管理相关API
          **/
@@ -90,6 +92,26 @@ const install = (Vue, vm) => {
             '/mobile/pro/taskissue/getReserveIssueList', params),
         //打印流转单
 
+        //投料验证
+        listFeedingInspection: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listIssueLine', params),
+        validateFeedingInspection: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/validateFeedingInspection', params),
+        validateFeedingInspectionById: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/validateFeedingInspectionById', params),
+
+        //查询反冲料列表
+        recoilMaterialList: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/getRecoilMaterial', params),
+        //增加反冲料
+        addRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/addRecoilMaterial', params),
+        //删除反冲料
+        deleteRecoilMaterial: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/deleteRecoilMaterial', params),
+
+        //领料申请
+        listMaterialRequest: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listMaterialRequest', params),
+        addMaterialRequest: (params = {}) => vm.$u.postJson(config.adminPath + '/mobile/pro/proMaterial/addMaterialRequest', params),
+        //退料申请
+        listMaterialReturn: (params = {}) => vm.$u.post(config.adminPath + '/mobile/pro/proMaterial/listIssueLine', params),
+        addMaterialReturn: (params = {}) => vm.$u.postJson(config.adminPath + '/mobile/pro/proMaterial/addMaterialReturn', params),
+
+
 
         //质量相关api
         //获取当前产品、当前质检类型的质检模板行信息
@@ -147,7 +169,7 @@ const install = (Vue, vm) => {
 			 detail: (params = {}) => vm.$u.get(config.adminPath+'/qc/information/list',params),
 			newlyAdd: (params = {}) => vm.$u.postJson(config.adminPath+'/qc/report',params),
 		 },
-		 
+
 
         // 增删改查例子
         testData: {

common/http.interceptor.js

@@ -79,6 +79,7 @@ const install = (Vue, vm) => {
 				// 错误
 				if (data.msg !== null) {
 					uni.showToast({
+						icon: 'none',
 						title: data.msg,
 						duration: 3000
 					})

store/index.js

@@ -12,7 +12,7 @@ try{
 	// 尝试获取本地是否存在lifeData变量，第一次启动APP时是不存在的
 	lifeData = uni.getStorageSync('lifeData');
 }catch(e){
-	
+
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
@@ -41,14 +41,15 @@ const store = new Vuex.Store({
 		vuex_remember: lifeData.vuex_remember ? lifeData.vuex_remember : '',
 		vuex_locale: lifeData.vuex_locale ? lifeData.vuex_locale : '',
 		vuex_isAgent: lifeData.vuex_isAgent ? lifeData.vuex_isAgent : '',
-		
+
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_config: config,
 		//当前设备绑定的工作站
 		vuex_workstation: null,
+		vuex_workunit: null,
 		//当前工作站正在进行的生产任务
 		vuex_task: null,
-		
+
 		// 自定义tabbar数据
 		// vuex_tabbar: [{
 		// 		iconPath: "/static/uview/example/component.png",