前端小程序 缺陷更新 sdy

config/index.js

@@ -1,11 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.120:8090/',
-	// baseUrlNew: 'http://192.168.1.103:9100/',
-	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "1.1.9",
-    "versionCode" : 119,
+    "versionName" : "1.1.10",
+    "versionCode" : 1110,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

pages.json

@@ -965,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",
@@ -1691,7 +1800,7 @@
 				, {
 					"path": "warehousings/warehousingDetails",
 					"style": {
-						"navigationBarTitleText": "详情",
+						"navigationBarTitleText": "入库详情",
 						"enablePullDownRefresh": false
 					}
 

pages/erp/exWarehousing/exWarehousing.vue

@@ -298,7 +298,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) {
@@ -361,9 +361,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 +376,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)) {
+
 					this.$api.msg('皮重不能大于毛重')
 					return
 				}
@@ -402,7 +403,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -432,12 +433,12 @@
 							(String(this.detailData.tidalGrainWater).indexOf('.') + 1) >
 							1) ||
 						this.detailData.tidalGrainWater < 1 ||
-						this.detailData.tidalGrainWater > 40
+						this.detailData.tidalGrainWater > 40	
 					) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -587,6 +588,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

pages/erp/improvedExWaehousing/improvedExWaehousingDetail.vue

@@ -351,9 +351,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
@@ -366,9 +366,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
@@ -392,7 +392,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 10
+						this.detailData.buckleWeightRatio > 2
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -427,7 +427,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
@@ -576,6 +576,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

pages/erp/warehousing/warehousing.vue

@@ -340,8 +340,7 @@
 				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) {
@@ -445,9 +444,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
@@ -502,7 +501,7 @@
 							(String(this.detailData.buckleWeightRatio).indexOf('.') + 1) >
 							2) ||
 						this.detailData.buckleWeightRatio < 0 ||
-						this.detailData.buckleWeightRatio > 2
+						this.detailData.buckleWeightRatio > 3
 					) {
 						this.$api.msg('扣重比输入错误！')
 						return
@@ -552,7 +551,7 @@
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}
-					if (this.detailData.tidalGrainWater < this.detailData.solidGrainWater) {
+					if (this.detailData.tidalGrainWater <= this.detailData.solidGrainWater) {
 						this.$api.msg('潮粮水分输入错误！')
 						return
 					}

pages/grain_pulse/my_grain_pulse.vue

@@ -180,8 +180,8 @@
 					},
 				})
 			},
-			edit(item){
-				if(item.status=='已驳回'||item.status=='已通过'){
+			edit(item){debugger
+				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,22 @@
+<template>
+	<view>
+		出入库任务审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</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,22 @@
+<template>
+	<view>
+		收购结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/acquisition_settlement_details.vue

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

pages/task/audit/freight_setting_approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费设置审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/freight_setting_details.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		运费设置详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

pages/task/audit/freight_settlement _approval.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		运费结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</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,22 @@
+<template>
+	<view>
+		采购结算审核
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/task/audit/purchase_settlement_details.vue

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

pages/task/audit/warehouse_approval.vue

@@ -0,0 +1,109 @@
+<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>
+		<view>
+			<button>驳回</button>
+			<button>通过</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</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;
+	}
+</style>

pages/task/audit/warehouse_details.vue

@@ -0,0 +1,22 @@
+<template>
+	<view>
+		仓库设置详情
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</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,20 @@
 					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")
+			debugger
+			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 +93,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,54 +114,55 @@
 		// 	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 => {
+				this.$api.doRequest('get', '/warehouseInOutInfo/selectInfoByKeyWord', this.warehouseInOutInfo).then(
+				res => {
 					if (res.data.code == 200) {
 						this.taskInfo = res.data.data
 						uni.hideLoading()
@@ -185,17 +187,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 +205,59 @@
 						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 == '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 == '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 == 'PROCUREMENT') {
+								if (this.taskInfo[i].businessCode == 'PROCUREMENT-ORDER-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 {
@@ -276,68 +282,70 @@
 				this.pageSize = 1
 				this.getIndexBuyData(1)
 			},
-			navToDetailPage(item) {
-				if(item.businessCode=='PROCUREMENT-ORDER-APPROVE'){
+			navToDetailPage(item) {debugger
+				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 == '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=' + this
+								.pcUserInfo.compId
 							// url: '/pageD/warehousings/warehousingDetails?id='+item.businessId+'&compId='+item.compId
 						})
-					}else{
+					} 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: '/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}`
-			// 		})
-			// 	}
-			// }
+
+				// 	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 +353,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>