Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

pages/erpbusiness/add_quality_testing.vue

@@ -1019,6 +1019,8 @@
 					if (this.outType) {
 						this.gridList.outType = this.outType
 					}
+				}else{
+					this.gridList.customerName = ''
 				}
 				var that = this
 				this.gridList.carNo = this.gridList.carNumber
@@ -1158,7 +1160,7 @@
 																		'/qualityInspectionManagement/api/addQualityInspection',
 																		that.gridList)
 																	.then(res => {
-																		if (res.data.code == 200) {debugger
+																		if (res.data.code == 200) {
 																			that.$api.msg('提交成功')
 																			that.isShowPrint = true
 																			that.gridList

pages/erpbusiness/edit_quality_testing.vue

@@ -814,6 +814,8 @@
 					if(this.outType){
 						this.gridList.outType=this.outType
 					}
+				}else{
+					this.gridList.customerName = ''
 				}
 				this.gridList.flag = this.flag
 				// if(this.flag==2){
@@ -828,7 +830,7 @@
 					this.$api.msg('仓位不能为空')
 					return
 				}
-				if(this.gridList.s==3){
+				if(this.gridList.serviceManagementType==3){
 					if (!this.gridList.customerName) {
 						this.$api.msg('客户不能为空')
 						return