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

pages/erpbusiness/add_quality_testing.vue

@@ -1601,7 +1601,6 @@
 				return year + '' + mouth + '' + datetime
 			},
 			submit() {
-				debugger
 				if (this.typevalue == 3) {
 					if (this.outType) {
 						this.gridList.outType = this.outType
@@ -1738,9 +1737,9 @@
 							if (res.confirm) {
 								that.gridList.serviceManagementType = that.typevalue
 								if (that.typevalue == 3) {
-									
 									uni.showLoading({
-										title:"加载中"
+										title: '加载中',
+										mask: true
 									})
 									that.$api.doRequest('get', '/paymentManagement/cumulant', {
 											compId: uni.getStorageSync('pcUserInfo').compId,
@@ -1778,6 +1777,8 @@
 																	'/warehouseInOutInfo/InOutWarehouse',
 																	that.gridList)
 																.then(res => {
+																	if (res.data.code ==
+																		200) {
 																	if (that.utils.getCurrectRoles(
 																			'acquisitionQuality.qview'
 																		)) {
@@ -1840,7 +1841,9 @@
 																					'提交失败')
 																			}
 																		})
+																		}
 																})
+																
 														}
 													}
 												}
@@ -1848,7 +1851,8 @@
 										})
 								} else {
 									uni.showLoading({
-										title:"加载中"
+										title: '加载中',
+										mask: true
 									})
 									that.gridList.inOutFlag = 2
 									that.$api.doRequest('post',
@@ -1911,6 +1915,10 @@
 									if (res.confirm) {
 										that.gridList.serviceManagementType = that.typevalue
 										if (that.typevalue == 3) {
+											uni.showLoading({
+												title: '加载中',
+												mask: true
+											})
 											that.$api.doRequest('get', '/paymentManagement/cumulant', {
 													compId: uni.getStorageSync('pcUserInfo')
 														.compId,
@@ -1947,6 +1955,7 @@
 																		.toFixed(2) +
 																		'吨，还可售粮' +
 																		count + '吨', )
+																		uni.hideLoading()
 
 																} else {
 																	that.gridList.inOutFlag = 2
@@ -1979,6 +1988,7 @@
 																				that.gridList)
 																				.then(res => {
 																					that.printId=res.data.data
+																					uni.hideLoading()
 																					if (res
 																						.data
 																						.code ==
@@ -2037,6 +2047,10 @@
 													}
 												})
 										} else {
+											uni.showLoading({
+												title: '加载中',
+												mask: true
+											})
 
 											that.gridList.inOutFlag = 2
 											that.$api.doRequest('post',
@@ -2050,6 +2064,7 @@
 															that.gridList)
 														.then(res => {
 															that.printId=res.data.data
+															uni.hideLoading()
 															if (res.data.code == 200) {
 																that.$api.msg('提交成功')
 																that.gridList.warehouseId =

pages/task/audit/refuel.vue

@@ -975,7 +975,9 @@
 					.status {
 						position: absolute;
 						border-radius: 50%;
-						padding: 0px 2px;
+						padding: 0px 8rpx;
+						width:40rpx;
+						height:40rpx;
 						right: -3px;
 						bottom: -3px;
 						background: #fff;

pages/user/newReport.vue

@@ -181,12 +181,13 @@
 					</view>
 				</view>
 				<view class="btn">
-					<view class="btn-in" :class='btnIndex==1?"btn-active":""' @click="changeWeight(1)">
-						折算纯重
-					</view>
 					<view class="btn-in" :class='btnIndex==2?"btn-active":""' @click="changeWeight(2)">
 						实际重量
 					</view>
+					<view class="btn-in" :class='btnIndex==1?"btn-active":""' @click="changeWeight(1)">
+						折算纯重
+					</view>
+
 
 
 				</view>