放货确认

README.md

@@ -1,4 +1,4 @@
 # 注意事项
 + 原生APP云打包使用自有证书
 + 证书别名：testalias
-+ app图标为acs
++ app图标项目中添加地址：static/logo.png

locale/en.json

@@ -31,6 +31,7 @@
 	"title.call": "Call management",
 	"title.command": "Command management",
 	"title.task": "task management",
+	"title.release-confirm": "Release confirmation",
 	"call.sp": "start point",
 	"call.ep": "end point",
 	"call.toast": "The starting and ending points of the task cannot be the same",
@@ -54,5 +55,7 @@
 	"time": "time",
 	"state": "state",
 	"regenerate": "Regenerate",
-	"forced-completion": "Forced completion"
+	"forced-completion": "Forced completion",
+	"take-and-place": "Take and place",
+	"allow-to-leave": "Allow to leave"
 }

locale/ko.json

@@ -31,6 +31,7 @@
 	"title.call": "콜 관리",
 	"title.command": "명령 관리",
 	"title.task": "작업 관리",
+	"title.release-confirm": "출하 확인",
 	"call.sp": "작업 시작",
 	"call.ep": "작업 끝",
 	"call.toast": "작업 시작점과 끝점은 같을 수 없습니다.",
@@ -54,5 +55,7 @@
 	"time": "시간",
 	"state": "상태",
 	"regenerate": "재생성",
-	"forced-completion": "강제 완료"
+	"forced-completion": "강제 완료",
+	"take-and-place": "픽업 허용",
+	"allow-to-leave": "떠날 것을 허락하다"
 }

locale/zh-Hans.json

@@ -31,6 +31,7 @@
 	"title.call": "呼叫管理",
 	"title.command": "指令管理",
 	"title.task": "任务管理",
+	"title.release-confirm": "放货确认",
 	"call.sp": "任务起点",
 	"call.ep": "任务终点",
 	"call.toast": "任务起点终点不能相同",
@@ -54,5 +55,7 @@
 	"time": "时间",
 	"state": "状态",
 	"regenerate": "重新生成",
-	"forced-completion": "强制完成"
+	"forced-completion": "强制完成",
+	"take-and-place": "允许取放",
+	"allow-to-leave": "允许离开"
 }

pages.json

@@ -42,6 +42,14 @@
             }
             
         }
+        ,{
+            "path" : "pages/manage/release-confirm",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		// "pageOrientation": "landscape",

pages/home/home.vue

@@ -34,7 +34,8 @@
 				menuList: [
 					{id: 1, title: this.$t('title.call'), icon: 'RF01', path: '/pages/manage/call-manage'},
 					{id: 2, title: this.$t('title.command'), icon: 'RF02', path: '/pages/manage/inst-manage'},
-					{id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'}
+					{id: 3, title: this.$t('title.task'), icon: 'RF03', path: '/pages/manage/task-manage'},
+					{id: 4, title: this.$t('title.release-confirm'), icon: 'RF04', path: '/pages/manage/release-confirm'}
 				],
 				show: false,
 				secM: []

pages/manage/release-confirm.vue

@@ -0,0 +1,66 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<view class="zd_wrapper">
+				<view class="zd-row mgb20 border-bottom">
+					<uni-icons type="arrow-up" size="18" color="#ff6a00"></uni-icons>
+					<view class="zd-col-6 filter_label">{{$t('call.sp')}}</view>
+					<view class="zd-col-18 relative">
+						<input type="text" class="filter_input" v-model="sCode" disabled>
+					</view>
+				</view>
+				<view class="zd-row">
+					<uni-icons type="arrow-down" size="18" color="#ff6a00"></uni-icons>
+					<view class="zd-col-6 filter_label">{{$t('call.ep')}}</view>
+					<view class="zd-col-18 relative">
+						<input type="text" class="filter_input" v-model="nCode" disabled>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_updateTask('1')">{{$t('take-and-place')}}</button>
+			<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_updateTask('2')">{{$t('allow-to-leave')}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import {updateTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				title: '',
+				disabled: false,
+				sCode: 'QFQ_2',
+				nCode: 'QFQ_4'
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			async _updateTask (type) {
+				this.disabled = true
+				try {
+					let res = await updateTask(this.sCode, this.nCode, type)
+					this.disabled = false
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				} catch (err) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+</style>

utils/getData2.js

@@ -84,45 +84,15 @@ export const handTaskoperation = (type, id) => request({
 		task_uuid: id
 	}
 })
+
 /**
- * 生箔站点管理
+ * 放货确认
  */
-// 1.1根据区域查询设备编号及状态
+export const updateTask = (code1,code2,type) => request({
-export const queryDevices = () => request({
+	url:'api/wms/updateTask',
-	url:'api/hands/queryDevices',
-	data: {}
-})
-// 1.3更新设备状态操作
-export const updateDeviceStatus = (code, option) => request({
-	url:'api/hands/updateDeviceStatus',
 	data: {
-		device_code: code,
+		device_code: code1,
-		option: option
+		task_code: code2,
-	}
+		option: type
-})
-/**
- * agv呼叫管理
- */
-// 1.1查询所有区域信息
-export const agvqueryArea = () => request({
-	url:'api/hands/queryArea',
-	data: {}
-})
-// 1.2根据区域查询设备编号及状态
-export const agvqueryPointByArea = (code) => request({
-	url:'api/hands/queryPointByArea',
-	data: {
-		region_code: code
-	}
-})
-// 1.2创建任务(生成任务号为-开头)
-export const agvcallTask = (scode1, ncode1, scode2, ncode2,type) => request({
-	url:'api/hands/callTask',
-	data: {
-		start_device_code1: scode1,
-		next_device_code1: ncode1,
-		start_device_code2: scode2,
-		next_device_code2: ncode2,
-		task_type: type
 	}
 })