前端默认热损伤等

pages.json

@@ -1570,7 +1570,7 @@
 						{
 						"color": "#000",
 						"fontSize": "28rpx",
-						"text": "发布"
+						"text": "发起"
 						}
 						]
 				    }

pages/erpbusiness/add_quality_testing.vue

@@ -746,6 +746,7 @@
 					},
 				],
 				cangid: '',
+				
 				inType:""//入库类型
 			}
 		},
@@ -827,8 +828,8 @@
 
 			// 	this.gridList.customerNumberCard = _customerInfo.customerNumberCard
 			// }
-			this.gridList.grade = this.gradeList[0].value
-			this.gridList.gradeKey = this.gradeList[0].key
+			this.gridList.grade = this.gradeList[1].value
+			this.gridList.gradeKey = this.gradeList[1].key
 			
 			this.$api.doRequest('get', '/qualityInspectionManagement/api/goodsName', {
 				warehouseId: this.cangid
@@ -1083,6 +1084,8 @@
 					// number = number.substring(number.length - 4, number.length)
 					// this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
 				}
+				this.gridList.grade = this.gradeList[1].value
+				this.gridList.gradeKey = this.gradeList[1].key
 				this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
 					flag: this.flag,
 					warehouseName: this.gridList.warehouseName
@@ -1155,8 +1158,16 @@
 					this.gridList.goodsName = this.taskNolist[e[0]].goodsName
 					if (this.taskNolist[e[0]].goodsName.indexOf("潮粮") != -1) { //收购从合同中带出货名  单价等信息  用货名是否带有潮粮字符来判断干潮类型
 						this.gridList.type = "潮粮"
+						this.gridList.imperfectGrain=8
+						this.gridList.impurity=1
+						this.gridList.mildewGrain=2
+						this.gridList.jiaorenli=0
 					} else {
 						this.gridList.type = "干粮"
+						this.gridList.imperfectGrain=8
+						this.gridList.impurity=1
+						this.gridList.mildewGrain=2
+						this.gridList.jiaorenli=1
 					}
 				}
 				if (this.taskNolist[e[0]].contractNo) {
@@ -1205,6 +1216,10 @@
 							this.gridList.goodsName = this.contractNolist.goodsName
 							if (this.gridList.goodsName == '玉米') {
 								this.gridList.type = '干粮'
+								this.gridList.imperfectGrain=8
+								this.gridList.impurity=1
+								this.gridList.mildewGrain=2
+								this.gridList.jiaorenli=1
 								if (this.contractNolist.priceType != '随行就市') {
 									this.gridList.dryGrainPrice = this.contractNolist.contractPrice
 								}
@@ -1216,9 +1231,16 @@
 									this.gridList.tidalGrainPrice = this.contractNolist.contractPrice
 									this.tidalGrainPrice = this.contractNolist.contractPrice
 								}
-
+								this.gridList.imperfectGrain=8
+								this.gridList.impurity=1
+								this.gridList.mildewGrain=2
+								this.gridList.jiaorenli=0
 							} else {
 								this.gridList.type = '干粮'
+								this.gridList.imperfectGrain=8
+								this.gridList.impurity=1
+								this.gridList.mildewGrain=2
+								this.gridList.jiaorenli=1
 								this.edit = false
 								if (this.contractNolist.priceType != '随行就市') {
 									this.gridList.dryGrainPrice = this.contractNolist.contractPrice
@@ -1226,7 +1248,9 @@
 							}
 						}
 						this.gridList.goodsNameKey = this.contractNolist.goodsNameKey
-						this.gridList.grade = this.contractNolist.grade
+						this.gridList.grade = this.gradeList[1].value
+						this.gridList.gradeKey = this.gradeList[1].key
+						// this.gridList.grade = this.contractNolist.grade
 						this.gridList.inOutType = this.contractNolist.inOutType
 						
 						if (this.gridList.inOutType == '采购入库') {
@@ -1544,7 +1568,7 @@
 							}
 						}
 
-						if (!this.gridList.jiaorenli) {
+						if (!this.gridList.jiaorenli&&this.gridList.jiaorenli!=0) {
 							this.$api.msg('热损伤不能为空')
 							return
 						}

pages/universalityAudit/list.vue

@@ -1,22 +1,25 @@
 <template>
 	<view>
-		<view class='wrap' v-for='item in datalist' @click='lookdetails(item)'>
-			<view style='display:flex;justify-content: space-between;'>
-				<view class='title'>
-					{{item.businessType}}
-				</view>
-				<view v-if='item.approveStatus' style='color:#FD714F;'>
-					{{item.approveStatus?item.approveStatus:item.status}}
-				</view>
-				<view v-if='item.status=="已驳回"' style='color:#FF4E4E;'>
-					{{item.approveStatus?item.approveStatus:item.status}}
-				</view>
-				<view v-if='item.status=="已通过"' style='color:#22C572;'>
-					{{item.approveStatus?item.approveStatus:item.status}}
+		<view v-if='datalist.length>0'>
+			<view class='wrap' v-for='item in datalist' @click='lookdetails(item)'>
+				<view style='display:flex;justify-content: space-between;'>
+					<view class='title'>
+						{{item.businessType}}
+					</view>
+					<view v-if='item.approveStatus' style='color:#FD714F;'>
+						{{item.approveStatus?item.approveStatus:item.status}}
+					</view>
+					<view v-if='item.status=="已驳回"' style='color:#FF4E4E;'>
+						{{item.approveStatus?item.approveStatus:item.status}}
+					</view>
+					<view v-if='item.status=="已通过"' style='color:#22C572;'>
+						{{item.approveStatus?item.approveStatus:item.status}}
+					</view>
 				</view>
+				<view>{{item.createDate}}</view>
 			</view>
-			<view>{{item.createDate}}</view>
 		</view>
+		<view v-if='show' style='text-align:center;background:#F2F6FA;'>暂无更多数据</view>
 	</view>
 </template>
 
@@ -26,12 +29,22 @@
 			return {
 				datalist:[],
 				currentPage:1,
+				show:false,
 				pageSize:10
 			}
 		},
 		onShow(){
 			this.getList()
 		},
+		onReachBottom() { //上拉触底函数
+			// if (this.statusFlag == 3) {
+				if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
+					this.pageSize += 1
+					this.currentPage += 1
+					this.getList()
+				}
+			// }
+		},
 		methods: {
 			lookdetails(row){
 				uni.navigateTo({
@@ -44,6 +57,9 @@
 			    })
 			  },
 			getList(){
+				uni.showLoading({
+					title: "正在加载"
+				})
 				this.$api.doRequest('get', '/generalAuditInfo/selectGeneralAuditInfo', {
 					startDate: '',
 					endDate: '',
@@ -53,7 +69,30 @@
 					searchType: '',
 					businessType: ''
 				}).then(res => {
-					this.datalist=res.data.data.records
+					if(res.data.code==200){
+						uni.hideLoading()
+						if(res.data.data.records.length>0){
+							this.show=false
+							if(this.currentPage==1){
+								this.datalist=res.data.data.records
+							}else{
+								this.datalist=this.datalist.concat(res.data.data.records)
+							}
+						}else{
+							this.show=true
+							if(this.currentPage==1){
+								this.datalist=[]
+							}
+						}
+					}else{
+						uni.hideLoading()
+						uni.showToast({
+							title: "系统异常，请联系管理员",
+							icon: 'none',
+							duration: 2000
+						})
+					}
+					
 				})
 			}
 		}