前端

config/index.js

@@ -2,6 +2,7 @@ const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrlNew: 'http://192.168.1.107:8090/',
 	// baseUrlNew: 'http://192.168.1.122:9100/',
+	// baseUrlNew: 'http://192.168.1.122:9100/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

pages/erp/exWarehousing/exWarehousing.vue

@@ -435,7 +435,7 @@
 				}
 
 
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -450,7 +450,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -470,12 +470,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -490,7 +490,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -505,7 +505,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -524,12 +524,12 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
 				}
-				if (this.detailData.grade == "请输入品级") {
+				if (this.detailData.grade == "请输入品级" && num == 2) {
 					this.$api.msg('品级不能为空')
 					return
 				}
@@ -545,7 +545,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if (!this.detailData.carNo) {
+				if (!this.detailData.carNo && num == 2) {
 					this.$api.msg('车牌号不能为空')
 					return
 				}
@@ -553,7 +553,7 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -410,7 +410,7 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -425,7 +425,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -444,12 +444,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -464,7 +464,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -479,7 +479,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -498,7 +498,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
@@ -519,7 +519,7 @@
 					this.$api.msg('出库类型不能为空')
 					return
 				}
-				if (!this.detailData.carNo) {
+				if (!this.detailData.carNo && num == 2) {
 					this.$api.msg('车牌号不能为空')
 					return
 				}
@@ -527,7 +527,7 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -363,7 +363,7 @@
 				console.log(e)
 			},
 			getContractNoList() {
-				this.imgUrl = []
+				// this.imgUrl = []
 				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
 					compId: this.compId,
 					flag: 7,
@@ -468,7 +468,7 @@
 				}
 			},
 			calculate() {
-				this.netWeight = this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight
+				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight).toFixed(2)
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -531,7 +531,7 @@
 				this.$api.msg('货名不能为空')
 				return
 			}
-			if (!this.detailData.grossWeight) {
+			if (!this.detailData.grossWeight && num == 2) {
 				this.$api.msg('毛重不能为空')
 				return
 			}
@@ -546,7 +546,7 @@
 				this.$api.msg('毛重输入错误！')
 				return
 			}
-			if (!this.detailData.tare) {
+			if (!this.detailData.tare && num == 2) {
 				this.$api.msg('皮重不能为空')
 				return
 			}
@@ -562,7 +562,7 @@
 				return
 			}
 			
-			if (!this.detailData.deductionWeight) {
+			if (!this.detailData.deductionWeight && num == 2) {
 				this.$api.msg('扣重不能为空')
 				return
 			}
@@ -581,12 +581,12 @@
 				this.$api.msg('皮重不能大于毛重')
 				return
 			}
-			if (this.netWeight <= 0) {
+			if (this.netWeight <= 0 && num == 2) {
 				this.$api.msg('净重不能小于等于0')
 				return
 			}
 			if (this.detailData.type == "潮粮") {
-				if (!this.detailData.buckleWeightRatio) {
+				if (!this.detailData.buckleWeightRatio && num == 2) {
 					this.$api.msg('扣重比不能为空')
 					return
 				}
@@ -601,7 +601,7 @@
 					this.$api.msg('扣重比输入错误！')
 					return
 				}
-				if (!this.detailData.solidGrainWater) {
+				if (!this.detailData.solidGrainWater && num == 2) {
 					this.$api.msg('干粮水分不能为空')
 					return
 				}
@@ -616,7 +616,7 @@
 					this.$api.msg('干粮水分输入错误！')
 					return
 				}
-				if (!this.detailData.tidalGrainWater) {
+				if (!this.detailData.tidalGrainWater && num == 2) {
 					this.$api.msg('潮粮水分不能为空')
 					return
 				}
@@ -631,7 +631,7 @@
 					this.$api.msg('扣款输入错误！')
 					return
 				}
-				if (!this.detailData.deductionAmount) {
+				if (!this.detailData.deductionAmount && num == 2) {
 					this.$api.msg('扣款不能为空')
 					return
 				}
@@ -650,7 +650,7 @@
 					this.$api.msg('潮粮水分输入错误！')
 					return
 				}
-				if (!this.detailData.pureWeight) {
+				if (!this.detailData.pureWeight && num == 2) {
 					this.$api.msg('纯重不能为空')
 					return
 				}
@@ -671,7 +671,7 @@
 				this.$api.msg('入库类型不能为空')
 				return
 			}
-			if (!this.detailData.carNo) {
+			if (!this.detailData.carNo && num == 2) {
 				this.$api.msg('车牌号不能为空')
 				return
 			}
@@ -679,11 +679,11 @@
 				this.$api.msg('车牌号输入有误！')
 				return
 			}
-			if (!this.detailData.addressUrl) {
+			if (!this.detailData.addressUrl && num == 2) {
 				this.$api.msg('请上传磅单')
 				return
 			}
-				if (!this.detailData.cost) {
+				if (!this.detailData.cost && num == 2) {
 					this.$api.msg('未获取到成本，请编辑后提交')
 					return
 				}
@@ -697,7 +697,7 @@
 					this.$api.msg('成本输入错误')
 					return
 				}
-			if (!this.detailData.freight) {
+			if (!this.detailData.freight && num == 2) {
 				this.$api.msg('运费不能为空')
 				return
 			}
@@ -904,7 +904,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/erp/warehousing/warehousing.vue

@@ -459,7 +459,7 @@
 				}
 			},
 			calculate() {
-				this.netWeight = this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight
+				this.netWeight = (this.detailData.grossWeight - this.detailData.tare - this.detailData.deductionWeight).toFixed(2)
 			},
 			getImgUrl(res) {
 				this.detailData.addressUrl = res
@@ -522,7 +522,7 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-				if (!this.detailData.grossWeight) {
+				if (!this.detailData.grossWeight && num == 2) {
 					this.$api.msg('毛重不能为空')
 					return
 				}
@@ -537,7 +537,7 @@
 					this.$api.msg('毛重输入错误！')
 					return
 				}
-				if (!this.detailData.tare) {
+				if (!this.detailData.tare && num == 2) {
 					this.$api.msg('皮重不能为空')
 					return
 				}
@@ -553,7 +553,7 @@
 					return
 				}
 
-				if (!this.detailData.deductionWeight) {
+				if (!this.detailData.deductionWeight && num == 2) {
 					this.$api.msg('扣重不能为空')
 					return
 				}
@@ -572,12 +572,12 @@
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
-				if (this.netWeight <= 0) {
+				if (this.netWeight <= 0 && num == 2) {
 					this.$api.msg('净重不能小于等于0')
 					return
 				}
 				if (this.detailData.type == "潮粮") {
-					if (!this.detailData.buckleWeightRatio) {
+					if (!this.detailData.buckleWeightRatio && num == 2) {
 						this.$api.msg('扣重比不能为空')
 						return
 					}
@@ -592,7 +592,7 @@
 						this.$api.msg('扣重比输入错误！')
 						return
 					}
-					if (!this.detailData.solidGrainWater) {
+					if (!this.detailData.solidGrainWater && num == 2) {
 						this.$api.msg('干粮水分不能为空')
 						return
 					}
@@ -607,7 +607,7 @@
 						this.$api.msg('干粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.tidalGrainWater) {
+					if (!this.detailData.tidalGrainWater && num == 2) {
 						this.$api.msg('潮粮水分不能为空')
 						return
 					}
@@ -622,7 +622,7 @@
 						this.$api.msg('扣款输入错误！')
 						return
 					}
-					if (!this.detailData.deductionAmount) {
+					if (!this.detailData.deductionAmount && num == 2) {
 						this.$api.msg('扣款不能为空')
 						return
 					}
@@ -641,7 +641,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (!this.detailData.pureWeight) {
+					if (!this.detailData.pureWeight && num == 2) {
 						this.$api.msg('纯重不能为空')
 						return
 					}
@@ -670,11 +670,11 @@
 					this.$api.msg('车牌号输入有误！')
 					return
 				}
-				if (!this.detailData.addressUrl) {
+				if (!this.detailData.addressUrl && num == 2) {
 					this.$api.msg('请上传磅单')
 					return
 				}
-					if (!this.detailData.cost) {
+					if (!this.detailData.cost && num == 2) {
 						this.$api.msg('未获取到成本，请编辑后提交')
 						return
 					}
@@ -688,7 +688,7 @@
 						this.$api.msg('成本输入错误')
 						return
 					}
-				if (!this.detailData.freight) {
+				if (!this.detailData.freight && num == 2) {
 					this.$api.msg('运费不能为空')
 					return
 				}
@@ -898,7 +898,7 @@
 
 			// border: 0;
 			.right-bottom {
-				width: 300rpx;
+				width: 280rpx;
 				text-align: right;
 			}
 		}

pages/grain_pulse/home.vue

@@ -153,6 +153,8 @@
 			}
 		 },
 		onShow(val) {
+			this.isLoadMore = false
+			this.currentPage = 1
 			uni.hideKeyboard()
 			uni.getStorage({
 				key: 'setLocaltion',

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -4,11 +4,14 @@
 			<view class="topInfo-item">
 				<view class="flex info">
 					<view class="logo">
-						<image src="../../../static/img/reject.png" mode="" v-if="OutList.taskStatus == '已驳回'||EnterList.taskStatus == '已驳回'"
-							style="height: 40rpx;"></image><!-- 驳回 -->
-						<image src="../../../static/img/tongguo.png" mode="" v-else-if="OutList.taskStatus == '已通过'||EnterList.taskStatus == '已通过'||OutList.taskStatus == '执行中'"
+						<image src="../../../static/img/reject.png" mode=""
+							v-if="OutList.taskStatus == '已驳回'||EnterList.taskStatus == '已驳回'" style="height: 40rpx;">
+						</image><!-- 驳回 -->
+						<image src="../../../static/img/tongguo.png" mode=""
+							v-else-if="OutList.taskStatus == '已通过'||EnterList.taskStatus == '已通过'||OutList.taskStatus == '执行中'"
 							style="height: 40rpx;"></image><!-- 通过 -->
-						<image src="../../../static/img/daishenhe.png" mode="" v-else-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'||EnterList.taskStatus == '待审核'"
+						<image src="../../../static/img/daishenhe.png" mode=""
+							v-else-if="OutList.taskStatus == '审核中'||OutList.taskStatus == '待审核'||EnterList.taskStatus == '待审核'"
 							style="height: 40rpx;"></image><!-- 待审核 -->
 					</view>
 					<view class="infoText" v-if="OutList.taskStatus">{{OutList.taskStatus}}</view>
@@ -53,7 +56,7 @@
 							<view class="right">{{retreatList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{retreatList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -113,7 +116,7 @@
 							<view class="right">{{OutList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{OutList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -186,7 +189,7 @@
 							<view class="right">{{EnterList.goodsName}}</view>
 						</view>
 						<view class='row'>
-							<view class="left">重量(吨)</view>
+							<view class="left">数量</view>
 							<view class="right">{{EnterList.weight}}</view>
 						</view>
 						<view class='row'>
@@ -237,7 +240,7 @@
 				<u-input v-model="rejectInfo" type="textarea" :border="border" class="rejectInfoCss"
 					placeholder="请输入驳回原因" />
 				<view class="flex">
-					<u-button @click="show1 = false" type="error"  hover-class='none'>取消</u-button>
+					<u-button @click="show1 = false" type="error" hover-class='none'>取消</u-button>
 					<u-button @click="rejectSubmit()" type="success">确定</u-button>
 				</view>
 			</view>
@@ -333,26 +336,38 @@
 				this.EnterList.gradeKey = e[0] + 1
 			},
 			passSubmit() {
-				this.OutList.inOutFlag = 1
-				this.EnterList.inOutFlag = 2
-				if (this.OutList.taskTypeKey == 1) {
-					this.requestadd(this.OutList)
-				} else if (this.EnterList.taskTypeKey == 2) {
-					this.requestadd(this.EnterList)
-				} else if (
-					this.OutList.taskTypeKey == 3 ||
-					this.OutList.taskTypeKey == 4
-				) {
-					this.requestadd(this.OutList, 'repetition')
-					if (!this.deletetask) {
-						this.requestadd(this.EnterList, 'repetition')
+				let that = this
+				uni.showModal({
+					content: "是否确定通过?",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							debugger
+							that.OutList.inOutFlag = 1
+							that.EnterList.inOutFlag = 2
+							if (that.OutList.taskTypeKey == 1) {
+								that.requestadd(that.OutList)
+							} else if (that.EnterList.taskTypeKey == 2) {
+								that.requestadd(that.EnterList)
+							} else if (
+								that.OutList.taskTypeKey == 3 ||
+								that.OutList.taskTypeKey == 4
+							) {
+								that.requestadd(that.OutList, 'repetition')
+								if (!that.deletetask) {
+									that.requestadd(that.EnterList, 'repetition')
+								}
+							}
+							if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey == 2) {
+								that.requestadd(that.retreatList)
+							} else if (that.retreatList.taskTypeKey == 3 || that.retreatList.taskTypeKey ==
+								4) {
+								that.requestadd(that.retreatList, 'repetition')
+							}
+						}
 					}
-				}
-				if(this.retreatList.taskTypeKey == 1 || this.retreatList.taskTypeKey == 2){
-					this.requestadd(this.retreatList)
-				}else if(this.retreatList.taskTypeKey == 3 || this.retreatList.taskTypeKey == 4){
-					this.requestadd(this.retreatList, 'repetition')
-				}
+				})
 			},
 			rejectSubmit() {
 				// （1出库2入库3移库4退库并出库）
@@ -360,38 +375,51 @@
 					this.$api.msg('驳回原因不能为空！')
 				} else {
 					this.show1 = false
-					if (this.OutList.taskTypeKey == 1 ) {
-						this.requestaudit(this.OutList)
-					} else if (this.OutList.taskTypeKey == 2) {
-						this.requestaudit(this.OutList)
-					} else if (
-						this.OutList.taskTypeKey == 3 ||
-						this.OutList.taskTypeKey == 4
-					) {
-						this.requestaudit(this.OutList, 'repetition')
-						if (!this.deletetask) {
-							this.requestaudit(this.OutList, 'repetition')
-						}
-					}
-					if(this.EnterList.taskTypeKey){
-						if(this.EnterList.taskTypeKey == 1 || this.EnterList.taskTypeKey == 2){
-						this.requestaudit(this.EnterList)
-					}else if(this.EnterList.taskTypeKey == 3 || this.EnterList.taskTypeKey == 4){
-						this.requestaudit(this.EnterList, 'repetition')
-					}
-					}
-					
-					if(this.retreatList.taskTypeKey){
-						if(this.retreatList.taskTypeKey == 1 || this.retreatList.taskTypeKey == 2){
-							this.requestaudit(this.retreatList)
-						}else if(this.retreatList.taskTypeKey == 3 || this.retreatList.taskTypeKey == 4){
-							this.requestaudit(this.retreatList, 'repetition')
+					let that = this
+					uni.showModal({
+						content: "是否确定驳回?",
+						showCancel: true,
+						confirmText: '确定',
+						success: function(res) {
+							if (res.confirm) {
+
+								if (that.OutList.taskTypeKey == 1) {
+									that.requestaudit(that.OutList)
+								} else if (that.OutList.taskTypeKey == 2) {
+									that.requestaudit(that.OutList)
+								} else if (
+									that.OutList.taskTypeKey == 3 ||
+									that.OutList.taskTypeKey == 4
+								) {
+									that.requestaudit(that.OutList, 'repetition')
+									if (!that.deletetask) {
+										that.requestaudit(that.OutList, 'repetition')
+									}
+								}
+								if (that.EnterList.taskTypeKey) {
+									if (that.EnterList.taskTypeKey == 1 || that.EnterList.taskTypeKey == 2) {
+										that.requestaudit(that.EnterList)
+									} else if (that.EnterList.taskTypeKey == 3 || that.EnterList.taskTypeKey ==
+										4) {
+										that.requestaudit(that.EnterList, 'repetition')
+									}
+								}
+								if (that.retreatList.taskTypeKey) {
+									if (that.retreatList.taskTypeKey == 1 || that.retreatList.taskTypeKey ==
+										2) {
+										that.requestaudit(that.retreatList)
+									} else if (that.retreatList.taskTypeKey == 3 || that.retreatList
+										.taskTypeKey == 4) {
+										that.requestaudit(that.retreatList, 'repetition')
+									}
+								}
+							}
 						}
-					}
+					})
 				}
 			},
 			requestadd(list, status) {
-				
+
 				list.compId = sessionStorage.getItem('ws-pf_compId')
 				list.publisher = this.userInfo.userName
 				uni.showLoading({
@@ -409,7 +437,7 @@
 							if (res.data.code == 200) {
 								this.$api.msg('审核成功！')
 								setTimeout(function() {
-										uni.navigateBack()
+									uni.navigateBack()
 								}, 1000);
 							}else{
 								this.$api.msg('审核失败！')
@@ -468,13 +496,201 @@
 							if (res.data.code == 200) {
 								this.$api.msg('驳回成功！')
 								setTimeout(function() {
-										uni.navigateBack()
+									uni.navigateBack()
 								}, 1000);
 							}
 						})
 					}
 				})
 			},
+			check() {
+				// （1出库2入库3移库4退库并出库）taskTypeKey
+				if(this.OutList.taskTypeKey == 1 || this.OutList.taskTypeKey == 3){
+					if (!this.OutList.grade) {
+					this.$api.msg('品级不能为空')
+					return
+				}
+				if (!this.OutList.bulkDensity) {
+					this.$api.msg('容重不能为空')
+					return
+				}
+				if (this.OutList.bulkDensity < 500 || this.OutList.bulkDensity > 1000) {
+					this.$api.msg('容重输入错误')
+					return
+				}
+				if (String(this.OutList.bulkDensity).indexOf('.') != -1 && String(this.OutList.bulkDensity).length - (
+						String(this.OutList.bulkDensity).indexOf('.') + 1) > 0) {
+					this.$api.msg('容重输入错误')
+					return
+				}
+				if (!this.OutList.waterContent) {
+					this.$api.msg('水分不能为空')
+					return
+				}
+				if (isNaN(this.OutList.waterContent) ||
+					(String(this.OutList.waterContent).indexOf('.') != -1 &&
+						String(this.OutList.waterContent).length -
+						(String(this.OutList.waterContent).indexOf('.') + 1) >
+						2) ||
+					this.OutList.waterContent < 1 ||
+					this.OutList.waterContent > 40
+				) {
+					this.$api.msg('水分输入错误！')
+					return
+				}
+				if (!this.OutList.unitPrice) {
+					this.$api.msg('单价不能为空')
+					return
+				}
+				if (isNaN(this.OutList.unitPrice) ||
+					(String(this.OutList.unitPrice).indexOf('.') != -1 &&
+						String(this.OutList.unitPrice).length -
+						(String(this.OutList.unitPrice).indexOf('.') + 1) >
+						2) ||
+					this.OutList.unitPrice < 1 ||
+					this.OutList.unitPrice > 10000
+				) {
+					this.$api.msg('单价输入错误！')
+					return
+				}
+				}
+				
+				if (this.OutList.taskTypeKey == 1) {
+					if (!this.OutList.businessDescribe) {
+						this.$api.msg('业务描述不能为空')
+						return
+					}
+					if (this.OutList.businessDescribe.length > 150) {
+						this.$api.msg('业务描述长度错误')
+						return
+					}
+				}
+				if (this.EnterList.taskTypeKey ==2 && this.EnterList.judge) {
+					if (!this.EnterList.grade) {
+						this.$api.msg('品级不能为空')
+						return
+					}
+					if (!this.EnterList.bulkDensity) {
+						this.$api.msg('容重不能为空')
+						return
+					}
+					if (this.EnterList.bulkDensity < 500 || this.EnterList.bulkDensity > 1000) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (String(this.EnterList.bulkDensity).indexOf('.') != -1 && String(this.EnterList.bulkDensity).length - (
+							String(this.EnterList.bulkDensity).indexOf('.') + 1) > 0) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (!this.EnterList.waterContent) {
+						this.$api.msg('水分不能为空')
+						return
+					}
+					if (isNaN(this.EnterList.waterContent) ||
+						(String(this.EnterList.waterContent).indexOf('.') != -1 &&
+							String(this.EnterList.waterContent).length -
+							(String(this.EnterList.waterContent).indexOf('.') + 1) >
+							2) ||
+						this.EnterList.waterContent < 1 ||
+						this.EnterList.waterContent > 40
+					) {
+						this.$api.msg('水分输入错误！')
+						return
+					}
+					if (!this.EnterList.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+					if (isNaN(this.EnterList.unitPrice) ||
+						(String(this.EnterList.unitPrice).indexOf('.') != -1 &&
+							String(this.EnterList.unitPrice).length -
+							(String(this.EnterList.unitPrice).indexOf('.') + 1) >
+							2) ||
+						this.EnterList.unitPrice < 1 ||
+						this.EnterList.unitPrice > 10000
+					) {
+						this.$api.msg('单价输入错误！')
+						return
+					}
+					if (!this.EnterList.businessDescribe) {
+						this.$api.msg('业务描述不能为空')
+						return
+					}
+					if (this.EnterList.businessDescribe.length > 150) {
+						this.$api.msg('业务描述长度错误')
+						return
+					}
+				}
+				if (this.OutList.taskTypeKey == 3) {
+					if (!this.EnterList.businessDescribe) {
+						this.$api.msg('业务描述不能为空')
+						return
+					}
+					if (this.EnterList.businessDescribe.length > 150) {
+						this.$api.msg('业务描述长度错误')
+						return
+					}
+				}
+				if(this.retreatList.taskTypeKey == 4 && this.retreatList.judge){
+					if (!this.retreatList.grade) {
+						this.$api.msg('品级不能为空')
+						return
+					}
+					if (!this.retreatList.bulkDensity) {
+						this.$api.msg('容重不能为空')
+						return
+					}
+					if (this.retreatList.bulkDensity < 500 || this.retreatList.bulkDensity > 1000) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (String(this.retreatList.bulkDensity).indexOf('.') != -1 && String(this.retreatList.bulkDensity).length - (
+							String(this.retreatList.bulkDensity).indexOf('.') + 1) > 0) {
+						this.$api.msg('容重输入错误')
+						return
+					}
+					if (!this.retreatList.waterContent) {
+						this.$api.msg('水分不能为空')
+						return
+					}
+					if (isNaN(this.retreatList.waterContent) ||
+						(String(this.retreatList.waterContent).indexOf('.') != -1 &&
+							String(this.retreatList.waterContent).length -
+							(String(this.retreatList.waterContent).indexOf('.') + 1) >
+							2) ||
+						this.retreatList.waterContent < 1 ||
+						this.retreatList.waterContent > 40
+					) {
+						this.$api.msg('水分输入错误！')
+						return
+					}
+					if (!this.retreatList.unitPrice) {
+						this.$api.msg('单价不能为空')
+						return
+					}
+					if (isNaN(this.retreatList.unitPrice) ||
+						(String(this.retreatList.unitPrice).indexOf('.') != -1 &&
+							String(this.retreatList.unitPrice).length -
+							(String(this.retreatList.unitPrice).indexOf('.') + 1) >
+							2) ||
+						this.retreatList.unitPrice < 1 ||
+						this.retreatList.unitPrice > 10000
+					) {
+						this.$api.msg('单价输入错误！')
+						return
+					}
+					if (!this.EnterList.businessDescribe) {
+						this.$api.msg('业务描述不能为空')
+						return
+					}
+					if (this.EnterList.businessDescribe.length > 150) {
+						this.$api.msg('业务描述长度错误')
+						return
+					}
+				}
+
+			}
 		}
 	}
 </script>
@@ -578,29 +794,30 @@
 	.rejectText {
 		text-align: center;
 	}
+
 	.topInfo {
 		height: 210rpx;
 		background: linear-gradient(270deg, #22C572 0%, #34DE8A 100%);
 		padding: 30rpx;
-	
+
 		.topInfo-item {
 			height: 150rpx;
 			background-color: #FFFFFF;
 			border-radius: 20rpx;
 			padding: 40rpx;
-	
+
 			.logo {
 				width: 40rpx;
 				height: 40rpx;
 				margin-top: 8rpx;
 			}
-	
+
 			.infoText {
 				font-size: 36rpx;
 				font-weight: 600;
 				margin-left: 20rpx;
 			}
-	
+
 			.infoData {
 				color: #878C9C;
 				font-size: 26rpx;

pages/task/audit/Issueandreceipt_task_details.vue

@@ -24,7 +24,7 @@
 					<u-input v-model="OutList.inOutType" input-align="right" disabled v-if="OutList.inOutType" />
 					<u-input v-model="EnterList.inOutType" input-align="right" disabled v-else />
 				</u-form-item>
-				<view v-if="retreatList.judge == 3">
+				<view v-if="retreatList.judge == 3 && retreatList">
 					<!-- 退库 -->
 					<view class="uForm_item">
 						<view class="title part2">{{retreatList.inOutType}}</view>
@@ -66,21 +66,19 @@
 						</view>
 					</view>
 					<view class="uForm_item">
-						<u-form-item label="品级" prop="grade" label-width="150">
+						<u-form-item label="品级" prop="grade" label-width="150" disabled>
 							<u-input v-model="retreatList.grade" input-align="right" placeholder="" @click='show=true'
 								disabled />
-							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
-								mode="selector">
 							</u-picker>
 						</u-form-item>
 						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190">
-							<u-input v-model="retreatList.bulkDensity" input-align="right" placeholder="" />
+							<u-input v-model="retreatList.bulkDensity" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160">
-							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" />
+							<u-input v-model="retreatList.waterContent" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160">
-							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" />
+							<u-input v-model="retreatList.unitPrice" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 					</view>
 				</view>
@@ -128,36 +126,34 @@
 
 					<view class="uForm_item">
 						<u-form-item label="品级" prop="grade" label-width="150" v-if="retreatList.inOutType != '退库'">
-							<u-input v-model="OutList.grade" input-align="right" placeholder="" @click='show=true'
+							<u-input v-model="OutList.grade" input-align="right" placeholder="" 
 								disabled />
-							<u-picker :range="pjList" range-key="type" @confirm='pjPicker($event)' v-model="show"
-								mode="selector"></u-picker>
 						</u-form-item>
 						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
 							v-if="retreatList.inOutType != '退库'">
-							<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" />
+							<u-input v-model="OutList.bulkDensity" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
-							v-if="retreatList.inOutType != '退库'">
-							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" />
+							v-if="retreatList.inOutType != '退库'" >
+							<u-input v-model="OutList.waterContent" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
 							v-if="retreatList.inOutType != '退库'">
-							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" />
+							<u-input v-model="OutList.unitPrice" input-align="right" placeholder="" disabled/>
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top"
 							v-if="OutList.inOutType != '移库出库'">
 							<u-input v-model="OutList.businessDescribe" input-align="left" placeholder="请输入业务描述"
-								type="textarea" class="textarea" maxlength="150" />
+								type="textarea" class="textarea" maxlength="150" disabled/>
 						</u-form-item>
 						<u-form-item v-if="retreatList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber"
 							label-width="170">
-							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" />
+							<u-input v-model="OutList.binNumber" input-align="right" placeholder="未指定" disabled/>
 						</u-form-item>
 					</view>
 
 				</view>
-				<view v-if="EnterList.judge == 2">
+				<view v-if="EnterList.judge == 2 && EnterList">
 					<view class="uForm_item">
 						<!-- 入库 -->
 						<view class="title part2">{{EnterList.inOutType}}</view>
@@ -203,34 +199,37 @@
 						<u-form-item label="品级" prop="grade" label-width="150" v-if="EnterList.inOutType != '移库入库' ">
 							<u-input v-model="EnterList.grade" input-align="right" placeholder="请选择品级"
 								@click='show=true' disabled />
-							<u-picker :range="pjList" range-key="type" @confirm='pjPicker1($event)' v-model="show"
-								mode="selector">
 							</u-picker>
 						</u-form-item>
 						<u-form-item label="容重(克/升)>=" prop="bulkDensity" label-width="190"
 							v-if="EnterList.inOutType != '移库入库'">
-							<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" />
+							<u-input v-model="EnterList.bulkDensity" input-align="right" placeholder="请输入容重占比" disabled/>
 						</u-form-item>
 						<u-form-item label="水分(%)<=" prop="waterContent" label-width="160"
 							v-if="EnterList.inOutType != '移库入库'">
-							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" />
+							<u-input v-model="EnterList.waterContent" input-align="right" placeholder="请输入水分占比" disabled/>
 						</u-form-item>
 						<u-form-item label="单价(元/吨)" prop="unitPrice" label-width="160"
 							v-if="EnterList.inOutType != '移库入库'">
-							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" />
+							<u-input v-model="EnterList.unitPrice" input-align="right" placeholder="请输入单价" disabled/>
 						</u-form-item>
 						<u-form-item label="业务描述" prop="businessDescribe" label-width="160" label-position="top">
 							<u-input v-model="EnterList.businessDescribe" input-align="left" placeholder="请输入业务描述"
-								type="textarea" class="textarea" maxlength="150" />
+								type="textarea" class="textarea" maxlength="150" disabled/>
 						</u-form-item>
 						<u-form-item v-if="OutList.inOutType!='退库'" label="仓位号(选填)" prop="binNumber" label-width="170">
-							<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" />
+							<u-input v-model="EnterList.binNumber" input-align="right" placeholder="未指定" disabled/>
 						</u-form-item>
 					</view>
-
+				</view>
+				<view class="uForm_item" v-if="OutList.taskTypeKey == 3 && !EnterList.judge">
+					<view class="deleteText">移库入库（已删除）</view>
 				</view>
 			</u-form>
 		</view>
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='fanHui' type="success" class="btn1" hover-class='none'>返回</u-button>
+		</view>
 	</view>
 
 </template>
@@ -339,7 +338,7 @@
 				}
 			},
 			rejectSubmit() {
-				// （1出库2入库3移库4退库并出库）
+				// （1出库2入库3移库4退库并出库）taskTypeKey
 				if (!this.rejectInfo) {
 					this.$api.msg('驳回原因不能为空！')
 				} else {
@@ -417,6 +416,9 @@
 					}
 				})
 			},
+			fanHui(){
+				uni.navigateBack()
+			}
 		}
 	}
 </script>
@@ -424,7 +426,7 @@
 <style scoped lang="scss">
 	.content1 {
 		margin: 10rpx;
-		padding-bottom: 224rpx;
+		padding-bottom: 120rpx;
 
 		.title {
 			height: 70rpx;
@@ -549,5 +551,10 @@
 				margin-top: 10rpx;
 			}
 		}
+		
 	}
+	.deleteText{
+		text-align: center;
+		color: #AFB3BF;
+		}
 </style>

pages/task/audit/acquisition_settlement_details.vue

@@ -19,7 +19,7 @@
 		</view>
 		<view class='content1'>
 			<view class='row content-item'>
-				<view class="left" style="color: #878C9C ;">仓库</view>
+				<view class="left" style="color: #878C9C;">仓库</view>
 				<view class="right">{{warehouseName}}</view>
 			</view>
 			<view class="content-item">
@@ -37,10 +37,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-	<!-- 	<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click='rejectSubmit()' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button @click='passSubmit()' type="success" class="btn2">通过</u-button>
-		</view> -->
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click='fanHui' type="success" class="btn2">返回</u-button>
+		</view>
 	</view>
 </template>
 
@@ -158,6 +157,9 @@
 					}
 				}
 			},
+			fanHui(){
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

pages/task/audit/freight_setting_approval.vue

@@ -50,7 +50,7 @@
 		data() {
 			return {
 				list: {
-					priceStatus:"",
+					priceStatus: "",
 				},
 				id: "",
 			}
@@ -71,20 +71,35 @@
 				})
 			},
 			passSubmit() {
+				console.log(this.list.id)
 				var that = this
-				var tranProcessInfo = {}
-				tranProcessInfo.id = this.list.id
-				tranProcessInfo.flag = "2"
-				tranProcessInfo.tranPriceIng = this.list.tranPriceIng
-				tranProcessInfo.reviewer = this.userInfo.userName
-				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
-					if (res.data.code == 200) {
-						this.$api.msg('审核通过成功!')
-						setTimeout(function() {
-							uni.navigateBack()
-						}, 1000);
+				if (!this.list.tranPriceIng) {
+					this.$api.msg('运费单价不能为空')
+					return
+				}
+				uni.showModal({
+					content: "是否通过该设置?",
+					showCancel: true,
+					confirmText: '确定',
+					success: function(res) {
+						if (res.confirm) {
+							var tranProcessInfo = {}
+							tranProcessInfo.id = that.list.id
+							tranProcessInfo.flag = "2"
+							tranProcessInfo.tranPriceIng = that.list.tranPriceIng
+							tranProcessInfo.reviewer = that.userInfo.userName
+							tranProcessInfo.tranTypeKey = 1
+							that.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo)
+								.then(res => {
+									if (res.data.code == 200) {
+										that.$api.msg('审核通过成功!')
+										setTimeout(function() {
+											uni.navigateBack()
+										}, 1000);
+									}
+							})
+						}
 					}
-
 				})
 			}
 		}

pages/task/audit/freight_setting_details.vue

@@ -34,11 +34,11 @@
 					<u-input v-model="list.receiveDetailedAddress" input-align="right" placeholder="收货地址" disabled />
 				</u-form-item>
 				<u-form-item label="运费（元/吨）" prop="tranPrice" label-width="250">
-					<u-input v-model="list.tranPriceIng" input-align="right" placeholder="请输入运费单价" />
+					<u-input v-model="list.tranPrice" input-align="right" placeholder="请输入运费单价" disabled/>
 				</u-form-item>
 			</u-form>
 		</view>
-		<!-- <u-button type="primary" class="submit" @click="passSubmit()" v-if="list.priceStatus == '审核中'">通过</u-button> -->
+	     <u-button type="primary" class="submit" @click="fanHui()">返回</u-button>
 	</view>
 </template>
 
@@ -49,7 +49,9 @@
 	export default {
 		data() {
 			return {
-				list: {},
+				list: {
+					priceStatus:"",
+				},
 				id: "",
 			}
 		},
@@ -78,12 +80,15 @@
 				this.$api.doRequest('post', '/tranProcessInfo/api/setUpTranPrice', tranProcessInfo).then(res => {
 					if (res.data.code == 200) {
 						this.$api.msg('审核通过成功!')
-						this.setTimeout(function() {
+						setTimeout(function() {
 							uni.navigateBack()
 						}, 1000);
 					}
 
 				})
+			},
+			fanHui(){
+				uni.navigateBack()
 			}
 		}
 	}

pages/task/audit/freight_settlement_details.vue

@@ -52,10 +52,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<!-- <view style='padding:10px;' class='flex bottom-btn'>
-			<u-button @click="rejectSubmit()" type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click="passSubmit()" type="success" class="btn2">通过</u-button>
-		</view> -->
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button @click="fanHui" type="success" class="btn1" hover-class='none'>返回</u-button>
+		</view>
 	</view>
 </template>
 
@@ -145,6 +144,9 @@
 					}
 				}
 			},
+			fanHui(){
+				uni.navigateBack()
+			}
 		}
 	}
 </script>
@@ -152,7 +154,7 @@
 <style scoped lang="scss">
 	.container {
 		margin: 10rpx;
-		padding: 20rpx 20rpx 230rpx 20rpx;
+		padding: 20rpx 20rpx 110rpx 20rpx;
 	}
 
 	.content {

pages/task/audit/purchase_settlement_approval.vue

@@ -159,11 +159,15 @@
 					})
 				} else {
 					if (status == true) {
-						that.$api.msg('通过成功')
-						this.getList()
+						this.$api.msg('通过成功')
+						setTimeout(function() {
+								uni.navigateBack()
+						}, 1000);
 					} else if (status == false) {
-						that.$api.msg('驳回成功')
-						this.getList()
+						this.$api.msg('驳回成功')
+						setTimeout(function() {
+								uni.navigateBack()
+						}, 1000);
 					}
 				}
 			},

pages/task/audit/purchase_settlement_details.vue

@@ -44,14 +44,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
-		<!-- <view class="bottom-btn">
-			<u-button type="primary" class="submit" hover-class="none" @click="rejectSubmit()">驳回</u-button>
-			<u-button type="primary" class="submit" hover-class="none" @click="passSubmit()">通过</u-button>
-		</view> -->
-	<!-- 	<view style='padding:10px;' class='flex bottom-btn'>
-			<u-button  @click='rejectSubmit' type="error" class="btn1" hover-class='none'>驳回</u-button>
-			<u-button  @click='passSubmit' type="success" class="btn2">通过</u-button>
-		</view> -->
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='fanHui' type="success" class="btn2">返回</u-button>
+		</view>
 	</view>
 </template>
 
@@ -62,7 +57,9 @@
 				id: "",
 				currentPage: 1,
 				pageSize: 10,
-				list: [],
+				list: [
+					{status:"",}
+				],
 				contractNo: "",
 			}
 		},
@@ -163,6 +160,9 @@
 					}
 				}
 			},
+			fanHui(){
+				uni.navigateBack()
+			}
 		}
 	}
 </script>

pages/task/audit/warehouse_details.vue

@@ -70,6 +70,9 @@
 			</view>
 		</view>
 		<u-toast ref="uToast" />
+		<view style='padding:10px;' class='flex bottom-btn'>
+			<u-button  @click='fanHui' type="success" class="btn2">返回</u-button>
+		</view>
 	</view>
 </template>
 
@@ -139,7 +142,7 @@
 									}).then(res1 => {
 										if (res1.data.code == 200) {
 											that.$api.msg('审核成功');
-											that.setTimeout(function() {
+											setTimeout(function() {
 													uni.navigateBack()
 											}, 1000);
 										} else {
@@ -170,10 +173,7 @@
 							}).then(res1 => {
 								if (res1.data.code == 200) {
 									that.$api.msg('驳回成功');
-									// that.$nextTick(function() {
-									// 	uni.navigateBack()
-									// })
-									this.setTimeout(function() {
+									setTimeout(function() {
 											uni.navigateBack()
 									}, 1000);
 								} else {
@@ -183,6 +183,9 @@
 						}
 					}
 				})
+			},
+			fanHui(){
+				uni.navigateBack()
 			}
 		}
 	}