拷贝上电科

pages/home/home.vue

@@ -0,0 +1,168 @@
+<template>
+	<view class="home_wraper">
+		<view class="zd_content">
+			<view class="header">首页</view>
+			<view class="userInfo-wrap">
+				<view class="userInfo">
+					<text v-if="userName !== ''" class="p1">{{userName}}</text>
+					<text class="p2">欢迎进入兰州铜箔二期acs系统！</text>
+				</view>
+				<view class="exit" @tap="Quit">
+					<view class="icon-exit"></view>
+					<view class="exit-text">退出</view>
+				</view>
+			</view>
+			<view class="zd_home_wrapper">
+				<view class="menus_wrap">
+					<view class="fir_menu_wrap">
+						<view class="fir_menu-item" v-for="e in menuList1" :key="e.id" @tap="toPage(e)">
+							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
+							<view class="menu-name">{{e.title}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				userName: '',
+				menuList: [
+					{id: '1', name: '人工组盘', sonTree: [
+						{menu_id: '1', icon: 'RF01', name: '人工组盘', path: '/pages/manage/man-group-disk'}
+					]},
+					{id: '2', name: '原材料库', sonTree: [
+						{menu_id: '1', icon: 'RF02', name: '入库', path: '/pages/manage/in-storage'},
+						{menu_id: '2', icon: 'RF03', name: '出库', path: '/pages/manage/out-storage'}
+					]},
+					{id: '3', name: '任务流转', sonTree: [
+						{menu_id: '1', icon: 'RF04', name: '任务流转', path: '/pages/manage/task-flow'}
+					]}
+				],
+				menuList1: [
+					{id: 1, title: '空托盘出库', icon: 'RF01', path: '/pages/manage/empty-tray-out'},
+					{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: '/pages/manage/produce-cut'},
+					{id: 6, title: '点位更新', icon: 'RF06', path: '/pages/manage/point-update'},
+					{id: 7, title: '定点作业', icon: 'RF07', path: '/pages/manage/fixed-point-task'},
+					{id: 8, title: '作业管理', icon: 'RF08', path: '/pages/manage/task-manage'},
+					{id: 9, title: '出库确认', icon: 'RF09', path: '/pages/manage/out-storage-confirm'}
+				],
+				show: false,
+				secM: []
+			};
+		},
+		created () {
+			this.$store.dispatch('setPublicObj', '')
+			if (this.$store.getters.userInfo) {
+				this.userName = JSON.parse(this.$store.getters.userInfo).username
+			}
+		},
+		methods: {
+			async _authority () {
+				let res = await authority()
+				this.menuList = [...res.sonTree]
+				
+			},
+			toPage (e) {
+				let url = e.path + '?title=' + e.title
+				uni.redirectTo({
+					url: url
+				})	
+			},
+			Quit () {
+			  this.$store.dispatch('delUserInfo', '')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.home_wraper
+	_wh(100%, 100%)
+	overflow hidden
+.zd_content
+	padding 0 24rpx
+	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, #f5f6fb 0%, #fff 100%)
+.header
+	position fixed
+	left 0
+	top 0
+	padding-top var(--status-bar-height)
+	z-index 100
+	_wh(100%, calc(var(--status-bar-height) + 86rpx))
+	_font(36rpx,86rpx,#333,,center)
+.userInfo-wrap
+	_fj()
+	_wh(100%,190rpx)
+	padding 0 30rpx
+	background-color $red
+	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
+	border-radius 12rpx
+	margin-bottom 24rpx
+.userInfo
+	_fj(,flex-start,column)
+.p1
+	_font(34rpx,1,#fff)
+	padding-bottom 18rpx
+.p2
+	_font(26rpx,1,#fff)
+.exit
+	_fj()
+	height 50rpx
+	padding 0 20rpx
+	border 1px solid #FF967C
+	border-radius 20rpx
+.icon-exit
+	_wh(22rpx, 22rpx)
+	_bis('../../static/image/exit.png',22rpx)
+.exit-text
+	_font(32rpx,50rpx,#fff,,right)
+	padding-left 10rpx
+.zd_home_wrapper
+	_wh(100%, calc(100% - 238rpx))
+	margin-bottom 24rpx
+	background-color #fff
+	border-radius: 12rpx;
+	padding: 14rpx;
+	margin-bottom 24rpx
+	box-shadow: 0 4rpx 10rpx 4rpx rgba(0,0,0,.1)
+	overflow-y scroll
+.menus_wrap
+	width 100%
+.fir_menu_wrap
+	_fj(flex-start,flex-start,,wrap)
+	align-content: flex-start
+.fir_menu-item
+	_fj()
+	flex-direction column
+	_wh(30%, auto)
+	margin-bottom 40rpx
+	_font(26rpx, 60rpx,#e74f1a,,center)
+	&:nth-child(3n+2)
+		margin-left 5%
+		margin-right 5%
+::v-deep .menu-img 
+	_wh(100%, auto)
+	img
+		position relative
+		opacity 1
+		_wh(55%, auto)
+		margin 0 auto 0.2rpx
+.menu-name
+	_font(28rpx, 38rpx, #444,,center)
+</style>

pages/login/login.vue

@@ -0,0 +1,180 @@
+<template>
+	<view class="zd_content bg">
+		<view class="p1">欢迎来到</view>
+		<view class="p2">兰州铜箔二期acs系统！</view>
+		<view class="input-box">
+			<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" autocomplete=“off”>
+			<uni-icons :type="showPassword ? 'eye-filled' : 'eye'" size="20" :color="showPassword ? '#ff6a00' : '#999'" @tap="showPassword = !showPassword"></uni-icons>
+	    </div>
+		<view class="zd-row radio-box">
+			<view class="zd-col-2 zd-row jccenter radio-icon-wrap" :class="{'radio-icon-wrap_checked': saveUser}" @tap="toSaveUser">
+				<uni-icons type="checkmarkempty" size="14" :color="saveUser ? '#ff6a00' : '#fff'"></uni-icons>
+			</view>
+			<view class="zd-col-13 radio-label">记住用户名</view>
+			<view class="zd-col-4 setup-text" @tap="setup">设置</view>
+			<view class="zd-col-5 setup-text" @tap="isUpdate">升级版本</view>
+		</view>
+		<button class="login-btn" :disabled="disabled" @tap="toLogin">确认登录</button>
+		<view v-if="version !== ''" class="version-name">v{{version}}</view>
+		<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
+	</view>
+</template>
+
+<script>
+	import { RSAencrypt } from '@/utils/jsencrypt.js'
+	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
+	import UpGrade from './upgrade.vue'
+	export default {
+		components: {
+			UpGrade
+		},
+		data() {
+			return {
+				user: this.$store.getters.loginName ? this.$store.getters.loginName : '',
+				password: '',
+				showPassword: false,
+				saveUser: this.$store.getters.loginName ? true : false,
+				disabled: false,
+				version: '',
+				versionCode: '',
+				grade: false,
+				androidUrl: ''
+			}
+		},
+		created () {
+			//#ifdef APP-PLUS
+				// 获取本地应用资源版本号
+				plus.runtime.getProperty(plus.runtime.appid, (info) => {
+					// console.log(JSON.stringify(info));
+					this.version = info.version;
+					this.versionCode = info.versionCode ;
+				}) 
+			//#endif
+		},
+		methods: {
+			isUpdate () {
+				this._pdaUpdate()
+			},
+			toSaveUser() {
+				this.saveUser = !this.saveUser
+			},
+			setup () {
+				uni.redirectTo({
+					url: '/pages/login/setup'
+				})
+			},
+			async toLogin() {
+				// uni.redirectTo({
+				// 	url: '/pages/home/home'
+				// })
+				this.disabled = true
+				if (this.user === '') {
+					uni.showToast({
+						title: '用户名不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				if (this.password === '') {
+					uni.showToast({
+						title: '密码不能为空',
+						icon: 'none'
+					})
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handLogin(this.user, RSAencrypt(this.password))
+					if (this.saveUser) {
+						this.$store.dispatch('saveLoginName', this.user)
+					} else {
+						this.$store.dispatch('delLoginName', '')
+					}
+					this.$store.dispatch('saveUserInfo', JSON.stringify(res.user.user))
+					this.$store.dispatch('saveToken', res.token)
+					uni.redirectTo({
+						url: '/pages/home/home'
+					})
+					this.disabled = false
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _pdaUpdate () {
+				let res = await pdaUpdate()
+				// if (res.versionName === this.version) {
+				// 	uni.showToast({
+				// 		title: '当前为最新版本',
+				// 		icon: 'none'
+				// 	})
+				// } else {
+				// 	this.grade = true
+				// 	this.androidUrl = res.url
+				// }
+				this.grade = true
+				this.androidUrl = res.url
+			},
+			closeUpdate () {
+				this.grade = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.p1
+  _font(40rpx,75rpx,#444,666)
+  padding-top: 190rpx
+.p2
+  _font(44rpx,1,#444,600)
+  padding: 10rpx 0 55rpx 0
+.input-box
+  _fj()
+  margin-top 68rpx
+  height 75rpx
+  border-bottom 1rpx solid #e2e2e2
+.large-input
+	_wh(calc(100% - 100rpx), 74rpx)
+	_font(32rpx,74rpx,#999)
+	padding-left 10rpx
+.radio-box
+	margin 25rpx 0 70rpx 0
+.radio-icon-wrap
+	_wh(34rpx, 34rpx)
+	border 1rpx solid #999
+	border-radius 4rpx
+	text-align center
+	line-height 40rpx
+.radio-icon-wrap_checked
+	border-color $red
+.radio-label
+	_font(28rpx, 28rpx,#333)
+.setup-text
+	_font(28rpx, 28rpx,$red,,right)
+.bg
+	background-color: #fff;
+	_bis('../../static/image/login_bg.png', 100%,,bottom)
+.login-btn
+  width 100%
+  border-radius 46rpx
+  _font(36rpx,92rpx,#fff,,center)
+  background-color $red
+.zd_content
+	position: relative
+	top 0
+	height: 100%
+	padding-left 40rpx
+	padding-right 40rpx
+	background-color: #fff
+	overflow: hidden
+.version-name
+	width 100%
+	position: absolute
+	bottom: 30rpx
+	_font(30rpx, 60rpx, #999,,center)
+</style>

pages/login/setup.vue

@@ -0,0 +1,103 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="设置" :inner2="true" @goIn="goIn"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
+					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
+				</view>
+				<view class="setup-item">
+					<view class="setup-label">ACS地址</view>
+					<input type="text" class="setup-input" placeholder="请输入ACS地址" v-model="acsip">
+				</view>
+				<view class="setup-item">
+					<view class="setup-label">打印地址</view>
+					<input type="text" class="setup-input" placeholder="请输入打印地址" v-model="printip">
+				</view>
+				<!-- <view class="setup-item">
+					<view class="setup-label">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
+				printip: this.$store.getters.printUrl,
+				setTime: this.$store.getters.setTime / 1000
+			};
+		},
+		methods: {
+			goIn () {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			},
+			_submit () {
+				if (this.addrip === '') {
+					uni.showToast({
+						title: '请填写服务器地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.acsip === '') {
+					uni.showToast({
+						title: '请填写ACS地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.printip === '') {
+					uni.showToast({
+						title: '请填写打印地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.setTime === '') {
+					uni.showToast({
+						title: '请填写刷新时间',
+						icon: 'none'
+					})
+					return
+				}
+				// 存值
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, printUrl: this.printip,setTime: this.setTime * 1000})
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.setup-item
+	width 100%
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
+.setup-input
+	_wh(100%, 80rpx)
+	background #fff
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
+</style>

pages/login/upgrade.vue

@@ -0,0 +1,229 @@
+<template>
+	<view class="mask flex-center">
+		<view class="content botton-radius">
+			<view class="content-top">
+				<text class="content-top-text">发现新版本</text>
+				<image class="content-top" style="top: 0;" width="100%" height="100%" src="../../static/image/bg_top.png">
+				</image>
+			</view>
+			<view class="content-header"></view>
+			<view class="content-body">
+				<view class="title">
+					<text>兰州铜箔二期acs系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！</text>
+				</view>
+				<view class="footer flex-center">
+					<template>
+						<template v-if="!downloadSuccess">
+							<view class="progress-box flex-column" v-if="downloading">
+								<progress class="progress" border-radius="35" :percent="downLoadPercent" activeColor="#3DA7FF" show-info stroke-width="10" />
+								<view style="width:100%;font-size: 28rpx;display: flex;justify-content: space-around;">
+									<text>安装包下载中，请稍后</text>
+									<text>({{downloadedSize}}/{{packageFileSize}}M)</text>
+								</view>
+							</view>
+							<button v-else class="content-button" style="border: none;color: #fff;" plain @click="updateApp">立即升级</button>
+						</template>
+					</template>
+				</view>
+			</view>
+			<image v-if="is_mandatory" class="close-img" src="../../static/image/app_update_close.png" @click.stop="closeUpdate"></image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data () {
+			return {
+				downloadSuccess: false,
+				downloading: false,
+				downLoadPercent: 0,
+				downloadedSize: 0,
+				packageFileSize: 0,
+				is_mandatory: true
+			}
+		},
+		props: {
+			androidUrl: String
+		},
+		methods: {
+			updateApp() {
+				this.is_mandatory = false
+				this.downloading = true
+				this.doUpData(this.androidUrl);
+			},
+			doUpData(Url) {
+				const downloadTask = uni.downloadFile({
+					url: Url,
+					success: downloadResult => {
+						if (downloadResult.statusCode == 200) {
+							this.downloadSuccess = true;
+							plus.runtime.install(
+								//安装软件
+								downloadResult.tempFilePath,
+								{
+									force: true
+								},
+								function(res) {
+									plus.runtime.restart();
+								}
+							);
+						}
+					},
+					complete: () => {
+						this.downloading = false;
+						this.downLoadPercent = 0
+						this.downloadedSize = 0
+						this.packageFileSize = 0
+					}
+				});
+				// 下载进度
+				downloadTask.onProgressUpdate(res => {
+					this.downLoadPercent = res.progress;
+					this.downloadedSize = (res.totalBytesWritten / Math.pow(1024, 2)).toFixed(2);
+					this.packageFileSize = (res.totalBytesExpectedToWrite / Math.pow(1024, 2)).toFixed(2);
+				});
+			},
+			closeUpdate () {
+				this.$emit('closeUpdate')
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background: transparent;
+	}
+
+	.flex-center {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mask {
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, .65);
+	}
+
+	.botton-radius {
+		border-bottom-left-radius: 30rpx;
+		border-bottom-right-radius: 30rpx;
+	}
+
+	.content {
+		position: relative;
+		top: 0;
+		width: 600rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		padding: 0 50rpx;
+		font-family: Source Han Sans CN;
+	}
+
+	.text {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		line-height: 200px;
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.content-top {
+		position: absolute;
+		top: -195rpx;
+		left: 0;
+		width: 600rpx;
+		height: 270rpx;
+	}
+
+	.content-top-text {
+		font-size: 45rpx;
+		font-weight: bold;
+		color: #F8F8FA;
+		position: absolute;
+		top: 120rpx;
+		left: 50rpx;
+		z-index: 1;
+	}
+
+	.content-header {
+		height: 80rpx;
+	}
+
+	.title {
+		font-size: 33rpx;
+		font-weight: bold;
+		color: #3DA7FF;
+		line-height: 38rpx;
+		color: #333;
+	}
+
+	.footer {
+		height: 150rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+	}
+
+	.box-des-scroll {
+		box-sizing: border-box;
+		padding: 0 40rpx;
+		height: 50rpx;
+		text-align: left;
+	}
+
+	.box-des {
+		font-size: 26rpx;
+		color: #000000;
+		line-height: 50rpx;
+	}
+
+	.progress-box {
+		width: 100%;
+	}
+
+	.progress {
+		width: 90%;
+		height: 40rpx;
+		border-radius: 35px;
+	}
+
+	.close-img {
+		width: 70rpx;
+		height: 70rpx;
+		z-index: 1000;
+		position: absolute;
+		bottom: -120rpx;
+		left: calc(50% - 70rpx / 2);
+	}
+
+	.content-button {
+		text-align: center;
+		flex: 1;
+		font-size: 30rpx;
+		font-weight: 400;
+		color: #FFFFFF;
+		border-radius: 40rpx;
+		margin: 0 18rpx;
+
+		height: 80rpx;
+		line-height: 80rpx;
+
+		background: linear-gradient(to right, #1785ff, #3DA7FF);
+	}
+
+	.flex-column {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+</style>

pages/manage/back/in-storage.vue

@@ -0,0 +1,107 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="入库"></nav-bar>
+		<view class="zd_content">
+			<view class="flow_wrapper" v-for="e in dataList" :key="e.point_code">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<view class="zd-row">
+							<view class="zd-col-2">
+								<view class="zd-row flow_icon_item_1">
+									<view class="iconfont icon_start_point">&#xe820;</view>
+								</view>
+							</view>
+							<view class="zd-col-22">
+								<view class="zd-row flow_start_item" @tap="checkcode(e)" :class="{'flow_start_item_checked': pkId === e.point_code}">
+									<view class="zd-col-12 pdl20 pdr20 font-size-1">{{e.point_code}}</view>
+									<view class="zd-col-12 pdr20 font-size-2">{{e.point_name}}</view>
+									<view v-show="pkId === e.point_code" class="iconfont icon_choosed">&#xe66b;</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="_callEmptyVehicle">呼叫空托</button>
+			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="_fullVehicleIn">满托入库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryPoints, callEmptyVehicle, fullVehicleIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				pkId: ''
+			};
+		},
+		created () {
+			this._queryPoints()
+		},
+		methods: {
+			/** 初始化查询 */
+			async _queryPoints () {
+				let res = await queryPoints('1')
+				this.dataList = [...res]	
+			},
+			checkcode (e) {
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+			},
+			/** 呼叫空托 */
+			async _callEmptyVehicle () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await callEmptyVehicle(this.pkId)
+					this.disabled1 = false
+					this.pkId = ''
+					this._queryPoints()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 满托入库 */
+			async _fullVehicleIn () {
+				this.disabled2 = true
+				if (!this.pkId) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await fullVehicleIn(this.pkId)
+					this.disabled2 = false
+					this.pkId = ''
+					this._queryPoints()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/back/man-group-disk.vue

@@ -0,0 +1,289 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="人工组盘"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label">载具类型</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">载具编码</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input filter_input_disabled pointer" v-model="val2" @tap="getMater">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">当前点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>载具编码</th>
+								<th>载具类型</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>点位</th>
+								<th>物料数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.checked}">
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<view class="zd-col-4">
+				<view class="zd-row flexcol">
+					<view class="iconfont icon_unchecked mgb10" :class="{'icon_checked': isV}" @tap="isVirtual">&#xe66b;</view>
+					<view class="filter_input_wraper_inn_text">是否配盘</view>
+				</view>
+			</view>
+			<button class="zd-col-4 submit-button_new" @tap="clearUp">清空</button>
+			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': !index1 || !val1 || !val3 || !index2 || !$store.getters.publicObj}" :disabled="disabled1" @tap="_groupManual">开始组盘</button>
+			<button class="zd-col-5 submit-button_new" :class="{'btn-disabled': checkArr.length === 0}" :disabled="disabled2" @tap="_groupLink">开始配盘</button>
+			<button class="zd-col-4 submit-button_new" :class="{'btn-disabled': !val1 || (isV === true && printActive === false)}" :disabled="disabled3" @tap="_pdaPrintf">打印</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getCLodop} from "@/utils/CLodopfuncs.js"
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryPoints, getVehicleType, queryVehicleGroup, groupManual, groupLink, pdaPrintf} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				options1: [],
+				index1: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				options2: [],
+				index2: '',
+				dataList: [],
+				isV: false,
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				checkArr: [],
+				printActive: false
+			};
+		},
+		created () {
+			this._getVehicleType()
+			this._queryPoints()
+			this._queryVehicleGroup()
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicObj', '')
+		},
+		onShow() {
+			if (this.$store.getters.publicObj) {
+				this.val2 = this.$store.getters.publicObj.material_name
+				this.val4 = this.$store.getters.publicObj.material_id
+				this.val5 = this.$store.getters.publicObj.material_code
+			}
+		},
+		methods: {
+			/** 选择器 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			/** 点位下拉框 */
+			async _queryPoints () {
+				let res = await queryPoints('1')
+				res.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options2 = [...res]	
+			},
+			/** grid */
+			async _queryVehicleGroup () {
+				let res = await queryVehicleGroup()
+				res.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList = [...res]	
+			},
+			getMater () {
+				uni.navigateTo({
+					url: '/pages/manage/search-mater-1'
+				})
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList.filter(i => { return i.checked === true })
+			},
+			isVirtual () {
+				this.isV = !this.isV
+			},
+			/** 开始组盘 */
+			async _groupManual () {
+				this.disabled1 = true
+				if (!this.index1 || !this.val1 || !this.val3 || !this.index2 || !this.$store.getters.publicObj) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await groupManual(this.index1, this.val1, this.index2, this.val4, this.val5, this.val3, this.isV)
+					this.disabled1 = false
+					this.checkArr = []
+					this._queryVehicleGroup()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			/** 开始配盘 */
+			async _groupLink () {
+				this.disabled2 = true
+				if (this.checkArr.length === 0) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let arr = []
+					this.checkArr.map(el => {
+						if (el.checked) {
+							arr.push({group_id: el.group_id, vehicle_code: this.val1})
+						}
+					})
+					let res = await groupLink(arr)
+					this.disabled2 = false
+					this.checkArr = []
+					this.printActive = true
+					this._queryVehicleGroup()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.printActive = false
+				this.$store.dispatch('setPublicObj', '')
+			},
+			/** 打印 */
+			async _pdaPrintf () {
+				this.disabled3 = true
+				if (!this.val1 || (this.isV === true && this.printActive === false)) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await pdaPrintf(this.val1)
+					this.disabled3 = false
+					if (JSON.stringify(res) !== '{}') {
+						setTimeout(this.toPrint(res), 800)
+					}
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			toPrint (data) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+				    return
+				  }
+				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+				// 更换为打印服务器ip 不需要加前缀
+				LODOP.PRINT_INIT(null, printUrl);
+				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
+				LODOP.SET_PRINTER_INDEX(-1);
+				// 设置打印纸大小
+				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '');
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
+				LODOP.SET_PRINT_STYLE('Bold', 1);
+				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '32mm', '32mm', 'QRCode', data.vehicle_code + '##' + data.material_code + '##' + data.material_qty + '##' + data.pcsn + '##' + data.print_time);
+				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '载具编码：' + data.vehicle_code);
+				LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '物料编码：' + data.material_code);
+				LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '物料名称：' + data.material_name);
+				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '物料数量：' + data.material_qty);
+				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '配盘批次：' + data.pcsn);
+				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '打印时间：' + data.print_time);
+				LODOP.PRINT();  // 打印
+				// LODOP.PREVIEW()
+				uni.showToast({
+					title: '打印成功',
+					icon: 'none'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/back/out-storage.vue

@@ -0,0 +1,262 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="出库"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input filter_input_disabled pointer" v-model="val1" @tap="getMater">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">起点点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<input type="text" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">终点点位</span>
+					</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index1" :localdata="options1" @change="selectChange1"></uni-data-select>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>点位编码</th>
+								<th>点位名称</th>
+								<th>载具编码</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>配盘批次</th>
+								<th>物料数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.group_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<button class="zd-col-4 submit-button_new" @tap="clearUp">清空</button>
+			<button class="zd-col-6 submit-button_new" :class="{'btn-disabled': !val2 || !index1}" :disabled="disabled1" @tap="_fullVehicleOut">满托出库</button>
+			<button class="zd-col-6 submit-button_new" @tap="popUp(1)">余料回库</button>
+			<button class="zd-col-7 submit-button_new" @tap="popUp(2)">满托出库确认</button>
+		</view>
+		<view class="msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="msg_box">
+				<view class="filter_item">
+					<view class="filter_label">当前点位</view>
+					<view class="filter_input_wraper">
+						<uni-data-select v-model="index2" :localdata="options1" @change="selectChange2"></uni-data-select>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">载具编码</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val3"
+						/>
+					</view>
+				</view>
+				<view class="filter_item">
+					<view class="filter_label">物料数量</view>
+					<view class="filter_input_wraper">
+						<input type="number" class="filter_input" v-model="val4">
+					</view>
+				</view>
+			</view>
+			<view class="zd-row msg_btns">
+				<button class="zd-col-9 msg_btn_cancle" @tap="toClear">清空</button>
+				<button class="zd-col-13 msg_btn" :class="{'btn-disabled': !index2 || !val3 || !val4}" :disabled="disabled2" @tap="toConfirm">确认</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask" @click.stop="show = false"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryLinkMaterial, queryPoints, fullVehicleOut, vehicleGoBack, fullVehicleOutConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				options1: [],
+				index1: '',
+				index2: '',
+				val3: '',
+				val4: '',
+				dataList: [],
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				pkId: '',
+				show: false,
+				type: ''
+			};
+		},
+		created () {
+			this._queryPoints()
+		},
+		destroyed () {
+			this.$store.dispatch('setPublicObj', '')
+		},
+		onShow() {
+			if (this.$store.getters.publicObj) {
+				this.val1 = this.$store.getters.publicObj.material_name
+				this._queryLinkMaterial(this.$store.getters.publicObj.material_id)
+			}
+		},
+		methods: {
+			getMater () {
+				uni.navigateTo({
+					url: '/pages/manage/search-mater-1'
+				})
+			},
+			/** grid查询 */
+			async _queryLinkMaterial (e) {
+				let res = await queryLinkMaterial(e)
+				this.dataList = [...res]
+			},
+			/** 选择器 */
+			selectChange1(e) {
+				this.index1 = e
+			},
+			selectChange2(e) {
+				this.index2 = e
+			},
+			/** 点位下拉框 */
+			async _queryPoints () {
+				let res = await queryPoints('2')
+				res.map(el => {
+					this.$set(el, 'value', el.point_code)
+					this.$set(el, 'text', el.point_name)
+				})
+				this.options1 = [...res]	
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.group_id ? '' : e.group_id
+				this.val2 = this.pkId === e.group_id ? e.point_code : ''
+			},
+			/** 满托出库 */
+			async _fullVehicleOut () {
+				this.disabled1 = true
+				if (!this.val2 || !this.index1) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await fullVehicleOut(this.val2, this.index1)
+					this.disabled1 = false
+					this._queryLinkMaterial(this.$store.getters.publicObj.material_id)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			
+			popUp (type) {
+				this.show = true
+				this.type = type
+			},
+			toClear () {
+				this.index2 = ''
+				this.val3 =''
+				this.val4 =''
+			},
+			toConfirm () {
+				if (this.type === 1) {
+					this._vehicleGoBack()
+				}
+				if (this.type === 2) {
+					this._fullVehicleOutConfirm()
+				}
+			},
+			/** 余料回库 */
+			async _vehicleGoBack () {
+				this.disabled2 = true
+				if (!this.index2 || !this.val3 || !this.val4) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await vehicleGoBack(this.index2, this.val3, this.val4)
+					this.disabled2 = false
+					this.toClear()
+					this.show = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+					this.toClear()
+					this.show = false
+				}
+			},
+			/** 满托出库确认 */
+			async _fullVehicleOutConfirm () {
+				this.disabled2 = true
+				if (!this.index2 || !this.val3 || !this.val4) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await fullVehicleOutConfirm(this.index2, this.val3, this.val4)
+					this.disabled2 = false
+					this.toClear()
+					this.show = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+					this.toClear()
+					this.show = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.dataList = []
+				this.pkId = ''
+				this.$store.dispatch('setPublicObj', '')
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/back/search-mater-1.vue

@@ -0,0 +1,77 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :inner2="true" @goIn="goIn" title="物料查询"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>物料编码</th>
+								<th>物料名称</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<button class="zd-col-24 submit-button_new" :class="{'btn-disabled': !pkId}" @tap="toSure">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterial} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				pkObj: {}
+			};
+		},
+		created () {
+			this._getMaterial()
+		},
+		methods: {
+			handleChange (e) {
+				this._getMaterial(e)
+			},
+			async _getMaterial (e) {
+				let res = await queryMaterial(e)
+				this.dataList = [...res]
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (!this.pkId) {
+					return
+				}
+				this.$store.dispatch('setPublicObj', this.pkObj)
+				this.goIn()
+				
+			},
+			goIn () {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/back/search-mater.vue

@@ -0,0 +1,103 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :inner2="true" @goIn="goIn" title="物料查询"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="filter_item">
+					<view class="filter_label_wraper">
+						<span class="filter_label">物料Id</span>
+					</view>
+					<view class="filter_input_wraper">
+						<search-box
+						v-model="val1"
+						@handleChange="handleChange"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>点位编码</th>
+								<th>点位名称</th>
+								<th>载具编码</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>配盘批次</th>
+								<th>物料数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toCheck(e)" :class="{'checked': e.material_id === pkId}">
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<button class="zd-col-11 submit-button_new" :class="{'btn-disabled': !pkId}" @tap="toSure">确认</button>
+			<button class="zd-col-11 submit-button_new" @tap="searchList">查询</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryLinkMaterial} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				dataList: [],
+				pkId: '',
+				pkObj: {}
+			};
+		},
+		methods: {
+			handleChange (e) {
+				this._getMaterial(e)
+			},
+			searchList () {
+				this._getMaterial(this.val1)
+			},
+			/** grid查询 */
+			async _getMaterial (e) {
+				let res = await queryLinkMaterial(e)
+				this.dataList = [...res]
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.material_id ? '' : e.material_id
+				this.pkObj = this.pkId === e.material_id ? e : {}
+			},
+			toSure () {
+				if (!this.pkId) {
+					return
+				}
+				this.$store.dispatch('setPublicObj', this.pkObj)
+				this.goIn()
+				
+			},
+			goIn () {
+				uni.navigateBack()
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/back/task-flow.vue

@@ -0,0 +1,132 @@
+<template>
+	<view class="zd_container">
+		<nav-bar title="任务流转"></nav-bar>
+		<view class="zd_content">
+			<view class="flow_wrapper" v-for="e in dataList" :key="e.point_code">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<view class="zd-row">
+							<view class="zd-col-2">
+								<view class="zd-row flow_icon_item_1">
+									<view class="iconfont icon_start_point">&#xe820;</view>
+								</view>
+							</view>
+							<view class="zd-col-22">
+								<view class="zd-row flow_start_item" @tap="checkcode1(e)" :class="{'flow_start_item_checked': pkId1 === e.point_id}">
+									<view class="zd-col-8 pdl20 pdr20 font-size-1">{{e.point_code}}</view>
+									<view class="zd-col-16 pdr20 font-size-2">{{e.point_name}}</view>
+									<view v-show="pkId1 === e.point_code" class="iconfont icon_choosed">&#xe66b;</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<view class="zd-row flow_icon_item_2">
+							<view class="iconfont icon_vdash_line">&#xe603;</view>
+						</view>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<view class="zd-row flexstart">
+							<view class="zd-col-2">
+								<view class="zd-row flow_icon_item_1">
+									<view class="iconfont icon_start_point">&#xe61f;</view>
+								</view>
+							</view>
+							<view class="zd-col-22">
+								<view class="zd-row mgb10 flow_start_item" v-for="el in e.end_points" :key="el.point_code" @tap="checkcode2(el, e)" :class="{'flow_start_item_checked': pkId2 === el.point_id}">
+									<view class="zd-col-8 pdl20 pdr20 font-size-1">{{el.point_code}}</view>
+									<view class="zd-col-16 pdr20 font-size-2">{{el.point_name}}</view>
+									<view v-show="pkId2 === el.point_code" class="iconfont icon_choosed">&#xe66b;</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-bar_new">
+			<button class="zd-col-24 submit-button_new" :class="{'btn-disabled': !pkId1}" :disabled="disabled" @tap="toSure">生成任务</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryAllPoints, createP2pTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				dataList: [],
+				disabled: false,
+				pkId1: '',
+				pkId2: '',
+				pid1: '',
+				pid2: '',
+				pd2: ''
+			};
+		},
+		created () {
+			this._queryAllPoints()
+		},
+		methods: {
+			/** 初始化查询 */
+			async _queryAllPoints () {
+				let res = await queryAllPoints()
+				this.dataList = [...res]	
+			},
+			checkcode1 (e) {
+				if (this.pid2 !== '' && e.point_id !== this.pid2) {
+					this.pkId2 = ''
+					this.pid2 = ''
+					this.pd2 = ''
+				}
+				this.pkId1 = this.pkId1 === e.point_id ? '' : e.point_id
+				this.pid1 = this.pkId1 === e.point_id ? e.point_code : ''
+			},
+			checkcode2 (el, e) {
+				if (this.pkId1 !== '' && this.pkId1 !== e.point_id) {
+					return
+				}
+				this.pkId2 = this.pkId2 === el.point_id ? '' : el.point_id
+				this.pid2 = this.pkId2 === el.point_id ? e.point_id : ''
+				this.pd2 = this.pkId2 === el.point_id ? el.point_code : ''
+			},
+			/** 重新下发 */
+			async toSure () {
+				this.disabled = true
+				if (!this.pkId1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await createP2pTask(this.pid1, this.pd2)
+					this.disabled = false
+					this.pkId1 = ''
+					this.pkId2 = ''
+					this.pid1 = ''
+					this.pid2 = ''
+					this.pd2 = ''
+					this._queryAllPoints()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/empty-tray-in.vue

@@ -0,0 +1,108 @@
+<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-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 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">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</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 || !val2}" :disabled="disabled" @tap="_emptyInStore">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, emptyInStore} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				val1: '',
+				val2: '',
+				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 _emptyInStore () {
+				this.disabled = true
+				if (this.index1 === '' || !this.val1  || !this.val2) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await emptyInStore(this.options1[this.index1].value, this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val2 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/empty-tray-out.vue

@@ -0,0 +1,106 @@
+<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-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">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view> -->
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">点位编码</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</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="_callEmptyVehicle">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, callEmptyVehicle} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				// options2: [],
+				// index2: '',
+				val1: '',
+				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 _callEmptyVehicle () {
+				this.disabled = true
+				if (!this.val1 || this.index1 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await callEmptyVehicle(this.options1[this.index1].value, this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/fixed-point-task.vue

@@ -0,0 +1,146 @@
+<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 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">起点点位</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">终点区域</span>
+					</view>
+					<view class="zd-col-19 filter_select">
+						<zxz-uni-data-select v-model="index3" filterable :localdata="options3" @change="selectChange3"></zxz-uni-data-select>
+					</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="index4" filterable :localdata="options4"></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': !index2 || !index4}" :disabled="disabled" @tap="_taskConfirm">确认</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryDevice, taskConfirm} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				options3: [],
+				index3: '',
+				options4: [],
+				index4: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._queryDevice()
+		},
+		methods: {
+			/** 点位下拉框 */
+			async _queryDevice () {
+				let res = await queryDevice()
+				res.map(el => {
+					this.$set(el, 'value', el.region_code)
+					this.$set(el, 'text', el.region_name)
+				})
+				this.options1 = [...res]
+				this.options3 = [...res]
+			},
+			selectChange1 (e) {
+				this.options2 = []
+				this.options1.map(el => {
+					if (el.value === e) {
+						this.options2 = [...el.deviceArr]
+					}
+				})
+				if (this.options2.length > 0) {
+					this.options2.map(ele => {
+						this.$set(ele, 'value', ele.point_code)
+						this.$set(ele, 'text', ele.point_name)
+					})
+				}
+			},
+			selectChange3 (e) {
+				this.options4 = []
+				this.options3.map(el => {
+					if (el.value === e) {
+						this.options4 = [...el.deviceArr]
+					}
+				})
+				if (this.options4.length > 0) {
+					this.options4.map(ele => {
+						this.$set(ele, 'value', ele.point_code)
+						this.$set(ele, 'text', ele.point_name)
+					})
+				}
+			},
+			async _taskConfirm () {
+				this.disabled = true
+				if (!this.index2 || this.index4 === '') {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await taskConfirm(this.index2, this.index4)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.index3 = ''
+				this.index4 = ''
+				this.options2 = []
+				this.options4 = []
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/group-in-storage.vue

@@ -0,0 +1,352 @@
+<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-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 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-19 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="number" class="filter_input" v-model="val2">
+					</view>
+				</view>
+				<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="val3"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">是否配盘</span>
+					</view>
+					<view class="zd-col-19 zd-row jcflexend">
+						<switch :checked="isSwitchOn" color="#4e6ef2" style="transform:scale(0.7)" @change="switch1Change"/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th class="fontcol1">载具编码</th>
+								<th>载具类型</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>点位</th>
+								<th>物料数量</th>
+								<th>配盘批次</th>
+							</tr>
+						</thead>
+						<tbody>
+							<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>
+								<td class="fontcol2">{{e.material_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_qty}}</td>
+								<td>{{e.pcsn}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': index1 === '' || !val1 || !val3 || !index2 || !val2}" :disabled="disabled1" @tap="_groupManual">组盘</button>
+			<button class="zd-col-4 button-primary" @tap="_queryVehicleGroup">配盘</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !pkId}" :disabled="disabled3" @tap="_pdaPrintf">打印</button>
+			<button class="zd-col-4 button-primary" :class="{'button-info': !pkId}" :disabled="disabled4" @tap="_fullVehicleIn">入库</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="msg_content">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th>载具编码</th>
+								<th>载具类型</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>点位</th>
+								<th>物料数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="e in dataList1" :key="e.group_id" @click="toCheck(e)" :class="{'checked': e.checked}">
+								<td class="fontcol1">{{e.vehicle_code}}</td>
+								<td><view class="fontbg">{{e.vehicle_type}}</view></td>
+								<td class="fontcol2">{{e.material_code}}</td>
+								<td class="fontcol2">{{e.material_name}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-9 button-default" @tap.stop="show = false">取消</button>
+				<button class="zd-col-13 button-primary" :class="{'button-info': checkArr.length === 0}" :disabled="disabled2" @tap="_groupLink">确认</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import {getCLodop} from "@/utils/CLodopfuncs.js"
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {getVehicleType, queryMaterial, queryExistGroup, groupManual, queryVehicleGroup, groupLink, pdaPrintf, fullVehicleIn} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				isSwitchOn: false,
+				dataList: [],
+				pkId: '',
+				pkObj: {},
+				disabled1: false,
+				show: false,
+				dataList1: [],
+				checkArr: [],
+				disabled2: false,
+				disabled3: false,
+				disabled4: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._getVehicleType()
+			this._queryMaterial()
+			this._queryExistGroup()
+		},
+		methods: {
+			/** 载具类型下拉框 */
+			async _getVehicleType () {
+				let res = await getVehicleType()
+				this.options1 = [...res]
+			},
+			pickerChange (e) {
+				this.index1 = e.detail.value
+			},
+			/** 物料下拉框*/
+			async _queryMaterial (e) {
+				let res = await queryMaterial(e)
+				res.map(el => {
+					this.$set(el, 'value', el.material_id)
+					this.$set(el, 'text', el.material_name)
+				})
+				this.options2 = [...res]
+			},
+			/** 是否配盘 */
+			switch1Change: function (e) {
+				this.isSwitchOn = e.detail.value
+			},
+			/** 查询已配盘的组盘信息 */
+			async _queryExistGroup () {
+				let res = await queryExistGroup()
+				this.dataList = [...res]
+			},
+			/** 组盘 */
+			async _groupManual () {
+				this.disabled1 = true
+				if (this.index1 === '' || !this.val1 || !this.val3 || !this.index2 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let code = ''
+					this.options2.map(el => {
+						if (el.value === this.index2) {
+							code = el.material_code
+						}
+					})
+					let res = await groupManual(this.options1[this.index1].value, this.val1, this.val3, this.index2, code, this.val2, this.isSwitchOn)
+					this.clearUp()
+					this._queryExistGroup()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.val1 = ''
+				this.val3 = ''
+				this.index2 = ''
+				this.val2 = ''
+				this.isSwitchOn = false
+				this.disabled1 = false
+			},
+			/** 获取待配盘信息 */
+			async _queryVehicleGroup () {
+				this.dataList1 = []
+				this.checkArr = []
+				this.disabled2 = false
+				let res = await queryVehicleGroup()
+				res.map(el => {
+					this.$set(el, 'checked', false)
+				})
+				this.dataList1 = [...res]
+				this.show = true
+			},
+			toCheck (e) {
+				e.checked = !e.checked
+				this.checkArr = this.dataList1.filter(i => { return i.checked === true })
+			},
+			/** 配盘确定 */
+			async _groupLink () {
+				this.disabled2 = true
+				if (this.checkArr.length === 0) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await groupLink(this.checkArr)
+					this.disabled2 = false
+					this.show = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+					this._queryExistGroup()
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+				this.pkObj = this.pkId === e.point_code ? e : {}
+			},
+			/**  打印 */
+			async _pdaPrintf () {
+				this.disabled3 = true
+				if (!this.pkId) {
+					this.disabled3 = false
+					return
+				}
+				try {
+					let res = await pdaPrintf(this.pkObj.vehicle_code)
+					this.disabled3 = false
+					this.pkId = ''
+					if (JSON.stringify(res) !== '{}') {
+						setTimeout(this.toPrint(res), 800)
+					}
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+			toPrint (data) {
+				let iparr = this.$store.getters.printUrl.split(":")
+				let printUrl = iparr[1].slice(2)
+				let LODOP = getCLodop();
+				if (!(LODOP.webskt && LODOP.webskt.readyState === 1)) {
+				    uni.showToast({
+						title: '当前配置ip：' + printUrl + '网络不通，请检查',
+						icon: 'none',
+						duration: 5000
+					})
+				    return
+				  }
+				LODOP.SET_SHOW_MODE('HIDE_DISBUTTIN_SETUP', 1)// 隐藏那些无效按钮
+				LODOP.SET_LICENSES('浙江省烟草专卖局（公司）', 'C0C4A46A3A0D1F526D426018D9F11921', '', '')
+				// 更换为打印服务器ip 不需要加前缀
+				LODOP.PRINT_INIT(null, printUrl);
+				// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
+				LODOP.SET_PRINTER_INDEX(-1);
+				// 设置打印纸大小
+				LODOP.SET_PRINT_PAGESIZE(1, '80mm', '60mm', '');
+				LODOP.ADD_PRINT_RECT('1mm', '3mm', '74mm', '54mm', 0, 1);
+				LODOP.SET_PRINT_STYLE('FontSize', 12);
+				LODOP.SET_PRINT_STYLE('Bold', 1);
+				LODOP.ADD_PRINT_BARCODE('2mm', '4mm', '32mm', '32mm', 'QRCode', data.vehicle_code + '##' + data.material_code + '##' + data.material_qty + '##' + data.pcsn + '##' + data.print_time);
+				LODOP.ADD_PRINT_TEXT('5mm', '35mm', '50mm', '15mm', '载具编码：' + data.vehicle_code);
+				LODOP.ADD_PRINT_TEXT('15mm', '35mm', '50mm', '15mm', '物料编码：' + data.material_code);
+				LODOP.ADD_PRINT_TEXT('25mm', '35mm', '50mm', '15mm', '物料名称：' + data.material_name);
+				LODOP.ADD_PRINT_TEXT('34mm', '5mm', '80mm', '15mm', '物料数量：' + data.material_qty);
+				LODOP.ADD_PRINT_TEXT('41mm', '5mm', '80mm', '15mm', '配盘批次：' + data.pcsn);
+				LODOP.ADD_PRINT_TEXT('48mm', '5mm', '80mm', '15mm', '打印时间：' + data.print_time);
+				LODOP.PRINT();  // 打印
+				// LODOP.PREVIEW()
+				uni.showToast({
+					title: '打印成功',
+					icon: 'none'
+				})
+			},
+			/**  入库 */
+			async _fullVehicleIn () {
+				this.disabled4 = true
+				if (!this.pkId) {
+					this.disabled4 = false
+					return
+				}
+				try {
+					let res = await fullVehicleIn(this.pkId)
+					this.disabled4 = false
+					this.pkId = ''
+					this._queryExistGroup()
+				} catch (e) {
+					this.disabled4 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/mater-out-storage.vue

@@ -0,0 +1,139 @@
+<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 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1" @change="selectChange"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">出库点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd_wrapper grid-wraper">
+				<view class="slide_new">
+					<table>
+						<thead>
+							<tr>
+								<th class="fontcol1">点位编码</th>
+								<th>点位名称</th>
+								<th>载具编码</th>
+								<th>物料编码</th>
+								<th>物料名称</th>
+								<th>配盘批次</th>
+								<th>物料数量</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="(e, i) in dataList" :key="i" @click="toChose(e)" :class="{'checked': e.point_code === pkId}">
+								<td class="fontcol1">{{e.point_code}}</td>
+								<td class="fontcol2">{{e.point_name}}</td>
+								<td>{{e.vehicle_code}}</td>
+								<td>{{e.material_code}}</td>
+								<td>{{e.material_name}}</td>
+								<td>{{e.pcsn}}</td>
+								<td>{{e.material_qty}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</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': !pkId || !val1}" :disabled="disabled" @tap="_fullVehicleOut">出库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryMaterial, queryLinkMaterial, fullVehicleOut} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				val1: '',
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._queryMaterial()
+		},
+		methods: {
+			/** 物料下拉框*/
+			async _queryMaterial (e) {
+				let res = await queryMaterial(e)
+				res.map(el => {
+					this.$set(el, 'value', el.material_id)
+					this.$set(el, 'text', el.material_name)
+				})
+				this.options1 = [...res]
+			},
+			selectChange (e) {
+				this._queryLinkMaterial(e)
+			},
+			/** grid */
+			async _queryLinkMaterial (e) {
+				let res = await queryLinkMaterial(e)
+				this.dataList = [...res]
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.point_code ? '' : e.point_code
+			},
+			async _fullVehicleOut () {
+				this.disabled = true
+				if (!this.pkId || !this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await fullVehicleOut(this.pkId, this.val1)
+					this.pkId = ''
+					this.disabled = false
+					this._queryLinkMaterial(this.index1)
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.index1 = ''
+				this.dataList = []
+				this.val1 = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>

pages/manage/out-storage-confirm.vue

@@ -0,0 +1,182 @@
+<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 border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">出库点位</span>
+					</view>
+					<view class="zd-col-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-5">
+						<span class="filter_label">物料编码</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="data.material_code" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-5">
+						<span class="filter_label">物料名称</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="data.material_name" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-5">
+						<span class="filter_label">配盘批次</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="data.pcsn" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom filter_input_disabled">
+					<view class="zd-col-5">
+						<span class="filter_label">物料数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" v-model="val5" disabled>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">出库数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="number" class="filter_input" v-model="val3">
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-5">
+						<span class="filter_label">剩余数量</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="number" class="filter_input" v-model="val4">
+					</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': !val1 || !val2 || val4 === ''}" :disabled="disabled1" @tap="_fullVehicleOutConfirm">出库确认</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !val2 || val4 === ''}" :disabled="disabled2" @tap="_vehicleGoBack">回库</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {queryGroupInfoByVehicle, fullVehicleOutConfirm, vehicleGoBack} from '@/utils/getData2.js'
+	import {accSubtract} from '@/utils/utils.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				val1: '',
+				val2: '',
+				val3: '',
+				val4: '',
+				val5: '',
+				data: {},
+				title: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		watch: {
+			val3 () {
+				if (this.val5 !== '') {
+					this.val4 =  accSubtract(this.val5, this.val3)
+				}
+			},
+			val4 () {
+				if (this.val5 !== '') {
+					this.val3 =  accSubtract(this.val5, this.val4)
+				}
+			}
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			handleChange (e) {
+				this._queryGroupInfoByVehicle(e)
+			},
+			async _queryGroupInfoByVehicle (e) {
+				let res = await queryGroupInfoByVehicle(e)
+				this.data = res
+				this.val2 = this.data.point_code
+				if (this.data.material_qty) {
+					this.val5 = this.data.material_qty
+				}
+			},
+			async _fullVehicleOutConfirm () {
+				this.disabled1 = true
+				if (!this.val1  || !this.val2  || this.val4 === '') {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await fullVehicleOutConfirm(this.val2, this.val1, this.val4)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _vehicleGoBack () {
+				this.disabled2 = true
+				if (!this.val1  || !this.val2  || this.val4 === '') {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await vehicleGoBack(this.val2, this.val1, this.val4)
+					this.disabled2 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.data = {}
+				this.disabled1 = false
+				this.disabled2 = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>

pages/manage/point-update.vue

@@ -0,0 +1,132 @@
+<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: '',
+				disabled1: false,
+				disabled2: 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.options1[this.index1].value, 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 type = ''
+					if (this.index1 !== '') {
+						type = this.options1[this.index1].value
+					}
+					let res = await unbindVehicle(this.val1, type, 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>

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>

pages/manage/task-manage.vue

@@ -0,0 +1,185 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title" :searchActive="true" @toSearch="toSearch"></nav-bar>
+		<view class="zd_content pdt0">
+			<view class="filter_wrapper">
+				<view class="zd-row">
+					<view class="zd-col-8 font-style-1" v-for="e in state" :key="e.id" @tap="changeTab(e)">
+						<view class="font-style-1" :class="{'font-style-2': e.id === tab}">{{e.text}}</view>
+						<view class="tab-line" :class="{'tab-line_active': e.id === tab}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="item-wrapper">
+				<view class="item-wrap" v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{isChecked: pkId === e.inst_uuid}">
+					<view class="zd-row mgb10">
+						<view class="item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成'][Number(e.inst_status)]}}</view>
+					</view>
+					<view class="zd-row">
+						<view class="zd-col-16">
+							<view class="item-font-2 mgb10">{{e.create_time}}&nbsp;&#124;&nbsp;{{['请求取货', '取货完成', '请求放货', '放货完成'][Number(e.inst_step) - 1]}}</view>
+							<view class="zd-row mgb10">
+								<view class="item-font-3">载具号：</view>
+								<view class="item-font-4">{{e.carrier}}</view>
+							</view>
+							<view class="zd-row mgb10">
+								<view class="item-font-3">指令号：</view>
+								<view class="item-font-4">{{e.instruction_code}}</view>
+							</view>
+							<view class="zd-row mgb10">
+								<view class="item-font-3">车号：</view>
+								<view class="item-font-4">{{e.carno}}</view>
+							</view>
+						</view>
+						<view class="zd-col-8">
+							<view class="item-font-5">{{e.priority}}</view>
+							<view class="item-font-8">优先级</view>
+						</view>
+					</view>
+					<view class="zd-row">
+						<view class="item-font-3">设备：</view>
+						<view class="item-font-6">{{e.start_devicecode}}</view>
+						<view class="item-font-7">&ndash;</view>
+						<view class="item-font-6">{{e.next_devicecode}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('1')">指令撤销</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('2')">重新下发</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_pdaInst('3')">强制完成</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="msg_content">
+				<view class="zd-row border-bottom">
+					<view class="zd-col-5">
+						<span class="filter_label">关键字</span>
+					</view>
+					<view class="zd-col-19">
+						<input type="text" class="filter_input" 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-19">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</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="val3"
+						/>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-7 button-default" @tap.stop="show = false">取消</button>
+				<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+				<button class="zd-col-7 button-primary" @tap="_pdaInsts">查询</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {pdaInsts, pdaInst} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				show: false,
+				state: [{id:'-1', text: '全部'}, {id:'0', text: '就绪'}, {id:'1', text: '执行中'}, {id:'2', text: '完成'}],
+				tab: '-1',
+				title: '',
+				val1: '',
+				val2: '',
+				val3: '',
+				data: [],
+				dataList: [],
+				pkId: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._pdaInsts()
+		},
+		methods: {
+			toSearch () {
+				this.show = true
+				this.tab = '-1'
+			},
+			async _pdaInsts () {
+				this.show = false
+				let res = await pdaInsts(this.val1, this.val2, this.val3)
+				if (res.code === '1') {
+					this.data = [...res.result]
+					this.dataList = [...this.data]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			changeTab (e) {
+				this.tab = e.id
+				if (e.id !== '-1') {
+					let arr = this.data.filter(el => {return el.inst_status === e.id})
+					this.dataList = [...arr]
+				} else {
+					this.dataList = [...this.data]
+				}
+			},
+			async _pdaInst (type) {
+				this.disabled = true
+				if (!this.pkId) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await pdaInst(type, this.pkId)
+					this.disabled = false
+					this.tab = '-1'
+					this._pdaInsts()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.val3 = ''
+				this.pkId = ''
+				this.disabled = false
+			},
+			toCheck (e) {
+				this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+</style>