生产下料、点位更新

2024-03-12 15:23:12 +08:00
parent 6aafccdf0c
commit 6fdce408c4
31 changed files with 373 additions and 463 deletions
--- a/App.vue
+++ b/App.vue
@@ -17,9 +17,8 @@
 	}
 </script>

-<style>
+<style lang="stylus">
 	/*每个页面公共css */
 	@import '@/common/style/reset.css';
-	@import '@/common/style/uni.css';
-	@import '@/common/style/layout.css';
+	@import '@/common/style/layout.styl';
 </style>
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -1,3 +1,4 @@
+@import './mixin.styl';
 page {
    background-color: #f2f5fa !important;
    min-height: 100% !important;
@@ -10,130 +11,6 @@ uni-page-body {
 uni-button:after {
 	border: none;
 }
-/** iconfont */
-@font-face {
-  font-family: 'iconfont';
-  src: url('@/static/iconfont/iconfont.woff2?t=1665454521636') format('woff2'),
-       url('@/static/iconfont/iconfont.woff?t=1665454521636') format('woff'),
-       url('@/static/iconfont/iconfont.ttf?t=1665454521636') format('truetype');
-}
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 50rpx;
-  color: #000;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.icon_eye_close {
-	color: #bbb;
-}
-.icon_eye_active {
-	color: #ff6a00;
-}
-.icon_unchecked {
-	color: #fff;
-	width: 32rpx;
-	height: 32rpx;
-	background-color: #fff;
-	font-size: 24rpx;
-	border: 1rpx solid #bbb;
-}
-.icon_checked {
-	color: #ff6a00;
-	border: 1rpx solid #ff6a00;
-}
-.icon_choosed {
-	position: absolute;
-	bottom: 0;
-	right: 0;
-	padding: 4rpx 10rpx;
-	line-height: 20rpx;
-	font-size: 20rpx;
-	color: #fff;
-	border: 1rpx solid #ff6a00;
-	background-color: #ff6a00;
-	border-top-left-radius: 10rpx;
-	border-bottom-right-radius: 10rpx;
-}
-.icon_back {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_home {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_scan {
-	width: 60rpx;
-	height: 80rpx;
-	font-size: 48rpx;
-	line-height: 80rpx;
-	color: #4e6ef2;
-	text-align: center;
-}
-.icon_phone {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 36rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_del {
-	width: 46rpx;
-	height: 48rpx;
-	font-size: 46rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_search {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	color: #323232;
-	line-height: 48rpx;
-}
-.cancel_icon::before {
-	content: "\e6db";
-}
-.cancel_icon {
-	display: block;
-	width: 60rpx;
-	height: 60rpx;
-	font-size: 40rpx;
-	color: #000;
-	line-height: 60rpx;
-	text-align: center;
-	border: 1px solid #999;
-	border-radius: 50%;
-	transform: rotate(-90deg);
-}
-.icon_start_point {
-	width: 46rpx;
-	height: 46rpx;
-	font-size: 26rpx;
-	line-height: 46rpx;
-	background-color: #ff6a00;
-	color: #fff;
-	border-radius: 50%;
-}
-.icon_vdash_line {
-	width: 46rpx;
-	height: 26rpx;
-	font-size: 26rpx;
-	line-height: 26rpx;
-	text-align: center;
-	color: #ff6a00;
-}
-.icon_right {
-	text-align: right;
-	font-size: 28rpx;
-	color: rgb(153, 153, 153);
-}

 /** 内容 */
 .zd_container {
@@ -146,8 +23,6 @@ uni-button:after {
 	width: 100%;
 	height: auto;
 	padding: 20rpx 14rpx 140rpx 14rpx;
-	/* background: linear-gradient(to bottom, #ff6400 0%, #fee4d7 30%, #f6f6f6 100%) */
-	background-color: #f6f6f6;
 }
 .zd_wrapper {
 	width: 100%;
@@ -294,9 +169,6 @@ uni-button:after {
 	color: #7d7d7d;
 	background: #fff;
 }
-.slide_new table tbody tr.checked td {
-	background-color: #f9efb6;
-}
 .slide_new table tbody tr td .td_input {
 	width: 150rpx;
 	font-size: 28rpx;
@@ -308,8 +180,9 @@ uni-button:after {
 	box-shadow: 0 0 0 2px rgba(136, 157, 199,.2);
 	border-radius: 10rpx;
 }
-.slide_new table tbody tr td.fontcol1 {
+.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
 	color: #4e6ef2;
+	font-weight: bold;
 }
 .slide_new table tbody tr td.fontcol2 {
 	color: #000;
@@ -334,6 +207,12 @@ uni-button:after {
 	background-color: #f3ccb5;
 	color: #ff5e00;
 }
+.slide_new table tbody tr.checked
+	td
+		background-color: #4e6ef2
+		color #fff
+	td.fontcol1, td.fontcol2
+		color #fff
 .item-wrapper {
 	width: 100%;
 	height: auto;
@@ -517,6 +396,7 @@ uni-button:after {
 	left: 0;
 	width: 100%;
 	height: calc(100% - var(--status-bar-height) - 72rpx);
+	background-color: #f6f6f6;
 	box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
 	border-top-left-radius: 20rpx;
 	border-top-right-radius: 20rpx;
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -6,7 +6,7 @@
 	text-decoration: none;
 	border: none;
 	outline: none;
-	font-family: uniicons, Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
+	font-family: Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-webkit-tap-highlight-color:transparent;
--- a/common/style/uni.css
+++ b/common/style/uni.css
@@ -1,12 +0,0 @@
-@font-face {
-	font-family: uniicons;
-	font-weight: normal;
-	font-style: normal;
-	src: url('~@/static/uni.ttf') format('truetype');
-}
-.iconfont{
-	font-family: uni;
-	text-decoration: none;
-	text-align: center;
-}
-
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -1,8 +1,12 @@
 <template>
-	<view class="header">
-		<span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
-		<span class="page_name">{{title}}</span>
-		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
+	<view class="zd-row jcflexstart header">
+		<view class="zd-col-4">
+			<uni-icons @tap="goBack" type="back" size="26" color="#fff"></uni-icons>
+		</view>
+		<view class="zd-col-16 page_name">{{title}}</view>
+		<!-- <view class="zd-col-4" style="text-align: right">
+			<uni-icons @tap="backHome" type="home-filled" size="26" color="#fff" :class="{'vhide': show1 === false}"></uni-icons>
+		</view> -->
 	</view>
 </template>

@@ -51,7 +55,6 @@
 <style lang="stylus">
@import '@/common/style/mixin.styl';
 .header
-	_fj()
 	position fixed
 	_wh(100%, calc(var(--status-bar-height) + 72rpx))
 	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -2,16 +2,16 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input pdr110" 
+		class="filter_input pdr120" 
 		:value="value"
 		:focus="focusState"
 		@blur="handleBlur($event)"
 		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<!-- <view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view> -->
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focusState === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_scan" @tap="toPhone">&#xe663;</view>
-			<view v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</view>
+		<view class="zd-row buttons_wraper">
+			<!-- <uni-icons @tap="toDel" type="closeempty" size="20" color="#4e6ef2"></uni-icons> -->
+			<uni-icons class="pdr10" @tap="toScan" type="scan" size="20" :color="focusState ? '#ff6a00' : '#4e6ef2'"></uni-icons>
+			<uni-icons @tap="toPhone" type="camera" size="26" color="#4e6ef2"></uni-icons>
+			<uni-icons v-show="seaShow" @tap="toSearch" type="search" size="20" color="#4e6ef2"></uni-icons>
 		</view>
 	</view>
 </template>
@@ -130,14 +130,13 @@
 .search_wraper
 	position relative
 	_wh(100%, 80rpx)
-.pdr110
-	padding-right: 110rpx;
+.pdr120
+	padding-right: 120rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 10rpx
-	_wh(auto, 70rpx)
-	_fj(flex-end)
-.icon_scan_active
-	color $red
+	_wh(auto, 80rpx)
+.pdr10
+	padding-right 10rpx
 </style>
--- a/components/SearchBox1.vue
+++ b/components/SearchBox1.vue
@@ -1,110 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<input 
-		type="text" 
-		class="filter_input pdr160" 
-		:value="value"
-		:focus="focused"
-		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<span class="iconfont icon-del" @tap="toDel">&#xe6dc;</span>
-			<span class="iconfont icon_scan" @tap="toScan">&#xe6e2;</span>
-			<span v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</span>
-		</view>
-	</view>
-</template>
-
-<script>
-	import permision from "@/utils/permission.js"
-	export default {
-		data() {
-			return {
-				cur: ''
-			};
-		},
-		model: {
-			prop: 'value',
-			event: 'input'
-		},
-		props: {
-			value: String,
-			seaShow: {
-			  type: Boolean,
-			  default: false
-			},
-			focused: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			handleChange ($event) {
-				this.cur = $event.target.value
-				this.$emit('input', this.cur)
-				this.$emit('handleChange', this.cur)
-			},
-			toSearch () {
-				this.$emit('toSearch', this.cur)
-			},
-			toDel () {
-				this.$emit('input', '')
-			},
-			async toScan() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.$emit('input', res.result)
-						this.$emit('handleChange', res.result)
-					},
-					fail: (err) => {
-						// uni.showToast({
-						// 	title: '出错',
-						// 	icon: 'none'
-						// })
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "需要相机权限",
-						confirmText: "设置",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style lang="stylus">
-@import '../common/style/mixin.styl';
-.search_wraper
-	position relative
-	_wh(100%, 70rpx)
-.pdr160
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 0
-	_wh(auto, 70rpx)
-</style>
--- a/components/SearchBoxMx.vue
+++ b/components/SearchBoxMx.vue
@@ -1,88 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<slot></slot>
-		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focused === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import permision from "@/utils/permission.js"
-	export default {
-		props: {
-			focused: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			toDel () {
-				this.$emit('inputDel')
-			},
-			toScan () {
-				this.$emit('inputScan', '')
-			},
-			async toPhone() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.$emit('toPhone', res.result)
-					},
-					fail: (err) => {
-						// uni.showToast({
-						// 	title: '出错',
-						// 	icon: 'none'
-						// })
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "需要相机权限",
-						confirmText: "设置",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style lang="stylus">
-@import '../common/style/mixin.styl';
-.search_wraper
-	position relative
-	_wh(100%, 70rpx)
-.pdr160
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 10rpx
-	_wh(auto, 70rpx)
-	_fj(flex-end)
-.icon_scan_active
-	color $red
-</style>
--- a/package.json
+++ b/package.json
@@ -1,5 +1,3 @@
 {
-  "dependencies": {
-    "jsencrypt": "^3.2.1"
-  }
+  "dependencies": {}
 }
--- a/pages.json
+++ b/pages.json
@@ -17,60 +17,6 @@
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }  
-		}
-		,{
-		    "path" : "pages/login/upgrade",
-		    "style": {
-		    	"navigationStyle": "custom"
-		    }  
-		}
-        ,{
-            "path" : "pages/manage/man-group-disk",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/in-storage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/out-storage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/task-flow",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/manage/search-mater",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        },
-		{
-		    "path" : "pages/manage/search-mater-1",
-		    "style" :                                                                                    
-		    {
-		        "navigationStyle": "custom"
-		    }
-		    
 		}
        ,{
            "path" : "pages/manage/empty-tray-out",
@@ -104,6 +50,22 @@
            }
            
        }
+        ,{
+            "path" : "pages/manage/produce-cut",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/point-update",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
    ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -48,8 +48,8 @@
 					{id: 2, title: '空托盘入库', icon: 'RF02', path: '/pages/manage/empty-tray-in'},
 					{id: 3, title: '组盘入库', icon: 'RF03', path: '/pages/manage/group-in-storage'},
 					{id: 4, title: '原料出库', icon: 'RF04', path: '/pages/manage/mater-out-storage'},
-					{id: 5, title: '生产下料', icon: 'RF05', path: ''},
-					{id: 6, title: '点位更新', icon: 'RF06', path: ''},
+					{id: 5, title: '生产下料', icon: 'RF05', path: '/pages/manage/produce-cut'},
+					{id: 6, title: '点位更新', icon: 'RF06', path: '/pages/manage/point-update'},
 					{id: 7, title: '定点作业', icon: 'RF07', path: ''},
 					{id: 8, title: '作业管理', icon: 'RF08', path: ''},
 					{id: 9, title: '出库确认', icon: 'RF09', path: ''}
@@ -71,13 +71,13 @@
 				
 			},
 			toPage (e) {
-				let url = e.path
+				let url = e.path + '?title=' + e.title
 				uni.redirectTo({
 					url: url
 				})	
 			},
 			Quit () {
-			  this.$store.dispatch('delUserInfo')
+			  this.$store.dispatch('delUserInfo', '')
 			  uni.redirectTo({
 			  	url: '/pages/login/login'
 			  })
@@ -96,7 +96,8 @@
 	height 100%
 	top 0
 	padding-top calc(var(--status-bar-height) + 86rpx)
-	background linear-gradient(to bottom, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%)
+	// background linear-gradient(to bottom, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%)
+	background linear-gradient(to bottom, #f5f6fb 0%, #fff 100%)
 .header
 	position fixed
 	left 0
@@ -104,7 +105,6 @@
 	padding-top var(--status-bar-height)
 	z-index 100
 	_wh(100%, calc(var(--status-bar-height) + 86rpx))
-	background-color  #f8e6db
 	_font(36rpx,86rpx,#333,,center)
 .userInfo-wrap
 	_fj()
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -6,8 +6,8 @@
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>
 		<div class="input-box">
-			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password">
-			<span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @tap="changePassword">&#xe6a0;</span>
+			<input class="large-input" :password="!showPassword" placeholder="请输入密码" v-model="password" autocomplete=“off”>
+			<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
 	    </div>
 		<view class="radio-box">
 			<view class="radio-wrap">
@@ -61,9 +61,6 @@
 			toSaveUser() {
 				this.saveUser = !this.saveUser
 			},
-			changePassword() {
-			    this.showPassword = !this.showPassword
-			},
 			setup () {
 				uni.redirectTo({
 					url: '/pages/login/setup'
@@ -142,7 +139,7 @@
  height 75rpx
  border-bottom 1rpx solid #e2e2e2
 .large-input
-	_wh(calc(100% - 40rpx), 74rpx)
+	_wh(calc(100% - 100rpx), 74rpx)
 	_font(32rpx,74rpx,#999)
 	padding-left 10rpx
 .radio-box
--- a/pages/manage/back/in-storage.vue
+++ b/pages/manage/back/in-storage.vue
--- a/pages/manage/back/man-group-disk.vue
+++ b/pages/manage/back/man-group-disk.vue
--- a/pages/manage/back/out-storage.vue
+++ b/pages/manage/back/out-storage.vue
--- a/pages/manage/back/search-mater-1.vue
+++ b/pages/manage/back/search-mater-1.vue
--- a/pages/manage/back/search-mater.vue
+++ b/pages/manage/back/search-mater.vue
--- a/pages/manage/back/task-flow.vue
+++ b/pages/manage/back/task-flow.vue
--- a/pages/manage/empty-tray-in.vue
+++ b/pages/manage/empty-tray-in.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="空托盘入库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -54,6 +54,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				val1: '',
@@ -61,6 +62,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 		},
--- a/pages/manage/empty-tray-out.vue
+++ b/pages/manage/empty-tray-out.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="空托盘出库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<!-- <view class="zd-row">
 					<view class="zd-col-5">
@@ -52,6 +52,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				// options2: [],
@@ -60,6 +61,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 		},
--- a/pages/manage/group-in-storage.vue
+++ b/pages/manage/group-in-storage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="组盘入库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -12,7 +12,7 @@
 							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
 						</picker>
 					</view>
-					<view class="uni-icons icon_right">&#xe6b5;</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
 				</view>
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
@@ -64,7 +64,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>载具编码</th>
+								<th class="fontcol1">载具编码</th>
 								<th>载具类型</th>
 								<th>物料编码</th>
 								<th>物料名称</th>
@@ -74,7 +74,7 @@
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.vehicle_code === pkId}">
+							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.point_code === pkId}">
 								<td class="fontcol1">{{e.vehicle_code}}</td>
 								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
 								<td class="fontcol2">{{e.material_code}}</td>
@@ -143,6 +143,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				options2: [],
@@ -163,6 +164,9 @@
 				disabled4: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._getVehicleType()
 			this._queryMaterial()
@@ -344,5 +348,4 @@
 </script>

 <style lang="stylus">
-@import '../../common/style/mixin.styl';
 </style>
--- a/pages/manage/mater-out-storage.vue
+++ b/pages/manage/mater-out-storage.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="原料出库"></nav-bar>
+		<nav-bar :title="title"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
@@ -11,7 +11,7 @@
 						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
 					</view>
 				</view>
-				<view class="zd-row border-bottom">
+				<view class="zd-row">
 					<view class="zd-col-5">
 						<span class="filter_label">出库点位</span>
 					</view>
@@ -27,7 +27,7 @@
 					<table>
 						<thead>
 							<tr>
-								<th>点位编码</th>
+								<th class="fontcol1">点位编码</th>
 								<th>点位名称</th>
 								<th>载具编码</th>
 								<th>物料编码</th>
@@ -69,6 +69,7 @@
 		},
 		data() {
 			return {
+				title: '',
 				options1: [],
 				index1: '',
 				val1: '',
@@ -77,6 +78,9 @@
 				disabled: false
 			};
 		},
+		onLoad (options) {
+			this.title = options.title
+		},
 		created () {
 			this._queryMaterial()
 		},
@@ -111,6 +115,7 @@
 					let res = await fullVehicleOut(this.pkId, this.val1)
 					this.pkId = ''
 					this.disabled = false
+					this._queryLinkMaterial(this.index1)
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
@@ -130,4 +135,5 @@
 </script>

 <style lang="stylus">
+@import '../../common/style/mixin.styl';
 </style>
--- a/pages/manage/point-update.vue
+++ b/pages/manage/point-update.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">载具类型</span>
+					</view>
+					<view class="zd-col-17 filter_picker">
+						<picker @change="pickerChange" :value="index1" :range="options1" range-key="text">
+							<view class="uni-input">{{index1 !== '' ? options1[index1].text : ''}}</view>
+						</picker>
+					</view>
+					<uni-icons type="right" size="14" color="#999"></uni-icons>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': index1 === '' || !val1  || !val2}" :disabled="disabled1" @tap="_bindVehicle">绑定</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1}" :disabled="disabled2" @tap="_unbindVehicle">解绑</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, bindVehicle, unbindVehicle} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				val2: '',
+				options1: [],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getVehicleType()
+		},
+		methods: {
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			pickerChange (e) {
+				this.index1 = e.detail.value
+			},
+			async _bindVehicle () {
+				this.disabled1 = true
+				if (!this.val1 || this.index1 === '' || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await bindVehicle(this.val1, this.index1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _unbindVehicle () {
+				this.disabled2 = true
+				if (!this.val1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await unbindVehicle(this.val1, this.index1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled1 = false
+				this.disabled2 = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
--- a/pages/manage/produce-cut.vue
+++ b/pages/manage/produce-cut.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">当前点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">下一点位</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': index1 === '' || !val1}" :disabled="disabled" @tap="_createP2pTask">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryEndPointsByStart, createP2pTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				options1: [],
+				index1: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				this._queryEndPointsByStart(e)
+			},
+			/** 下一点位下拉框 */
+			async _queryEndPointsByStart (e) {
+				let res = await queryEndPointsByStart(e)
+				if (res.length > 0) {
+					res.map(el => {
+						this.$set(el, 'value', el.point_code2)
+						this.$set(el, 'text', el.point_name)
+					})
+					this.options1 = [...res]
+					this.index1 = this.options1[0].value
+				}
+			},
+			async _createP2pTask () {
+				this.disabled = true
+				if (!this.val1 || this.index1 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createP2pTask(this.val1, this.index1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.options1 = []
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>
--- a/static/iconfont/iconfont.ttf
+++ b/static/iconfont/iconfont.ttf
--- a/static/iconfont/iconfont.woff
+++ b/static/iconfont/iconfont.woff
--- a/static/iconfont/iconfont.woff2
+++ b/static/iconfont/iconfont.woff2
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -196,6 +196,62 @@ export const queryLinkMaterial = () => {
 ]
 	return res
 }
+// 1.2出库确认
+export const fullVehicleOut = (code1, code2) => request({
+	url:'api/pda/fullVehicleOut',
+	data: {
+		point_code1: code1,
+		point_code2: code2
+	}
+})
+/**
+ * 生产下料
+ */
+// 根据起点查询终点列表
+// export const queryEndPointsByStart = (code) => request({
+// 	url:'api/pda/queryEndPointsByStart',
+// 	data: {
+// 		point_code1: code
+// 	}
+// })
+export const queryEndPointsByStart = (code) => {
+	let res = [
+    {
+        "point_code2": "81",
+        "point_name": "回史就问装作过"
+    }
+]
+	return res
+}
+// 下料
+export const createP2pTask = (code, mcode) => request({
+	url:'api/pda/createP2pTask',
+	data: {
+		point_code1: code,
+		point_code2: mcode
+	}
+})
+/**
+ * 点位更新
+ */
+// 解绑
+export const unbindVehicle = (code, type, vcode) => request({
+	url:'api/pda/unbindVehicle',
+	data: {
+		point_code: code,
+		vehicle_type: type,
+		vehicle_code: vcode
+	}
+})
+// 绑定
+export const bindVehicle = (code, type, vcode) => request({
+	url:'api/pda/bindVehicle',
+	data: {
+		point_code: code,
+		vehicle_type: type,
+		vehicle_code: vcode
+	}
+})
 /**
 * 任务流转
 */
@@ -233,14 +289,7 @@ export const queryAllPoints = () => request({
 // ]
 // 	return res
 // }
-// 1.2生成任务
-export const createP2pTask = (code, mcode) => request({
-	url:'api/pda/createP2pTask',
-	data: {
-		point_code1: code,
-		point_code2: mcode
-	}
-})
+

 /**
 * 原材料库入库
@@ -269,14 +318,7 @@ export const queryPoints = (type) => request({



-// 1.2满托出库
-export const fullVehicleOut = (code1, code2) => request({
-	url:'api/pda/fullVehicleOut',
-	data: {
-		point_code1: code1,
-		point_code2: code2
-	}
-})
+
 //1.3余料回库
 export const vehicleGoBack = (code, vcode, num) => request({
 	url:'api/pda/vehicleGoBack',
--- a/utils/request.js
+++ b/utils/request.js
@@ -67,7 +67,7 @@ const request = (params) => {
 						content: res[1].data.message,
 						showCancel: false
 					})
-					store.dispatch('delUserInfo')
+					store.dispatch('delUserInfo', '')
 					uni.redirectTo({
 						url: '/pages/login/login'
 					})
--- a/vuex/modules/user.js
+++ b/vuex/modules/user.js
@@ -64,6 +64,7 @@ const mutations = {
 	},
 	[types.DEL_USER_INFO] (state, res) {
 		state.userInfo = res
+		state.saveToken = res
 	},
 	[types.SAVE_TOKEN] (state, res) {
 		state.saveToken = res
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,7 +2,3 @@
 # yarn lockfile v1


-jsencrypt@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jsencrypt/-/jsencrypt-3.2.1.tgz#09766983cc760088ff26b12fe7e574252af97727"
-  integrity sha512-k1sD5QV0KPn+D8uG9AdGzTQuamt82QZ3A3l6f7TRwMU6Oi2Vg0BsL+wZIQBONcraO1pc78ExMdvmBBJ8WhNYUA==