前端修改数据报表

config/index.js

@@ -6,11 +6,11 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.9:9100/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
-	 // baseUrlNew: 'http://192.168.110.82:8090/',
+	 baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	baseUrlNew: 'https://api2.eliangeyun.com/',
+	// baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -1,6 +1,6 @@
 <template>
-	<view>
-		<view @click='hidden' class='wrap'>
+	<view :style='{"margin-bottom":InputEvent!=""?"100px":0}'>
+		<view  @click='hidden' class='wrap'>
 			<view class='title_b'>基本信息</view>
 			<view class="c-row ">
 				<view class="title">类型</view>
@@ -898,7 +898,7 @@
 				// this.taskNolist=res.data.data
 			})
 			if (uni.getStorageSync('checkcustomer')) {
-console.log(11111111)
+
 				let _customerInfo = uni.getStorageSync('checkcustomer')
 				if (_customerInfo.shipperName) {
 					this.gridList.identityId = _customerInfo.id
@@ -1749,7 +1749,7 @@ console.log(11111111)
 													console.log('that.gridList', that.gridList)
 													// uni.navigateBack({})
 												} else {
-													hat.$api.msg('提交失败')
+													that.$api.msg('提交失败')
 												}
 											})
 									})

pages/erpbusiness/edit_quality_testing.vue

@@ -1,5 +1,5 @@
 <template>
-	<view ref="all-input">
+	<view :style='{"margin-bottom":InputEvent!=""?"100px":0}' ref="all-input">
 		<view @click='hidden' class='wrap'>
 			<view class='title_b'>基本信息</view>
 			<view class="c-row ">

pages/user/newReport.vue

@@ -752,31 +752,32 @@
 				let _price1 = []
 				let _price2 = []
 				if (this.textIndex == 1) {
-					this.ym1 = val[0].biViewInfoList[val[0].biViewInfoList.length - 1].name
-					this.sr = val[0].biViewInfoList[val[0].biViewInfoList.length - 1].weight
-					this.zc = val[2].biViewInfoList[val[2].biViewInfoList.length - 1].weight
-
-					for (let i = 0; i < val[0].biViewInfoList.length; i++) {
-						_categories.push(val[0].biViewInfoList[i].name)
-						_price1.push(val[0].biViewInfoList[i].weight)
-					}
-					for (let i = 0; i < val[2].biViewInfoList.length; i++) {
-						_price2.push(val[2].biViewInfoList[i].weight)
+					if(val[0].biViewInfoList&&val[0].biViewInfoList.length>0){
+						this.ym1 = val[0].biViewInfoList[val[0].biViewInfoList.length - 1].name
+						this.sr = val[0].biViewInfoList[val[0].biViewInfoList.length - 1].weight
+						this.zc = val[2].biViewInfoList[val[2].biViewInfoList.length - 1].weight
+
+						for (let i = 0; i < val[0].biViewInfoList.length; i++) {
+							_categories.push(val[0].biViewInfoList[i].name)
+							_price1.push(val[0].biViewInfoList[i].weight)
+						}
+						for (let i = 0; i < val[2].biViewInfoList.length; i++) {
+							_price2.push(val[2].biViewInfoList[i].weight)
+						}
 					}
-
-
 				} else {
-					this.ym1 = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].name
-					this.sr = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].weight
-					this.zc = val[3].biViewInfoList[val[3].biViewInfoList.length - 1].weight
-					for (let i = 0; i < val[1].biViewInfoList.length; i++) {
-						_categories.push(val[1].biViewInfoList[i].name)
-						_price1.push(val[1].biViewInfoList[i].weight)
-					}
-					for (let i = 0; i < val[3].biViewInfoList.length; i++) {
-						_price2.push(val[3].biViewInfoList[i].weight)
+					if(val[1].biViewInfoList&&val[1].biViewInfoList.length>0){
+						this.ym1 = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].name
+						this.sr = val[1].biViewInfoList[val[1].biViewInfoList.length - 1].weight
+						this.zc = val[3].biViewInfoList[val[3].biViewInfoList.length - 1].weight
+						for (let i = 0; i < val[1].biViewInfoList.length; i++) {
+							_categories.push(val[1].biViewInfoList[i].name)
+							_price1.push(val[1].biViewInfoList[i].weight)
+						}
+						for (let i = 0; i < val[3].biViewInfoList.length; i++) {
+							_price2.push(val[3].biViewInfoList[i].weight)
+						}
 					}
-
 				}
 				let res = {
 					categories: _categories,
@@ -796,11 +797,14 @@
 				let _categories = []
 				let _count1 = []
 				let _count2 = []
-				for (let i = 0; i < val[4].biViewInfoList.length; i++) {
-					_categories.push(val[4].biViewInfoList[i].name)
-					_count1.push(val[4].biViewInfoList[i].weight)
-					_count2.push(val[4].biViewInfoList[i].count ? val[4].biViewInfoList[i].count : 0)
+				if(val[4].biViewInfoList&&val[4].biViewInfoList.length>0){
+					for (let i = 0; i < val[4].biViewInfoList.length; i++) {
+						_categories.push(val[4].biViewInfoList[i].name)
+						_count1.push(val[4].biViewInfoList[i].weight)
+						_count2.push(val[4].biViewInfoList[i].count ? val[4].biViewInfoList[i].count : 0)
+					}
 				}
+				
 				// for (let i = 0; i < val[5].biViewInfoList.length; i++) {
 				// 	_count2.push(val[5].biViewInfoList[i].weight)
 				// }
@@ -827,9 +831,11 @@
 			makeDate3(val) {
 				let _categorieslr = []
 				let _countlr = []
-				for (let i = 0; i < val[5].biViewInfoList.length; i++) {
-					_categorieslr.push(val[5].biViewInfoList[i].name)
-					_countlr.push(val[5].biViewInfoList[i].weight ? val[5].biViewInfoList[i].weight : 0)
+				if(val[5].biViewInfoList&&val[5].biViewInfoList.length>0){
+					for (let i = 0; i < val[5].biViewInfoList.length; i++) {
+						_categorieslr.push(val[5].biViewInfoList[i].name)
+						_countlr.push(val[5].biViewInfoList[i].weight ? val[5].biViewInfoList[i].weight : 0)
+					}
 				}
 				//利润核算
 				let res3 = {
@@ -845,10 +851,12 @@
 
 				let _categorieslr = []
 				let _countlr = []
-				for (let i = 0; i < val[8].biViewInfoList.length; i++) {
-					_categorieslr.push(val[8].biViewInfoList[i].name)
-					_countlr.push(Number(val[8].biViewInfoList[i].weight).toFixed(0) ? Number(val[8].biViewInfoList[i]
-						.weight).toFixed(0) : 0)
+				if(val[8].biViewInfoList&&val[8].biViewInfoList.length>0){
+					for (let i = 0; i < val[8].biViewInfoList.length; i++) {
+						_categorieslr.push(val[8].biViewInfoList[i].name)
+						_countlr.push(Number(val[8].biViewInfoList[i].weight).toFixed(0) ? Number(val[8].biViewInfoList[i]
+							.weight).toFixed(0) : 0)
+					}
 				}
 				let res4 = {
 					categories: _categorieslr,
@@ -885,9 +893,11 @@
 			makeDate5(val) {
 				let _categorieslr = []
 				let _count = []
-				for (let i = 0; i < val[7].biViewInfoList.length; i++) {
-					_categorieslr.push(val[7].biViewInfoList[i].name)
-					_count.push(val[7].biViewInfoList[i].count ? val[7].biViewInfoList[i].count : 0)
+				if(val[7].biViewInfoList&&val[7].biViewInfoList.length>0){
+					for (let i = 0; i < val[7].biViewInfoList.length; i++) {
+						_categorieslr.push(val[7].biViewInfoList[i].name)
+						_count.push(val[7].biViewInfoList[i].count ? val[7].biViewInfoList[i].count : 0)
+					}
 				}
 				let res5 = {
 					categories: _categorieslr,
@@ -902,7 +912,7 @@
 			},
 			makeDate6(val) {
 				let _data = []
-				if (val[10].biViewInfoList) {
+				if (val[10].biViewInfoList&&val[10].biViewInfoList.length>0) {
 					for (let i = 0; i < val[10].biViewInfoList.length; i++) {
 						let _obj = {
 							name: val[10].biViewInfoList[i].name,
@@ -941,13 +951,16 @@
 			},
 			makeDate7(val) {
 				let _data = []
-				for (let i = 0; i < val[11].biViewInfoList.length; i++) {
-					let _obj = {
-						name: val[11].biViewInfoList[i].name,
-						value: Number(val[11].biViewInfoList[i].count)
+				if(val[11].biViewInfoList&&val[11].biViewInfoList.length){
+					for (let i = 0; i < val[11].biViewInfoList.length; i++) {
+						let _obj = {
+							name: val[11].biViewInfoList[i].name,
+							value: Number(val[11].biViewInfoList[i].count)
+						}
+						_data.push(_obj)
 					}
-					_data.push(_obj)
 				}
+				
 				console.log(_data)
 				let res7 = {
 					series: [{
@@ -963,14 +976,19 @@
 				let _data1 = []
 				this.appTotal = val[12].count
 				this.lmTotal = val[13].count
-				for (let i = 0; i < val[12].biViewInfoList.length; i++) {
-					_categories.push(val[12].biViewInfoList[i].name)
-					_data.push(val[12].biViewInfoList[i].weight)
+				if(val[12].biViewInfoList&&val[12].biViewInfoList.length){
+					for (let i = 0; i < val[12].biViewInfoList.length; i++) {
+						_categories.push(val[12].biViewInfoList[i].name)
+						_data.push(val[12].biViewInfoList[i].weight)
+					}
 				}
-				for (let i = 0; i < val[13].biViewInfoList.length; i++) {
-					_categories1.push(val[13].biViewInfoList[i].name)
-					_data1.push(val[12].biViewInfoList[i].weight)
+				if(val[13].biViewInfoList&&val[13].biViewInfoList.length>0){
+					for (let i = 0; i < val[13].biViewInfoList.length; i++) {
+						_categories1.push(val[13].biViewInfoList[i].name)
+						_data1.push(val[12].biViewInfoList[i].weight)
+					}
 				}
+				
 				let res8 = {
 					categories: _categories,
 					series: [{

util/util.js

@@ -108,6 +108,7 @@ const utils = {
 				method: method, //'GET','POST'
 				dataType: 'json',
 				success: (res) => {
+					uni.hideLoading()
 					if (loadding && !hideLoading) {
 						uni.hideLoading()
 					}
@@ -156,8 +157,10 @@ const utils = {
 					reject(res)
 				},
 				complete: function(res) {
+					uni.hideLoading()
 					clearTimeout(utils.delayed)
 					utils.delayed = null;
+					
 					if (res.statusCode === 200) {
 						if (res.data.errno === 0 || res.data.errno === 401) {
 							uni.hideLoading()