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

common/http.api.js

@@ -82,7 +82,7 @@ const install = (Vue, vm) => {
 			//生产领料
 			pdaSapissuecreate: (params = {}) => vm.$u.post(config.adminPath + '/apiPda/issue/pdaissuecreate', params),
 			// 生产退料
-			pdaMaterialReturnNum: (params = {}) => vm.$u.post(config.adminPath + '/apiPad/materialReturn/pdaMaterialReturnNum', params),
+			pdaMaterialReturnNum: (params = {}) => vm.$u.post(config.adminPath + '/apiPad/materialReturn/pdaMaterialReturnNum', params, {'content-type': 'application/json;charset=UTF-8'}),
 			// 完工入库
 			pdaFindPackageLinkInfo: (params = {}) => vm.$u.post(config.adminPath + '/apiPda/search/findPackageLinkInfo', params),
 			// 调拨料回传mes

pages/produceReturn/produceReturnList.vue

@@ -199,6 +199,7 @@ export default {
 				ele.backNum = ele.quantityIssued
 				ele.issueCode = num
 				ele.issueType = ele.materialType
+				ele.returnNum = ele.quantityIssued
 			});
 			this.$u.api.mesApi
 				.pdaMaterialReturnNum(arr)
@@ -209,7 +210,7 @@ export default {
 						this.$u.toast('提交成功');
 						setTimeout(() => {
 							this.goBack()
-						}, 1000);
+						}, 3000);
 					}else{
 						this.$u.toast(res.msg);
 					}

uview-ui/libs/request/index.js

@@ -89,14 +89,16 @@ class Request {
 				}
 
 				// 设置公共参数
-				if (Object.prototype.toString.call(options.data) != '[object Array]') {
+				if (Object.prototype.toString.call(options.data) != '[object Array]') {
+					console.log('设置参数vuex_user_factory', options.data)
 					options.data = {
 						...options.data,
 						werks: store.state.vuex_user_factory
 					}
 				}
 
-			} else if (options.url.indexOf('apiPda') > -1) {
+			} else if (options.url.indexOf('apiPda') > -1) {
+				
 				options.header = {
 					...options.header,
 					'content-type': 'application/json;charset=UTF-8',
@@ -121,7 +123,7 @@ class Request {
 					})
 					this.config.timer = null;
 				}, this.config.loadingTime);
-			}
+			}
 			console.log('请求参数', options)
 			uni.request(options);
 		})