add:收卷辊库\检测取样\废箔处理

README.md

@@ -1,4 +1,4 @@
 # 注意事项
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
-+ 接口线上地址：https://apifox.com/apidoc/shared-3b67df3b-411c-4dd4-9752-f9b71898ee7d/api-150208183
++ 接口线上地址：https://apifox.com/apidoc/shared-36902b16-4b6e-4ea6-af9d-43db3974ba93

pages.json

@@ -6,20 +6,36 @@
 				"navigationStyle": "custom"
 		    }
 		}
+		,{
+		    "path" : "pages/login/setup",
+		    "style": {
+		    	"navigationStyle": "custom"
+		    }  
+		}
 		,{
 		    "path" : "pages/home/home",
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }   
 		}
-        ,{
+		,{
-		    "path" : "pages/login/setup",
+		    "path" : "pages/manage/roll-manage",
-		    "style": {
+		    "style" :                                                                                    
-		    	"navigationStyle": "custom"
+		    {
-		    }  
+		        "navigationStyle": "custom"
+		    }
+		    
+		}
+		,{
+		    "path" : "pages/manage/call-sampling",
+		    "style" :                                                                                    
+		    {
+		        "navigationStyle": "custom"
+		    }
+		    
 		}
         ,{
-            "path" : "pages/manage/empty-tray-back",
+            "path" : "pages/manage/waste-foil-move",
             "style" :                                                                                    
             {
                 "navigationStyle": "custom"
@@ -33,14 +49,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/manage/area-lock",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/manage/fill-tray",
@@ -49,14 +57,6 @@
                 "navigationStyle": "custom"
             }
             
-        }
-        ,{
-            "path" : "pages/manage/empty-material-racks-back",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
         }
         ,{
             "path" : "pages/manage/material-transfer",

pages/home/home.vue

@@ -1,62 +1,82 @@
 <template>
-	<view class="home_wraper">
+	<view class="zd_container">
+		<view class="header"><span class="page_name">首页</span></view>
 		<view class="zd_content">
-			<view class="header">首页</view>
+			<view class="userInfo_wrap">
-			<view class="userInfo-wrap">
+				<view class="userInfo_content">
-				<view class="userInfo">
+					<view class="userInfo">
-					<text v-if="userName !== ''" class="p1">{{userName}}</text>
+						<text v-if="userName !== ''" class="p1">{{userName}}</text>
-					<text class="p2">欢迎进入西门子LMS手持系统！</text>
+						<text class="p2">欢迎进入龙电宁鑫手持系统！</text>
-				</view>
+					</view>
-				<view class="exit" @tap="Quit">
+					<view class="exit" @tap="Quit">
-					<view class="icon-exit"></view>
+						<view class="icon-exit"></view>
-					<view class="exit-text">退出</view>
+						<view class="exit-text">退出</view>
+					</view>
 				</view>
 			</view>
 			<view class="zd_home_wrapper">
-				<view class="menus_wrap">
+				<view class="menu-wrap">
-					<view class="fir_menu_wrap">
+					<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
-						<view class="fir_menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
+						<image class="menu-img" :src="require('../../static/image/menu/' + e.path + '.png')" alt="">
-							<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
+						<view class="menu-name">{{e.title}}</view>
-							<view class="menu-name">{{e.title}}</view>
-						</view>
 					</view>
 				</view>
 			</view>
 		</view>
+		<view class="sec_menu_wraper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-title">{{title}}</view>
+			<view class="sec_menu_w">
+				<view class="sec_menu-item" :style="{'background-image': 'url(' + require('../../static/image/menu/' + icon + '.png') + ')'}" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
+					<view class="menu-name_inner">{{e.title}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="show" class="modal" @click.stop="show = false"></view>
 	</view>
 </template>
 
 <script>
+	import {authority} from '@/utils/mork2.js'
+	// import {authority} from '@/utils/getData2.js'
 	export default {
 		data() {
 			return {
 				userName: '',
-				menuList: [
+				menuList: [],
-					{title: '物料入库', icon: 'RF03', path: '/pages/manage/mater-in-storage'},
-					{title: '外协区空笼框送回', icon: 'RF01', path: '/pages/manage/empty-tray-back'},
-					{title: '外协区空料架送回', icon: 'RF05', path: '/pages/manage/empty-material-racks-back'},
-					{title: '物料转运', icon: 'RF02', path: '/pages/manage/material-transfer'},
-					{title: '区域锁定', icon: 'RF06', path: '/pages/manage/area-lock'},
-					{title: '补空框', icon: 'RF04', path: '/pages/manage/fill-tray'},
-					{title: '修改订单工序', icon: 'RF07', path: '/pages/manage/modify-process'}
-				],
 				show: false,
-				secM: []
+				secM: [],
+				icon: '',
+				title: '',
+				tab: this.$store.getters.navTab
 			};
 		},
 		created () {
-			this.$store.dispatch('setPublicObj', '')
 			if (this.$store.getters.userInfo) {
 				this.userName = JSON.parse(this.$store.getters.userInfo).username
 			}
+			this._authority()
 		},
 		methods: {
 			async _authority () {
 				let res = await authority()
-				this.menuList = [...res.sonTree]
+				if (res.code === '1') {
-				
+					this.menuList = [...res.result.rf_menu0.sonTree]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
 			},
-			toPage (e) {
+			toPage1 (e) {
+				if (e.sonTree.length > 0) {
+					this.show = true
+					this.secM = e.sonTree
+					this.icon = e.path
+					this.title = e.title
+				}
+			},
+			toPage2 (e) {
 				let url = e.path + '?title=' + e.title
 				uni.redirectTo({
 					url: url
@@ -72,34 +92,30 @@
 	}
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 @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
+	_fj(center)
 	position fixed
-	left 0
+	_wh(100%, calc(var(--status-bar-height) + 88rpx))
-	top 0
+	z-index 200
-	padding-top var(--status-bar-height)
+	padding var(--status-bar-height) 20rpx 0 20rpx
-	z-index 100
+	background-color #f6f6f6
-	_wh(100%, calc(var(--status-bar-height) + 86rpx))
+.page_name
-	_font(36rpx,86rpx,#333,,center)
+	_font(36rpx, 88rpx, #444,700,center)
-.userInfo-wrap
+.zd_content
-	_fj()
+	padding-top calc(var(--status-bar-height) + 88rpx)
-	_wh(100%,190rpx)
+	padding-bottom 20rpx
+.userInfo_wrap
+	_wh(100%,173rpx)
 	padding 0 30rpx
-	background-color $red
+	background linear-gradient(to bottom, #ff6800, #ff9856)
-	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 	border-radius 12rpx
-	margin-bottom 24rpx
+	margin-bottom 68rpx
+.userInfo_content
+	_fj()
+	_wh(100%, 100%)
+	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 .userInfo
 	_fj(,flex-start,column)
 .p1
@@ -109,7 +125,7 @@
 	_font(26rpx,1,#fff)
 .exit
 	_fj()
-	height 50rpx
+	height 48rpx
 	padding 0 20rpx
 	border 1px solid #FF967C
 	border-radius 20rpx
@@ -117,38 +133,100 @@
 	_wh(22rpx, 22rpx)
 	_bis('../../static/image/exit.png',22rpx)
 .exit-text
-	_font(32rpx,50rpx,#fff,,right)
+	_font(24rpx,48rpx,#fff,,right)
 	padding-left 10rpx
 .zd_home_wrapper
-	_wh(100%, calc(100% - 238rpx))
+	width 100%
-	margin-bottom 24rpx
 	background-color #fff
 	border-radius: 12rpx;
-	padding: 14rpx;
+	padding: 24rpx 14rpx;
-	margin-bottom 24rpx
+	margin-bottom: 24rpx;
-	box-shadow: 0 4rpx 10rpx 4rpx rgba(0,0,0,.1)
+	overflow-y auto
-	overflow-y scroll
+	box-shadow 0 4rpx 4rpx 0 rgba(180, 182, 186, 0.4)
-.menus_wrap
+.menu-wrap
-	width 100%
+	_wh(100%, auto)
-.fir_menu_wrap
 	_fj(flex-start,flex-start,,wrap)
 	align-content: flex-start
-.fir_menu-item
+.menu-item
 	_fj()
 	flex-direction column
 	_wh(30%, auto)
 	margin-bottom 40rpx
-	_font(26rpx, 60rpx,#e74f1a,,center)
+	_font(26rpx, 28rpx,#e74f1a,,center)
 	&:nth-child(3n+2)
 		margin-left 5%
 		margin-right 5%
 ::v-deep .menu-img 
 	_wh(100%, auto)
+	margin-bottom 16rpx
 	img
 		position relative
 		opacity 1
 		_wh(55%, auto)
+		background-color: #f3f5f8
+		box-shadow 8rpx 6rpx 10rpx 0px rgba(0,0,0,0.1)
+		padding 16rpx
+		border-radius 50%
 		margin 0 auto 0.2rpx
 .menu-name
-	_font(28rpx, 38rpx, #444,,center)
+	_font(28rpx, 30rpx, #444,,center)
+.sec_menu_wraper
+	position fixed
+	bottom 0
+	left 0
+	width 100%
+	background-color #f4f5f5
+	box-shadow 0 -8px 16px 0 rgba(28,31,33,.1)
+	border-top-left-radius 20rpx
+	border-top-right-radius 20rpx
+	z-index 2017
+	transition all .3s
+.modal
+	position fixed
+	bottom 0
+	left 0
+	_wh(100%, 100%)
+	background-color rgba(0,0,0,0.8)
+	z-index 2010
+.sec_menu_w
+	width calc(100% - 76rpx)
+	margin 30rpx auto 60rpx auto
+	_fj(flex-start)
+	flex-wrap wrap
+.sec_menu-item
+	_wh(30%, 120rpx)
+	margin-bottom 20rpx
+	border-radius 10rpx
+	background-size 40% auto
+	background-position right 90%
+	background-repeat no-repeat
+	&:nth-child(3n+2)
+		margin-left 5%
+		margin-right 5%
+	&:nth-child(5n+1) .menu-name_inner
+		background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%)
+	&:nth-child(5n+2) .menu-name_inner
+		background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%)
+	&:nth-child(5n+3) .menu-name_inner
+		background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%)
+	&:nth-child(5n+4) .menu-name_inner
+		background linear-gradient(to right, rgba(162, 86, 171,0.8) 0%, rgba(183,120,190,0.8) 100%)
+	&:nth-child(5n+5) .menu-name_inner
+		background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%)
+.menu-name_inner
+	_wh(100%, 100%)
+	_fj(center)
+	_font(28rpx, 30rpx, #fff, 700, center)
+	border-radius 10rpx
+	padding 10rpx
+	overflow hidden
+.pop-title
+	margin 60rpx 38rpx 0 38rpx
+	_font(30rpx, 60rpx, #000,700,center)
+.cancel
+	_wh(calc(100% - 76rpx), 100rpx)
+	margin 0 auto
+	padding 20rpx 0
+	overflow hidden
+	border-bottom 1px solid #c5c6c7
 </style>

pages/login/login.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="zd_content bg">
 		<view class="p1">欢迎来到</view>
-		<view class="p2">西门子LMS手持系统！</view>
+		<view class="p2">龙电宁鑫手持系统！</view>
 		<view class="input-box">
 			<input class="large-input" type="text" placeholder="请输入用户名" v-model="user">
 		</view>

pages/login/upgrade.vue

@@ -9,7 +9,7 @@
 			<view class="content-header"></view>
 			<view class="content-body">
 				<view class="title">
-					<text>西门子LMS手持系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！</text>
+					<text>龙电宁鑫手持系统又有新版本了，升级到最新版本，享受更丰富、稳定、快速的功能和体验！</text>
 				</view>
 				<view class="footer flex-center">
 					<template>

pages/manage/call-sampling.vue

@@ -5,7 +5,7 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
-						<span class="filter_label">当前点位</span>
+						<span class="filter_label">起点</span>
 					</view>
 					<view class="zd-col-19">
 						<search-box
@@ -15,7 +15,7 @@
 				</view>
 				<view class="zd-row">
 					<view class="zd-col-5">
-						<span class="filter_label">载具号</span>
+						<span class="filter_label">终点</span>
 					</view>
 					<view class="zd-col-19">
 						<search-box
@@ -27,8 +27,10 @@
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-4 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_handheldRack">确认</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSampling">呼叫</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('1')">放货确认</button>
+			<button class="zd-col-6 button-primary" :class="{'button-info': !val1 || !val2}" :disabled="disabled" @tap="_callAgvToSamplingVerify('2')">取货确认</button>
 		</view>
 	</view>
 </template>
@@ -36,7 +38,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {handheldRack} from '@/utils/getData2.js'
+	import {callAgvToSampling, callAgvToSamplingVerify} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -54,14 +56,31 @@
 			this.title = options.title
 		},
 		methods: {
-			async _handheldRack () {
+			async _callAgvToSampling () {
 				this.disabled = true
 				if (!this.val1 || !this.val2) {
 					this.disabled1 = false
 					return
 				}
 				try {
-					let res = await handheldRack(this.val1, this.val2)
+					let res = await callAgvToSampling(this.val1, this.val2)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _callAgvToSamplingVerify (type) {
+				this.disabled = true
+				if (!this.val1 || !this.val2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await callAgvToSamplingVerify(type, this.val1, this.val2)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,

pages/manage/empty-tray-back.vue

@@ -1,87 +0,0 @@
-<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">
-					<view class="zd-col-5">
-						<span class="filter_label">载具号</span>
-					</view>
-					<view class="zd-col-19">
-						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="zd-row submit-bar">
-			<button class="zd-col-7 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-15 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_handheldCageFrame">送回确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import LinkScan from '@/components/LinkScan.vue'
-	import {handheldCageFrame} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			LinkScan
-		},
-		data() {
-			return {
-				title: '',
-				val1: '',
-				val2: '',
-				disabled: false
-			};
-		},
-		onLoad (options) {
-			this.title = options.title
-		},
-		methods: {
-			getScanlist (e) {
-				this.val2 = e.join()
-			},
-			async _handheldCageFrame () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await handheldCageFrame(this.val1, this.val2)
-					this.clearUp()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			clearUp () {
-				this.val1 = ''
-				this.val2 = ''
-				this.$refs.scanChild.toDel()
-				this.disabled = false
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>

pages/manage/roll-manage.vue

@@ -0,0 +1,116 @@
+<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-7">
+						<span class="filter_label">点位</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-7">
+						<span class="filter_label">收卷辊码</span>
+					</view>
+					<view class="zd-col-17">
+						<search-box
+						v-model="val2"
+						/>
+					</view>
+				</view>
+				<view class="zd-row">
+					<view class="zd-col-7">
+						<span class="filter_label">收卷辊规格</span>
+					</view>
+					<view class="zd-col-17 filter_select">
+						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_onlySendRollTruss">入辊</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1 || !index}" :disabled="disabled" @tap="_onlyCallRollTruss">出辊</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {onlySendRollTruss, onlyCallRollTruss} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				va1: '',
+				val2: '',
+				options: [],
+				index: '',
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			selectChange (e) {
+				this.index = e
+			},
+			async _onlySendRollTruss () {
+				this.disabled = true
+				if (!this.val1 || !this.val2 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await handhonlySendRollTrusseldLock(this.val1, this.val2, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _onlyCallRollTruss () {
+				this.disabled = true
+				if (!this.val1 || !this.index) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await onlyCallRollTruss(this.val1, this.index)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			clearUp () {
+				this.val1 = ''
+				this.val2 = ''
+				this.index = ''
+				this.disabled = false
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>

pages/manage/waste-foil-move.vue

@@ -5,18 +5,21 @@
 			<view class="zd_wrapper">
 				<view class="zd-row border-bottom">
 					<view class="zd-col-5">
-						<span class="filter_label">区域</span>
+						<span class="filter_label">点位</span>
 					</view>
-					<view class="zd-col-19 filter_select">
+					<view class="zd-col-19">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<search-box
+						v-model="val1"
+						/>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
 			<button class="zd-col-5 button-default" @tap="clearUp">清空</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': index === ''}" :disabled="disabled" @tap="_handheldLock('1')">锁定</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_startMoveWasteFoilv2">开始</button>
-			<button class="zd-col-8 button-primary" :class="{'button-info': index === ''}" :disabled="disabled" @tap="_handheldLock('0')">释放</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('1')">确认</button>
+			<button class="zd-col-8 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="_resumeMoveWasteFoilv2('2')">结束</button>
 		</view>
 	</view>
 </template>
@@ -24,43 +27,50 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {regionList, handheldLock} from '@/utils/getData2.js'
+	import LinkScan from '@/components/LinkScan.vue'
+	import {startMoveWasteFoilv2, resumeMoveWasteFoilv2} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
-			SearchBox
+			SearchBox,
+			LinkScan
 		},
 		data() {
 			return {
 				title: '',
-				options: [],
+				val1: '',
-				index: '',
 				disabled: false
 			};
 		},
 		onLoad (options) {
 			this.title = options.title
-			this._regionList()
 		},
 		methods: {
-			async _regionList () {
+			async _startMoveWasteFoilv2 () {
-				let res = await regionList()
-				this.options = [...res.content]
-				this.options.map(el => {
-					this.$set(el, 'text', el.label)
-				})
-			},
-			selectChange (e) {
-				this.index = e
-			},
-			async _handheldLock (type) {
 				this.disabled = true
-				if (this.index === '') {
+				if (!this.val1) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await handheldLock(this.index, type)
+					let res = await startMoveWasteFoilv2(this.val1)
+					this.clearUp()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			},
+			async _resumeMoveWasteFoilv2 (type) {
+				this.disabled = true
+				if (!this.val1) {
+					this.disabled = false
+					return
+				}
+				try {
+					let res = await resumeMoveWasteFoilv2(type, this.val1)
 					this.clearUp()
 					uni.showToast({
 						title: res.message,
@@ -71,7 +81,7 @@
 				}
 			},
 			clearUp () {
-				this.index = ''
+				this.val1 = ''
 				this.disabled = false
 			}
 		}
@@ -79,5 +89,4 @@
 </script>
 
 <style lang="stylus">
-@import '../../common/style/mixin.styl';
 </style>

utils/getData2.js

@@ -20,56 +20,36 @@ export const handLogin = (user, password) => request({
 		password: password
 	}
 })
-// 区域
+// 菜单
-export const regionList = () => request({
+export const authority = () => request({
-	url:'api/fab/regionList',
+	url:'mobile/auth/authority',
-	method: 'GET'
-})
-// 区域锁定
-export const handheldLock = (code, status) => request({
-	url:'api/handheld/lock',
-	data: {region_code: code, status: status}
-})
-// 外协区空料架送回
-export const handheldRack = (code, vcode) => request({
-	url:'api/handheld/rack',
-	data: {device_code: code, vehicle_code: vcode}
-})
-// 外协区空笼框送回
-export const handheldCageFrame = (code, list) => request({
-	url:'api/handheld/cageFrame',
-	data: {device_code: code, vehicle_list: list}
-})
-// 物料转运
-export const handheldTranshipment = (code, vcode) => request({
-	url:'api/handheld/transhipment',
-	data: {device_code: code, vehicle_code: vcode}
-})
-// 载具类型列表
-export const vehicleType = () => request({
-	url:'api/fab/vehicleType',
 	data: {}
 })
-// 补空框
+// 入辊
-export const handheldStorehouse = (code, type) => request({
+export const onlySendRollTruss = (code, vcode, type) => request({
-	url:'api/handheld/storehouse',
+	url:'api/pda/other/onlySendRollTruss',
-	data: {device_code: code, vehicle_type: type}
+	data: {point_code: code, vehicle_code: vcode, vehicle_type: type}
 })
-// 工序下料
+// 
-// export const handheldGetRegionCode = (code) => request({
+export const onlyCallRollTruss = (code, vcode, type) => request({
-// 	url:'api/handheld/getRegionCode',
+	url:'api/pda/other/onlyCallRollTruss',
-// 	data: {orderCode: code}
+	data: {point_code: code, vehicle_type: type}
-// })
-export const handheldBlanking = (code, rcode, vcode, material) => request({
-	url:'api/handheld/blanking',
-	data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material}
 })
-// 修改订单工序
+// 呼叫取样
-export const fabOrders = (code) => request({
+export const callAgvToSampling = (code1, code2) => request({
-	url:'api/fab/orders',
+	url:'api/pda/other/callAgvToSampling',
-	data: {vehicle_code: code}
+	data: {point_code1: code1, point_code1: code2}
 })
-export const updateOrder = (data) => request({
+export const callAgvToSamplingVerify = (flag, scode, ecode) => request({
-	url:'api/handheld/updateOrder',
+	url:'api/pda/other/callAgvToSamplingVerify',
-	data: data
+	data: {flag: flag, startPoint: scode, endPoint: ecode}
+})
+// 废箔搬运
+export const startMoveWasteFoilv2 = (code) => request({
+	url:'api/pda/other/startMoveWasteFoil/v2',
+	data: {point_code: code}
+})
+export const resumeMoveWasteFoilv2 = (flag, code) => request({
+	url:'api/pda/other/resumeMoveWasteFoil/v2',
+	data: {flag: flag, point_code: code}
 })

utils/mork2.js

@@ -1,24 +1,15 @@
-export const handLogin = (user, password) => {
+export const authority = () => {
 	let res = {
-		user: {
+		code: '1',
-			user: {username: 'admin'},
+		result: {
-		},
+		rf_menu0: {
-		token: 'abcd'
+			sonTree:
-	}
+			[
-	return res
+				{path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]},
-}
+				{path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]},
-export const regionList = () => {
+				{path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]}
-	let res = {
+			]
-		content: [{value: '1', label: 'aa'}, {value: '2', label: 'bb'}]
+		}
-	}
+	}}
-	return res
-}
-	
-export const fabOrders = (data) => {
-	let res = {
-		content: [
-		{order_code: '111', region_code: '3', due_date: '2020-10-10 11:30:30'}
-	]
-	}
 	return res
 }