常崟菜单重新规划

pages.json

@@ -151,7 +151,7 @@
 	{
       "path": "pages/payInto/index",
       "style": {
-        "navigationBarTitleText": "整件拣货界面",
+        "navigationBarTitleText": "其他入库",
         "navigationBarBackgroundColor": "#228B22"
       }
     },
@@ -296,7 +296,7 @@
     }, {
       "path": "pages/AvgOrderPkg/index",
       "style": {
-        "navigationBarTitleText": "AGV拣货",
+        "navigationBarTitleText": "拣货出库",
         "navigationBarBackgroundColor": "#228B22"
       }
     }, {

pages/AvgOrderPkg/index.scss

@@ -11,9 +11,9 @@
 	}
 	.sh-search {
 		display: flex;
-		padding: 10rpx 30rpx;
+		padding: 10rpx 20rpx;
-		background-color: #F2F2F2;
+		flex:60px;
-
+		// background-color: #F2F2F2;
 		.sh-form {
 			width: 100%;
 		}
@@ -28,9 +28,15 @@
 			}
 		}
 	}
-
+	.all-card{
+	display: flex;
+	flex-direction:column;
+	height: 340px;
+	flex: 340px;
+	overflow: auto;
 	.sh-card {
-		margin-top: 30rpx;
+		// background-color: red;
+		margin-top: 16rpx;
 		// padding: 20rpx 0rpx;
 		border: 0.5px solid #797979;
 		border-radius: 20rpx;
@@ -39,10 +45,42 @@
 		.sh-card-title {
 			display: flex;
 			flex-direction: column;
+			position: relative;
 			padding: 0 20px;
 			background-color: #f2f2f2;
 			border-top-left-radius: 20rpx;
 			border-top-right-radius: 20rpx;
+			.sh-button{
+					position: absolute;
+					width: 38px;
+					height: 28px;
+					line-height: 28px;
+					border-radius: 50%;
+					top: 0;
+					right: 0;
+			}
+			.receipt-number {
+				display: flex;
+				.receipt-number-title {
+					color: #333333;
+					font-size: 24rpx;
+				}
+				.receipt-number-value {
+					color: #333333;
+					font-size: 28rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+			}
+
+		}
+		.sh-card-title-two{
+			display: flex;
+			flex-direction: column;
+			padding: 0 20px;
+			background-color: #d7d7d7;
+			border-top-left-radius: 20rpx;
+			border-top-right-radius: 20rpx;
 			.receipt-number {
 				display: flex;
 				.receipt-number-title {
@@ -81,7 +119,7 @@
 				.goods-card-content-item {
 					display: flex;
 					align-items: center;
-					width: 60%;
+					width: 70%;
 					.goods-title {
 						font-size: 28rpx;
 						color: #555555;
@@ -107,19 +145,26 @@
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
+			
 			.card-content-item {
-				width: 50%;
+				width: 90%;
 				display: flex;
-				align-items: center;
+				// align-items: center;
+				// position: relative;
 				.item-title {
-					font-size: 24rpx;
+					font-size: 22rpx;
 					color: #555555;
+					width: 130rpx;
+					text-align: right;
+					// right: 0;
 				}
 				.item-value {
-					font-size: 26rpx;
+					font-size: 24rpx;
 					color: #666666;
-					margin-left: 20rpx;
+					margin-left: 14rpx;				}
 			}
+			.card-content-item:first-child{
+					width: 100%;
 				}
 			.sh-bold {
 				font-weight: bold;
@@ -128,8 +173,62 @@
 		}
 
 	}
-	
+	margin-bottom: 100px;
+	}
+	// .sh-card:first-child{
+	// 	margin-bottom: 50px;
+	// }
 	.loadmore-data{
 		padding-top: 30rpx;
 	}
+.recommend {
+  text-align: center;
+  height: 50rpx;
+  margin-top: 10rpx;
 }
+
+.recommend-title {
+  display: table;
+  width: 100%;
+  line-height: 50rpx;
+  white-space: nowrap;
+  border-spacing: 2rem 0;
+  font-size: 30rpx;
+  color: gray
+}
+
+.recommend-title::before, .recommend-title::after {
+  display: table-cell;
+  content: "";
+  width: 50%;
+  background: linear-gradient(#eee, #eee) repeat-x center;
+  background-size: 0.1rem 0.1rem;
+}
+
+.bottom{
+	display: flex;
+	flex: 130px;
+		position:fixed;
+		height: 40px;		
+		width: 100%;
+		bottom:58px;
+		button{
+			height: 100%;
+			margin-top: 20px;
+			line-height: 40px;
+			width: 60%;
+			font-size: 16px;
+		
+		}
+		.foot{
+			position: fixed;
+			bottom: 15px;
+			margin-left: 1%;
+			.size {
+					 transform: scale(0.5,0.5);
+					 font-size: 24px;
+				}
+		}
+	}
+}
+

pages/AvgOrderPkg/index.vue

@@ -1,26 +1,82 @@
 <template>
   <view class="sh-content">
-    <view class="" style="display: flex;justify-content:space-around;padding-top:250rpx;">
+    <view class="sh-search">
-      <view style="text-align: center;">
+      <u-form labelPosition="left" :model="dataForm" class="sh-form">
-        待拣订单
+        <u-form-item  prop="barCode">
-        <br>
+          <u-input v-model="dataForm.containerCode" border input-align="left" height="70" style="background-color: #ffffff;height: 38px;line-height: 38px;"   placeholder="请扫描台车编号"
-        <span>{{dataForm.waitPickOrderNumber}}</span>
+            @confirm="inputQuery()" :focus="firstFocus">
+			</u-input>
+        </u-form-item>
+      </u-form>
+ 
+    </view>
+<!-- 	<view class="" style="font-size: 36px;margin: 20rpx 20rpx 20rpx 20rpx;">
+		<text>{{dataForm.containerCode1}}</text>
+	</view> -->
+	<view class='recommend'>
+	  <text class='recommend-title'>待出库物料信息</text>
+	</view>
+    <!-- {{dataList}} -->
+	<view class="all-card">
+		
+		<view class="sh-card" v-for="(item, index) in dataList" :keys="item.id" :index="item.id" v-if="dataList.length > 0"
+		       style="border-radius: 20rpx;">
+			<view  class="sh-card-title"   style="border-radius: 20rpx;">
+				   <image src="@/static/icon/edit.png" @click="editBtn(index)" style="width: 2.5vh;height: 2.5vh;position: absolute;right: 1vh;margin-top: 1vh;" />
+		      <view class="card-content">
+			
+		        <view class="card-content-item" width="60%" style="margin-top: 1vh;">
+		          <text class="item-title" >物料编号:</text>
+		          <text class="item-value">{{item.ttPart}}</text>
+		        </view>
+		      </view>
+		     <view class="card-content">
+		       <view class="card-content-item">
+		         <text class="item-title">物料信息:</text>
+		         <text class="item-value">{{item.ptName}}--{{item.ptDesc}}</text>
+		       </view>
+		
+		     </view>
+		     <view class="card-content">
+		       <view class="card-content-item">
+		         <text class="item-title">台车编号:</text>
+		         <text class="item-value">{{item.containerCode}}</text>
+		       </view>
+			
 		     </view>
-      <view style="text-align: center;">待拣品类
+		     <view class="card-content">
-      <br>
+		       <view class="card-content-item">
-      <span>{{dataForm.waitPickTypeNumber}}</span></view>
+		         <text class="item-title">缴库数量:</text>
-      <view  style="text-align: center;">待拣数量
+		         <text class="item-value">{{item.ttQtyRct}}</text>
-      <br>
-      <span>{{dataForm.waitPickGoodsNumber}}</span></view>
 		       </view>
 		    
-    <view style="position: absolute ;bottom:50rpx;left: 50%;transform: translateX(-50%);text-align: center;">
-      <view class="confrim-btn" style="margin-bottom: 40rpx;">
-        <u-button size="medium" type="primary" style="width:350rpx; margin-top: 40rpx" @click="operation">开始拣选</u-button>
 		     </view> 
-      <text>
+			
-        开始拣选后，系统自动呼叫AGV按顺序把需要拣货的 商品送至待拣区域，请及时处理！
+		    
-      </text>
+		    </view>
+			<u-popup v-model="show" width='90%' height="220px" :mask-close-able="false" :mask="true" @close="close"  mode="center">
+					  		<view style="height: 44px;text-align: center;line-height: 44px;font-size: 18px;margin-bottom: 18px;">
+					  		<text>数量确认</text>	
+					  		</view>
+					  		<view style="width: 100%;display: flex;align-items: baseline;">
+					  			<text style="margin: 0px 20px 0px;">拣货数量:</text> <input  v-model="item.ttQtyRct" style="border:1px solid #000;padding-right: 20px;"></u-input>
+					  			
+					  		</view>
+					  	<view style="width: 100%; display: flex;margin-top: 40px;font-size: 14px;">
+					  			    <button style="width: 30%; font-size: 16px;line-height: 44px;" class="btn1" type="default" @click="noEnter()">取消</button>
+					  			    <button  style="width: 30%;font-size: 16px;line-height: 44px;;" type="default"  @click="enterUp(item)">确认</button>
+					  		    </view>
+					  
+					  	</u-popup>
+		     </view>
+	</view>
+
+   <!-- <view class="loadmore-data">
+      <u-loadmore :status="loadStatus"></u-loadmore>
+    </view> -->
+    <!-- <button @click="open">测试</button> -->
+	<view class="bottom">
+		<button @click="pickUp()" >完成出库</button>
 	</view>
     
   </view>
@@ -30,47 +86,215 @@
   export default {
     data() {
       return {
+		  show:false,
+        showDiv:false,
+        queryFlag: '',
         dataForm: {
-          //待拣订单
+          containerCode: null,
-          waitPickOrderNumber:'',
+          keywords: "",
-          //待拣品类 
+          pageNum: 1,
-          waitPickTypeNumber:'',
+          pageSize: 10
-          //待拣数量
+        },
-          waitPickGoodsNumber:'',
+		
-        }
+		pickUpObj:{
+			pointNo:'',
+			taskCode:'',
+			taskId:'',
+			containerId:'',
+			dtlAddBos:[]
+		},
+        dataList: [],
+        query: {
+          current: 1,
+          size: 20
+        },
+		isActive:0,
+        loadStatus: 'loadmore',
+        dicOptions: [],
+		timer:0,
+		//模拟数据列表
+		datalist3: [],
+		//模拟初始数据
+		tval3: "myvalue1",
+		firstFocus:false
       }
     },
     onLoad() {
-      this.getList()
+      this.loadList();
+	 //  this.$u.api.waitOutPlan(this.dataForm).then(res=>console.log(
+	 // this.dataList=res.rows
+	 //  ))
+		  // uni.setNavigationBarTitle({
+		  // 		title:this.$i18nMsg().nav.outStore
+		  // 	})
+	// this.$u.api.mouldStorage.queryMouldStorage({pageNum: 1,pageSize:9999,type:'out'}).then(res=>{
+	// 	console.log(res);
+	// })
+    },
+    //上拉刷新(当数据距离底部100时触发，距离在pages.json配置)
+    onReachBottom() {
+      this.loadStatus = "loading";
+      setTimeout(() => {
+        this.dataForm.pageNum += 1;
+        this.loadList();
+      }, 100);
+    },
+	 onPullDownRefresh () {
+	    this.list = []
+	    //调用获取数据方法
+	    this.getData()
+	    setTimeout(() => {
+			// onLoad()
+			// this.$u.api.waitOutPlan(this.dataForm).then(res=>this.dataList=res.rows)}
+			// console.log(111);
+	        //结束下拉刷新
+	      uni.stopPullDownRefresh ();
+	    }, 800);
+	},
+		onReady() {
+			
 			},
     methods: {
-      /**开始拣货操作*/
+		 getData(){
-      operation(){
+			 this.$u.api.waitOutPlan(this.dataForm).then(res=>console.log(
-         this.$u.api.AvgOrderPkg.startPick().then(res=>{
+			 this.dataList=res.rows
-           if(res.code == 200){
+			  ))
-             this.$u.toast('开始拣货操作')
+		 },
+		//点击变色
+		btn(index,item){
+			this.pickUpObj.dtlAddBos=[]
+			this.isActive = index
+			this.pickUpObj.pointNo=item.endLocation
+			this.pickUpObj.taskCode=item.taskCode
+			this.pickUpObj.taskId=item.taskId
+			this.pickUpObj.taskType=item.taskType
+			this.pickUpObj.containerId=item.containerId
+			this.pickUpObj.dtlAddBos.push({qrCode:item.qrCode} )
+			
+		},
+		editBtn(){
+			this.show=true
+		},
+		queryList(index,item){
+			console.log(index,item);
+		this.dataForm.containerCode=item.containerCode
+		},
+			
+		enterUp(item){
+			console.log(item);
+		this.$u.api.replaceCar.upateBusinItemInDataForQty(item).then(res=>{
+			console.log(res);
+		})
+		},
+      /**搜索框查询*/
+      inputQuery() {
+        // if (this.queryFlag !== '') {
+        //   clearTimeout(this.queryFlag);
+        //    this.loadList()
+        // }
+        if (this.dataForm.containerCode == '' || this.dataForm.containerCode == null || this.dataForm.containerCode ==
+          undefined) {
+          return
+        }
+        // this.queryFlag = setTimeout(() => {
+          this.loadList()
+        // }, 500)
+      },
+	  onNavigationBarButtonTap(e){
+		  // console.log(e);
 		  this.$u.route({
-             	url: 'pages/AvgOrderPkg/picking/index',
+		  	url: 'pages/BusinPickup/index2',
 		  	type: 'navigateTo',	
 		  })
-           }else{
+	  },
-             this.$u.toast(res.msg)
+		  
+	  close(){
+	  },
+	  noEnter(){
+		  this.show=false
+	  },
+      loadList() {
+		  //防抖
+		  clearInterval(this.timer)
+		  console.log(this.dataForm);
+		  this.timer =setTimeout(()=>{
+		  	//节流
+		  	let flag = true
+		  	if(flag===false) return
+			if (this.dataForm.containerCode == '' || this.dataForm.containerCode == null || this.dataForm.containerCode ==
+			  undefined) {
+			  return
+			}
+		  	flag=false
+		  	setTimeout(()=>{
+		  		flag = true
+				this.firstFocus=false
+				
+				this.$u.api.replaceCar.getBusinItemInData(this.dataForm).then(res=>{
+					if(!res.data || res.data.length == 0){
+					// console.log(res);
+					this.$u.toast("当前托盘模具不存在");		
+					}else if(res.code == '200'){
+							// console.log(res);
+							res.data.forEach((item)=>{
+								item.containerId=item.id
+							})
+							this.dataList=res.data
+							setTimeout(()=>{
+								this.dataForm.containerCode1=this.dataForm.containerCode
+								this.dataForm.containerTypeLabel=this.dataForm.containerCode
+								this.dataForm.containerCode=''
+							},0)
+					
+							this.$nextTick(()=>{
+								this.firstFocus = true
+							})
 						}
 				})	
+			}
+			,500)
+			
+		  },400)
       },
-      getList(){
+	// 下一个界面
-         this.$u.api.AvgOrderPkg.getAGVStatistics().then(res=>{
+	enterNext(item,index){
-           if(res.code == 200){
+		this.$u.route({
-			   console.log(res);
+			url: 'pages/BusinPickup/index1',
-              this.dataForm = res.data
+			type: 'navigateTo',
-           }else{
+			params:{
-             this.$u.toast(res.msg)
+				containerCode:item.containerCode
 			} 			
 		})
 	},
+	
+	
+      // 任务查看
+      searchClick() {
+        this.dataList = [];
+        this.dataForm.pageNum = 1;
+        this.loadList();
+      },
+    },
+	filters: {
+	  formatType(value) {
+	    switch (Number(value)) {
+	      case 0:
+	        return "type1";
+	      case 1:
+	        return "type2";
+	      case 2:
+	        return "type3";
+	      default:
+	        return "";
 	    }
+	  }}
   }
 </script>
 
-<style>
+<style lang="scss">
+  @import "index.scss";
+  .footer {
+    display: flex;
+    padding: 20rpx 0;
+  }
 </style>

pages/AvgOrderPkg/index22222.scss

@@ -0,0 +1,135 @@
+.sh-content {
+	padding: 25rpx;
+	background-color: #fff;
+	display: flex;
+	flex-direction: column;
+    .u-form-item {
+		padding: 5rpx 0px;
+	}
+	.u-input__input {
+		background-color: #ffffff;
+	}
+	.sh-search {
+		display: flex;
+		padding: 10rpx 30rpx;
+		background-color: #F2F2F2;
+
+		.sh-form {
+			width: 100%;
+		}
+
+		.sh-sub-search {
+			display: flex;
+			align-items: center;
+			padding: 15rpx 0 15rpx 15rpx;
+
+			.sh-search-button {
+				height: 100%;
+			}
+		}
+	}
+
+	.sh-card {
+		margin-top: 30rpx;
+		// padding: 20rpx 0rpx;
+		border: 0.5px solid #797979;
+		border-radius: 20rpx;
+		line-height: 60rpx;
+
+		.sh-card-title {
+			display: flex;
+			flex-direction: column;
+			padding: 0 20px;
+			background-color: #f2f2f2;
+			border-top-left-radius: 20rpx;
+			border-top-right-radius: 20rpx;
+			.receipt-number {
+				display: flex;
+				.receipt-number-title {
+					color: #333333;
+					font-size: 24rpx;
+				}
+				.receipt-number-value {
+					color: #333333;
+					font-size: 28rpx;
+					font-weight: 600;
+					margin-left: 20rpx;
+				}
+			}
+		}
+		.borderBottom {
+			border-bottom-left-radius: 20rpx;
+			border-bottom-right-radius: 20rpx;
+		}
+		.sh-card-title-border {
+			border-bottom: 2px dashed #797979;
+		}
+		.sh-card-content {
+			position: relative;
+			margin: 16rpx 0;
+			padding: 0rpx 70rpx;
+
+			.detail-icon {
+				position: absolute;
+				right: 10rpx;
+				top: 90rpx;
+			}
+			.goods-card-content {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				.goods-card-content-item {
+					display: flex;
+					align-items: center;
+					width: 60%;
+					.goods-title {
+						font-size: 28rpx;
+						color: #555555;
+					}
+					.goods-value {
+						font-size: 28rpx;
+						color: #666666;
+						margin-left: 20rpx;
+					}
+					
+				}
+			}
+		}
+		.goods-no{
+			font-weight: bold;
+			margin-right: 20rpx;
+		}
+		.pad-content {
+			padding-bottom: 16rpx;
+		}
+
+		.card-content {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			.card-content-item {
+				width: 50%;
+				display: flex;
+				align-items: center;
+				.item-title {
+					font-size: 24rpx;
+					color: #555555;
+				}
+				.item-value {
+					font-size: 26rpx;
+					color: #666666;
+					margin-left: 20rpx;
+				}
+			}
+			.sh-bold {
+				font-weight: bold;
+				word-break: break-all;
+			}
+		}
+
+	}
+	
+	.loadmore-data{
+		padding-top: 30rpx;
+	}
+}

pages/AvgOrderPkg/index22222.vue

@@ -0,0 +1,76 @@
+<template>
+  <view class="sh-content">
+    <view class="" style="display: flex;justify-content:space-around;padding-top:250rpx;">
+      <view style="text-align: center;">
+        待拣订单
+        <br>
+        <span>{{dataForm.waitPickOrderNumber}}</span>
+        </view>
+      <view style="text-align: center;">待拣品类
+      <br>
+      <span>{{dataForm.waitPickTypeNumber}}</span></view>
+      <view  style="text-align: center;">待拣数量
+      <br>
+      <span>{{dataForm.waitPickGoodsNumber}}</span></view>
+    </view>
+
+    <view style="position: absolute ;bottom:50rpx;left: 50%;transform: translateX(-50%);text-align: center;">
+      <view class="confrim-btn" style="margin-bottom: 40rpx;">
+        <u-button size="medium" type="primary" style="width:350rpx; margin-top: 40rpx" @click="operation">开始拣选</u-button>
+      </view>
+      <text>
+        开始拣选后，系统自动呼叫AGV按顺序把需要拣货的 商品送至待拣区域，请及时处理！
+      </text>
+    </view>
+
+  </view>
+</template>
+
+<script>
+  export default{
+    data(){
+      return{
+        dataForm:{
+          //待拣订单
+          waitPickOrderNumber:'',
+          //待拣品类 
+          waitPickTypeNumber:'',
+          //待拣数量
+          waitPickGoodsNumber:'',
+        }
+      }
+    },
+    onLoad() {
+      this.getList()
+    },
+    methods:{
+      /**开始拣货操作*/
+      operation(){
+         this.$u.api.AvgOrderPkg.startPick().then(res=>{
+           if(res.code == 200){
+             this.$u.toast('开始拣货操作')
+             this.$u.route({
+             	url: 'pages/AvgOrderPkg/picking/index',
+             	type: 'navigateTo',
+             })
+           }else{
+             this.$u.toast(res.msg)
+           }
+         })
+      },
+      getList(){
+         this.$u.api.AvgOrderPkg.getAGVStatistics().then(res=>{
+           if(res.code == 200){
+			   console.log(res);
+              this.dataForm = res.data
+           }else{
+             this.$u.toast(res.msg)
+           }
+         })
+      },
+    }
+  }
+</script>
+
+<style>
+</style>

pages/index/index.vue

@@ -1,11 +1,52 @@
 <template>
 	<view class="cy_grid_box">
 		<u-grid :col="3" :border="false">
-			<u-grid-item @click="PagerJump(item.menuId)" v-for="item in menuList" :key="item.menuId">
+		<!-- 	<u-grid-item @click="PagerJump(item.menuId)" v-for="item in menuList" :key="item.menuId">
 				<image class="in-img" :src="item.pdaIcon" alt="">
 					<view class="wk-text">{{ item.menuName}}</view>
+			</u-grid-item> -->
+			<u-grid-item @click="PagerJump(2094)">
+						<image class="in-img" src="../../static/icon/1.png" alt="">
+							<view class="wk-text">入库收货</view>
 			</u-grid-item>
+			<u-grid-item @click="PagerJump(2095)">
+						<image class="in-img" src="../../static/icon/2.png" alt="">
+							<view class="wk-text">入库验收</view>
+			</u-grid-item>
+			
 			
+			<u-grid-item @click="PagerJump(10010)">
+						<image class="in-img" src="../../static/icon/5.png" alt="">
+							<view class="wk-text">AGV搬运</view>
+			</u-grid-item>	
+			<u-grid-item @click="PagerJump(10009)">
+						<image class="in-img" src="../../static/icon/6.png" alt="">
+							<view class="wk-text">出库分拣</view>
+			</u-grid-item>
+			<u-grid-item @click="PagerJump(10015)">
+						<image class="in-img" src="../../static/icon/qita.png" alt="">
+							<view class="wk-text">其他入库</view>
+			</u-grid-item>
+			<u-grid-item @click="PagerJump(2103)">
+						<image class="in-img" src="../../static/icon/3.png" alt="">
+							<view class="wk-text">库存查询</view>
+			</u-grid-item>
+			<u-grid-item @click="PagerJump(2102)">
+						<image class="in-img" src="../../static/icon/10.png" alt="">
+							<view class="wk-text">盘点计划</view>
+			</u-grid-item>
+			<!-- 	<u-grid-item @click="PagerJump(10076)">
+						<image class="in-img" src="../../static/icon/icon_94vo0bbzuhq/ruku.png" alt="">
+							<view class="wk-text">人工入库</view>
+				</u-grid-item>
+				<u-grid-item @click="PagerJump(10077)">
+						<image class="in-img" src="../../static/icon/icon_94vo0bbzuhq/chukuguanli-copy.png" alt="">
+							<view class="wk-text">更换台车物料</view>
+				</u-grid-item>	
+				<u-grid-item @click="PagerJump(10079)">
+						<image class="in-img" src="../../static/icon/icon_94vo0bbzuhq/navicon-pdd-copy.png" alt="">
+							<view class="wk-text">盘点执行</view>
+				</u-grid-item> -->
 		</u-grid>
 	</view>
 </template>
@@ -230,6 +271,11 @@
 						url: 'pages/cache/index',
 						type: 'navigateTo',
 					})
+				}else if(this.PagerJumpType === 10015){//其他入库
+					this.$u.route({
+						url: 'pages/payInto/index',
+						type: 'navigateTo',
+					})
 				}
 			},
 		}