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

pages/erpbusiness/add_quality_testing.vue

@@ -1028,6 +1028,7 @@
 			if(uni.getStorageSync('compName1')){
 				that.compName = uni.getStorageSync('compName1').company
 				if(that.compName=='辽宁佳屹农商贸有限公司'){
+					console.log("123")
 					this.typevalue = '1'
 					this.contractFlag = 7
 				}
@@ -1036,9 +1037,11 @@
 			this.isZJ = this.utils.getCurrectRoles('acquisitionQuality.initial')
 			if(!uni.getStorageSync('gridList')&&that.compName!='辽宁佳屹农商贸有限公司'){
 				if (this.isZJ && !this.isQY) {
+					console.log("123456")
 					this.typevalue = '1'
 					this.contractFlag = 7
 				} else {
+					console.log("243423423")
 					this.typevalue = '3'
 					this.contractFlag = 10
 				}
@@ -1894,8 +1897,8 @@
 									this.gridList.compId = uni.getStorageSync(
 										'pcUserInfo').compId
 									uni.setStorageSync("quality_print", this.gridList)
-									uni.setStorageSync('typevalue', 3)
-									uni.setStorageSync('gridList', {})
+									uni.removeStorageSync('typevalue')
+									uni.removeStorageSync('gridList')
 									if (this.isZJ) {
 										this.isShowPrint = true
 									} else {
@@ -1939,8 +1942,8 @@
 									uni.setStorageSync(
 										'checkcustomer', {}
 									)
-									uni.setStorageSync('typevalue', 3)
-									uni.setStorageSync('gridList', {})
+									uni.removeStorageSync('typevalue')
+									uni.removeStorageSync('gridList')
 									console.log('that.gridList', this.gridList)
 									// uni.navigateBack({})
 								} else if(res.data.message == '货物种类与类型不符，请确认！'){