From 25765da896f914b7a81cd9ab9150a4a99748c68e Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 4 Apr 2024 18:03:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=AE=A1=E7=90=86=E3=80=81?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.styl     |  2 +-
 pages/manage/inst-manage.vue | 15 +++++----
 pages/manage/task-manage.vue | 39 ++++++++++-------------
 utils/mork2.js               | 62 ++++++++++++++++++++++++++----------
 4 files changed, 72 insertions(+), 46 deletions(-)

diff --git a/common/style/layout.styl b/common/style/layout.styl
index 8cbadd2..3b7e0fc 100644
--- a/common/style/layout.styl
+++ b/common/style/layout.styl
@@ -228,7 +228,7 @@ uni-button:after {
 .item-wrap {
 	background-color: #fff;
 	border-radius: 24rpx;
-	padding: 22rpx 14rpx;
+	padding: 22rpx 30rpx;
 	margin-bottom: 20rpx;
 	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
 }
diff --git a/pages/manage/inst-manage.vue b/pages/manage/inst-manage.vue
index 1de8e4b..f979342 100644
--- a/pages/manage/inst-manage.vue
+++ b/pages/manage/inst-manage.vue
@@ -13,15 +13,19 @@
 			<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="zd-col-24 item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成','取消'][Number(e.inst_status)]}}</view>
+						<view class="zd-col-10 item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成','取消'][Number(e.inst_status)]}}</view>
+						<view class="zd-col-10 item-font-2" style="text-align:right">{{e.create_time}}</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="zd-col-6 item-font-3">指令号：</view>
 								<view class="zd-col-18 item-font-4">{{e.instruction_code}}</view>
 							</view>
+							<view class="zd-row mgb10">
+								<view class="zd-col-10 item-font-3">指令执行步骤：</view>
+								<view class="zd-col-14 item-font-4">{{e.inst_step}}</view>
+							</view>
 							<view class="zd-row mgb10">
 								<view class="zd-col-6 item-font-3">载具号：</view>
 								<view class="zd-col-18 item-font-4">{{e.carrier}}</view>
@@ -37,10 +41,9 @@
 						</view>
 					</view>
 					<view class="zd-row">
-						<view class="zd-col-4 item-font-3">点位：</view>
-						<view class="zd-col-8 item-font-6">{{e.start_devicecode}}</view>
-						<view class="zd-col-4 item-font-7">&ndash;</view>
-						<view class="zd-col-8 item-font-6">{{e.next_devicecode}}</view>
+						<view class="zd-col-10 item-font-6">起始设备：{{e.start_devicecode}}</view>
+						<view class="zd-col-2 item-font-7">&ndash;&ndash;</view>
+						<view class="zd-col-10 item-font-6">目标设备：{{e.next_devicecode}}</view>
 					</view>
 				</view>
 			</view>
diff --git a/pages/manage/task-manage.vue b/pages/manage/task-manage.vue
index 9f1341a..07d7367 100644
--- a/pages/manage/task-manage.vue
+++ b/pages/manage/task-manage.vue
@@ -13,18 +13,14 @@
 			<view class="item-wrapper">
 				<view class="item-wrap" v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{isChecked: pkId === e.task_uuid}">
 					<view class="zd-row mgb10">
-						<view class="zd-col-24 item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成'][Number(e.inst_status)]}}</view>
+						<view class="zd-col-24 item-font-1">{{e.task_no}}&nbsp;&#124;&nbsp;{{['就绪', '执行中', '完成'][Number(e.task_status)]}}</view>
 					</view>
 					<view class="zd-row">
 						<view class="zd-col-16">
 							<view class="item-font-2 mgb10">{{e.create_time}}</view>
 							<view class="zd-row mgb10">
-								<view class="zd-col-7 item-font-3">托盘号：</view>
-								<view class="zd-col-17 item-font-4">{{e.vehicle_code}}</view>
-							</view>
-							<view class="zd-row mgb10">
-								<view class="zd-col-7 item-font-3">物料类型：</view>
-								<view class="zd-col-17 item-font-4">{{e.material_type_name}}</view>
+								<view class="zd-col-7 item-font-3">载具号：</view>
+								<view class="zd-col-17 item-font-4">{{e.carrier}}</view>
 							</view>
 						</view>
 						<view class="zd-col-8">
@@ -33,17 +29,16 @@
 						</view>
 					</view>
 					<view class="zd-row">
-						<view class="zd-col-4 item-font-3">点位：</view>
-						<view class="zd-col-8 item-font-6">{{e.start_devicecode}}</view>
-						<view class="zd-col-4 item-font-7">&ndash;</view>
-						<view class="zd-col-8 item-font-6">{{e.next_devicecode}}</view>
+						<view class="zd-col-10 item-font-6">起始设备：{{e.start_devicecode}}</view>
+						<view class="zd-col-2 item-font-7">&ndash;&ndash;</view>
+						<view class="zd-col-10 item-font-6">目标设备：{{e.next_devicecode}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submit-bar">
-			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_taskOperation('1')">重新生成</button>
-			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_taskOperation('2')">强制完成</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handTaskoperation('1')">重新生成</button>
+			<button class="zd-col-11 button-primary" :class="{'button-info': !pkId}" :disabled="disabled" @tap="_handTaskoperation('2')">强制完成</button>
 		</view>
 		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
 			<view class="msg_content">
@@ -79,7 +74,7 @@
 			<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="_queryTask">查询</button>
+				<button class="zd-col-7 button-primary" @tap="_handTasks">查询</button>
 			</view>
 		</view>
 		<view v-if="show" class="msg_mask"></view>
@@ -89,7 +84,7 @@
 <script>
 	import NavBar from '@/components/NavBar.vue'
 	import SearchBox from '@/components/SearchBox.vue'
-	import {queryTask, taskOperation} from '@/utils/getData2.js'
+	import {handTasks, handTaskoperation} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -114,17 +109,17 @@
 			this.title = options.title
 		},
 		created () {
-			this._queryTask()
+			this._handTasks()
 		},
 		methods: {
 			toSearch () {
 				this.show = true
 				this.tab = '-1'
 			},
-			async _queryTask () {
+			async _handTasks () {
 				this.show = false
 				try {
-					let res = await queryTask(this.val1, this.val2, this.val3)
+					let res = await handTasks(this.val1, this.val2, this.val3)
 					this.data = [...res.data]
 					this.dataList = [...this.data]
 					
@@ -138,23 +133,23 @@
 			changeTab (e) {
 				this.tab = e.id
 				if (e.id !== '-1') {
-					let arr = this.data.filter(el => {return el.inst_status === e.id})
+					let arr = this.data.filter(el => {return el.task_status === e.id})
 					this.dataList = [...arr]
 				} else {
 					this.dataList = [...this.data]
 				}
 			},
-			async _taskOperation (type) {
+			async _handTaskoperation (type) {
 				this.disabled = true
 				if (!this.pkId) {
 					this.disabled = false
 					return
 				}
 				try {
-					let res = await taskOperation(type, this.pkId)
+					let res = await handTaskoperation(type, this.pkId)
 					this.disabled = false
 					this.tab = '-1'
-					this._queryTask()
+					this._handTasks()
 					uni.showToast({
 						title: res.message,
 						icon: 'none'
diff --git a/utils/mork2.js b/utils/mork2.js
index 33f57ca..e507916 100644
--- a/utils/mork2.js
+++ b/utils/mork2.js
@@ -1,21 +1,49 @@
-export const handInsts = () => {
+export const handTasks = (key, scode, ncode) => {
+	let res = {
+    "data": [
+        {
+            "task_no": "-087",
+            "task_status": "2",
+            "create_time": "2024-03-28 10:54:39",
+            "carrier": '001',
+            "task_uuid": "012bc5e653ce48949020f1147333aa7f",
+            "inst_step": "7",
+            "next_devicecode": "L1",
+            "start_devicecode": "RKSSX2",
+            "instruction_code": "163",
+            "priority": "1"
+        }
+    ],
+    "message": "操作成功"
+}
+	return res
+}
+// 1.2 任务操作
+export const handTaskoperation = (type, id) => {
 	let res = {
-    "message": "ok",
-    "data": [
-        {
-            "inst_uuid": "51",
-            "task_no": "ADB001",
-            "start_devicecode": "46",
-            "next_devicecode": "2",
-            "inst_status": "3",
-            "priority": "一级",
-            "create_time": "1976-04-07 02:36:18",
-            "carrier": "890000008",
-			"instruction_code": '0000',
-			"carno": '1号车',
-			"inst_step": '1'
-        }
-    ]
+    "message": "001"
+}
+	return res
+}
+export const handInsts = () => {
+	let res = {
+    "data": [
+        {
+            "task_no": "-087",
+            "inst_status": "2",
+            "create_time": "2024-03-28 10:54:39",
+            "carrier": '001',
+			"carno": '1号车',
+            "inst_uuid": "012bc5e653ce48949020f1147333aa7f",
+            "inst_step": "3",
+			"instruction_code": '11100',
+            "next_devicecode": "L1",
+            "start_devicecode": "RKSSX2",
+            "instruction_code": "163",
+            "priority": "1"
+        }
+    ],
+    "message": "操作成功"
 }
 	return res
 }