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

# Conflicts:
#	config/index.js

pages.json

@@ -883,6 +883,15 @@
 		        "enablePullDownRefresh": false
 		    }
 		    
+		},
+		{
+		    "path" : "pages/erp/exWarehousing/selectCarNo",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "选择车牌号",
+		        "enablePullDownRefresh": false
+		    }
+		    
 		}
         ,{
             "path" : "pages/erp/improvedWrehousing/improvedWrehousing",
@@ -956,6 +965,115 @@
             }
             
         }
+        ,{
+            "path" : "pages/task/audit/warehouse_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "仓库设置审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/warehouse_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "仓库设置详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_setting_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费设置审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_setting_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费设置详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_settlement_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/freight_settlement_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "运费结算详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/acquisition_settlement_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/acquisition_settlement_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "收购结算详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/purchase_settlement_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "采购结算审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+		,{
+		    "path" : "pages/task/audit/purchase_settlement_details",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "采购结算详情",
+		        "enablePullDownRefresh": false
+		    }
+		    
+		}
+        ,{
+            "path" : "pages/task/audit/Issueandreceipt_task_approval",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "出入库任务审核",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/task/audit/Issueandreceipt_task_details",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "出入库任务详情",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        
     ],
 	"subpackages": [{
 			"root": "pageA",
@@ -1682,7 +1800,7 @@
 				, {
 					"path": "warehousings/warehousingDetails",
 					"style": {
-						"navigationBarTitleText": "详情",
+						"navigationBarTitleText": "入库详情",
 						"enablePullDownRefresh": false
 					}
 

pages/attestation/indexTwo.vue

@@ -190,6 +190,7 @@
 				}
 			},
 			open(item) {
+				console.log(item.id)
 				this.id = item.id
 				this.pricestatus = !this.pricestatus
 			},
@@ -242,7 +243,7 @@
 					});
 			},
 			amendprice(item) {
-				this.identityAuthenticationInfo.id = item.id
+				this.identityAuthenticationInfo.id = this.id
 				this.identityAuthenticationInfo.customerPhone = this.price
 				var that = this
 				this.$api.doRequest('get', '/commonUser/loginVerifyCode', {
@@ -269,9 +270,8 @@
 																icon: 'none',
 																duration: 2000
 															})
-															uni.navigateTo({
-																url: `/pages/attestation/indexTwo`,
-															})
+															that.pricestatusTwo = false
+															that.getList()
 														}).catch(res => {
 														uni.showToast({
 															title: res.data.message,

pages/erp/exWarehousing/exWarehousing.vue

@@ -224,7 +224,7 @@
 			this.cangId = options.cangId
 		},
 		onShow() {
-			let _data = uni.getStorageSync('erpContractNoCK')==''?{}:uni.getStorageSync('erpContractNoCK')
+			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
 			this.detailData.goodsName = _data.goodsName;
@@ -232,18 +232,23 @@
 				this.detailData.contractNo = _data.contractNo;
 			}
 			this.detailData.goodsNameKey = _data.goodsNameKey;
-			this.detailData.carNo = uni.getStorageSync('erpcarNoCK')
 			if (!_data.tranCarInfoList) {
 				this.isPC = false
 				_data.tranCarInfoList = []
 			} else {
 				this.isPC = true
-				if (uni.getStorageSync('ContractNoCar')) {
-					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
+				if (uni.getStorageSync('ContractNoCarCK')) {
+					this.detailData.carNo = uni.getStorageSync('ContractNoCarCK')
 				} else {
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
+			if (this.detailData.carNo) {
+				for (let i = 0; i < uni.getStorageSync('erpContractNoCK').tranCarInfoList.length; i++) {
+					if (uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].carNo == this.detailData.carNo)
+						this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].tranCarNo
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			} else {
@@ -259,7 +264,7 @@
 			this.detailData.inOutDate = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 			//出库类型
 			this.outWarehouse()
-			if(helper.erpWarehouse.personCharge){
+			if (helper.erpWarehouse.personCharge) {
 				this.detailData.agent = helper.erpWarehouse.personCharge
 			}
 			//经办人
@@ -298,7 +303,7 @@
 				this.detailData.type = this.typeList[e].type
 			},
 			pjPicker(e) {
-				this.detailData.gradeKey = e[0]
+				this.detailData.gradeKey = e[0] + 1
 				this.detailData.grade = this.pjList[e].type
 			},
 			handlerPicker(e) {
@@ -310,6 +315,17 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				if (this.detailData.inOutType == '销售出库') {
+					this.detailData.inOutTypeKey = 1
+				} else if (this.detailData.inOutType == '移库出库') {
+					this.detailData.inOutTypeKey = 3
+				} else if (this.detailData.inOutType == '暂存出库') {
+					this.detailData.inOutTypeKey = 4
+				} else if (this.detailData.inOutType == '贸易服务出库') {
+					this.detailData.inOutTypeKey = 5
+				} else if (this.detailData.inOutType == '采购出库') {
+					this.detailData.inOutTypeKey = 6
+				}
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -361,9 +377,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -376,14 +392,15 @@
 					(String(this.detailData.tare).indexOf('.') != -1 &&
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
-						1) ||
-					this.detailData.tare < 1 ||
-					this.detailData.tare > 100000
+						3) ||
+					this.detailData.tare < 0 ||
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
 				}
-				if (Number(this.detailData.tare ) > Number(this.detailData.grossWeight)) {
+				if (Number(this.detailData.tare) > Number(this.detailData.grossWeight)) {
+
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
@@ -402,7 +419,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -437,7 +454,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -490,15 +507,16 @@
 					if (this.detailData.type == "干粮") {
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
-							return
-						}
-						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
-								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
+
+					}
+					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
+							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
+						this.$api.msg('水分占比输入错误')
+						return
 					}
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
@@ -586,6 +604,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this
@@ -595,12 +615,13 @@
 						if (res.confirm) {
 							that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
 								that.detailData).then(res => {
+									console.log(res,"报异常")
 								if (res.data.code == 200) {
 									that.$api.msg(title)
 									setTimeout(() => {
 										uni.navigateBack()
 									}, 1000)
-								}else{
+								} else {
 									that.$api.msg(res.data.message)
 								}
 							})
@@ -710,10 +731,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/exWarehousing/selectCarNo.vue

@@ -4,16 +4,16 @@
 			<u-search placeholder="输入车牌号" :show-action="false" v-model="inputKeyword"></u-search>
 		</view>
 		<view class="content2" v-if="!inputKeyword">
-			<view class="title">编号123456789可选车牌号如下：</view>
+			<view class="title">编号{{contractNo}}可选车牌号如下：</view>
 			<view class="item-contnet">
 				<view class="item-list" v-for="(item,index) in newList" :key="index" @click="confirm(item)">
-					{{item.contractNo}}
+					{{item.carNo}}({{item.tranCarNo}})
 				</view>
 			</view>
 		</view>
 		<view class="content3" v-if="inputKeyword">
 			<view class="search-item-list" v-for="(item,index) in filterNewList" :key="index" @click="confirm(item)">
-				{{item.contractNo}}
+				{{item.carNo}}
 			</view>
 		</view>
 	</view>
@@ -27,19 +27,21 @@
 				inputKeyword: '',
 				newList: [],
 				filterNewList: [],
-				compId: ''
+				compId: '',
+				contractNo:''
 			}
 		},
-		onShow() {},
+		onShow() {
+			this.newList = uni.getStorageSync('erpContractNoCK').tranCarInfoList
+			this.contractNo = uni.getStorageSync('erpContractNoCK').contractNo
+		},
 		onLoad(options) {
-			this.compId = options.compId
-			console.log(helper.selectContractNo); 
-			this.getContractNoList()
+			
 		},
 		watch: {
 			inputKeyword(val) {
 				this.filterNewList = this.newList.filter(function(item) {
-					if (item.contractNo.indexOf(val) > -1) {
+					if (item.carNo.indexOf(val) > -1) {
 						return item
 					}
 				})
@@ -47,21 +49,10 @@
 		},
 		methods: {
 			confirm(item){
-				uni.setStorageSync('ContractNo', item);
-				uni.setStorageSync('ContractNoCar',item.carNo);
+				uni.setStorageSync('erpcarNoListCK', item);
+				uni.setStorageSync('ContractNoCarCK',item.carNo);
 				uni.navigateBack({})
 			},
-			getContractNoList() {
-				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
-					compId: this.compId,
-					flag: 5,
-				}).then(res => {
-					if (res.data.code == 200) {
-						console.log(res)
-						this.newList = res.data.data
-					}
-				})
-			},
 		}
 	}
 </script>

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -80,8 +80,11 @@
 				</u-picker>
 			</view>
 			<view class="row row-bottom">
+			<!-- 	<view class="left">车牌号</view>
+				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input> -->
 				<view class="left">车牌号</view>
-				<input v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
+				<input v-if="!isPC" v-model='detailData.carNo' class="right-bottom" placeholder="请输入车牌号"></input>
+				<view @click='slectCarNo' v-if="isPC">{{detailData.carNo}}</view>
 			</view>
 		</view>
 		<view class="content2">
@@ -158,9 +161,7 @@
 				show5: false,
 				show6: false,
 				show7: false,
-				contractNoList: [{
-					contractNo: ""
-				}],
+				isPC:true,
 				typeList: [{
 						type: "干粮"
 					},
@@ -219,16 +220,18 @@
 		onLoad(options) {
 			this.detailData = JSON.parse(options.data)
 			this.netWeight = this.detailData.netWeight
-			this.imgUrl.push({
+			if(this.detailData.addressUrl){
+				this.imgUrl.push({
 				url: this.detailData.addressUrl.split(",")[0]
 			})
+			}
 			this.cangId = options.cangId
 		},
 		onShow() {
 			this.binNumber = helper.erpWarehouse.binNumber
 			this.warehouseName = helper.erpWarehouse.warehouseName
-			this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
-			this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
+			// this.detailData.goodsName = uni.getStorageSync('erpContractNo').goodsName;
+			// this.detailData.contractNo = uni.getStorageSync('erpContractNo').contractNo;
 			this.detailData.goodsNameKey = uni.getStorageSync('erpContractNo').goodsNameKey;
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
@@ -236,6 +239,24 @@
 			if (!this.detailData.goodsName) {
 				this.detailData.goodsName = '货名'
 			}
+			let _data = uni.getStorageSync('erpContractNoCK') == '' ? {} : uni.getStorageSync('erpContractNoCK')
+			if (!_data.tranCarInfoList) {
+				this.isPC = false
+				_data.tranCarInfoList = []
+			} else {
+				this.isPC = true
+				if (uni.getStorageSync('ContractNoCarCK')) {
+					this.detailData.carNo = uni.getStorageSync('ContractNoCarCK')
+				} else {
+					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+				}
+			}
+			if(this.detailData.carNo){
+				for(let i = 0 ; i < uni.getStorageSync('erpContractNoCK').tranCarInfoList.length ;i++){
+					if(uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].carNo == this.detailData.carNo)
+					this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCK').tranCarInfoList[i].tranCarNo
+				}
+			}
 			//出库类型
 			this.outWarehouse()
 			//经办人
@@ -286,6 +307,18 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				if (this.detailData.inOutType == '销售出库') {
+					this.detailData.inOutTypeKey = 1
+				} else if (this.detailData.inOutType == '移库出库') {
+					this.detailData.inOutTypeKey = 3
+				} else if (this.detailData.inOutType == '暂存出库') {
+					this.detailData.inOutTypeKey = 4
+				} else if (this.detailData.inOutType == '贸易服务出库') {
+					this.detailData.inOutTypeKey = 5
+				} else if (this.detailData.inOutType == '采购出库') {
+					this.detailData.inOutTypeKey = 6
+				}
+				
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -328,8 +361,6 @@
 					this.$api.msg('货名不能为空')
 					return
 				}
-
-
 				if (!this.detailData.grossWeight) {
 					this.$api.msg('毛重不能为空')
 					return
@@ -338,9 +369,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -353,9 +384,9 @@
 					(String(this.detailData.tare).indexOf('.') != -1 &&
 						String(this.detailData.tare).length -
 						(String(this.detailData.tare).indexOf('.') + 1) >
-						1) ||
-					this.detailData.tare < 1 ||
-					this.detailData.tare > 100000
+						3) ||
+					this.detailData.tare < 0 ||
+					this.detailData.tare > 10000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
@@ -414,7 +445,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -467,16 +498,16 @@
 					if (this.detailData.type == "干粮") {
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
-							return
-						}
-						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
-								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
 					}
+					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
+							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
+						this.$api.msg('水分占比输入错误')
+						return
+					}
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
 					if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -563,6 +594,8 @@
 					title = "暂存成功"
 				} else if (num == 2) {
 					this.detailData.statusFlag = 3
+					this.detailData.backOffice = this.userInfo.userName
+					this.detailData.backOfficeId = this.userInfo.id
 					title = "提交成功"
 				}
 				let that = this
@@ -687,10 +720,12 @@
 	}
 
 	.bottom-btn {
+	    padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/improvedWrehousing/improvedWrehousing.vue

@@ -107,6 +107,9 @@
 				this.getList()
 			},
 			goDetail(val) {
+				 // uni.setStorageSync('erpContractNoList',val)
+				  uni.setStorageSync('erpContractNo',val.contractNo)
+				  uni.setStorageSync('ContractNoCar',val.carNo)
 				uni.navigateTo({
 					url: '/pages/erp/improvedWrehousing/improvedWrehousingDetail?data=' + JSON.stringify(val),
 				})

pages/erp/improvedWrehousing/improvedWrehousingDetail.vue

@@ -241,10 +241,12 @@
 			}
 		},
 		onLoad(options) {
-			this.detailData = JSON.parse(options.data)
+			this.detailData =JSON.parse(options.data)
+			this.netWeight = this.detailData.netWeight
 			this.binNumber = this.detailData.binNumber
 			this.warehouseName = this.detailData.warehouseName
 			this.compId = helper.erpWarehouse.compId
+			console.log(this.detailData.addressUrl)
 			if(this.detailData.addressUrl){
 				this.imgUrl.push({
 					url: this.detailData.addressUrl.split(",")[0]
@@ -255,28 +257,26 @@
 			...mapState(['hasLogin', 'userInfo']),
 		},
 		onShow() {
+			this.getContractNoList();
 			if (this.detailData.inOutType == '采购入库'&&this.detailData.status!='已暂存') {
 				this.detailData.freight = 0
 			}
-			if (!this.detailData.tranCarInfoList) this.detailData.tranCarInfoList = []
-			if (!this.detailData.contractNo) {
-				this.detailData.contractNo = '请选择合同编号'
-			} else {
-				if (this.detailData.tranCarInfoList.length == 0) {
-					this.isPC = false
-				}
+			// if (!this.detailData.tranCarInfoList) this.detailData.tranCarInfoList = []
+			// if (!this.detailData.contractNo) {
+			// 	this.detailData.contractNo = '请选择合同编号'
+			// } else {
+			// 	if (this.detailData.tranCarInfoList.length == 0) {
+			// 		this.isPC = false
+			// 	}
+			// }
+			// if (!this.detailData.goodsName) {
+			// 	this.detailData.goodsName = '货名'
+			// }
+			let _data = uni.getStorageSync('erpContractNo')
+			if(_data){
+				 this.detailData.contractNo = _data
 			}
-			if (!this.detailData.goodsName) {
-				this.detailData.goodsName = '货名'
-			}
-			let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
-		     this.detailData.contractNo = _data.contractNo
-			if (!_data.tranCarInfoList){
-				this.isPC = false
-					this.detailData.carNo = ""
-				_data.tranCarInfoList = []
-			} else{
-				this.isPC = true
+				
 				if(uni.getStorageSync('ContractNoCar')){
 					this.detailData.carNo = uni.getStorageSync('ContractNoCar')
 					this.$api.doRequest('get', '/warehouseBaseInfo/selectCost', {
@@ -288,18 +288,13 @@
 						}
 					})
 				}else{
-					this.detailData.carNo = _data.tranCarInfoList[0].carNo
+					// this.detailData.carNo = uni.setStorageSync('erpContractNoList')[0].carNo
 				}
-			}
-			
-			
-			
 			
 			// 获取入库类型
 			this.getrkType()
 			//获取经办人
 			this.getPerson()
-			console.log(this.detailData)
 		},
 		watch: {
 			netWeight: function(v) {
@@ -307,6 +302,41 @@
 			},
 		},
 		methods: {
+			getContractNoList() {
+				this.imgUrl = []
+				this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
+					compId: this.compId,
+					flag: 7,
+				}).then(res => {
+					if (res.data.code == 200) {debugger
+						console.log(res.data.data)
+						console.log(this.id)
+						for (let i = 0; i < res.data.data.length; i++) {
+							console.log(this.contractNo)
+							if (res.data.data[i].contractNo == this.detailData.contractNo) {
+								if (res.data.data[i].tranCarInfoList) {
+									this.isPC = true
+									uni.setStorageSync('erpContractNoCarList', res.data.data[i].tranCarInfoList);
+									
+									if(this.detailData.carNo){debugger
+									console.log(uni.getStorageSync('erpContractNoCarList'))
+										for(let i = 0 ; i < uni.getStorageSync('erpContractNoCarList').length;i++){
+											console.log(uni.getStorageSync('erpContractNoCarList'))
+											if(uni.getStorageSync('erpContractNoCarList')[i].carNo == this.detailData.carNo)
+											this.detailData.tranCarNo = uni.getStorageSync('erpContractNoCarList')[i].tranCarNo
+										}
+									}
+									// uni.setStorageSync('erpContractNoList', res.data.data[i].tranCarInfoList);
+									// this.detailData.tranCarInfoList = res.data.data[i].tranCarInfoList
+								} else {
+									this.isPC = false
+								}
+							}
+						}
+					}
+				})
+			
+			},
 			//计算纯重
 			pureWeightCount() {
 				if (this.netWeight && this.detailData.buckleWeightRatio && this.detailData.solidGrainWater && this
@@ -349,6 +379,21 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.inOutTypeKey = 1
+				} else if (this.detailData.inOutType == '移库入库') {
+					this.detailData.inOutTypeKey = 3
+				} else if (this.detailData.inOutType == '暂存入库') {
+					this.detailData.inOutTypeKey = 4
+				} else if (this.detailData.inOutType == '贸易服务入库') {
+					this.detailData.inOutTypeKey = 5
+				} else if (this.detailData.inOutType == '退库') {
+					this.detailData.inOutTypeKey = 6
+				}
+				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.freight = 0
+				}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -614,16 +659,16 @@
 					if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData
 						.warehouseInOutDetail
 						.waterContent > 40) {
-						this.$api.msg('热损伤占比输入错误')
+						this.$api.msg('水分占比输入错误')
 						return
 					}
-					if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-							.detailData.warehouseInOutDetail.jiaorenli).length - (String(
+				}
+				if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
+							.detailData.warehouseInOutDetail.waterContent).length - (String(
 							this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-						this.$api.msg('热损伤占比输入错误')
+						this.$api.msg('水分占比输入错误')
 						return
 					}
-				}
 			}
 			if (this.detailData.warehouseInOutDetail.bulkDensity) {
 				if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -838,10 +883,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/erp/index.vue

@@ -272,7 +272,6 @@
 							this.baseId = _showCWData.baseId
 							this.positionId = _showCWData.id
 							this.personCharge = _showData.personCharge
-							console.log('this.warehouseCWList', this.warehouseCWList)
 						} else {
 							this.allWarehouse = res.data.data
 							this.warehouseName = res.data.data[0].warehouseName
@@ -285,7 +284,6 @@
 							this.baseId = res.data.data[0].positionInfos[0].baseId
 							this.positionId = res.data.data[0].positionInfos[0].id
 							this.personCharge = res.data.data[0].personCharge
-							console.log('this.warehouseCWList', this.warehouseCWList)
 						}
 
 					} else {

pages/erp/warehousing/selectCarNo.vue

@@ -31,10 +31,9 @@
 				contractNo:''
 			}
 		},
-		onShow() {
-			this.newList = uni.getStorageSync('erpContractNo').tranCarInfoList
-			console.log(this.newList,"List")
-			this.contractNo = uni.getStorageSync('erpContractNo').contractNo
+		onShow() {debugger
+			this.newList = uni.getStorageSync('erpContractNoCarList')
+			this.contractNo = uni.getStorageSync('erpContractNo')
 		},
 		onLoad(options) {
 			

pages/erp/warehousing/selectContractNo.vue

@@ -41,22 +41,16 @@
 				flag:""
 			}
 		},
-
-		// onShow() {},
-		// onLoad(options) {
-
 		onShow() {
 			this.newSelectList =  uni.getStorageSync('erpContractNoList');
 		},
 		onLoad(options) {
 			this.flag = options.flag
 			this.compId = helper.erpWarehouse.compId 
-			console.log(helper.selectContractNo); 
 			this.getContractNoList()
 		},
 		watch: {
 			inputKeyword(val) {
-				console.log(this.newList)
 				this.filterNewList = this.newList.filter(function(item) {
 					if (item.contractNo.indexOf(val) > -1) {
 						return item
@@ -81,7 +75,7 @@
 					_list.unshift(item).pop(item)
 				}
 				uni.setStorageSync('erpContractNoList', _list);
-				uni.setStorageSync('erpContractNo', item);
+				uni.setStorageSync('erpContractNo', item.contractNo);
 				uni.navigateBack({})
 			},
 			getContractNoList() {
@@ -113,9 +107,7 @@
 						}
 					})
 				}
-				
 			},
-		
 		}
 	}
 </script>

pages/erp/warehousing/warehousing.vue

@@ -264,8 +264,8 @@
 			this.detailData.inOutDate = _day.getFullYear() + "-" + (_day.getMonth() + 1) + "-" + _day.getDate();
 			if (_data.inOutType == '采购入库') {
 				this.detailData.freight = 0
-			}
-				this.detailData.freight = uni.getStorageSync('CarFreight')
+			}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
+				
 			if (!_data.tranCarInfoList){
 				this.isPC = false
 				this.detailData.carNo = ""
@@ -287,6 +287,12 @@
 					this.detailData.carNo = _data.tranCarInfoList[0].carNo
 				}
 			}
+			if(this.detailData.carNo){
+				for(let i = 0 ; i < uni.getStorageSync('erpContractNo').tranCarInfoList.length ;i++){
+					if(uni.getStorageSync('erpContractNo').tranCarInfoList[i].carNo == this.detailData.carNo)
+					this.detailData.tranCarNo = uni.getStorageSync('erpContractNo').tranCarInfoList[i].tranCarNo
+				}
+			}
 			if (!this.detailData.contractNo) {
 				this.detailData.contractNo = '请选择合同编号'
 			}
@@ -338,12 +344,9 @@
 			typePicker(e) {
 				console.log(e)
 				this.detailData.type = this.typeList[e].type
-
-
 			},
 			pjPicker(e) {
-				console.log(e)
-				this.detailData.gradeKey = e[0]
+				this.detailData.gradeKey = e[0]+1
 				this.detailData.grade = this.pjList[e].grade
 			},
 			handlerPicker(e) {
@@ -357,6 +360,22 @@
 			},
 			warehousingTypePicker(e) {
 				this.detailData.inOutType = this.warehousingTypeList[e].constValue
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.inOutTypeKey = 1
+				} else if (this.detailData.inOutType == '移库入库') {
+					this.detailData.inOutTypeKey = 3
+				} else if (this.detailData.inOutType == '暂存入库') {
+					this.detailData.inOutTypeKey = 4
+				} else if (this.detailData.inOutType == '贸易服务入库') {
+					this.detailData.inOutTypeKey = 5
+				} else if (this.detailData.inOutType == '退库') {
+					this.detailData.inOutTypeKey = 6
+				}
+				let _data = uni.getStorageSync('erpContractNo')==''?{}:uni.getStorageSync('erpContractNo')
+				if (this.detailData.inOutType == '采购入库') {
+					this.detailData.freight = 0
+				}else{this.detailData.freight = uni.getStorageSync('CarFreight')}
+				
 			},
 			filterFileType(index, lists) {
 				if (lists[index].fileType != 'jpg' && lists[index].fileType != 'png' && lists[index].fileType != 'gif') {
@@ -442,9 +461,9 @@
 					(String(this.detailData.grossWeight).indexOf('.') != -1 &&
 						String(this.detailData.grossWeight).length -
 						(String(this.detailData.grossWeight).indexOf('.') + 1) >
-						1) ||
-					this.detailData.grossWeight < 1 ||
-					this.detailData.grossWeight > 100000
+						3) ||
+					this.detailData.grossWeight < 0 ||
+					this.detailData.grossWeight > 10000
 				) {
 					this.$api.msg('毛重输入错误！')
 					return
@@ -459,7 +478,7 @@
 						(String(this.detailData.tare).indexOf('.') + 1) >
 						3) ||
 					this.detailData.tare < 0 ||
-					this.detailData.tare > 10
+					this.detailData.tare > 100000
 				) {
 					this.$api.msg('皮重输入错误！')
 					return
@@ -475,7 +494,7 @@
 						(String(this.detailData.deductionWeight).indexOf('.') + 1) >
 						1) ||
 					this.detailData.deductionWeight < 1 ||
-					this.detailData.deductionWeight > 100000
+					this.detailData.deductionWeight > 10
 				) {
 					this.$api.msg('扣重输入错误！')
 					return
@@ -499,7 +518,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -549,7 +568,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -622,16 +641,17 @@
 						if (this.detailData.warehouseInOutDetail.waterContent < 0 || this.detailData
 							.warehouseInOutDetail
 							.waterContent > 40) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
+					}
 						if (String(this.detailData.warehouseInOutDetail.waterContent).indexOf('.') != -1 && String(this
-								.detailData.warehouseInOutDetail.jiaorenli).length - (String(
+								.detailData.warehouseInOutDetail.waterContent).length - (String(
 								this.detailData.warehouseInOutDetail.waterContent).indexOf('.') + 1) > 1) {
-							this.$api.msg('热损伤占比输入错误')
+							this.$api.msg('水分占比输入错误')
 							return
 						}
-					}
+					
 				}
 				if (this.detailData.warehouseInOutDetail.bulkDensity) {
 					if (this.detailData.warehouseInOutDetail.bulkDensity < 500 || this.detailData.warehouseInOutDetail
@@ -848,10 +868,12 @@
 	}
 
 	.bottom-btn {
+		padding: 30rpx;
+		background: #FFFFFF;
 		width: 92%;
 		position: fixed;
-		bottom: 40rpx;
+		bottom: 0rpx;
 		display: flex;
-		z-index: 2;
+		z-index: 9999;
 	}
 </style>

pages/grain_pulse/my_grain_pulse.vue

@@ -181,7 +181,7 @@
 				})
 			},
 			edit(item){
-				if(item.status=='已驳回'||item.status=='已通过'){
+				if(item.status=='已驳回'||item.status=='待审核'){
 					uni.navigateTo({
 						url:'/pages/grain_pulse/editcompany?id='+item.id
 					})

pages/task/audit/Issueandreceipt_task_approval.vue

@@ -0,0 +1,341 @@
+<template>
+	<view class="warp">
+		<view class="content1">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="任务类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<view v-if="type=='移库'" class="title part2">移库出库</view>
+				<view v-if="type=='退库'" class="title part2">退库</view>
+				<u-form-item label="编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='移库'||type=='退库'" label="仓库" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="出库类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="入库类型" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='移库'" label="移库任务编号" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="合同编号" v-if="type!='移库'" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="预计出库日期" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="预计入库日期" prop="receivingAddress" label-width="180">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='入库'||type=='退库'" label="入库经办人" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item v-if="type=='出库'||type=='移库'" label="出库经办人" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<view class="title part2">可编辑项</view>
+				<u-form-item label="品级" prop="receivingAddress" label-width="150">
+					<u-input v-model="purchaseOrder.receivingAddress" 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="receivingAddress" label-width="190">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+				</u-form-item>
+				<u-form-item v-if="type!='移库'&&type!='退库'" label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+				</u-form-item>
+				<u-form-item v-if="type!='退库'" label="仓位号(选填)" prop="receivingAddress" label-width="170">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+				</u-form-item>
+				<view v-if="type=='移库'">
+					<view class="title part2">移库入库</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="移库任务编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计入库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="入库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" 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="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view>
+				<view v-if="type=='退库'">
+					<view class="title part2">出</view>
+					<u-form-item label="编号" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="仓库" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库类型" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="合同编号" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="货名" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="重量(吨)" prop="receivingAddress" label-width="140">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="预计出库时间" prop="receivingAddress" label-width="180">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="出库经办人" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+					</u-form-item>
+					<u-form-item label="品级" prop="receivingAddress" label-width="150">
+						<u-input v-model="purchaseOrder.receivingAddress" 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="receivingAddress" label-width="190">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="水分(%)<=" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<u-form-item label="单价(元/吨)" prop="receivingAddress" label-width="160">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder=""/>
+					</u-form-item>
+					<view class="title part2">可编辑项</view>
+					<u-form-item label="业务描述" prop="receivingAddress" label-width="160" label-position="top">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" type="textarea" class="textarea"/>
+					</u-form-item>
+					<u-form-item label="仓位号(选填)" prop="receivingAddress" label-width="170">
+						<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="未指定"/>
+					</u-form-item>
+				</view>
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<!-- <u-modal v-model="show" content="确定通过出入库任务？" showCancelButton></u-modal> -->
+		<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>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type:'移库',
+				show:false,
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'出库',
+					grade:"1"
+				},
+				pjList:[{
+					type:'一等品'
+				},
+				{
+					type:'二等品'
+				},
+				{
+					type:'三等品'
+				},
+				{
+					type:'等外'
+				}],
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		methods: {
+			pjPicker(){},
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						// uni.showLoading({
+						// 	title: '正在加载',
+						// 	mask: true
+						// })
+						console.log('验证通过');
+						
+				// 		this.$api.doRequest('post',
+				// 			'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+				// 			this
+				// 			.purchaseOrder).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				uni.showToast({
+				// 					title: '提交成功',
+				// 					icon: 'none',
+				// 					duration: 2000,
+				// 					success: function() {
+				// 						uni.navigateTo({
+				// 							url: `/pageA/freightTransport/index`
+				// 						})
+				// 					}
+				// 				})
+				
+				// 			}
+				
+				// 		}).catch(res => {
+				// 			// uni.showToast({
+				// 			// 	title: res.data.message,
+				// 			// 	icon: 'none',
+				// 			// 	duration: 2000
+				// 			// })
+				// 		})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			},
+			rejectSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.show = true
+				// 		this.$api.doRequest('post',
+				// 			'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+				// 			this
+				// 			.purchaseOrder).then(res => {
+				// 			if (res.data.code == 200) {
+				// 				uni.showToast({
+				// 					title: '提交成功',
+				// 					icon: 'none',
+				// 					duration: 2000,
+				// 					success: function() {
+				// 						uni.navigateTo({
+				// 							url: `/pageA/freightTransport/index`
+				// 						})
+				// 					}
+				// 				})
+				
+				// 			}
+				
+				// 		}).catch(res => {
+				// 			// uni.showToast({
+				// 			// 	title: res.data.message,
+				// 			// 	icon: 'none',
+				// 			// 	duration: 2000
+				// 			// })
+				// 		})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content1,.content2 {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.part2{
+		margin-top: 20rpx;
+	}
+	.textarea{
+		border: 1px solid #ccc;
+	}
+</style>

pages/task/audit/Issueandreceipt_task_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		出入库任务详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/acquisition_settlement_approval.vue

@@ -0,0 +1,129 @@
+<template>
+	<view class="warp">
+		<view class='content1'>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view v-for="(item,index) in 4">
+				<view class='row row1'>
+					<view class="left">SG11111111111</view>
+					<view class="right">辽H12345</view>
+				</view>
+				<view class='row'>
+					<view class="left">玉米（150000kg-2.58）</view>
+					<view class="right">100000元</view>
+				</view>
+			</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.row1{
+		border-bottom: 0!important;
+	}
+</style>

pages/task/audit/acquisition_settlement_details.vue

@@ -0,0 +1,129 @@
+<template>
+	<view class="warp">
+		<view class='content1'>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view v-for="(item,index) in 4">
+				<view class='row row1'>
+					<view class="left">SG11111111111</view>
+					<view class="right">辽H12345</view>
+				</view>
+				<view class='row'>
+					<view class="left">玉米（150000kg-2.58）</view>
+					<view class="right">100000元</view>
+				</view>
+			</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+	.row1{
+		border-bottom: 0!important;
+	}
+</style>

pages/task/audit/freight_setting_approval.vue

@@ -0,0 +1,132 @@
+<template>
+	<view class="warp">
+		<view class="transaction">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				</u-form-item>
+				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+			</u-form>
+		</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>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'444'
+				},
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		methods: {
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.$api.doRequest('post',
+							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+							this
+							.purchaseOrder).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 2000,
+									success: function() {
+										uni.navigateTo({
+											url: `/pageA/freightTransport/index`
+										})
+									}
+								})
+				
+							}
+				
+						}).catch(res => {
+							// uni.showToast({
+							// 	title: res.data.message,
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.transaction {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/freight_setting_details.vue

@@ -0,0 +1,131 @@
+<template>
+	<view class="warp">
+		<view class="transaction">
+			<u-form :model="purchaseOrder" ref="uForm" class="uForm">
+				<u-form-item label="合同编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="任务编号" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="货名" prop="receivingAddress" label-width="140">
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="right" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="发货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="" disabled/>
+				</u-form-item>
+				<u-form-item label="收货地址" prop="receivingAddress" label-width="140" label-position='top'>
+					<u-input v-model="purchaseOrder.receivingAddress" input-align="left" placeholder="请输入收货地址" disabled/>
+				</u-form-item>
+				<u-form-item label="运费（元/吨）" prop="freightUnitPrice" label-width="250">
+					<u-input v-model="purchaseOrder.freightUnitPrice" input-align="right" placeholder="请输入运费单价" />
+				</u-form-item>
+			</u-form>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				purchaseOrder: {
+					freightUnitPrice: "123",
+					receivingAddress:'444'
+				},
+				rules: {
+					freightUnitPrice: [{
+							validator: (rule, value, callback) => {
+								return !this.$u.test.isEmpty(value)
+							},
+							message: '运费不能为空',
+							trigger: ['change', 'blur']
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.amount(value)
+							},
+							message: '数值类型，最多保留两位小数',
+							trigger: ['change', 'blur'],
+						}
+					]
+				}
+			}
+		},
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+		methods: {
+			passSubmit(){
+				this.$refs.uForm.validate(valid => {
+					if (valid) {
+						uni.showLoading({
+							title: '正在加载',
+							mask: true
+						})
+						console.log('验证通过');
+						this.$api.doRequest('post',
+							'/freightReceivingDispatching/api/insertFreightReceivingDispatching',
+							this
+							.purchaseOrder).then(res => {
+							if (res.data.code == 200) {
+								uni.showToast({
+									title: '提交成功',
+									icon: 'none',
+									duration: 2000,
+									success: function() {
+										uni.navigateTo({
+											url: `/pageA/freightTransport/index`
+										})
+									}
+								})
+				
+							}
+				
+						}).catch(res => {
+							// uni.showToast({
+							// 	title: res.data.message,
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						})
+					} else {
+						console.log('验证失败');
+					}
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.transaction {
+		background-color: #FFFFFF;
+		margin: 10rpx;
+		padding-bottom: 10rpx;
+		border-radius: 20rpx;
+	}
+	.uForm {
+		padding: 0 40rpx;
+	}
+	.u-form-item{
+		padding: 0;
+	}
+	.bottom-btn {
+		width: 100%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/freight_settlement_approval.vue

@@ -0,0 +1,93 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">装</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">卸</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">运</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">付</view>
+					<view class="left">120.4吨</view>
+				</view>
+			</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 33.33%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/freight_settlement_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费结算详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/purchase_settlement_approval.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">净重</view>
+					<view class="left">150.11吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结重</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣款</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">应付</view>
+					<view class="left">1000元</view>
+				</view>
+			</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 50%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/purchase_settlement_details.vue

@@ -0,0 +1,85 @@
+<template>
+	<view class="container">
+		<view class="content">
+			<view class="top">
+				<view>合同编号</view>
+				<view>123456796</view>
+			</view>
+			<view class="car-container" v-for="(item,index) in 4">
+				<view class="car-num title">辽H123465（c001）</view>
+				<view class="car-type-item">
+					<view class="left">净重</view>
+					<view class="left">150.11吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">结重</view>
+					<view class="left">120.4吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">扣款</view>
+					<view class="left">120元/吨</view>
+				</view>
+				<view class="car-type-item">
+					<view class="left">应付</view>
+					<view class="left">1000元</view>
+				</view>
+			</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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.container {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+		border-radius: 20rpx;
+		background: white;
+	}
+	.content {
+		.top{
+			display: flex;
+			justify-content: space-between;
+		}
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: left;
+		}
+		.car-type-item{
+			display: inline-flex;
+			// justify-content: center;
+			width: 50%;
+		}
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/warehouse_approval.vue

@@ -0,0 +1,225 @@
+<template>
+	<view class="warp">
+		<view class='content1'>
+			<view class="title">基本信息</view>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">{{list.warehouseName}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">货名</view>
+				<view class="right">{{list.goodsName}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">基准水分（%）</view>
+				<view class="right">{{list.waterBase}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮水分（%）</view>
+				<view class="right">{{list.waterMin}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">水分上限（%）</view>
+				<view class="right">{{list.waterMax}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">扣重比</view>
+				<view class="right">{{list.warehouseName}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮收购价格（元/公斤）</view>
+				<view class="right">{{list.warehouseName}}</view>
+			</view>
+			<view class='row'>
+				<view class="left">销售上限</view>
+				<view class="right">{{list.warehouseName}}</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">粮价设置</view>
+			<view v-for="(item,index) in 4" :key="index">
+				<view class="row">
+					<view class="left">等级</view>
+					<view class="right">一等、二等</view>
+				</view>
+				<view class="row">
+					<view class="left">基准单价（元/公斤）</view>
+					<view class="right">2.2</view>
+				</view>
+				<view class="row" v-for="(item1,index1) in 10" :key="index1">
+					<view class="left">15-23降幅（元/0.1%）</view>
+					<view class="right">0.001</view>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view style='padding:10px;' class='flex'>
+			<u-button v-if='list.status=="未审核"' @click='reject' type="error">驳回</u-button>
+			<u-button v-if='list.status=="未审核"' @click='audit' type="success">通过</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: "task",
+
+		data() {
+			return {
+				show: false,
+				id: 0,
+				list: {},
+				form: {
+
+					name: '',
+					intro: '',
+					sex: ''
+				},
+				radio: '',
+				pcUserInfo: uni.getStorageSync('pcUserInfo'),
+				switchVal: false,
+				contractNoList: []
+			};
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		onLoad(options) {
+			console.log(options)
+			this.id = options.id
+		},
+		onShow() {
+			var that = this
+			this.$nextTick(function() {
+				that.getData()
+			})
+
+			// this.userInfo =  uni.getStorageSync("userInfo")
+		},
+		methods: {
+			getData() {
+				var data = []
+				this.$api.doRequest('get', '/purchasePrice/purchasePriceLook', {
+					id: this.id
+				}).then(res => {
+					if (res.data.code == 200) {
+						this.list = res.data.data
+						console.log(this.list)
+					}
+				})
+			},
+			confirm(item) {
+				this.list.contractNo = item[0].value
+			},
+			audit() {
+				var that = this
+				uni.showModal({
+					content: "是否确定通过审核？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: true,
+								auditMind: '34',
+								needReapply: false,
+							}).then(res1 => {
+								if (res1.data.code == 200) {
+									that.$api.msg('审核成功');
+									that.$nextTick(function() {
+										uni.navigateBack()
+									})
+								} else {
+									that.$api.msg('系统异常，请联系管理员');
+								}
+							})
+						}
+					}
+				})
+			},
+			reject() {
+				var that = this
+				uni.showModal({
+					content: "是否确定驳回？",
+					showCancel: true,
+					confirmText: '提交',
+					success: function(res) {
+						if (res.confirm) {
+							that.$api.doRequest('post', '/workflow/api/handle', {
+								taskId: that.list.taskId,
+								approved: false,
+								auditMind: '已驳回',
+								needReapply: true,
+							}).then(res1 => {
+								if (res1.data.code == 200) {
+									that.$api.msg('驳回成功');
+									that.$nextTick(function() {
+										uni.navigateBack()
+									})
+								} else {
+									that.$api.msg(res1.data.message);
+								}
+							}).catch()
+						}
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+
+	.content2 {
+		margin-top: 20rpx;
+	}
+
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/audit/warehouse_details.vue

@@ -0,0 +1,160 @@
+<template>
+	<view class="warp">
+		<view class='content1'>
+			<view class="title">基本信息</view>
+			<view class='row'>
+				<view class="left">仓库</view>
+				<view class="right">鲅鱼圈一号库</view>
+			</view>
+			<view class='row'>
+				<view class="left">货名</view>
+				<view class="right">玉米</view>
+			</view>
+			<view class='row'>
+				<view class="left">基准水分（%）</view>
+				<view class="right">30</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮水分（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">水分上限（%）</view>
+				<view class="right">40</view>
+			</view>
+			<view class='row'>
+				<view class="left">扣重比</view>
+				<view class="right">1.25</view>
+			</view>
+			<view class='row'>
+				<view class="left">干粮收购价格（元/公斤）</view>
+				<view class="right">2.58</view>
+			</view>
+			<view class='row'>
+				<view class="left">销售上限</view>
+				<view class="right">2000</view>
+			</view>
+		</view>
+		<view class="content2">
+			<view class="title">粮价设置</view>
+			<view  v-for="(item,index) in 4" :key="index">
+				<view class="row">
+					<view class="left">等级</view>
+					<view class="right">一等、二等</view>
+				</view>	
+				<view class="row">
+					<view class="left">基准单价（元/公斤）</view>
+					<view class="right">2.2</view>
+				</view>	
+				<view class="row" v-for="(item1,index1) in 10" :key="index1">
+					<view class="left">15-23降幅（元/0.1%）</view>
+					<view class="right">0.001</view>
+				</view>	
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+		<view class="bottom-btn">
+			<u-button type="primary" class="submit" hover-class="none">已通过</u-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			rejectSubmit(){
+				uni.showModal({
+					content: "确定驳回该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+			passSubmit(){
+				uni.showModal({
+					content: "确定通过该设置?",
+					success(res) {
+						// if (res.confirm) {
+						// 	that.$api.doRequest('post', '/warehouseInOutInfo/InOutWarehouse',
+						// 		that.detailData).then(res => {
+						// 		if (res.data.code == 200) {
+						// 		that.$api.msg(title)
+						// 		setTimeout(() => {
+						// 			uni.navigateBack()
+						// 		}, 1000)
+						// 		}else{
+						// 			that.$api.msg(res.data.message)
+						// 		}
+						// 	})
+						// }
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.warp {
+		margin: 10rpx;
+		padding: 20rpx 20rpx 140rpx 20rpx;
+	}
+	.content1,
+	.content2 {
+		border-radius: 20rpx;
+		background: white;
+		padding: 20rpx;
+	
+		.title {
+			font-size: 28rpx;
+			font-weight: 600;
+			color: #333333;
+			text-align: center;
+		}
+	
+		.row {
+			display: flex;
+			justify-content: space-between;
+			border-bottom: 1px solid #EEEEEE;
+			padding: 21rpx 0;
+	
+			.right,
+			input {
+				font-size: 28rpx;
+				color: #333333;
+			}
+		}
+	}
+	.content2{
+		margin-top: 20rpx;
+	}
+	.bottom-btn {
+		width: 92%;
+		position: fixed;
+		bottom: 40rpx;
+		display: flex;
+		z-index: 2;
+	}
+	.submit {
+		width: 40%;
+		background: #22C572;
+		border-radius: 10rpx;
+	}
+</style>

pages/task/my_task.vue

@@ -1,31 +1,30 @@
 <template name="task">
 	<view class="content">
 		<view class="cu-bar search bg-white">
-			<view class="search-form round" >
-				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword"
-				@search="searchKeyWord()"
-				@custom="searchKeyWord()"
-				></u-search>
+			<view class="search-form round">
+				<u-search placeholder="请输入合同编号、车牌号或派车编号" v-model="keyword" @search="searchKeyWord()"
+					@custom="searchKeyWord()"></u-search>
 			</view>
 		</view>
 		<view style='background:#fff;padding:0 15px;'>
 			<view @click='tabcarchange(1)' class='line' :class='statusFlag==1?"active":""'>未完成</view>
-			<view  @click='tabcarchange(3)' class='line'  :class='statusFlag==3?"active":""'>已完成</view>
+			<view @click='tabcarchange(3)' class='line' :class='statusFlag==3?"active":""'>已完成</view>
 		</view>
 		<view class="introduce-section">
 			<view v-for="(item, index) in taskInfo" :key="index" class="guess-item" @click="navToDetailPage(item)">
 				<view class="title flex">
-					<text >{{item.messageTitle}}</text>
-					<view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
-					<view  class="title-tip" v-if="statusFlag==1">未完成</view>
+					<text>{{item.messageTitle}}</text>
+					<!-- <view  class="title-tip-a" v-if="statusFlag==3">已完成</view>
+					<view  class="title-tip" v-if="statusFlag==1">未完成</view> -->
+					<view class='line'>2021-06-30 11:11:22</view>
 				</view>
 				<view class="flex title_b">
 					<view class="title">
 						{{item.messageContent}}
 					</view>
 				</view>
-				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'"/>
-				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'"/>
+				<u-tag :text="item.taskType" type="success" v-if="item.taskType == '出库任务'" />
+				<u-tag :text="item.taskType" type="primary" v-if="item.taskType == '入库任务'" />
 			</view>
 			<view v-show="isSole">
 				<uni-load-more :status="loadStatus"></uni-load-more>
@@ -40,7 +39,7 @@
 	} from 'vuex';
 	export default {
 		name: "task",
-		
+
 		data() {
 			return {
 				PageCur: "task",
@@ -49,13 +48,13 @@
 				limit: 10, //每次取条目数
 				loadStatus: 'loading', //加载样式：more-加载前样式，loading-加载中样式，nomore-没有数据样式
 				isLoadMore: false, //是否加载中
-				isSole:false,
+				isSole: false,
 				showTran: true,
 				scrollTop: 0,
-				isContent:true,
+				isContent: true,
 				statusFlag: 1,
 				current: 1,
-				pcUserInfo:{},
+				pcUserInfo: {},
 				warehouseInOutInfo: {
 					pageSize: 10,
 					currentPage: 1
@@ -64,20 +63,19 @@
 					pageSize: 10,
 					currentPage: 1
 				},
-				keyword:""
+				keyword: ""
 			};
 		},
 		computed: {
 			...mapState(['hasLogin', 'userInfo'])
 		},
 		onShow() {
-			this.warehouseInOutInfo.currentPage=1
-			this.data.currentPage=1
-			this.taskInfo=[]
-			this.getIndexBuyData()
-			this.pcUserInfo =  uni.getStorageSync("pcUserInfo")
+			this.warehouseInOutInfo.currentPage = 1
+			this.data.currentPage = 1
+			this.taskInfo = []
+			this.pcUserInfo = uni.getStorageSync("pcUserInfo")
 			this.$api.doRequest('get', '/commonUser/api/checkSession').then(res => {
-				console.log("checkSession",res)
+				console.log("checkSession", res)
 				if (res.data.data == "INVALID") {
 					uni.showModal({
 						title: '登录提示',
@@ -94,18 +92,20 @@
 						fail: () => {},
 						complete: () => {}
 					})
+				} else {
+					this.getIndexBuyData()
 				}
 			})
 			// this.warehouseInOutInfo.phone = this.userInfo.phone
 		},
 		onReachBottom() { //上拉触底函数
 			if (!this.isLoadMore) { //此处判断，上锁，防止重复请求
-			if(this.statusFlag==1){
-				this.warehouseInOutInfo.currentPage += 1
-			}else{
-				this.data.currentPage+=1
-			}
-				
+				if (this.statusFlag == 1) {
+					this.warehouseInOutInfo.currentPage += 1
+				} else {
+					this.data.currentPage += 1
+				}
+
 				this.getIndexBuyData()
 			}
 		},
@@ -113,66 +113,67 @@
 		// 	this.getIndexBuyData()
 		// },
 		filters: {
-			formatDate (date) {
-				var date=new Date(date)
-				var time=new Date()
-				var newdate=''
-				if(time.getMonth() + 1>=10){
-					newdate=time.getFullYear()+'-'+(time.getMonth()+1)+'-'+time.getDate()
-				}else{
-					newdate=time.getFullYear()+'-0'+(time.getMonth()+1)+'-'+time.getDate()
+			formatDate(date) {
+				var date = new Date(date)
+				var time = new Date()
+				var newdate = ''
+				if (time.getMonth() + 1 >= 10) {
+					newdate = time.getFullYear() + '-' + (time.getMonth() + 1) + '-' + time.getDate()
+				} else {
+					newdate = time.getFullYear() + '-0' + (time.getMonth() + 1) + '-' + time.getDate()
+				}
+				//把时间戳改为yyyy-MM-dd格式
+				//判断是否今天
+				var datatime = ''
+				if (date.getMonth() + 1 >= 10) {
+					datatime = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+				} else {
+					datatime = date.getFullYear() + '-0' + (date.getMonth() + 1) + '-' + date.getDate()
+				}
+				if (datatime == newdate) {
+					var h = date.getHours();
+					h = h < 10 ? '0' + h : h;
+					var m = date.getMinutes();
+					m = m < 10 ? '0' + m : m;
+					var s = date.getSeconds();
+					s = s < 10 ? '0' + s : s;
+					return h + ':' + m + ':' + s;
+				} else {
+					if (date.getMonth() + 1 >= 10) {
+						return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+					} else {
+						return date.getFullYear() + '-0' + (date.getMonth() + 1) + '-' + date.getDate()
+					}
+				}
+				let o = {
+					'Y': date.getFullYear(),
+					'M+': date.getMonth() + 1,
+					'd+': date.getDate(),
 				}
-			     //把时间戳改为yyyy-MM-dd格式
-			     //判断是否今天
-				 var datatime=''
-				 if(date.getMonth() + 1>=10){
-				 	datatime=date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
-				 }else{
-				 	datatime=date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
-				 }
-			     if(datatime == newdate){
-			          var h = date.getHours();
-			             h = h < 10 ? '0' + h : h;
-			             var m = date.getMinutes();
-			             m = m < 10 ? '0' + m : m;
-			             var s = date.getSeconds();
-			             s = s < 10 ? '0' + s : s;
-			             return h + ':' + m + ':' + s;
-			     }else{
-					 if(date.getMonth() + 1>=10){
-						 return date.getFullYear()+'-'+(date.getMonth()+1)+'-'+date.getDate()
-					 }else{
-						  return date.getFullYear()+'-0'+(date.getMonth()+1)+'-'+date.getDate()
-					 } 
-				 }
-			 let o = {
-			  'Y': date.getFullYear(),
-			  'M+': date.getMonth() + 1,
-			  'd+': date.getDate(),
-			 }
 			},
 		},
 		methods: {
-			searchKeyWord(){
-				if(!this.keyword){
+			searchKeyWord() {
+				if (!this.keyword) {
 					this.$api.msg('关键字不能为空')
 				}
 				uni.showLoading({
-					title:"正在加载"
+					title: "正在加载"
 				})
-				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(res => {
-					if (res.data.code == 200) {
-						this.taskInfo = res.data.data
-						uni.hideLoading()
-					} else {
-						uni.showToast({
-							title: res.data.message,
-							icon: 'none',
-							duration: 2000
-						})
-						uni.hideLoading()
-					}
-				}).catch(res => {
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
+					res => {
+						if (res.data.code == 200) {
+							this.taskInfo = res.data.data
+							uni.hideLoading()
+						} else {
+							uni.showToast({
+								title: res.data.message,
+								icon: 'none',
+								duration: 2000
+							})
+							uni.hideLoading()
+						}
+					}).catch(res => {
 					uni.showToast({
 						title: res.data.message,
 						icon: 'none',
@@ -185,17 +186,17 @@
 				const that = this
 				var pages = that.pages
 				var limit = that.limit
-				var url=''
+				var url = ''
 				uni.showLoading({
-					title:"正在加载"
+					title: "正在加载"
 				})
-			   var data={}
-				if(this.statusFlag==1){
-					data=this.warehouseInOutInfo
-					url='/noticeTask/query/noticeTasks'
-				}else{
-					data=this.data
-					url='/commonUser/query/findHisPageNoticeTasks'
+				var data = {}
+				if (this.statusFlag == 1) {
+					data = this.warehouseInOutInfo
+					url = '/noticeTask/query/noticeTasks'
+				} else {
+					data = this.data
+					url = '/commonUser/query/findHisPageNoticeTasks'
 				}
 				//this.warehouseInOutInfo.status = this.status
 				this.$api.doRequest('get', url, data).then(res => {
@@ -203,55 +204,74 @@
 						let data = res.data.data.records
 						//采购信息
 						if (data.length > 0) {
-							if(status){
-								that.taskInfo=data
-							}else{
+							if (status) {
+								that.taskInfo = data
+							} else {
 								that.taskInfo = that.taskInfo.concat(data)
 							}
-							
-							
+
+
 						} else {
 							if (that.pages > 1) {
 								that.pages -= 1
 							}
-							
+
 							that.isLoadMore = false
 							that.loadStatus = 'nomore'
 						}
-							for(var i=0;i<this.taskInfo.length;i++){
-								if(this.taskInfo[i].businessType=='WAREHOUSE'){
-									if(this.taskInfo[i].businessCode=='INOUTTASK-TASK-APPROVE'){
-										this.taskInfo[i].messageTitle='出入库任务'
-									}
-								}else if(this.taskInfo[i].businessType=='REPORT'){
-									if(this.taskInfo[i].businessCode=='PROCUREMENT-RECEIPT-REPORT'){
-										this.taskInfo[i].messageTitle='采购入库统计'
-									}else if(this.taskInfo[i].businessCode=='PROCUREMENT-CLOSE-REPORT'){
-										this.taskInfo[i].messageTitle='采购平仓统计'
-									}else if(this.taskInfo[i].businessCode=='SALE-RECEIPT-REPORT'){
-										this.taskInfo[i].messageTitle='销售出库统计'
-									}else if(this.taskInfo[i].businessCode=='SALE-CLOSE-REPORT'){
-										this.taskInfo[i].messageTitle='销售平仓统计'
-									}
-								}else if(this.taskInfo[i].businessType=='PROCUREMENT'){
-									if(this.taskInfo[i].businessCode=='PROCUREMENT-ORDER-APPROVE'){
-										this.taskInfo[i].messageTitle='采购订单'
-									}
-								}else if(this.taskInfo[i].businessType=='SALE'){
-									if(this.taskInfo[i].businessCode=='SALE-ORDER-APPROVE'){
-										this.taskInfo[i].messageTitle='销售订单'
-									}
+						for (var i = 0; i < this.taskInfo.length; i++) {
+							if (this.taskInfo[i].businessType == 'WAREHOUSE') {
+								if (this.taskInfo[i].businessCode == 'INOUTTASK-TASK-APPROVE') {
+									this.taskInfo[i].messageTitle = '出入库任务'
+								}
+							} else if (this.taskInfo[i].businessType == 'acquisition') {
+								if (this.taskInfo[i].businessCode == 'PAYMENT-MANAGEMENT-APPROVE') {
+									this.taskInfo[i].messageTitle = '付款管理'
+								}
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+									this.taskInfo[i].messageTitle = '仓库设置'
+								}
+							} else if (this.taskInfo[i].businessType == 'REPORT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '采购平仓统计'
+								}
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
+									this.taskInfo[i].messageTitle = '采购入库统计'
+								}
+								if (this.taskInfo[i].businessCode == 'SALE-CLOSE-REPORT') {
+									this.taskInfo[i].messageTitle = '销售平仓统计'
+								}
+								if (this.taskInfo[i].businessCode == 'SALE-RECEIPT-REPORT') {
+									this.taskInfo[i].messageTitle = '销售入库统计'
+								}
+								if (this.taskInfo[i].businessCode == 'TRANSPORTATION-SETTLEMENT-REPORT') {
+									this.taskInfo[i].messageTitle = '运输结算统计'
+								}
+							} else if (this.taskInfo[i].businessType == 'PROCUREMENT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-APPROVE') {
+									this.taskInfo[i].messageTitle = '采购订单'
+								}
+							} else if (this.taskInfo[i].businessType == 'SALE') {
+								if (this.taskInfo[i].businessCode == 'SALE-ORDER-APPROVE') {
+									this.taskInfo[i].messageTitle = '销售订单'
+								}
+							} else if (this.taskInfo[i].businessType == 'TRANSPORTATIONTASK') {
+								if (this.taskInfo[i].businessCode == 'TRAN-TASK-APPROVE') {
+									this.taskInfo[i].messageTitle = '运费设置'
 								}
 							}
-						if(res.data.data.records.length==0){
-							that.isSole=true
-						}else{
-							that.isSole=false
 						}
-						if(res.data.data.records.length==0&&this.data.currentPage==1&&this.statusFlag==3
-						||res.data.data.records.length==0&&this.warehouseInOutInfo.currentPage==1&&this.statusFlag==1){
+						if (res.data.data.records.length == 0) {
+							that.isSole = true
+						} else {
+							that.isSole = false
+						}
+						if (res.data.data.records.length == 0 && this.data.currentPage == 1 && this.statusFlag ==
+							3 ||
+							res.data.data.records.length == 0 && this.warehouseInOutInfo.currentPage == 1 && this
+							.statusFlag == 1) {
 							console.log()
-							this.taskInfo=[]
+							this.taskInfo = []
 						}
 						uni.hideLoading()
 					} else {
@@ -277,67 +297,80 @@
 				this.getIndexBuyData(1)
 			},
 			navToDetailPage(item) {
-				if(item.businessCode=='PROCUREMENT-ORDER-APPROVE'){
+				if (item.businessCode == 'PROCUREMENT-ORDER-APPROVE') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_details?id='+item.businessId
+						url: '/pages/task/procurement_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-ORDER-APPROVE'){
+				} else if (item.businessCode == 'SALE-ORDER-APPROVE') {
 					uni.navigateTo({
-						url:'/pages/task/sale_details?id='+item.businessId
+						url: '/pages/task/sale_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='PROCUREMENT-RECEIPT-REPORT'){
+				} else if (item.businessCode == 'PROCUREMENT-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_report_details?id='+item.businessId
+						url: '/pages/task/procurement_report_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='PROCUREMENT-CLOSE-REPORT'){
+				} else if (item.businessCode == 'PROCUREMENT-CLOSE-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/procurement_close_details?id='+item.businessId
+						url: '/pages/task/procurement_close_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-RECEIPT-REPORT'){
+				} else if (item.businessCode == 'SALE-RECEIPT-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/sale_report_details?id='+item.businessId
+						url: '/pages/task/sale_report_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='SALE-CLOSE-REPORT'){
+				} else if (item.businessCode == 'SALE-CLOSE-REPORT') {
 					uni.navigateTo({
-						url:'/pages/task/sale_close_details?id='+item.businessId
+						url: '/pages/task/sale_close_details?id=' + item.businessId
 					})
-				}else if(item.businessCode=='INOUTTASK-TASK-APPROVE'){
-					if(this.statusFlag==3){
+				} else if (item.businessCode == 'PROCUREMENT-PRICE-APPROVE') {
+					if(this.statusFlag==1){
 						uni.navigateTo({
-							url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+this.pcUserInfo.compId
-							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+							url: `/pages/task/audit/warehouse_approval?id=${item.businessId}`
 						})
 					}else{
 						uni.navigateTo({
-							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
-							url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+this.pcUserInfo.compId
+							url: '/pages/task/audit/warehouse_details/?id=' + item.businessId
 						})
 					}
-					
 				}
 				
-			// 	if(item.taskType == "入库任务"){
-					
-			// 	if(item.statusFlag == 3){
-			// 	uni.navigateTo({
-			// 		url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
-			// 	})
-			// 	}else{
-			// 		uni.navigateTo({
-			// 			url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
-			// 		})
-			// 	}
-			// }else if(item.taskType == "出库任务"){
-			// 	if(item.statusFlag == 3){
-			// 	uni.navigateTo({
-			// 		url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
-			// 	})
-			// 	}else{
-			// 		uni.navigateTo({
-			// 			url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
-			// 		})
-			// 	}
-			// }
+				else if (item.businessCode == 'INOUTTASK-TASK-APPROVE') {
+					if (this.statusFlag == 3) {
+						uni.navigateTo({
+							url: '/pageD/warehousings/warehousingDetails?id=' + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
+							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
+						})
+					} else {
+						uni.navigateTo({
+							// url:'/pageD/warehousings/warehousings?id='+item.businessId+'&compId='+item.compId
+							url: '/pageD/warehousings/warehousings?id=' + item.businessId + '&compId=' + this
+								.pcUserInfo.compId
+						})
+					}
+
+				}
+				if (item.taskType == "入库任务") {
+
+					if (item.statusFlag == 3) {
+						uni.navigateTo({
+							url: `/pageD/warehousings/warehousingDetails?id=${item.id}`
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pageD/warehousings/warehousings?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&startWeight=${item.startWeight}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&warehouseName=${item.warehouseName}&addressUrl=${item.addressUrl}&inOutDate=${item.inOutDate}&binNumber=${item.binNumber}`
+						})
+					}
+				} else if (item.taskType == "出库任务") {
+					if (item.statusFlag == 3) {
+						uni.navigateTo({
+							url: `/pageD/warehousings/ex_warehouse_detail?id=${item.id}`
+						})
+					} else {
+						uni.navigateTo({
+							url: `/pageD/warehousings/ex_warehouse?id=${item.id}&goodsName=${item.goodsName}&contractNo=${item.contractNo}&consignee=${item.consignee}&carNo=${item.carNo}&tranCarNo=${item.tranCarNo}&boxNo=${item.boxNo}&titleNo=${item.titleNo}`
+						})
+					}
+				}
 			}
 		}
 	}
@@ -345,88 +378,101 @@
 
 <style lang="scss" scoped>
 	.tag {
-		background:#F5F6F9;
+		background: #F5F6F9;
 		padding: 5px;
-		color:#333333;
+		color: #333333;
 		display: inline-flex;
 		font-size: 22rpx;
 		border-radius: 3px;
 		margin: 3px;
 	}
-	.introduce-section .title_b .title-tip{
+
+	.introduce-section .title_b .title-tip {
 		font-size: 13px;
-		height:40px;
+		height: 40px;
 		line-height: 40px;
 		flex: 2.5;
 	}
-	.introduce-section .title_b .title{
+
+	.introduce-section .title_b .title {
 		font-size: 13px;
-		height:40px;
-		padding:10px 0;
+		height: 40px;
+		padding: 10px 0;
 		flex: 2.5;
 	}
-	.introduce-section .title_b .title-tip-b{
+
+	.introduce-section .title_b .title-tip-b {
 		flex: 1;
 		font-size: 13px;
 		color: #878C9C;
-		height:40px;
+		height: 40px;
 		line-height: 40px;
 	}
-	.introduce-section .title text{
+
+	.introduce-section .title {
+		justify-content: space-between;
+	}
+
+	.introduce-section .title text {
 		font-size: 17px;
 		font-weight: bold;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		flex: 2.5;
-		border-bottom:1px solid #EEEEEE;
 	}
-	.introduce-section .title .title-tip{
+
+	.introduce-section .title .title-tip {
 		flex: 1;
 		font-size: 15px;
 		color: #FE6430;
 		font-weight: 500;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		border-bottom:1px solid #EEEEEE;
+		border-bottom: 1px solid #EEEEEE;
 	}
-	.introduce-section .title .title-tip-a{
+
+	.introduce-section .title .title-tip-a {
 		flex: 1;
 		font-size: 15px;
 		color: #AFB3BF;
 		font-weight: 500;
-		height:50px;
+		height: 50px;
 		line-height: 50px;
-		border-bottom:1px solid #EEEEEE;
+		border-bottom: 1px solid #EEEEEE;
 	}
-	.introduce-section .guess-item{
-		border-radius:4px;
+
+	.introduce-section .guess-item {
+		border-radius: 4px;
 		background: #fff;
 		padding: 0upx 30upx 20upx;
-		margin:10px;
+		margin: 10px;
 		padding-bottom: 20upx;
 		border-bottom: 1px solid #ccc;
 	}
-	.line{
-		display:inline-block;
-		padding:5px;
-		position:relative;
-		font-size:17px;
+
+	.line {
+		display: inline-block;
+		padding: 5px;
+		position: relative;
+		font-size: 17px;
 	}
-	.line.active{
-		font-size:19px;
+
+	.line.active {
+		font-size: 19px;
 		font-weight: 900;
 	}
-	.line.active:after{
-		content:'';
-		display:block;
-		position:absolute;
-		width:18px;
-		left:50%;
+
+	.line.active:after {
+		content: '';
+		display: block;
+		position: absolute;
+		width: 18px;
+		left: 50%;
 		transform: translateX(-50%);
-		bottom:0;
-		border-bottom:1px solid #22C572;
+		bottom: 0;
+		border-bottom: 1px solid #22C572;
 	}
-	/deep/.u-action-active{
-		margin-right:6px;
+
+	/deep/.u-action-active {
+		margin-right: 6px;
 	}
 </style>