From 77a24ae77472ef6a1b6def2eae2298a89926dca7 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Fri, 29 Mar 2024 16:08:33 +0800
Subject: [PATCH] =?UTF-8?q?4=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |   7 +-
 README.md                               |   3 +-
 common/style/layout.css                 | 370 --------------------
 common/style/layout.styl                | 447 ++++++++++++++++++++++++
 common/style/reset.css                  | 114 +++++-
 common/style/uni.css                    |  12 -
 components/NavBar.vue                   |  28 +-
 components/SearchBox.vue                |  30 +-
 components/SearchBox1.vue               | 110 ------
 pages.json                              | 130 ++-----
 pages/home/home.vue                     | 174 ++++-----
 pages/login/login.vue                   |  88 +++--
 pages/login/setup.vue                   |  53 +--
 pages/manage/hn-carry.vue               | 223 ++++++++++++
 pages/manage/man-sort.vue               | 115 ++++++
 pages/manage/mater-scrap.vue            |  89 +++++
 pages/manage/press-carry.vue            |  96 +++++
 pages/modules/call-full-mater.vue       |  77 ----
 pages/modules/call-mupan.vue            |  77 ----
 pages/modules/empty-instore.vue         |  77 ----
 pages/modules/equip-inspection.vue      | 124 -------
 pages/modules/equip-operate.vue         | 115 ------
 pages/modules/forced-rest.vue           | 102 ------
 pages/modules/hunnian-carry.vue         |  92 -----
 pages/modules/hunnian-operate.vue       |  89 -----
 pages/modules/man-group.vue             | 134 -------
 pages/modules/package-instore.vue       | 111 ------
 pages/modules/pallet-bind.vue           |  76 ----
 pages/modules/press-carry.vue           | 110 ------
 pages/modules/shelf-check.vue           | 142 --------
 pages/modules/sort-schedue.vue          | 123 -------
 pages/modules/surplus-mater-instore.vue | 101 ------
 static/image/menu/RF01.png              | Bin 2595 -> 4185 bytes
 static/image/menu/RF02.png              | Bin 2668 -> 2390 bytes
 static/image/menu/RF03.png              | Bin 2097 -> 3065 bytes
 static/image/menu/RF04.png              | Bin 2249 -> 2394 bytes
 static/image/menu/RF05.png              | Bin 3065 -> 0 bytes
 static/image/menu/RF06.png              | Bin 2390 -> 0 bytes
 static/image/menu/RF07.png              | Bin 1970 -> 0 bytes
 static/image/menu/RF08.png              | Bin 2601 -> 0 bytes
 static/image/menu/RF09.png              | Bin 3239 -> 0 bytes
 static/image/menu/RF10.png              | Bin 1599 -> 0 bytes
 42 files changed, 1280 insertions(+), 2359 deletions(-)
 delete mode 100644 common/style/layout.css
 create mode 100644 common/style/layout.styl
 delete mode 100644 common/style/uni.css
 delete mode 100644 components/SearchBox1.vue
 create mode 100644 pages/manage/hn-carry.vue
 create mode 100644 pages/manage/man-sort.vue
 create mode 100644 pages/manage/mater-scrap.vue
 create mode 100644 pages/manage/press-carry.vue
 delete mode 100644 pages/modules/call-full-mater.vue
 delete mode 100644 pages/modules/call-mupan.vue
 delete mode 100644 pages/modules/empty-instore.vue
 delete mode 100644 pages/modules/equip-inspection.vue
 delete mode 100644 pages/modules/equip-operate.vue
 delete mode 100644 pages/modules/forced-rest.vue
 delete mode 100644 pages/modules/hunnian-carry.vue
 delete mode 100644 pages/modules/hunnian-operate.vue
 delete mode 100644 pages/modules/man-group.vue
 delete mode 100644 pages/modules/package-instore.vue
 delete mode 100644 pages/modules/pallet-bind.vue
 delete mode 100644 pages/modules/press-carry.vue
 delete mode 100644 pages/modules/shelf-check.vue
 delete mode 100644 pages/modules/sort-schedue.vue
 delete mode 100644 pages/modules/surplus-mater-instore.vue
 delete mode 100644 static/image/menu/RF05.png
 delete mode 100644 static/image/menu/RF06.png
 delete mode 100644 static/image/menu/RF07.png
 delete mode 100644 static/image/menu/RF08.png
 delete mode 100644 static/image/menu/RF09.png
 delete mode 100644 static/image/menu/RF10.png

diff --git a/App.vue b/App.vue
index 3d97b1b..58b029a 100644
--- a/App.vue
+++ b/App.vue
@@ -3,7 +3,7 @@
 		onLaunch: function() {
 			// #ifdef APP-PLUS
 			plus.screen.lockOrientation('portrait-primary');
-			plus.navigator.setFullscreen(true);
+			// plus.navigator.setFullscreen(true);
 			// #endif
 		},
 		onHide: function() {
@@ -17,9 +17,8 @@
 	}
 </script>
 
-<style>
+<style lang="stylus">
 	/*每个页面公共css */
 	@import '@/common/style/reset.css';
-	@import '@/common/style/uni.css';
-	@import '@/common/style/layout.css';
+	@import '@/common/style/layout.styl';
 </style>
diff --git a/README.md b/README.md
index f7b1e0a..5f049ea 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
 # 注意事项
 + 原生APP云打包使用自有证书
-+ 证书别名：testalias
\ No newline at end of file
++ 证书别名：testalias
++ 接口在线地址：(https://apifox.com/apidoc/shared-e9d4798e-2db1-493d-a0cb-7a0e881c4bd6/api-160097540)
\ No newline at end of file
diff --git a/common/style/layout.css b/common/style/layout.css
deleted file mode 100644
index e003df6..0000000
--- a/common/style/layout.css
+++ /dev/null
@@ -1,370 +0,0 @@
-page {
-    background-color: #f6f6f6 !important;
-    min-height: 100% !important;
-    height: 100% !important;
-}
-uni-page-body {
-	background-color: #f6f6f6 !important;
-	min-height: 100% !important;
-	height: 100% !important;
-}
-uni-button:after {
-	border: none;
-}
-/** iconfont */
-@font-face {
-  font-family: 'iconfont';
-  src: url('@/static/iconfont/iconfont.woff2?t=1665454521636') format('woff2'),
-       url('@/static/iconfont/iconfont.woff?t=1665454521636') format('woff'),
-       url('@/static/iconfont/iconfont.ttf?t=1665454521636') format('truetype');
-}
-.iconfont {
-  font-family: "iconfont" !important;
-  font-size: 50rpx;
-  color: #000;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-.icon_eye_close {
-	color: #bbb;
-}
-.icon_eye_active {
-	color: #ff6a00;
-}
-.icon_unchecked {
-	color: #fff;
-	width: 32rpx;
-	height: 32rpx;
-	background-color: #fff;
-	font-size: 24rpx;
-	border: 1rpx solid #bbb;
-}
-.icon_checked {
-	color: #ff6a00;
-	border: 1rpx solid #ff6a00;
-}
-.icon_back {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_home {
-	font-size: 52rpx;
-	line-height: 52rpx;
-	color: #fff;
-}
-.icon_scan {
-	width: 42rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_phone {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 36rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_del {
-	width: 46rpx;
-	height: 48rpx;
-	font-size: 46rpx;
-	line-height: 48rpx;
-	color: #323232;
-	text-align: center;
-}
-.icon_search {
-	width: 48rpx;
-	height: 48rpx;
-	font-size: 40rpx;
-	color: #323232;
-	line-height: 48rpx;
-}
-.cancel_icon::before {
-	content: "\e6dc";
-}
-.cancel_icon {
-	display: block;
-	width: 100rpx;
-	height: 100rpx;
-	font-size: 50rpx;
-	color: #fff;
-	line-height: 100rpx;
-	text-align: center;
-	background-color: #E9B451;
-}
-
-/** 内容 */
-.zd_container {
-	width: 100%;
-	height: 100%;
-}
-.zd_content {
-	width: 100%;
-	height: auto;
-	padding: 92rpx 15rpx 82rpx 14rpx;
-}
-.zd_wrapper {
-	width: 100%;
-	height: auto;
-	background-color: #fff;
-	border-radius: 24rpx;
-	padding: 14rpx;
-	margin-bottom: 20rpx;
-}
-.filter_item {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	margin-bottom: 10rpx;
-}
-.filter_item:last-child {
-	margin-bottom: 0;
-}
-.filter_label_wraper {
-	flex: none;
-	width: 140rpx;
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
-}
-.filter_label {
-	display: block;
-	width: 140rpx;
-	line-height: 80rpx;
-	font-size: 28rpx;
-	color: #323232;
-	text-align:justify;
-	text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
-}
-.filter_label_1 {
-	line-height: 30rpx;
-}
-.filter_search {
-	width: 100rpx;
-	height: 70rpx;
-	line-height: 70rpx;
-	font-size: 28rpx;
-	color: #323232;
-	text-align: center;
-	background-color: #fff;
-	border: 1px solid #ff6a00;
-	border-radius: 10rpx;
-	margin-left: 30rpx;
-}
-.filter_search_disabled {
-	background-color: #dcdfe6;
-	border: 1px solid #dcdfe6;
-	color: #fff;
-}
-.filter_input_wraper {
-	/* flex: 1; */
-	width: calc(100% - 170rpx);
-	height: 80rpx;
-	padding: 5rpx 0;
-	margin-left: 30rpx;
-	display: flex;
-	justify-content: flex-start;
-	align-items: center;
-}
-.filter_input_wraper_1 {
-	height: 30rpx;
-}
-.filter_input_wraper_inn_text {
-	line-height: 30rpx;
-	font-size: 28rpx;
-	color: #606266;
-	margin-left: 10rpx;
-}
-.filter_input {
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	border: 1px solid #dcdfe6;
-	background-color: #fff;
-	padding: 0 15rpx;
-	font-size: 28rpx;
-	color: #606266;
-	border-radius: 10rpx;
-}
-.filter_textarea {
-	width: 100%;
-	height: 210rpx;
-	line-height: 70rpx;
-	border: 1px solid #dcdfe6;
-	background-color: #fff;
-	padding: 0 15rpx;
-	font-size: 28rpx;
-	color: #606266;
-	border-radius: 10rpx;
-}
-.filter_input_disabled {
-	background-color: #eee;
-}
-
-.grid-wraper {
-	width: 100%;
-}
-.slide_new {
-	width: 100%;
-	height: 100%;
-	overflow-y: auto;
-}
-.slide_new table {
-	table-layout: fixed;
-	min-width: 100%;
-	border-collapse: separate;
-	border-spacing: 0;
-	border: 0;
-}
-.slide_new table td, .slide_new table th {
-	box-sizing: border-box;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	padding: 0 20rpx;
-	border-bottom: 10rpx solid #f5f5f5;
-	text-align: center;
-}
-.slide_new table td:first-child, .slide_new table th:first-child{
-	position: sticky;
-	left: 0;
-	z-index: 101;
-}
-.slide_new table thead tr th {
-	position: sticky;
-	top: 0;
-	background: #d7d7d7;
-	font-size: 26rpx;
-	line-height: 98rpx;
-	color: #696969;
-	font-weight: bold;
-	z-index: 100;
-}
-.slide_new table thead tr th:first-child {
-	background: #d7d7d7;
-}
-.slide_new table tbody tr td {
-	font-size: 28rpx;
-	line-height: 98rpx;
-	color: #323232;
-	background: #fff;
-}
-.slide_new table tbody tr.checked td {
-	background-color: #fef6e4;
-}
-
-/** 提交栏 **/
-.submit-bar {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: flex-end;
-	align-items: center;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	width: 100%;
-	z-index: 200;
-	background-color: #fff;
-	padding-top: 10rpx;
-	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
-}
-.submit-button {
-	font-size: 30rpx;
-	line-height: 62rpx;
-	color: #ff6a00;
-	text-align: center;
-	letter-spacing: 1rpx;
-	padding: 0 22rpx;
-	background-color: #fff;
-	border: 1px solid #ff6a00;
-	margin: 0 40rpx 10rpx 0;
-	border-radius: 30rpx;
-}
-.btn-disabled, .submit-button[disabled] {
-	background-color: #c9c9c9;
-	border: 1px solid #c9c9c9;
-	color: #fff;
-}
-
-/** 下拉框 */
-.uni-select__selector {
-	z-index: 300 !important;
-}
-  
-/** 弹窗 */
-.msg_wrapper {
-	position: fixed;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	text-align: center;
-	z-index: 201;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.msg_wrapper_1 {
-	text-align: left;
-}
-
-.msg_box {
-	width: 90%;
-	padding: 20rpx;
-	background-color: #fff;
-	border-radius: 4px;
-	border: 1px solid #ebeef5;
-	box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
-	backface-visibility: hidden;
-}
-
-.msg_mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	opacity: .7;
-	background: #000;
-	z-index: 200;
-}
-
-.msg_btns {
-	width: 100%;
-	max-width: 300px;
-	margin: 40rpx auto 0;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-}
-.msg_btn {
-	border-radius: 10rpx;
-}
-.msg_btn:disabled {
-	background-color: #c9c9c9;
-}
-.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
-	font-size: 28rpx !important
-}
-.sin_input {
-	width: 150rpx;
-	font-size: 28rpx;
-	line-height: 150rpx;
-	height: 68rpx;
-	color: #323232;
-	padding: 0 .1rem;
-	border: 1px solid #a1a1a1;
-	border-radius: 3px;
-}
-.layout-t tr.checked td .sin_input {
-	color: #8a8a8a;
-	border: 1px solid #ffffff;
-}
\ No newline at end of file
diff --git a/common/style/layout.styl b/common/style/layout.styl
new file mode 100644
index 0000000..c64071b
--- /dev/null
+++ b/common/style/layout.styl
@@ -0,0 +1,447 @@
+@import './mixin.styl';
+page {
+    background-color: #f2f5fa !important;
+    min-height: 100% !important;
+    height: 100% !important;
+}
+uni-page-body {
+	min-height: 100% !important;
+	height: 100% !important;
+}
+uni-button:after {
+	border: none;
+}
+
+/** 内容 */
+.zd_container {
+	width: 100%;
+	height: 100%;
+}
+.zd_content {
+	position: relative;
+	top: calc(var(--status-bar-height) + 72rpx);
+	width: 100%;
+	height: auto;
+	padding: 20rpx 14rpx 140rpx 14rpx;
+}
+.zd_wrapper {
+	width: 100%;
+	height: auto;
+	background-color: #fff;
+	border-radius: 10rpx;
+	padding: 22rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.filter_wrapper {
+	position relative
+	left -14rpx
+	width: calc(100% + 28rpx);
+	height: auto;
+	background-color: #fff;
+	padding: 22rpx 22rpx 0 22rpx;
+	margin-bottom: 20rpx;
+}
+.filter_label {
+	display: block;
+	line-height: 80rpx;
+	font-size: 28rpx;
+	color: #323232;
+	font-weight: bold;
+	letter-spacing: 4rpx;
+	padding-left: 10rpx;
+	/* text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph; */
+}
+/** 筛选选择器样式 */
+.filter_picker .uni-input {
+	width: 100%;
+	line-height: 80rpx;
+	height: 80rpx;
+	font-size: 28rpx;
+	color: #606266;
+}
+/** 筛选下拉框带搜索过滤功能样式 */
+.filter_select .uni-select {
+	line-height: 80rpx !important;
+	height: 80rpx !important;
+	font-size: 28rpx !important;
+	color: #606266;
+	padding: 0 !important;
+	border: 0 !important;
+}
+.filter_input {
+	width: 100%;
+	height: 80rpx;
+	line-height: 80rpx;
+	border: 0;
+	background-color: transparent;
+	font-size: 28rpx;
+	color: #606266;
+}
+.filter_input_disabled {
+	background-color: #eee;
+}
+.filter_input_wraper {
+	/* flex: 1; */
+	width: calc(100% - 170rpx);
+	height: 80rpx;
+	padding: 5rpx 0;
+	margin-left: 30rpx;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+}
+.tab-line {
+	_wh(32rpx, 10rpx)
+	background-color #fff
+	border-radius 10rpx
+	margin 20rpx auto 0
+}
+.tab-line_active {
+	background-color #4e6ef2
+}
+.font-style-1 {
+	_font(32rpx, 32rpx, #c1c1c3,,center)
+}
+.font-style-2 {
+	_font(32rpx, 32rpx, #000,bold,center)
+}
+.grid-wraper {
+	width: 100%;
+	padding: 10rpx;
+}
+.slide_new {
+	width: 100%;
+	height: 100%;
+	overflow-y: auto;
+}
+.slide_new table {
+	table-layout: fixed;
+	min-width: 100%;
+	border-collapse: separate;
+	-webkit-border-horizontal-spacing: 0px;
+	-webkit-border-vertical-spacing: 10rpx;
+	background-color: #f5f5f5;
+}
+.slide_new table td, .slide_new table th {
+	box-sizing: border-box;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	padding: 0 20rpx;
+	text-align: center;
+}
+.slide_new table td:first-child, .slide_new table th:first-child{
+	position: sticky;
+	left: 0;
+	z-index: 101;
+	box-shadow: inset -3px 0px 3px 0px rgba(160,160,160,0.20);
+}
+.slide_new table thead tr th {
+	position: sticky;
+	top: 0;
+	background: #d7d7d7;
+	font-size: 26rpx;
+	line-height: 98rpx;
+	color: #696969;
+	font-weight: bold;
+	z-index: 100;
+}
+.slide_new table thead tr th:first-child {
+	background: #d7d7d7;
+}
+.slide_new table tbody tr td {
+	font-size: 28rpx;
+	line-height: 98rpx;
+	color: #323232;
+	background: #fff;
+}
+.slide_new table thead tr th.fontcol1,.slide_new table tbody tr td.fontcol1 {
+	color: #4e6ef2;
+	font-weight: bold;
+}
+.slide_new table thead tr th.fontcol2,.slide_new table tbody tr td.fontcol2 {
+	color: #d7592f;
+	font-weight: bold;
+}
+.slide_new table tbody tr.checked td {
+	background-color: #f0c560;
+	color: #fff;
+}
+.slide_new table tbody tr.checked td:first-child {
+	border-left: 6rpx solid #ff8227;
+}
+
+.item-wrapper {
+	width: 100%;
+	height: auto;
+}
+.item-wrap {
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 14rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.item-font-1
+	_font(30rpx,28rpx,#000,,)
+.item-font-2
+	_font(24rpx,40rpx,$red,,)
+.item-font-3
+	width 110rpx
+	_font(24rpx,26rpx,#333,,)
+	text-align:justify;
+	text-align-last: justify;
+	text-justify: inter-ideograph;
+.item-font-4
+	width calc(100% - 110rpx)
+	_font(26rpx,26rpx,#999,,)
+.item-font-5
+	_font(44rpx,60rpx,$green,,center)
+	background-color #f6f6f6
+.item-font-6
+	width calc(50% - 110rpx)
+	_font(24rpx,52rpx,#666,,center)
+	background-color #e5e5e5
+	border-radius 26rpx
+.item-font-7
+	width 110rpx
+	_font(24rpx,52rpx,#666,,center)
+.item-font-8
+	_font(24rpx,52rpx,#666,,center)
+.isChecked
+	box-shadow inset 2px 2px 4px 0px rgba(120, 141, 250, 0.7), inset -2px -2px 4px 0px rgba(120, 141, 250, 0.7)
+/** 提交栏 **/
+.submit-bar {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 200;
+	background-color: #fff;
+	padding: 14rpx;
+	box-shadow: 0 0 20rpx 0 rgba(160,160,160,0.7);
+}
+.button-default {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #fff;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-primary {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #fff;
+	text-align: center;
+	letter-spacing: 4rpx;
+	padding: 0;
+	background-color: #ff6a00;
+	border: 2rpx solid #ff6a00;
+	border-radius: 10rpx;
+}
+.button-info, .submit-button[disabled] {
+	background-color: #c9c9c9;
+	border: 2rpx solid #c9c9c9;
+	color: #fff;
+}
+uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
+	border: 2rpx solid #c9c9c9;
+}
+.submit-more {
+	width: 20%;
+	font-size: 34rpx;
+	line-height: 34rpx;
+	padding: 27rpx 10rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff
+}
+.more_btns_wraper {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	z-index: 201;
+	padding: 0 20rpx 20rpx;
+	transition: all .3s;
+}
+.more-button {
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #ff6a00;
+	text-align: center;
+	border-radius: 0;
+	background-color: transparent;
+}
+.more_btns_items .btn-disabled, .more_btns_items .submit-button_new[disabled] {
+	color: #c9c9c9;
+	border: none;
+}
+.more-button:last-child {
+	border-bottom: none;
+}
+.more_btns_cancle {
+	margin-top: 20rpx;
+	width: 100%;
+	font-size: 34rpx;
+	line-height: 88rpx;
+	color: #000;
+	text-align: center;
+	background-color: #fff;
+	border-radius: 20rpx;
+}
+.more_btns_items{
+	width: 100%;
+	border-radius: 20rpx;
+	background-color: #fff;
+}
+
+/** 下拉框 */
+.uni-select__selector {
+	z-index: 300 !important;
+}
+  
+/** 弹窗 */
+.popshow {
+	transform: translateY(0);
+}
+.pophide {
+	transform: translateY(100%);
+}
+.msg_wrapper {
+	position: fixed;
+	top: auto;
+	bottom: 0;
+	left: 0;
+	width: 100%;
+	height: calc(100% - var(--status-bar-height) - 72rpx);
+	background-color: #f6f6f6;
+	box-shadow: 0 -8px 16px 0 rgba(28,31,33,.1);
+	border-top-left-radius: 20rpx;
+	border-top-right-radius: 20rpx;
+	z-index: 301;
+	transition: all .3s;
+}
+.pop-line {
+	width: 10%;
+	height: 8rpx;
+	margin: 0 auto 14rpx auto;
+	background-color: #d4d4d4;
+	border-radius: 8rpx;
+}
+.msg_content {
+	width: 100%;
+	height: 100%;
+	overflow-y: scroll;
+}
+.msg_box {
+	width: 100%;
+}
+.msg_mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	opacity: .7;
+	background: #000;
+	z-index: 300;
+}
+.msg_btns {
+	width: 100%;
+	margin: 40rpx auto 0;
+}
+.msg_btn {
+	font-size: 34rpx;
+	line-height: 78rpx;
+	color: #fff;
+	background-color: #ff6a00;
+	border: 1rpx solid #ff6a00;
+	border-radius: 44rpx;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn_cancle {
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+	font-size: 34rpx;
+	line-height: 78rpx;
+	border-radius: 44rpx;
+	color: #000;
+	box-shadow: 0 8rpx 18rpx 0 rgba(0,0,0,.2);
+}
+.msg_btn:disabled {
+	background-color: #c9c9c9;
+}
+.uni-select__input-placeholder,.uni-select__selector-empty, .uni-select__selector-item {
+	font-size: 28rpx !important
+}
+.sin_input {
+	width: 150rpx;
+	font-size: 28rpx;
+	line-height: 150rpx;
+	height: 68rpx;
+	color: #323232;
+	padding: 0 .1rem;
+	border: 1px solid #a1a1a1;
+	border-radius: 3px;
+}
+.layout-t tr.checked td .sin_input {
+	color: #8a8a8a;
+	border: 1px solid #ffffff;
+}
+
+.flow_wrapper {
+	width: 100%;
+	background-color: #fff;
+	border-radius: 24rpx;
+	padding: 22rpx 20rpx;
+	margin-bottom: 20rpx;
+	box-shadow: 0 4rpx 10rpx 2rpx rgba(0,0,0,.1);
+}
+.font-size-1 {
+	font-size: 30rpx;
+	line-height: 54rpx;
+	color: #ff6a00;
+}
+.font-size-2 {
+	font-size: 30rpx;
+	line-height: 54rpx;
+	color: #000;
+}
+.flow_start_item {
+	position: relative;
+	background-color: #f3f3f3;
+	border: 1rpx solid #f3f3f3;
+	border-radius: 10rpx;
+}
+.flow_start_item_checked {
+	position: relative;
+	background-color: #fff;
+	border: 1rpx solid #ff6a00;
+}
+.flow_icon_item_1 {
+	width: 46rpx;
+	height: 56rpx;
+}
+.flow_icon_item_2 {
+	width: 46rpx;
+	height: 26rpx;
+}
+// 日历
+.uni-calendar__mask, .uni-calendar--fixed {
+	z-index: 300 !important
+}
+.uni-date-x--border {
+	border-width: 0 !important
+}
+.uni-date-x {
+	background-color: transparent !important
+}
\ No newline at end of file
diff --git a/common/style/reset.css b/common/style/reset.css
index 8355389..8e5b014 100644
--- a/common/style/reset.css
+++ b/common/style/reset.css
@@ -6,7 +6,7 @@
 	text-decoration: none;
 	border: none;
 	outline: none;
-	font-family: uniicons, Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
+	font-family: Arial, "Microsoft Yahei", "Helvetica Neue", Helvetica, sans-serif;
 	box-sizing: border-box;
 	-webkit-box-sizing: border-box;
 	-webkit-tap-highlight-color:transparent;
@@ -40,4 +40,116 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re
 	overflow: hidden;
 	text-overflow: ellipsis;
 	white-space: nowrap;
+}
+.flexcol {
+	flex-direction: column;
+}
+.flexstart {
+	align-items: flex-start !important;
+}
+.jcflexstart {
+	justify-content: flex-start !important;
+}
+.jcflexend {
+	justify-content: flex-end !important;
+}
+.jccenter {
+	justify-content: center !important;
+}
+
+.zd-row {
+	width: 100%;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.zd-col-24 {
+	width: 100%;
+}
+.zd-col-23 {
+    width: 95.83333%
+}
+.zd-col-22 {
+    width: 91.66667%
+}
+.zd-col-21 {
+    width: 87.5%
+}
+.zd-col-20 {
+    width: 83.33333%
+}
+.zd-col-19 {
+    width: 79.16667%
+}
+.zd-col-18 {
+    width: 75%
+}
+.zd-col-17 {
+    width: 70.83333%
+}
+.zd-col-16 {
+    width: 66.66667%
+}
+.zd-col-15 {
+    width: 62.5%
+}
+.zd-col-14 {
+    width: 58.33333%
+}
+.zd-col-13 {
+    width: 54.16667%
+}
+.zd-col-12 {
+	width: 50%;
+}
+.zd-col-11 {
+    width: 45.83333%
+}
+.zd-col-10 {
+    width: 41.66667%
+}
+.zd-col-9 {
+    width: 37.5%
+}
+.zd-col-8 {
+    width: 33.33333%
+}
+.zd-col-7 {
+    width: 29.16667%
+}
+.zd-col-6 {
+    width: 25%
+}
+.zd-col-5 {
+    width: 20.83333%
+}
+.zd-col-4 {
+    width: 16.66667%
+}
+.zd-col-3 {
+    width: 12.5%
+}
+.zd-col-2 {
+    width: 8.33333%
+}
+.zd-col-1 {
+    width: 4.16667%
+}
+.border-bottom {
+	border-bottom: 1rpx solid #e5e5e5;
+}
+.mgb10 {
+	margin-bottom: 10rpx;
+}
+.pdl20 {
+	padding-left: 20rpx;
+}
+.pdr20 {
+	padding-right: 20rpx;
+}
+.pdr10 {
+	padding-right: 10rpx;
+}
+.pdt0 {
+	padding-top: 0 !important
 }
\ No newline at end of file
diff --git a/common/style/uni.css b/common/style/uni.css
deleted file mode 100644
index c72ebf0..0000000
--- a/common/style/uni.css
+++ /dev/null
@@ -1,12 +0,0 @@
-@font-face {
-	font-family: uniicons;
-	font-weight: normal;
-	font-style: normal;
-	src: url('~@/static/uni.ttf') format('truetype');
-}
-.iconfont{
-	font-family: uni;
-	text-decoration: none;
-	text-align: center;
-}
-
diff --git a/components/NavBar.vue b/components/NavBar.vue
index a03af93..eeb59d1 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -1,8 +1,12 @@
 <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 class="zd-row jcflexstart header">
+		<view class="zd-col-4">
+			<uni-icons @tap="goBack" type="back" size="26" color="#fff"></uni-icons>
+		</view>
+		<view class="zd-col-16 page_name">{{title}}</view>
+		<view v-if="searchActive" class="zd-col-4" style="text-align: right">
+			<uni-icons @tap="toSearch" type="search" size="26" color="#fff"></uni-icons>
+		</view>
 	</view>
 </template>
 
@@ -22,9 +26,9 @@
 				type: Boolean,
 				default: false
 			},
-			show1: {
+			searchActive: {
 				type: Boolean,
-				default: true
+				default: false
 			}
 		},
 		methods: {
@@ -39,10 +43,8 @@
 					})
 				}
 			},
-			backHome () {
-				uni.redirectTo({
-					url: '/pages/home/home'
-				})
+			toSearch () {
+				this.$emit('toSearch')
 			}
 		}
 	}
@@ -51,12 +53,12 @@
 <style lang="stylus">
 @import '@/common/style/mixin.styl';
 .header
-	_fj()
 	position fixed
-	_wh(100%, 72rpx)
+	_wh(100%, calc(var(--status-bar-height) + 72rpx))
+	// background: linear-gradient(to bottom, #ff6800 0%, #ff6400 100%)
 	background-color $red
 	z-index 200
-	padding 0 20rpx
+	padding var(--status-bar-height) 20rpx 0 
 .page_name
 	_font(32rpx, 32rpx, #fff,700,center)
 </style>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 7525607..239028a 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -2,16 +2,16 @@
 	<view class="search_wraper">
 		<input 
 		type="text" 
-		class="filter_input search_input" 
+		class="filter_input pdr120" 
 		:value="value"
 		:focus="focusState"
 		@blur="handleBlur($event)"
 		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<view class="iconfont icon_del" @tap="toDel">&#xe6dc;</view>
-			<view class="iconfont icon_scan" :class="{'icon_scan_active': focusState === true}" @tap="toScan">&#xe6e2;</view>
-			<view class="iconfont icon_phone" @tap="toPhone">&#xe663;</view>
-			<view v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</view>
+		<view class="zd-row buttons_wraper">
+			<!-- <uni-icons @tap="toDel" type="closeempty" size="20" color="#4e6ef2"></uni-icons> -->
+			<uni-icons class="pdr10" @tap="toScan" type="scan" size="20" :color="focusState ? '#ff6a00' : '#4e6ef2'"></uni-icons>
+			<uni-icons @tap="toPhone" type="camera" size="26" color="#4e6ef2"></uni-icons>
+			<uni-icons v-show="seaShow" @tap="toSearch" type="search" size="20" color="#4e6ef2"></uni-icons>
 		</view>
 	</view>
 </template>
@@ -40,6 +40,11 @@
 				default: false
 			}
 		},
+		watch: {
+			focused() {
+				this.focusState = this.focused
+			},
+		},
 		mounted () {
 		    if (this.focused) {
 				this.focusState = true
@@ -124,15 +129,14 @@
 @import '../common/style/mixin.styl';
 .search_wraper
 	position relative
-	_wh(100%, 70rpx)
-.search_input
-	padding-right: 160rpx;
+	_wh(100%, 80rpx)
+.pdr120
+	padding-right: 120rpx;
 .buttons_wraper
 	position absolute
 	top 0
 	right 10rpx
-	_wh(auto, 70rpx)
-	_fj(flex-end)
-.icon_scan_active
-	color $red
+	_wh(auto, 80rpx)
+.pdr10
+	padding-right 10rpx
 </style>
diff --git a/components/SearchBox1.vue b/components/SearchBox1.vue
deleted file mode 100644
index 63134f7..0000000
--- a/components/SearchBox1.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<template>
-	<view class="search_wraper">
-		<input 
-		type="text" 
-		class="filter_input search_input" 
-		:value="value"
-		:focus="focused"
-		@input="handleChange($event)">
-		<view class="buttons_wraper">
-			<span class="iconfont icon-del" @tap="toDel">&#xe6dc;</span>
-			<span class="iconfont icon_scan" @tap="toScan">&#xe6e2;</span>
-			<span v-show="seaShow" class="iconfont icon_search" @tap="toSearch">&#xe6e1;</span>
-		</view>
-	</view>
-</template>
-
-<script>
-	import permision from "@/utils/permission.js"
-	export default {
-		data() {
-			return {
-				cur: ''
-			};
-		},
-		model: {
-			prop: 'value',
-			event: 'input'
-		},
-		props: {
-			value: String,
-			seaShow: {
-			  type: Boolean,
-			  default: false
-			},
-			focused: {
-				type: Boolean,
-				default: false
-			}
-		},
-		methods: {
-			handleChange ($event) {
-				this.cur = $event.target.value
-				this.$emit('input', this.cur)
-				this.$emit('handleChange', this.cur)
-			},
-			toSearch () {
-				this.$emit('toSearch', this.cur)
-			},
-			toDel () {
-				this.$emit('input', '')
-			},
-			async toScan() {
-				// #ifdef APP-PLUS
-				let status = await this.checkPermission();
-				if (status !== 1) {
-				    return;
-				}
-				// #endif
-				uni.scanCode({
-					success: (res) => {
-						this.$emit('input', res.result)
-						this.$emit('handleChange', res.result)
-					},
-					fail: (err) => {
-						// uni.showToast({
-						// 	title: '出错',
-						// 	icon: 'none'
-						// })
-					}
-				});
-			}
-			// #ifdef APP-PLUS
-			,
-			async checkPermission(code) {
-				let status = permision.isIOS ? await permision.requestIOS('camera') :
-					await permision.requestAndroid('android.permission.CAMERA');
-			
-				if (status === null || status === 1) {
-					status = 1;
-				} else {
-					uni.showModal({
-						content: "需要相机权限",
-						confirmText: "设置",
-						success: function(res) {
-							if (res.confirm) {
-								permision.gotoAppSetting();
-							}
-						}
-					})
-				}
-				return status;
-			}
-			// #endif
-		}
-	}
-</script>
-
-<style lang="stylus">
-@import '../common/style/mixin.styl';
-.search_wraper
-	position relative
-	_wh(100%, 70rpx)
-.search_input
-	padding-right: 160rpx;
-.buttons_wraper
-	position absolute
-	top 0
-	right 0
-	_wh(auto, 70rpx)
-</style>
diff --git a/pages.json b/pages.json
index 2329e27..9e1e1ab 100644
--- a/pages.json
+++ b/pages.json
@@ -23,108 +23,36 @@
 		    "style": {
 		    	"navigationStyle": "custom"
 		    }  
-		},
-		{
-		    "path" : "pages/modules/equip-inspection",
-		    "style": {
-		    	"navigationStyle": "custom"
-		    }   
-		}
-        ,{
-            "path" : "pages/modules/equip-operate",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/pallet-bind",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/sort-schedue",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/man-group",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/hunnian-carry",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/forced-rest",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/surplus-mater-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/package-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/call-full-mater",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/call-mupan",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/empty-instore",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
-        ,{
-            "path" : "pages/modules/shelf-check",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-		}
-		,{
-            "path" : "pages/modules/press-carry",
-            "style": {
-            	"navigationStyle": "custom"
-            }
-            
-        }
+		}
         ,{
-            "path" : "pages/modules/hunnian-operate",
-            "style": {
-            	"navigationStyle": "custom"
+            "path" : "pages/manage/hn-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/press-carry",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/mater-scrap",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/manage/man-sort",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
             }
             
         }
diff --git a/pages/home/home.vue b/pages/home/home.vue
index cbf2dfd..a8fa0b7 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,35 +1,27 @@
 <template>
-	<view class="zd_content">
-		<view class="header">首页</view>
-		<view class="userInfo-wrap">
-			<view class="userInfo">
-				<text class="p1">{{userName}}</text>
-				<text class="p2">欢迎进入华弘手持系统！</text>
-			</view>
-			<view class="exit" @tap="Quit">
-				<view class="icon-exit"></view>
-				<view class="exit-text">退出</view>
-			</view>
-		</view>
-		<view class="zd_wrapper">
-			<view class="menu-wrap">
-				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage1(e)">
-					<image class="menu-img" :src="require('../../static/image/menu/' + e.icon + '.png')" alt="">
-					<view class="menu-name">{{e.name}}</view>
+	<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">欢迎进入华弘手持系统！</text>
+				</view>
+				<view class="exit" @tap="Quit">
+					<view class="icon-exit"></view>
+					<view class="exit-text">退出</view>
 				</view>
 			</view>
-		</view>
-		<view v-if="show === true" class="sec_menu_wraper">
-			<view class="sec_menu_w">
-				<view class="menu-item" v-for="(e, i) in secM" :key="i" @click="toPage2(e)">
-					<view class="sec_menu-col_inner">
-						<view class="menu-name menu-name_inner">{{e.name}}</view>
+			<view class="zd_home_wrapper">
+				<view class="menus_wrap">
+					<view class="fir_menu_wrap">
+						<view class="fir_menu-item" v-for="e in menuList" :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 class="cancel">
-				<view class="iconfont cancel_icon" @tap="show = false"></view>
-			</view>
 		</view>
 	</view>
 </template>
@@ -39,36 +31,11 @@
 		data() {
 			return {
 				userName: '',
-				// menuList: [
-				// 	{menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-				// 	{menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []},
-				// 	{menu_id: '3', icon: 'RF03', name: '人工分拣', path: '', sonTree: [
-				// 		{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
-				// 		{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
-				// 		{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
-				// 		{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
-				// 	]},
-				// 	{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-				// 	{menu_id: '5', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-				// 	{menu_id: '6', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []}
-				// ],
 				menuList: [
-					{menu_id: '1', icon: 'RF06', name: '混碾搬运', path: '/pages/modules/hunnian-carry', sonTree: []},
-					{menu_id: '2', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []},
-					{menu_id: '3', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []},
-					{menu_id: '4', icon: 'RF05', name: '人工组盘', path: '/pages/modules/man-group', sonTree: []},
-					{menu_id: '5', icon: 'RF09', name: '人工分拣', path: '', sonTree: [
-						{menu_id: '1', name: '分拣排产', path: '/pages/modules/sort-schedue'},
-						{menu_id: '2', name: '剩料入库', path: '/pages/modules/surplus-mater-instore'},
-						{menu_id: '3', name: '托盘绑定', path: '/pages/modules/pallet-bind'},
-						{menu_id: '4', name: '包装入库', path: '/pages/modules/package-instore'},
-						{menu_id: '5', name: '呼叫满料', path: '/pages/modules/call-full-mater'},
-						{menu_id: '6', name: '呼叫木盘', path: '/pages/modules/call-mupan'},
-						{menu_id: '7', name: '空盘入库', path: '/pages/modules/empty-instore'}
-					]},
-					{menu_id: '6', icon: 'RF10', name: '压机搬运', path: '/pages/modules/press-carry', sonTree: []},
-					{menu_id: '7', icon: 'RF08', name: '货架盘点', path: '/pages/modules/shelf-check', sonTree: []},
-					{menu_id: '8', icon: 'RF02', name: '混碾操作', path: '/pages/modules/hunnian-operate', sonTree: []}
+					{id: 1, title: '混碾搬运', icon: 'RF01', path: '/pages/manage/hn-carry'},
+					{id: 2, title: '压机搬运', icon: 'RF02', path: '/pages/manage/press-carry'},
+					{id: 3, title: '物料报废', icon: 'RF03', path: '/pages/manage/mater-scrap'},
+					{id: 4, title: '人工分拣', icon: 'RF04', path: '/pages/manage/man-sort'}
 				],
 				show: false,
 				secM: []
@@ -80,19 +47,13 @@
 			}
 		},
 		methods: {
-			toPage1 (e) {
-				if (e.sonTree.length > 0) {
-					this.show = true
-					this.secM = e.sonTree
-				} else {
-					let url = e.path
-					uni.redirectTo({
-						url: url
-					})
-				}
+			async _authority () {
+				let res = await authority()
+				this.menuList = [...res.sonTree]
+				
 			},
-			toPage2 (e) {
-				let url = e.path
+			toPage (e) {
+				let url = e.path + '?title=' + e.title
 				uni.redirectTo({
 					url: url
 				})	
@@ -109,19 +70,32 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
+.home_wraper
+	_wh(100%, 100%)
+	overflow hidden
 .zd_content
-	padding-top 0
+	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
-	height 86rpx
+	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%,160rpx)
+	_wh(100%,190rpx)
 	padding 0 30rpx
 	background-color $red
 	_bis('../../static/image/info_bg.png',auto,100%,right,bottom)
 	border-radius 12rpx
-	margin-bottom 20rpx
+	margin-bottom 24rpx
 .userInfo
 	_fj(,flex-start,column)
 .p1
@@ -131,20 +105,31 @@
 	_font(26rpx,1,#fff)
 .exit
 	_fj()
-	height 47rpx
-	padding 0 15rpx
+	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(24rpx,47rpx,#fff,,right)
+	_font(32rpx,50rpx,#fff,,right)
 	padding-left 10rpx
-.menu-wrap
+.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
-.menu-item
+.fir_menu-item
 	_fj()
 	flex-direction column
 	_wh(30%, auto)
@@ -162,41 +147,4 @@
 		margin 0 auto 0.2rpx
 .menu-name
 	_font(28rpx, 38rpx, #444,,center)
-.sec_menu_wraper
-	position fixed
-	top 0
-	left 0
-	_wh(100%, 100%)
-	background-color rgba(0, 0, 0, .9)
-	z-index 2017
-	flex-direction column
-.sec_menu_w
-	_fj()
-	_wh(100%, calc(100% - 100rpx))
-	padding 0 24rpx
-	flex-wrap wrap
-	align-content center
-	&::after
-		content ''
-		display block
-		_wh(30%,0)
-.sec_menu-col
-	background-color transparent
-	border none
-	height auto
-.sec_menu-col_inner
-	_fj(center)
-	_wh(160rpx, 160rpx)
-	border-radius 50%
-	background-color $yellow
-	margin 0 auto
-.menu-name_inner
-	color #fff
-	padding 0 20rpx
-.cancel
-	_wh(100%, 100rpx)
-	  padding 0 24rpx
-	  overflow hidden
-	  background-color rgba(255, 255, 255, .3)
-	  box-shadow 0 1rpx 4rpx 0 rgba(160,160,160,0.9)
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index b457aa7..1373267 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -6,26 +6,24 @@
 			<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">
-			<span class="iconfont icon_eye_close" :class="[showPassword ? 'icon_eye_active' : '']" @tap="changePassword">&#xe6a0;</span>
+			<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="radio-box">
-			<view class="radio-wrap">
-				<span class="iconfont icon_unchecked" :class="{'icon_checked': saveUser}"  @tap="toSaveUser">&#xe66b;</span>
-				<text class="radio-label">记住用户名</text>
+		<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>
-			<text class="setup-text" @tap="setup">设置</text>
-			<text class="setup-text" @tap="isUpdate">升级版本</text>
+			<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>
-		<!-- <button class="login-btn" @tap="test">打印</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 {getCLodop, getPrinterList} from "@/utils/CLodopfuncs.js"
 	import { RSAencrypt } from '@/utils/jsencrypt.js'
 	import {handLogin, pdaUpdate} from '@/utils/getData2.js'
 	import UpGrade from './upgrade.vue'
@@ -50,7 +48,7 @@
 			//#ifdef APP-PLUS
 				// 获取本地应用资源版本号
 				plus.runtime.getProperty(plus.runtime.appid, (info) => {
-					console.log(JSON.stringify(info));
+					// console.log(JSON.stringify(info));
 					this.version = info.version;
 					this.versionCode = info.versionCode ;
 				}) 
@@ -60,24 +58,9 @@
 			isUpdate () {
 				this._pdaUpdate()
 			},
-			// test() {
-			// 	let LODOP = getCLodop();
-			// 	// 更换为打印服务器ip 不需要加前缀
-			// 	LODOP.PRINT_INIT(null, "192.168.81.198");
-			// 	// 打印机序号 规则为打印服务器打印机列表倒数从0开始 -1为默认打印机 
-			// 	LODOP.SET_PRINTER_INDEX(-1);
-			// 	// 设置打印纸大小
-			// 	LODOP.SET_PRINT_PAGESIZE(1, 800, 600, "");
-			// 	// 根据需求插入打印代码
-			// 	LODOP.PRINT();  // 打印
-			// 	// LODOP.PREVIEW()
-			// },
 			toSaveUser() {
 				this.saveUser = !this.saveUser
 			},
-			changePassword() {
-			    this.showPassword = !this.showPassword
-			},
 			setup () {
 				uni.redirectTo({
 					url: '/pages/login/setup'
@@ -123,15 +106,17 @@
 			},
 			async _pdaUpdate () {
 				let res = await pdaUpdate()
-				if (res.versionName === this.version) {
-					uni.showToast({
-						title: '当前为最新版本',
-						icon: 'none'
-					})
-				} else {
-					this.grade = true
-					this.androidUrl = res.url
-				}
+				// 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
@@ -143,34 +128,34 @@
 <style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .p1
-  _font(60rpx,75rpx,#444)
-  padding-top: 90rpx
+  _font(40rpx,75rpx,#444,666)
+  padding-top: 190rpx
 .p2
-  _font(50rpx,1,#444)
-  padding: 40rpx 0 25rpx
+  _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% - 40rpx), 74rpx)
+	_wh(calc(100% - 100rpx), 74rpx)
 	_font(32rpx,74rpx,#999)
 	padding-left 10rpx
 .radio-box
-	_fj()
-	margin: 25rpx 0 70rpx 0
-	height: 34rpx
-.radio-wrap
-	_fj(flex-start)
-	height: 34rpx
-	flex: 2
+	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)
-	padding-left: 10rpx
 .setup-text
 	_font(28rpx, 28rpx,$red,,right)
-	padding-left 25rpx
 .bg
 	background-color: #fff;
 	_bis('../../static/image/login_bg.png', 100%,,bottom)
@@ -181,7 +166,12 @@
   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
diff --git a/pages/login/setup.vue b/pages/login/setup.vue
index c196bb1..ef54916 100644
--- a/pages/login/setup.vue
+++ b/pages/login/setup.vue
@@ -1,22 +1,24 @@
 <template>
 	<view class="zd_container">
-		<nav-bar title="设置" :inner2="true" @goIn="goIn" :show1="false"></nav-bar>
+		<nav-bar title="设置" :inner2="true" @goIn="goIn"></nav-bar>
 		<view class="zd_content">
 			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">服务器地址</view>
+				<view class="setup-item">
+					<view class="setup-label">服务器地址</view>
 					<input type="text" class="setup-input" placeholder="请输入服务器地址" v-model="addrip">
 				</view>
-			</view>
-			<view class="zd_wrapper">
-				<view class="input-wrap">
-					<view class="input-label">刷新时间(s)</view>
-					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				<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">刷新时间(s)</view>
+					<input type="text" class="setup-input" placeholder="请输入刷新时间" v-model="setTime">
+				</view> -->
 			</view>
 		</view>
-		<view class="submit-bar">
-		  <button class="submit-button" @click="_submit">确认</button>
+		<view class="zd-row submit-bar">
+		  <button class="zd-col-24 button-primary" @click="_submit">确认</button>
 		</view>
 	</view>
 </template>
@@ -29,9 +31,8 @@
 		},
 		data() {
 			return {
-				options: [],
-				index: '',
 				addrip: this.$store.getters.baseUrl,
+				acsip: this.$store.getters.acsUrl,
 				setTime: this.$store.getters.setTime / 1000
 			};
 		},
@@ -44,7 +45,14 @@
 			_submit () {
 				if (this.addrip === '') {
 					uni.showToast({
-						title: '服务器地址',
+						title: '请填写服务器地址',
+						icon: 'none'
+					})
+					return
+				}
+				if (this.acsip === '') {
+					uni.showToast({
+						title: '请填写ACS地址',
 						icon: 'none'
 					})
 					return
@@ -57,7 +65,7 @@
 					return
 				}
 				// 存值
-				this.$store.dispatch('setConfig',{baseUrl: this.addrip, setTime: this.setTime * 1000, setPrintName: this.index})
+				this.$store.dispatch('setConfig',{baseUrl: this.addrip, acsUrl: this.acsip, setTime: this.setTime * 1000})
 				uni.redirectTo({
 					url: '/pages/login/login'
 				})
@@ -68,15 +76,16 @@
 
 <style lang="stylus">
 @import '../../common/style/mixin.styl';
-.input-wrap
+.setup-item
 	width 100%
-	_fj()
-.input-label
-	wh(200rpx, 58rpx)
-	_font(28rpx,58rpx,#464646)
+	margin-bottom 40rpx
+.setup-label
+	_font(24rpx,40rpx,#000)
 .setup-input
-	_wh(calc(100% - 200rpx), 58rpx)
+	_wh(100%, 80rpx)
 	background #fff
-	_font(28rpx,58rpx,#323232)
-	padding 0 10rpx
+	_font(28rpx,80rpx,#323232)
+	padding 0 28rpx
+	border 2px solid #e9ecf3
+	border-radius 12rpx
 </style>
diff --git a/pages/manage/hn-carry.vue b/pages/manage/hn-carry.vue
new file mode 100644
index 0000000..08f678b
--- /dev/null
+++ b/pages/manage/hn-carry.vue
@@ -0,0 +1,223 @@
+<template>
+	<view class="zd_container">
+		<nav-bar :title="title"></nav-bar>
+		<view class="zd_content">
+			<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>
+								<th>批次号</th>
+								<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="toChose(e)" :class="{'checked': e.workorder_code === pkId}">
+								<td class="fontcol1">{{e.workorder_code}}</td>
+								<td>{{e.plan_qty}}</td>
+								<td>{{e.real_qty}}</td>
+								<td>{{e.plan_weight}}</td>
+								<td>{{e.real_weight}}</td>
+								<td>{{e.material_ratio}}</td>
+								<td>{{e.raw_material_code}}</td>
+								<td>{{e.produce_order}}</td>
+								<td>{{e.produce_date}}</td>
+								<td>{{e.vehicle_type}}</td>
+								<td>{{e.point_code}}</td>
+								<td>{{e.point_name}}</td>
+								<td>{{e.region_code}}</td>
+								<td>{{e.region_name}}</td>
+								<td>{{['未生产', '已下发', '生产中', '暂停', '完成', '暂存中'][Number(e.workorder_status) - 1]}}</td>
+							</tr>
+						</tbody>
+					</table>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" :disabled="disabled1" @tap="_hnOrderFinish">工单完成</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !pkId}" @tap="toPop">料盅入库</button>
+			<button class="zd-col-7 button-primary" @tap="toPop1">呼叫空蛊</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<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">
+						<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">
+						<view class="example-body">
+							<uni-datetime-picker type="datetime" v-model="datetimesingle" @change="changeLog" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-7 button-default" @tap.stop="closePop">关闭</button>
+				<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+				<button class="zd-col-7 button-primary" :class="{'button-info': !val1 || !datetimesingle}" :disabled="disabled2" @tap="_hnmlTask">料盅入库</button>
+			</view>
+		</view>
+		<view v-if="show" class="msg_mask"></view>
+		<view class="zd_content msg_wrapper" :class="show1 ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否呼叫空蛊？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show1 = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled3" @tap="_hnqkTask">确定</button>
+			</view>
+		</view>
+		<view v-if="show1" class="msg_mask"></view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {hnWorkOrder,hnOrderFinish,hnmlTask,hnqkTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				dataList: [],
+				pkId: '',
+				disabled1: false,
+				disabled2: false,
+				disabled3: false,
+				show: false,
+				val1: '',
+				datetimesingle: '',
+				show1: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._hnWorkOrder()
+		},
+		methods: {
+			changeLog(e) {
+				console.log('----change事件:', e);
+			},
+			/** grid */
+			async _hnWorkOrder () {
+				let res = await hnWorkOrder()
+				this.dataList = [...res]
+			},
+			toChose (e) {
+				this.pkId = this.pkId === e.workorder_code ? '' : e.workorder_code
+			},
+			async _hnOrderFinish () {
+				this.disabled1 = true
+				if (!this.pkId) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await hnOrderFinish(this.pkId)
+					this.pkId = ''
+					this.disabled1 = false
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			toPop () {
+				if (this.pkId) {
+					this.show = true
+				}
+			},
+			closePop () {
+				this.show = false
+				this.clearUp()
+			},
+			clearUp () {
+				this.val1 = ''
+				this.datetimesingle = ''
+			},
+			async _hnmlTask () {
+				this.disabled2 = true
+				if (!this.val1 || !this.datetimesingle) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await hnmlTask(this.pkId, this.val1, this.datetimesingle)
+					this.disabled2 = false
+					this.pkId = ''
+					this.closePop()
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			},
+			toPop1 () {
+				this.show1 = true
+			},
+			async _hnqkTask () {
+				this.disabled3 = true
+				try {
+					let res = await hnqkTask()
+					this.show1 = false
+					this.disabled3 = false
+					this._hnWorkOrder()
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled3 = false
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/manage/man-sort.vue b/pages/manage/man-sort.vue
new file mode 100644
index 0000000..659ca41
--- /dev/null
+++ b/pages/manage/man-sort.vue
@@ -0,0 +1,115 @@
+<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-8">
+						<span class="filter_label">人工分拣点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index1" filterable :localdata="options1"></zxz-uni-data-select>
+					</view>
+				</view>
+				<view class="zd-row border-bottom">
+					<view class="zd-col-8">
+						<span class="filter_label">缓存货架点位</span>
+					</view>
+					<view class="zd-col-15 filter_select">
+						<zxz-uni-data-select v-model="index2" filterable :localdata="options2"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-7 button-default" @tap.stop="clearUp">清空</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1 || !index2}" :disabled="disabled1" @tap="_rgfjqlTask">叫料</button>
+			<button class="zd-col-7 button-primary" :class="{'button-info': !index1}" :disabled="disabled2" @tap="_rgfjskTask">送空盘</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import NavBar from '@/components/NavBar.vue'
+	import SearchBox from '@/components/SearchBox.vue'
+	import {rgfjPoint,hchjPoint,rgfjqlTask,rgfjskTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				options2: [],
+				index2: '',
+				disabled1: false,
+				disabled2: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._rgfjPoint()
+			this._hchjPoint()
+		},
+		methods: {
+			/** 下拉框*/
+			async _rgfjPoint () {
+				let res = await rgfjPoint()
+				this.options1 = [...res]
+			},
+			async _hchjPoint () {
+				let res = await hchjPoint()
+				this.options2 = [...res]
+			},
+			clearUp () {
+				this.index1 = ''
+				this.index2 = ''
+				this.disabled1 = false
+				this.disabled2 = false
+			},
+			async _rgfjqlTask () {
+				this.disabled1 = true
+				if (!this.index1 || !this.index2) {
+					this.disabled1 = false
+					return
+				}
+				try {
+					let res = await rgfjqlTask(this.index2, this.index1)
+					this.disabled1 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled1 = false
+				}
+			},
+			async _rgfjskTask () {
+				this.disabled2 = true
+				if (!this.index1) {
+					this.disabled2 = false
+					return
+				}
+				try {
+					let res = await rgfjskTask(this.index1)
+					this.disabled2 = false
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled2 = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+</style>
diff --git a/pages/manage/mater-scrap.vue b/pages/manage/mater-scrap.vue
new file mode 100644
index 0000000..43777d3
--- /dev/null
+++ b/pages/manage/mater-scrap.vue
@@ -0,0 +1,89 @@
+<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">
+						<search-box
+						v-model="val1"
+						/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" :class="{'button-info': !val1}" :disabled="disabled" @tap="toPop">物料报废</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否执行物料报废？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_materialScrap">确定</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 {materialScrap} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				val1: '',
+				show: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		methods: {
+			toPop () {
+				if (this.val1) {
+					this.show = true
+				}
+			},
+			async _materialScrap () {
+				this.disabled = true
+				try {
+					let res = await materialScrap(this.val1)
+					this.show = false
+					this.disabled = false
+					this.val1 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/manage/press-carry.vue b/pages/manage/press-carry.vue
new file mode 100644
index 0000000..1e3e842
--- /dev/null
+++ b/pages/manage/press-carry.vue
@@ -0,0 +1,96 @@
+<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"></zxz-uni-data-select>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="zd-row submit-bar">
+			<button class="zd-col-22 button-primary" :class="{'button-info': !index1}" :disabled="disabled" @tap="toPop">强制回货架</button>
+		</view>
+		<view class="zd_content msg_wrapper" :class="show ? 'popshow' : 'pophide'">
+			<view class="pop-line"></view>
+			<view class="msg_content">
+				<view class="zd-row">
+					<view class="zd-col-24">
+						<span class="filter_label">确定是否强制回货架？</span>
+					</view>
+				</view>
+			</view>
+			<view class="zd-row submit-bar">
+				<button class="zd-col-11 button-default" @tap.stop="show = false">关闭</button>
+				<button class="zd-col-11 button-primary" :disabled="disabled" @tap="_qzhhjTask">确定</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 {yjslwPointList, qzhhjTask} from '@/utils/getData2.js'
+	export default {
+		components: {
+			NavBar,
+			SearchBox
+		},
+		data() {
+			return {
+				title: '',
+				options1: [],
+				index1: '',
+				show: false,
+				disabled: false
+			};
+		},
+		onLoad (options) {
+			this.title = options.title
+		},
+		created () {
+			this._yjslwPointList()
+		},
+		methods: {
+			/** 下拉框*/
+			async _yjslwPointList () {
+				let res = await yjslwPointList()
+				this.options1 = [...res]
+			},
+			toPop () {
+				if (this.index1) {
+					this.show = true
+				}
+			},
+			async _qzhhjTask () {
+				this.disabled = true
+				try {
+					let res = await qzhhjTask(this.index1)
+					this.show = false
+					this.disabled = false
+					this.index1 = ''
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				} catch (e) {
+					this.disabled = false
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="stylus">
+@import '../../common/style/mixin.styl';
+.msg_wrapper
+	height auto
+	min-height 30%
+</style>
diff --git a/pages/modules/call-full-mater.vue b/pages/modules/call-full-mater.vue
deleted file mode 100644
index d9ce7c4..0000000
--- a/pages/modules/call-full-mater.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="呼叫满料"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_callingMaterialTaskShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫满料</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {callingMaterialTaskShow, callingMaterialTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingMaterialTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingMaterialTaskShow () {
-				let res = await callingMaterialTaskShow()
-				this.dataList = [...res]
-			},
-			/** 呼叫满料 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await callingMaterialTask()
-					this.disabled = false
-					this._callingMaterialTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/call-mupan.vue b/pages/modules/call-mupan.vue
deleted file mode 100644
index 9c7e1fa..0000000
--- a/pages/modules/call-mupan.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="呼叫木盘"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_callingWoodenPalletTaskShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">呼叫木盘</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {callingWoodenPalletTaskShow, callingWoodenPalletTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingWoodenPalletTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingWoodenPalletTaskShow () {
-				let res = await callingWoodenPalletTaskShow()
-				this.dataList = [...res]
-			},
-			/** 呼叫木盘 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await callingWoodenPalletTask()
-					this.disabled = false
-					this._callingWoodenPalletTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/empty-instore.vue b/pages/modules/empty-instore.vue
deleted file mode 100644
index 827a045..0000000
--- a/pages/modules/empty-instore.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="空盘入库"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_emptyDiskIntoStorageShow">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">空盘入库</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {emptyDiskIntoStorageShow, emptyDiskIntoStorageTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._emptyDiskIntoStorageShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _emptyDiskIntoStorageShow () {
-				let res = await emptyDiskIntoStorageShow()
-				this.dataList = [...res]
-			},
-			/** 空盘入库 */
-			async toSure () {
-				this.disabled = true
-				try {
-					let res = await emptyDiskIntoStorageTask()
-					this.disabled = false
-					this._emptyDiskIntoStorageShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/equip-inspection.vue b/pages/modules/equip-inspection.vue
deleted file mode 100644
index 1440a6a..0000000
--- a/pages/modules/equip-inspection.vue
+++ /dev/null
@@ -1,124 +0,0 @@
-<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">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-				<view class="filter_item filter_item_1">
-					<view class="filter_label">备注</view>
-					<view class="filter_input_wraper filter_input_wraper_1">
-						<textarea class="filter_textarea" v-model="remark"></textarea>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				remark: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._deviceInfo()
-			this._deviceStatus()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 获取设备下拉框 */
-			async _deviceInfo () {
-				let res = await deviceInfo()
-				this.options1 = [...res]
-			},
-			/** 获取设备状态下拉框 */
-			async _deviceStatus () {
-				let res = await deviceStatus()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					uni.showToast({
-						title: '设备号不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					uni.showToast({
-						title: '状态不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await deviceCheckVerify(this.index1, userName,this.remark, this.index2)
-					this.disabled1 = false
-					this.index1 = ''
-					this.index2 = ''
-					this.remark = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.index1 = ''
-				this.index2 = ''
-				this.remark = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/equip-operate.vue b/pages/modules/equip-operate.vue
deleted file mode 100644
index af5a8eb..0000000
--- a/pages/modules/equip-operate.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<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">
-						<uni-data-select v-model="index2" :localdata="options2" @change="selectChange2"></uni-data-select>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {deviceInfo, deviceStatus, deviceCheckVerify} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._deviceInfo()
-			this._deviceStatus()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			selectChange2(e) {
-				this.index2 = e
-			},
-			/** 获取设备下拉框 */
-			async _deviceInfo () {
-				let res = await deviceInfo()
-				this.options1 = [...res]
-			},
-			/** 获取设备状态下拉框 */
-			async _deviceStatus () {
-				let res = await deviceStatus()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					uni.showToast({
-						title: '设备号不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					uni.showToast({
-						title: '状态不能为空',
-						icon: 'none'
-					})
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await deviceCheckVerify(this.index1, userName, this.index2)
-					this.disabled1 = false
-					this.index1 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.index1 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue
deleted file mode 100644
index 4c8523a..0000000
--- a/pages/modules/forced-rest.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<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">
-						<input type="text" class="filter_input" v-model="val1">
-					</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>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.group_id === pkId}">
-								<td>{{e.point_code}}</td>
-								<td>{{e.device_code}}</td>
-								<td>{{e.standing_time}}</td>
-								<td>{{e.timeDifferenceMinutes}}</td>
-								<td>{{e.estimatedCompletionTimeString}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !pkId}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {forcedRestingShow, forcedRestingSubmit} from '@/utils/getData2.js'
-	import {dateTimeFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				val1: '',
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		created () {
-			this._forcedRestingShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _forcedRestingShow () {
-				let res = await forcedRestingShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await forcedRestingSubmit(this.val1, this.pkId)
-					this.disabled = false
-					this.pkId = ''
-					this.pkObj = {}
-					this.val1 = ''
-					this._forcedRestingShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.group_id ? '' : e.group_id
-				this.pkObj = this.pkId === e.group_id ? e : {}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/hunnian-carry.vue b/pages/modules/hunnian-carry.vue
deleted file mode 100644
index 04cc8e7..0000000
--- a/pages/modules/hunnian-carry.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<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">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<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>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index1}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getBlendingCode, sendTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				options1: [],
-				index1: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._getBlendingCode()
-		},
-		methods: {
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			/** 下拉框-混碾位置 */
-			async _getBlendingCode () {
-				let res = await getBlendingCode()
-				this.options1 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.val1 || !this.index1) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await sendTask(this.val1, this.index1)
-					this.disabled1 = false
-					this.val1 = ''
-					this.index1 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.index1 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/hunnian-operate.vue b/pages/modules/hunnian-operate.vue
deleted file mode 100644
index ac4755a..0000000
--- a/pages/modules/hunnian-operate.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="混碾操作"></nav-bar>
-		<view class="zd_content">
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>压机编号</th>
-								<th>泥料号</th>
-								<th>工单号</th>
-								<th>是否上料</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.record_id === pkId}">
-								<td>{{e.device_code}}</td>
-								<td>{{e.material_id}}</td>
-								<td>{{e.workorder_id}}</td>
-								<td>{{e.is_finish}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_mixRequestInfo">刷新</button>
-			<button class="submit-button" :disabled="disabled" @tap="toSure">删除</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {mixRequestInfo, mixDeleteInfo} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled: false
-			};
-		},
-		created () {
-			this._mixRequestInfo()
-		},
-		methods: {
-			/** grid查询 */
-			async _mixRequestInfo () {
-				let res = await mixRequestInfo()
-				this.dataList = [...res]
-			},
-			/** 删除 */
-			async toSure () {
-				this.disabled = true
-				if (!this.pkId) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await mixDeleteInfo(this.pkObj)
-					this.disabled = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._mixRequestInfo()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.record_id ? '' : e.record_id
-				this.pkObj = this.pkId === e.record_id ? e : {}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/man-group.vue b/pages/modules/man-group.vue
deleted file mode 100644
index ff8d70f..0000000
--- a/pages/modules/man-group.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<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">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<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">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2" @inputChange="inputChange" @change="change"></zxz-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">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index1 || !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {getPressCode, getVehicleType, groupmanual} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				options1: [],
-				index1: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._getPressCode()
-			this._getVehicleType()
-		},
-		methods: {
-			change(e) {
-				// console.log('e:', e);
-			},
-			inputChange(e) {
-				// console.log(e);
-			},
-			/** 选择器 */
-			selectChange1(e) {
-				this.index1 = e
-			},
-			// selectChange2(e) {
-			// 	this.index2 = e
-			// },
-			/** 获取载具类型下拉框 */
-			async _getVehicleType () {
-				let res = await getVehicleType()
-				this.options1 = [...res]
-			},
-			/** 获取点位编码下拉框 */
-			async _getPressCode () {
-				let res = await getPressCode()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index1) {
-					this.disabled1 = false
-					return
-				}
-				if (!this.index2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await groupmanual(this.val1, this.index1, this.index2, this.val2)
-					this.disabled1 = false
-					this.val1 = ''
-					this.val2 = ''
-					this.index1 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.val2 = ''
-				this.index1 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/package-instore.vue b/pages/modules/package-instore.vue
deleted file mode 100644
index b6bc2cf..0000000
--- a/pages/modules/package-instore.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-<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">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">物料数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">剩余数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点1</th>
-								<th>终点1</th>
-								<th>起点2</th>
-								<th>终点2</th>
-								<th>任务状态</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.point_name3}}</td>
-								<td>{{e.point_name4}}</td>
-								<td>{{e.task_status}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_manualSortingPackingTaskShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingPackingTaskShow, manualSortingPackingTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				val3: '0',
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._manualSortingPackingTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _manualSortingPackingTaskShow () {
-				let res = await manualSortingPackingTaskShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await manualSortingPackingTask(this.val1, this.val2, this.val3)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					this.val3 = '0'
-					this._manualSortingPackingTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/pallet-bind.vue b/pages/modules/pallet-bind.vue
deleted file mode 100644
index ce3e1f3..0000000
--- a/pages/modules/pallet-bind.vue
+++ /dev/null
@@ -1,76 +0,0 @@
-<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">
-						<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">
-						<search-box v-model="val2" />
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">清空</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingBindingVehicle} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				disabled: false
-			};
-		},
-		methods: {
-			/** 确定 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await manualSortingBindingVehicle(this.val2, this.val1)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCancle () {
-				this.disabled = false
-				this.val1 = ''
-				this.val2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-</style>
diff --git a/pages/modules/press-carry.vue b/pages/modules/press-carry.vue
deleted file mode 100644
index b02b71b..0000000
--- a/pages/modules/press-carry.vue
+++ /dev/null
@@ -1,110 +0,0 @@
-<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">
-						<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">
-						<zxz-uni-data-select v-model="index2" filterable :localdata="options2" @inputChange="inputChange" @change="change"></zxz-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">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !index2}" :disabled="disabled1" @tap="toSure">确认</button>
-			<button class="submit-button" @tap="toCancle">取消</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {pressPointList, pressTask} from '@/utils/getData1.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				options2: [],
-				index2: '',
-				disabled1: false
-			};
-		},
-		created () {
-			this._pressPointList()
-		},
-		methods: {
-			change(e) {
-				// console.log('e:', e);
-			},
-			inputChange(e) {
-				// console.log(e);
-			},
-			// selectChange2(e) {
-			// 	this.index2 = e
-			// },
-			/** 获取下拉框 */
-			async _pressPointList () {
-				let res = await pressPointList()
-				this.options2 = [...res]
-			},
-			/** 确定 */
-			async toSure () {
-				this.disabled1 = true
-				if (!this.index2) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await pressTask(this.index2, this.val1, this.val2)
-					this.disabled1 = false
-					this.val1 = ''
-					this.val2 = ''
-					this.index2 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			toCancle () {
-				this.disabled1 = false
-				this.val1 = ''
-				this.val2 = ''
-				this.index2 = ''
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-.filter_item_1, .filter_input_wraper_1
-	align-items: flex-start
-	height 210rpx
-</style>
diff --git a/pages/modules/shelf-check.vue b/pages/modules/shelf-check.vue
deleted file mode 100644
index b082d79..0000000
--- a/pages/modules/shelf-check.vue
+++ /dev/null
@@ -1,142 +0,0 @@
-<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">
-						<input type="text" placeholder="输入货架号码" class="filter_input" 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">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
-					</view>
-				</view>
-				<view v-show="index === '2' || index === '3'" class="filter_item">
-					<view class="filter_label">托盘编码</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val2">
-					</view>
-				</view>
-				<view v-show="index === '3'" class="filter_item">
-					<view class="filter_label">砖块数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val3">
-					</view>
-				</view>
-				<view v-show="index === '3'" class="filter_item">
-					<view class="filter_label">物料编码</view>
-					<view class="filter_input_wraper">
-						<input type="text" class="filter_input" v-model="val4">
-					</view>
-				</view>
-			</view>
-			<view v-show="index === '3'" class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>物料编码</th>
-								<th>物料名称</th>
-								<th>物料规格</th>
-								<th>物料型号</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.material_id === pkId}">
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.material_spec}}</td>
-								<td>{{e.material_model}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_shelfMaterialQuery">查询</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !index || (index === '2' && !val2) || (index === '3' && (!val2 || !val3 || !pkId))}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import {shelfMaterialQuery, shelfUpdateData} from '@/utils/getData2.js'
-	import {dateTimeFtt} from '@/utils/utils.js'
-	export default {
-		components: {
-			NavBar
-		},
-		data() {
-			return {
-				val1: '',
-				index: '',
-				options: [{value: '1', text: '空位'}, {value: '2', text: '空盘'}, {value: '3', text: '有料'}],
-				val2: '',
-				val3: '',
-				val4: '',
-				dataList: [],
-				pkId: '',
-				disabled: false
-			};
-		},
-		methods: {
-			selectChange(e) {
-				this.index = e
-			},
-			/** grid查询 */
-			async _shelfMaterialQuery () {
-				let res = await shelfMaterialQuery(this.val4)
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.index || (this.index === '2' && !this.val2) || (this.index === '3' && (!this.val2 || !this.val3 || !this.pkId))) {
-					this.disabled = false
-					return
-				}
-				try {
-					let vcode = ''
-					let qty = ''
-					let id = ''
-					if (this.index === '2') {
-						vcode = this.val2
-					}
-					if (this.index === '3') {
-						vcode = this.val2
-						qty = this.val3
-						id = this.pkId
-					}
-					let res = await shelfUpdateData(this.val1, this.index, vcode, qty, id)
-					this.disabled = false
-					this.pkId = ''
-					this.val1 = ''
-					this.index = ''
-					this.val2 = ''
-					this.val3 = ''
-					this.val4 = ''
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.material_id ? '' : e.material_id
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/sort-schedue.vue b/pages/modules/sort-schedue.vue
deleted file mode 100644
index 0b3f70c..0000000
--- a/pages/modules/sort-schedue.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-	<view class="zd_container">
-		<nav-bar title="分拣排产"></nav-bar>
-		<view class="zd_content">
-			<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>
-								<th>实际量</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i" @tap="toCheck(e)" :class="{'checked': e.workorder_code === pkId}">
-								<td>{{e.workorder_code}}</td>
-								<td>{{e.material_code}}</td>
-								<td>{{e.material_name}}</td>
-								<td>{{e.workorder_status}}</td>
-								<td>{{e.operator}}</td>
-								<td>{{e.create_name}}</td>
-								<td><input type="number" class="sin_input" v-model="e.plan_qty"></td>
-								<td>{{e.real_qty}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled1" @tap="toSure1">开工</button>
-			<button class="submit-button" :class="{'btn-disabled': !pkId}" :disabled="disabled2" @tap="toSure2">完工</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {manualSortingOrders, manualSortingProductionScheduling, manualSortingProductionComplete} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				dataList: [],
-				pkId: '',
-				pkObj: {},
-				disabled1: false,
-				disabled2: false
-			};
-		},
-		created () {
-			this._manualSortingOrders()
-		},
-		methods: {
-			/** grid查询 */
-			async _manualSortingOrders () {
-				let res = await manualSortingOrders()
-				this.dataList = [...res]
-			},
-			toCheck (e) {
-				this.pkId = this.pkId === e.workorder_code ? '' : e.workorder_code
-				this.pkObj = this.pkId === e.workorder_code ? e : {}
-			},
-			/** 开工 */
-			async toSure1 () {
-				this.disabled1 = true
-				if (!this.pkId) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await manualSortingProductionScheduling(this.pkId, userName)
-					this.disabled1 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._manualSortingOrders()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			/** 完工 */
-			async toSure2 () {
-				this.disabled2 = true
-				if (!this.pkId) {
-					this.disabled2 = false
-					return
-				}
-				try {
-					let userName = this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : ''
-					let res = await manualSortingProductionComplete(this.pkId, userName)
-					this.disabled2 = false
-					this.pkId = ''
-					this.pkObj = {}
-					this._manualSortingOrders()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled2 = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/pages/modules/surplus-mater-instore.vue b/pages/modules/surplus-mater-instore.vue
deleted file mode 100644
index 3cdcd7b..0000000
--- a/pages/modules/surplus-mater-instore.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<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">
-						<search-box v-model="val1" />
-					</view>
-				</view>
-				<view class="filter_item">
-					<view class="filter_label">物料数量</view>
-					<view class="filter_input_wraper">
-						<input type="number" class="filter_input" v-model="val2">
-					</view>
-				</view>
-			</view>
-			<view class="zd_wrapper grid-wraper">
-				<view class="slide_new">
-					<table>
-						<thead>
-							<tr>
-								<th>起点</th>
-								<th>终点</th>
-								<th>任务状态</th>
-								<th>备注</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr v-for="(e, i) in dataList" :key="i">
-								<td>{{e.point_name1}}</td>
-								<td>{{e.point_name2}}</td>
-								<td>{{e.task_status}}</td>
-								<td>{{e.remark}}</td>
-							</tr>
-						</tbody>
-					</table>
-				</view>
-			</view>
-		</view>
-		<view class="submit-bar">
-			<button class="submit-button" @tap="_forcedRestingShow">刷新</button>
-			<button class="submit-button" :class="{'btn-disabled': !val1 || !val2}" :disabled="disabled" @tap="toSure">确认</button>
-		</view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import {callingResidueMaterialTaskShow, callingResidueMaterialTask} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox
-		},
-		data() {
-			return {
-				val1: '',
-				val2: '',
-				dataList: [],
-				disabled: false
-			};
-		},
-		created () {
-			this._callingResidueMaterialTaskShow()
-		},
-		methods: {
-			/** grid查询 */
-			async _callingResidueMaterialTaskShow () {
-				let res = await callingResidueMaterialTaskShow()
-				this.dataList = [...res]
-			},
-			/** 确认 */
-			async toSure () {
-				this.disabled = true
-				if (!this.val1 || !this.val2) {
-					this.disabled = false
-					return
-				}
-				try {
-					let res = await callingResidueMaterialTask(this.val1, this.val2)
-					this.disabled = false
-					this.val1 = ''
-					this.val2 = ''
-					this._callingResidueMaterialTaskShow()
-					uni.showToast({
-						title: res.message,
-						icon: 'none'
-					})
-				} catch (e) {
-					this.disabled = false
-				}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus">
-</style>
diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png
index 5f06944058382416a6d8195261c0a69b12f1f47f..7fb4f1259eb4eb88d9230f3911ce97bdac42a275 100644
GIT binary patch
literal 4185
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

literal 2595
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
P`)%{1tS4Xfj!6C+Uz29*

diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png
index 15c177a8163ce2d03f84990bc92bdb687a1dd55a..30c871f3c82ecc4e9bc9851577dc0b125a22aaa7 100644
GIT binary patch
delta 1583
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

delta 1864
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

diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png
index 1bc47ed7a441d8deaedfa51fffc4d1fe364d72b3..af989ff01a77693e8d7a7e6d54e67db8252b6eb4 100644
GIT binary patch
delta 2348
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

delta 1372
zcmew<zENO<50kv1vyp|Vv5AF=rKyFXp{u2(ft!hirHhlHfuVt$x!dGyCRvyoOI&J}
zGa16vnBh|M9bt|+E;Yu?&h=VMr3DNOEb~2G978H@y_u7l)8i;{{CVy6Rg3y|1gSJx
zHSxCyq;mv@x9oV;W7V|obN3e4r5OV56Et+2OiJBl3cY_gG)+=?wc<5*P^Uo4k&CPT
zU!J?oqx|B&<9n>n+yDH2_ikqTw*52D{XS#7+4Rz-ODw1BX7)5V8fS<#r(NKwpLKMB
zq)9iB%XT*D0uP9{<zCl{EY|49Ngu8XxUy*(_iQ@8Z_{zNldns@N-jNLt9t#?^*V`X
z`l*e_@B3&O2Zj~pc5iaIBK-ZTNpfNDk?*1pw#FpRy17H{@aIRLe$}WtuiyyJ+P&e8
z?TmUG^CNpo-78(3w?5SUP+OsRhp(@GN^0*zL4%3A7|WlnTwEl@Y~Lb&VBh|l{O})Y
zdm_vDn*XtHZ8(3x{ejy5pSv%ts8_J=bYu@SwTSc+c3u_WAAHku`NL;CzskS1y+4rs
zKuYYYWk}z<l$)JV&FlEzH?2SLHh0DTwl_Afj>K6tExV!5SjTd{V1ezcBda$BzkbOy
z%c*|L=?`){8V~0NFMoD8I5oXp^@WCo>^|=Ar61SNuqxND@hq!~XzZJO@ko$po=?!<
zjCbdJq-M{XXrp)P^@7Z=Wde5m+d~Y}`lrmDKYgZ<{Bzd}A@5@<H+O$`IHx|1%{lDU
z4`xYkwIda*CQoJ79gYr-<!irCu`4o7ckYAx+j17Itk=re)xG@CPNVM+LN7iz(QrO5
z+DtRb^a4vI`<|dbwv10iFV3m8(Jn1Ao$9dsfN?C-Cr-UhE8j5|%+gvAeNa1wAx6RR
z%A||Ev66pOdR~QTH7vW5(sFph{*x9zCe{3Nb2DF_lhM8Gkfm0G+?zug%Veh>uiq1<
zvbgQG*%osT)(ac!^&0rLP5RBl-y9!tCoWsmL0YfjoyPO03B~457uiSMh$~(H#Oh6i
zl{^=t0>2!$_^MBBdu!G$=HH|5a;J{bFXh6u43j;YE|#jluCMywrYyo(#$6YBa(*t`
z_lEVXn(<0Z)~`QWHUH!4Z#jSShTBGtoY{hJ@^<;jTIaUKtkVCGR6qCm3mf*^RV$5O
znDK49>Y09F^8-D;Etfgs)_y)~5cNzq!~dh?pTlitQm0ZYW$zxgo*!e>zV*iudtl<#
z=|6XIiu1X~`CQeTa!VgJ7WmI~tQUWpzWA-k+svS*%w6k(-Ip;>@H~2GE^kVzLww<e
zwM=szttIWhUy&?fvN_dQW_6%`cWJ-Xribbu_9{FDnk6*#KFhMD<;8sOTUKz+7iesr
zn6Is|+<EdA^BwcVbwb78*2(Z){3z}6K*FGTo5SCSy^5#A4<47?V!G&jtv`2=oBKYs
z!{;Tply=W}r#S6(I!Gee<G9NQ{yW=&L8a+-sBcw*octQ?7yM>>&AaC7AF4n6^s&m1
zB?Zp|o?44OdQp>j|KOB+m-4jZTLo*qTK4;`W~f@;!*(e2OX3n)t%f>Yeg5PND>sKf
z-4m$#>W0eW`vsTF9PX_Ns&KcKsH@o58`v?q%71^qeeL}FtGL#lxhI(8_2*6d@(zcf
z`F8We?<*H*7JIym`o*7m^WT@h@7J!`<8o@j^Vo{mz%x5tXD$74YJ%ft36thDLttsJ
nAd+Vmgm*y)%)6!dS0sU<`pIRUB@FU93_#%N>gTe~DWM4fA(naT

diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png
index 775f2e8d9c4f1b89be40339c285fb11af636a688..d648d050478a233b3bf309cb8ab75d646f70bb8e 100644
GIT binary patch
delta 1675
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

delta 1529
zcmZ{kXE+-O7{~J<tyyA(8Wn2S7GjS`RLqA;oxN%_c2TP&XpIID(cVdoqgwQ8cBlyD
z>Pl^WtQxUL&9q#kj<`O0_p$HC_xU~l|A+T|e$#><K#g{65N$mjU2RKEOSlD6S4#`2
zZ=r1oHGt~qXhW?KmInGzQW%@$cgVuRN(YAgDOAIz`G1ndPa)=6(peq+rx27Kjuo%W
z76t%-FciYVC1HBoD>O_PEo^$N{~>o_db%%D{+ui)nF-+Hs;aAj@F$}ExxfJ)_E6k8
zAv<}cJSPFT@GF4_IR0GoPKtQ}`TqM5YbYicbeW~e%;u0Mb2rDG4AI(}OJ@UvTZ{%~
zKkduU4-FKz#RtD_O_p9SGupz+kx+t6f;Q3oF1P|H`;t=)&VvX6xkKRi5!shNma*1O
zmzW~Z$)|d#tlntJz?cxZ`<+%|3d=QxB}I8cHQ|)(DnjWEnD<+I!$7sE`BDc`pN3b_
z$34fr>Xttk55jWl*~|cuwmI8;qG^x2ycVFfhSbG~s1Oa>DYnr?il%9ZFRf0e0lu}E
zic!x~hYEHv%A>6ft3mX7)%C5;BsGQ=T_K7fGp9)>8b2#71W`nc*>7bqwDfxm*6iuw
zzwW3qaWqO3c$-aVVIp^}0dX(lS-V)nm9Ag%i}r$=PI*&_kBOeV-Xe2`l!_#dJ|}iY
z=2pab{F^%L)=k@<`HQvwNF@Ppn^3cia6bL4>yG%vqmCXH{vhEF!3z#^na52!yc3N*
z5FHSW>73+c^mj%BS74w!s>=x+`VY!VSOTxQ%U{%Ph73C2=RV<@=TeXUbW~+iF};SD
zaoZj?-%is*OOaA~_XDH!63qEAn<*Q8e*+cMc3xvSy%w)^=s-`ppEzyPPJpb>`@ykW
zG!z$scjkh8P3vuShB(jj(DrO9`!PCm0kL<}N_>fsUo+wt?T<!yZE(f<*sJ;yzXeSq
z+w<2zQy|Q9gAz>57%%Ecmf-CihDQlM`cg+I)>(bxicN)<r0YVX+h$1G_cP;1M*ni4
zV|_r=K4F0M3?6IyM>!*=xB$fUjg<U<-T;l|;i95uL^9g(#+0d??z@j_aMAO@adBVp
zi?d<;>=4lO<%cA0pQsGQ3lp9j_?%}WGhOR^x66)_O4+javnxk@(g)8OIZ`?-`yyrA
z^Szh&opsi{)Qu*4BAsw)P$xlh1|%^Ed;HtttovLYiRcHSbBMvF4CKO!dAsl#C+;Dz
z_Zi`SZ#p6OSlphRtcm_RsSpwBE+e2Zraa)YijCU_sn)`Brb3D`mU7M4v^sA2u&tlw
ziZ_O;nzcgit`)Z6^x`G^m57qK)J7bY+$;II?IKmnF3v*$9+}oFr7mHV_!OI=u}U0P
zh<emDG|IyNIg!mF6KkS7G3(d(VtG9^N_mwbfvwD%ikRg#m3lv6$XQ`f60gziO<px_
za4bfts1I{o*dw23EjJV7L|AAA_~G#^-<V5V&VV;`mp_KNO;9&#)BCiOI2$Pad)6dc
z*qI~cFtN!o8GOnPyG8xFiM7tmlVX-;F6uUniHoe|r;5Q}Mkuc4misAnZQGWyncAvQ
z<J%Wc>L@buAVXL^&<xm0JRXRvw}lld&~fWd5}EaW82!x8g(m$0M_VYh76`}?OQ*b>
zD@rywTuoYWRfZq#k|&7n(Se)9?t?)w2e8Zltu1J7P-3C^tvMD0euUUqO1qjQo#wi^
ze7-CB1H8y1DlY()c$l9a(Cb{}ajVo*!^aYAS&2e!bQUzCHkQFWDPsy1K20tw!?o2y
zR}SE2NEQEH1-k06EG9>B2Xr)k_)S@7yy{X=VWatq!;)@++LwltBS6og8P&~sjvyHv
zMVL7{B?%9kcomQSE!Pv{h_RC{KSkvm60~2H50fMl6@te*gi_~GS6Ob>l=vSeLZ1EY
nnV#-~v;Wf*GNcRGiDlyjsHRVv_a}c%0DK=5(g9Hq_f7v7V~N5m

diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png
deleted file mode 100644
index af989ff01a77693e8d7a7e6d54e67db8252b6eb4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png
deleted file mode 100644
index 30c871f3c82ecc4e9bc9851577dc0b125a22aaa7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png
deleted file mode 100644
index ba6628ae6fc661e8487ee66743e3cc455512d23e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1970
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
V9V^0nj=l!fqMojPF6*2UngAdJA3gv8

diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png
deleted file mode 100644
index d2b969bf0ae2f9e84136d31f5490edfcd916f351..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png
deleted file mode 100644
index 972a4920c553af88167556f4f3050860baf61319..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png
deleted file mode 100644
index 7e9ddd271932fb4ad02bc97a7cc6ea9a32403fdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1599
zcmaJ>e@qj16z?=DLrrj?4x@Np1%J_A+dH7WQcdZ#+PD^kDxCr6(H>lfy{p&57B+CH
z8bRi|OgB;R2PIQy5EdLdK<g&M=q4Z=qLV0rWr&Q-FtcGMgMEvD`$Klg_rBlv@;;yU
zzVChVElM)3pBua=SRfG0)o&n@!M-)Hf@Xrh{H%H!*ur_OnNMLec^Ao10=1RRpdh`S
z%%YMh(we*TCKWFbOkZg;nR&C}E!@J|#bh8x?6x}qS|EsD=XQ{mY>J06s4N?!f}b>8
zg&~_&1*gUsBnF3uqHP=UI4UL2XtLyGTNGA!-C8K#jROKZ#gmZRzJqb%ZWTPni-U8(
zjlj@Y2%oKjUle6FBtaUMqo5dZtjHoo<xreLER9jfWmq&MlSpF`i2{*gB8e22C~%1s
z8vkIBjk9Lr$%Jk^7qC<?&GQZ%L0m4E*oBH&E(?(=6beKlLu4`$h!8n*8J={D7^iT8
zfuNig&gS54ECU4?$qY7!SHYmt7gw-5CTSVxc$+}O5I5;Sq+&_nN)v$w!~cic?UT_?
zKAC!1?<<L&rd$VwBvVc{hqHjeWeNkS9Jq#~NS@_PEW2Z(i%B%gvrd|IKpIV;YjMy@
z18K1_0q3eQl)-@O87EIN7D`X3V8A1`*{rxms)$KIb!dWGi%F$gxmu>d6c~!iFdd;$
z$gv45!CG?c6vIzotuL|Il-PhE><*Bbpg7wu%Btg7J2ZB2-1drE65?Xi3KW%0$v2L*
zPF;&^N-P43K?39b&$uUCKtqA!q<DcbDSwIqn&*JHV@tj{ArMSEuP4+d_x*vg){SB0
z;{93Izq%HzSMtH<Qf49P{UN4y1CmLrwX@32$Uak0`h~NnB$3M#RMiVv&#4C<@utxa
zh@@GFR(tqjfo^^HXPdC0{H%vZA5Hf@|D#3L7_am{&F}iBJ9YJZZ;97S6T)NAqP9XE
z=9^~-IS5Q(L>0E2@9QXNo$aAn|NW6owWr&eE$`JL{`_C14~_j#Yg_A~@^!G^j&>e7
z85-R;_>uccM_hZ|NZo@IWj}RkvRm_i>>aH>y`;9F`@2GUS$FYobtMZ<?ufw74vth6
zq2Z&*L*cf2YiW^oX-MLda9L;5j8yIZPllBI?nPnG(?au&X*(-J<SQfUm*-t_Kc?^G
zG_LtHu^#^0FYkFbw;?U^Ph)%O+S`A9-_S8~y)R1M`|SOmuid5TZA&AD4-Z6~na^V6
zO~(>L$Z_VPQU~6Z&8w@c_N5KYRO;${;dqd5-a*<!6QP8#9`E)T^|z!bb|kzls-Q?e
zxD9h^OAjsXz3}YDZE_1&Qrd(0nm0!DW)@n{5G(Y*|IlFV^c`B>73%$>0{FLI^8ml_
z=WDkdv1+dPnTUBCznbC`w)#eks#f15dz;YWM+*z$hxXq)dbhmdjr2NO)-w1~Du3J^
zDK2U<@7^QN92{;raQ(8kZDG?pJ7c1rd;1o+ig%${dQRGcUwr;^{qDUqTC>7OR(x4w
zZ=Tcm<io?o(Ve|p*OybB+pess9Kbp%X0KA7cbS7%D4U1o+&!f7(8`*wW%nxw(tGwk
zYPnm6qBFYA4ImlSmuie2dXLT54}p=Z$A=DDapqW4bmF&-O{bnJJ|5nDS>HD*_TT9d
w3<p(y9*{@Wm_UF$K+9gJ<#peMW09}T6g<vo4hv1a@n+yj*K3VLRl;`9zti7lw*UYD