From 214ae34f9282698ab50cf6d59ef86c88ea168e0b Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Wed, 22 Mar 2023 14:32:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/style/layout.css          | 104 ++++++++++++++++++++++++++
 components/NavBar.vue            |  71 ++++++++++++++++++
 pages.json                       |   6 ++
 pages/home/home.vue              |   2 +-
 pages/management/inscanerror.vue | 122 +++++++++++++++++++++++++++++++
 static/iconfont/iconfont.ttf     | Bin 3244 -> 3588 bytes
 static/iconfont/iconfont.woff    | Bin 2192 -> 2432 bytes
 static/iconfont/iconfont.woff2   | Bin 1644 -> 1884 bytes
 8 files changed, 304 insertions(+), 1 deletion(-)
 create mode 100644 components/NavBar.vue
 create mode 100644 pages/management/inscanerror.vue

diff --git a/common/style/layout.css b/common/style/layout.css
index 19096a6..b5ea470 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -63,4 +63,108 @@ uni-button:after {
 }
 .scan_icon::after {
 	content: '\e607';
+}
+
+.content{
+	/* display: flex; */
+	width: 100%;
+	height: 100%;
+	background-color: #fff;/* 
+	justify-content: space-between;
+	align-items: flex-start; */
+}
+.search-wrap{
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	width: 100%;
+	padding: 0 30rpx;
+}
+.search-item{
+	display: flex;
+	justify-content: space-between;
+	width: 48%;
+	margin-top: 30rpx;
+}
+.search-label{
+	width: 160rpx;
+	height: 90rpx;
+	font-size: 32rpx;
+	line-height: 90rpx;
+	color: #323232;
+	text-align: justify;
+	text-align-last: justify;
+}
+.search-label::after {
+    display: inline-block;
+	 content: '';
+	 width: 100%;
+	 height: 0;
+	 visibility: hidden;
+}
+.search-input{
+	width: calc(100% - 200rpx);
+	height: 86rpx;
+	line-height: 86rpx;
+	font-size: 32rpx;
+	color: #606266;
+	border: 1px solid #d1d1d1;
+	border-radius: 8rpx;
+	text-indent: 40rpx;
+}
+.confirm-button-wrap{
+	display: flex;
+	justify-content: flex-end;
+	width: 100%;
+	height: 86rpx;
+	line-height: 86rpx;
+	margin-top: 30rpx;
+	padding: 0 30rpx;
+}
+.confirm-button{
+	margin-left: 30rpx !important;
+	margin-right: 0 !important;
+	background-color: #D7592F;
+	color: #fff;
+	line-height: 86rpx;
+}
+.grid-wrap{
+	width: 100%;
+	height: calc(100% - 324rpx); /** 88+ 30+ 90 + 30+ 86*/
+	padding: 30rpx;
+	overflow-y: scroll;
+}
+.grid-table{
+	width: 100%;
+	border-collapse: separate;
+	border-spacing: 0;
+	border: 1px #e1e1e1;
+	text-align: center;
+}
+.grid-table thead tr th{
+	font-size: 26rpx;
+	line-height: 86rpx;
+	padding: 0 10rpx;
+	background-color: #e1e1e1;
+}
+.grid-table thead tr th:first-child{
+	border-top-left-radius: 12rpx;
+}
+.grid-table thead tr th:last-child{
+	border-top-right-radius: 12rpx;
+}
+.grid-table th, .grid-table td {
+    color: #464646;
+    background-color: #fff;
+    border-right: 2rpx solid #e1e1e1;
+    border-bottom: 2rpx solid #e1e1e1;
+}
+.grid-table th:first-child, .grid-table td:first-child{
+	border-left: 2rpx solid #e1e1e1;
+}
+.grid-table td {
+    height: 88rpx;
+    line-height: 44rpx;
+    font-size: 24rpx;
+    padding: 0 10rpx;
 }
\ No newline at end of file
diff --git a/components/NavBar.vue b/components/NavBar.vue
new file mode 100644
index 0000000..bf6a22d
--- /dev/null
+++ b/components/NavBar.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="header">
+		<span @tap="goBack" class="iconfont icon_back">&#xe6db;</span>
+		<span class="page_name">{{title}}</span>
+		<span @tap="backHome" class="iconfont icon_home" :class="{'vhide': show1 === false}">&#xe69b;</span>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+			};
+		},
+		props: {
+			title: String,
+			inner: {
+				type: Boolean,
+				default: false
+			},
+			inner2: {
+				type: Boolean,
+				default: false
+			},
+			show1: {
+				type: Boolean,
+				default: true
+			}
+		},
+		methods: {
+			goBack () {
+				if (this.inner) {
+					uni.navigateBack()
+				} else if (this.inner2) {
+					this.$emit('goIn')
+				} else {
+					uni.redirectTo({
+						url: '/pages/home/home'
+					})
+				}
+			},
+			backHome () {
+				uni.redirectTo({
+					url: '/pages/home/home'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '@/common/style/mixin.styl';
+.header
+	_fj()
+	_wh(100%, 88rpx)
+	background-color $red
+	z-index 200
+	padding 0 20rpx
+.page_name
+	_font(32rpx, 32rpx, #fff,700,center)
+.icon_back {
+	font-size: 52rpx;
+	line-height: 52rpx;
+	color: #fff;
+}
+.icon_home {
+	font-size: 52rpx;
+	line-height: 52rpx;
+	color: #fff;
+}
+</style>
diff --git a/pages.json b/pages.json
index 125fad2..1520aea 100644
--- a/pages.json
+++ b/pages.json
@@ -11,6 +11,12 @@
 			"style": {
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/management/inscanerror",
+			"style": {
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d63ac74..71ebd5b 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -10,7 +10,7 @@
 		</view>
 		<view class="nav-wrap">
 			<view class="nav-item">
-				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">入箱扫码异常</text>
+				<text class="nav-text" @click="toJump('/pages/management/inscanerror')">入箱扫码异常</text>
 			</view>
 			<view class="nav-item">
 				<text class="nav-text" @click="toJump('/pages/equipStatus/equipStatus')">出箱扫码异常</text>
diff --git a/pages/management/inscanerror.vue b/pages/management/inscanerror.vue
new file mode 100644
index 0000000..cf34117
--- /dev/null
+++ b/pages/management/inscanerror.vue
@@ -0,0 +1,122 @@
+<template>
+	<view class="content">
+		<nav-bar title="入箱扫码异常"></nav-bar>
+		<view class="search-wrap">
+			<view class="search-item">
+				<label class="search-label">关键字</label>
+				<input type="text" class="search-input" placeholder="任务号、指令号、载具号" v-model="keyword">
+			</view>
+			<view class="search-item">
+				<label class="search-label">起点</label>
+				<input type="text" class="search-input" v-model="startPoint">
+			</view>
+		</view>
+		<view class="confirm-button-wrap">
+			<button class="confirm-button" :disabled="disabled0" @click="toSearch()">查询</button>
+			<button class="confirm-button" :disabled="disabled1" @click="toSure('1')">撤销指令</button>
+			<button class="confirm-button" :disabled="disabled1" @click="toSure('2')">重新下发</button>
+			<button class="confirm-button" :disabled="disabled1" @click="toSure('3')">强制完成</button>
+		</view>
+		<view class="grid-wrap">
+			<table class="grid-table">
+				<thead>
+					<tr>
+						<th>选择</th>
+						<th>指令号</th>
+						<th>任务号</th>
+						<th>起点</th>
+						<th>终点</th>
+						<th>状态</th>
+						<th>agv车号</th>
+						<th>物料类型</th>
+						<th>优先级</th>
+						<th>时间</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr v-for="e in dataList" :key="e.inst_uuid"  @click="toRadio(e)">
+						<td>
+							<view class="iconfont icon-check" :class="{'icon-checked': pkId === e.inst_uuid}"></view>
+						</td>
+						<td>{{e.inst_no}}</td>
+						<td>{{e.task_no}}</td>
+						<td>{{e.start_devicecode}}</td>
+						<td>{{e.next_devicecode}}</td>
+						<td>{{e.inst_status_name}}</td>
+						<td>{{e.carno}}</td>
+						<td>{{e.material_type_name}}</td>
+						<td>{{e.priority}}</td>
+						<td>{{e.create_time}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	// import {queryInstraction, instOperation} from '@/utils/api.js'
+	export default {
+		components: {
+			NavBar
+		},
+		data() {
+			return {
+				dataList: [],
+				keyword: '',
+				startPoint: '',
+				endPoint: '',
+				pkId: '',
+				disabled0: false,
+				disabled1: false
+			};
+		},
+		mounted () {
+			this.queryInstraction(this.keyword, this.startPoint, this.endPoint)
+		},
+		methods: {
+			onNavigationBarButtonTap(e) {
+			    uni.redirectTo({
+			        url: '/pages/index/index'
+			    });
+			},
+			toSearch () {
+			  this.pkId = ''
+			  this.dataList = []
+			  this.disabled0 = true
+			  this.queryInstraction()
+			},
+			toSure (type) {
+			  if (this.pkId) {
+				this.disabled1 = true
+				this.instOperation(type)
+			  } else {
+				uni.showToast({
+					title: '请查询后进行选择',
+					icon: 'none'
+				})
+			  }
+			},
+			toRadio (e) {
+			  this.pkId = this.pkId === e.inst_uuid ? '' : e.inst_uuid
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.content1
+	flex-direction column
+	justify-content flex-start
+	padding 30rpx
+	box-sizing border-box
+.icon-check
+	_wh(44rpx, 44rpx)
+	background-color #ffffff
+	border-radius 50%
+	margin 0 auto
+.icon-checked
+	background-color $red
+</style>
diff --git a/static/iconfont/iconfont.ttf b/static/iconfont/iconfont.ttf
index 9cb8c8166f0a4d4d55d7c8164ce0517b445156f5..e2aaf3a50cbc17da7e04c48a74b9a32b91a5dbe1 100644
GIT binary patch
delta 2181
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

delta 1868
zcmZ8hZ){Ul6hG&__wH-EwH>tU>!$nnwzk<iy0zOLGaJQ02Z|Wth8P!!JjTW*>o&F-
zh7mf5CdQa3drl?d2aO;60F!|7i3o|tFX}g9;s@!}q|*<J#>B)A(0Xp)1B~zH+<VTs
z=bn3izjy9^_0dZ;IY0oYfF+QibNBGGJFXP3Z2({|d3Wp^?nw2Ye)1EtUm^RzXx5y)
zeqs0vvi|{K?AX+)@u#v^5&&`)fO2VK%sg7Xbh(LQ*GP;Ba;QH`Z;*b2q-7$zu-GE@
z1H3KlshQDjrjq6h0McD@1heMiEVjWJ3J8<kIBjOf())|20o;^;WoKvR7ygX<{Q#Bi
zG=KX1jpps{G6KrF{OSD43;zDUp+crPfFC<P7dty+=~tOaTgY?)6JGknN!(UFHdWL^
zJ78wl-u>XR4q~!`=48OPK_UBH><K+yP}i?YOQj_^C@m3J_F4;>X5GaqE6f79<#IZJ
zH;G7*xSd81#Vvyjhsmy@CIJ*&1y3PfNEI^c$JeixO5{=h@1f|2AJV$b|7id!0g%Pf
zXdf<eA_uU(Vt1`us8}~8o||=+yF_+dXcg^kiy)vtXA?r1pb)o(azY_x3uT8w#ukBR
z{kSc(BdlMwMeJSvx?v9#@Cd$+f3b_~2Wx>R-GOj8z?9A5u(isYC7<rIZu8z;sU)pQ
zNcE;cGYo)9hu4gr1jck#t4B4Kzz*cq^{AyVs`H?Rp_I`biwO5tV{6QZD)%GrQiIhE
z7?QOV`8amRq8%7*iE&jky6Ulkf>bR{3$~*XOB(D@T45s@t$JHst~I``u9e$%@uH`8
zvxlv@YXhEQ_FO)VnAn?W%hVtuqoxcZtn`d`ruN`@a!G?FSb5P*?b-J*G|cSKmA*hA
zGs4t9CH5^zoozDB9jx)(dtCIb?EQ1HoHH|9qK6ELF;|5o`F+-9R-+{wu+h!9!rxhC
znCNU^7tShDIj~2P(M6RgeiB`gHMRy3=!FbCO}sroEkEEyONPp{IM|~}BNj|n6KQ4s
z$eR=FM94u5lbH}R-9{=D<kH%Gh$|%+v>6cK1P3dnK^x~lI)APV-WiLB2{ch__pOF8
zWEi+~9}8Qx?gN!1nZU8t+_H^GMLc_fl_?P;0siPgn#@QMMWP`?fEHH?WX3*#O#qQ-
z45M^j&5cHi$^|)Nfy!ds`-twt>v-L(*P<}TuoCm$<{EEt2Y%_T)xE{0N=l<bj(X`E
zdInVRL5Rpq5S{(Bi>Mt@V0PgIh#_GHs49)Flop~!WJy6$jZ~Kb;pieyEPz`P&(uCQ
zpkvRjx#Pon>|oa|y-#aa;{AdC-rDxW%d<V5iJ1QUZ<jS)8zR}Aer#6{>ir*%d|VuA
z$5s5gT_1>`QTIpZGm&UIRJ`VDs%hbED&{>2-VthQh(->W_hvR}njQ+_q7tq%TKaZk
zv4Q<wb5FbWg!?VbRdFBZ8+lHHpXc+OY(>d$a5hfk#)hK!$VKyh5qIZ~6Su+X*`~MU
zj!iS^)g)!gsdtfO>x}rSb99OPEsideP7f!Pc~$6EcRLfDCbm1e2jZ~X(JLSTbM$PW
z?52&{;5A1VkKAXD&gj?NbaaXQ-#fZY`cICo(9hd&bPiRRkQ~DU2Qc916%fTq&(66q
zb7Aag<B?O1lcO`!<1^C>9t$f^pvO8<8KeHa%3rLLUOnihD=(pp3UaC}7rM~{)_2}$
mL|L3Pr%d<s%$E7dW7Fo8IyQH5Y%*)A^AqOu=)_Be1mIsIBT+*D

diff --git a/static/iconfont/iconfont.woff b/static/iconfont/iconfont.woff
index f8f32323745c37f067102224f79257e680fbfbdf..424bb12f225ea365bc1050536db160b55805cf1a 100644
GIT binary patch
delta 2389
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
F@Ly*oDU|>K

literal 2192
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

diff --git a/static/iconfont/iconfont.woff2 b/static/iconfont/iconfont.woff2
index 86a835955e0d32c18120b4e508c711562ebbef77..f17404cc62262330d76de49ddfd3e036dafb0a7d 100644
GIT binary patch
literal 1884
zcmV-i2c!6RPew8T0RR9100&$E3jhEB01gBI00$2M0RR9100000000000000000000
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
W8>QFB>^1g)Z}3^{ixY!#^I`#Fy@DnH

literal 1644
zcmV-y29x=BPew8T0RR9100wLT3jhEB01T`E00tlc0RR9100000000000000000000
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