diff --git a/common/style/layout.css b/common/style/layout.css
index 198ea1d..c4da749 100644
--- a/common/style/layout.css
+++ b/common/style/layout.css
@@ -1,10 +1,10 @@
 /** 平板尺寸960*600 **/
 page {
-    background-color: #0a2b57 !important;
+    background-color: #fff !important;
     min-height: 100% !important;
 }
 uni-page-body {
-	background-color: #0a2b57 !important;
+	background-color: #fff !important;
 	min-height: 100% !important;
 }
 body, html {
@@ -31,7 +31,7 @@ uni-toast .uni-toast {
 .content{
 	width: 100%;
 	min-height: 100%;
-	background: top center / 100% 100% url(./static/images/page_bg.jpg) repeat-y;
+	background-color: #f3f3f3;
 }
 .footer{
 	width: 100%;
@@ -42,9 +42,9 @@ uni-toast .uni-toast {
 	margin: 10px auto;
 	border-radius: 6px;
 	padding: 10px;
-	background: linear-gradient(-45deg,rgba(16, 131, 202, 1),rgba(8, 39, 87, 1));
-	border: 1px solid #00a3dd;
-	box-shadow: rgba(4, 136, 203, 0.2) -3px 6px 6px 1px, rgba(4, 136, 203, 0.2) 3px -3px 6px 1px;
+	background-color: #fff;
+	border: 1px solid #ebebeb;
+	z-index: 100;
 }
 .search-confirm-wrap_2 {
 	width: calc(100% - 20px);
@@ -106,13 +106,19 @@ uni-toast .uni-toast {
 	margin-left: 6px;
 	margin-right: 0;
 	white-space: nowrap;
-	background: center / 100% 100% url(./static/images/button.png) no-repeat;
+	background: #ff6a00;
+	border: 1px solid #ff6a00;
+	box-sizing: border-box;
 }
 .confirm-button_cancle {
-	background: center / 100% 100% url(./static/images/button_cancle.png) no-repeat;
+	background: #fff;
+	border-color: #ff6a00;
+	color: #ff6a00;
 }
 .confirm-button_disabled {
-	background: center / 100% 100% url(./static/images/button_disabled.png) no-repeat;
+	color: #fff;
+	background-color: #909399;
+	border-color: #909399;
 }
 .table-title_wraper {
 	width: calc(100% - 20px);
@@ -128,10 +134,9 @@ uni-toast .uni-toast {
 	width: calc(100% - 20px);
 	margin: 0 auto;
 	padding: 4px 0 10px 0;
-	border: 1px solid #01c2f3;
+	border: 1px solid #ebebeb;
 	border-radius: 4px;
-	background-color: rgba(1, 114, 195, 40%);
-	box-shadow: inset 5px 5px 6px rgb(1 194 243 / 70%), inset -5px -5px 6px rgb(1 194 243 / 70%);
+	background-color: #fff;
 }
 .zdrow-wrap {
 	width: 100%;
@@ -162,27 +167,27 @@ uni-toast .uni-toast {
 	font-size: 12px;
 	line-height: 20px;
 	height: 30px;
-	color: #fff;
+	color: #909399;
 	font-weight: 700;
 	padding: 5px 10px;
 	text-align: center;
 	white-space: nowrap;
-	background-color: #3F6ACA;
-	border-bottom: 1px solid #9fd3ff;
+	background-color: #fff;
+	border-bottom: 1px solid #ebeef5;
 }
 .grid-table td{
 	font-size: 12px;
 	line-height: 13px;
 	height: 40px;
-	color: #fff;
+	color: #909399;
 	padding: 5px 10px;
 	text-align: center;
-	background-color: rgba(63,106,202,0.3);
-	border-bottom: 1px solid #9fd3ff;
+	background-color: #fff;
+	border-bottom: 1px solid #ebeef5;
 	white-space: nowrap;
 }
 .grid-table .fontcol1 {
-	color: #58e9ff;
+	color: #ffaa00;
 	font-weight: 700;
 }
 .grid-table th:first-child, .grid-table td:first-child {
@@ -194,7 +199,7 @@ uni-toast .uni-toast {
 	white-space: nowrap;
 }
 .grid-table td:first-child, .grid-table td:nth-child(2), .grid-table td:last-child {
-	background-color: #2951ac;
+	/* background-color: #2951ac; */
 }
 .grid-table th:last-child, .grid-table td:last-child {
 	position: sticky;
@@ -206,7 +211,7 @@ uni-toast .uni-toast {
 	position: sticky;
 	left: 46px;
 	z-index: 5;
-	box-shadow: inset -2px 0px 2px 0px rgba(19, 19, 19, 30%);
+	/* box-shadow: inset -2px 0px 2px 0px rgba(19, 19, 19, 30%); */
 }
 .td_input {
 	font-size: 12px;
@@ -221,7 +226,7 @@ uni-toast .uni-toast {
 	padding: 0 10px;
 	height: 28px;
 	background-color: transparent;
-	border: 1px solid #4980BD;
+	border: 1px solid #dcdfe6;
 	border-radius: 6px;
 }
 .td_input .uni-input-input:focus {
@@ -239,7 +244,7 @@ uni-toast .uni-toast {
 	line-height: 26px;
 	padding: 0 10px;
 	background-color: transparent;
-	border: 1px solid #4980BD;
+	border: 1px solid #dcdfe6;
 	border-radius: 6px;
 }
 .td_change_focus {
@@ -273,8 +278,8 @@ uni-toast .uni-toast {
 }
 .zd-sec-th-wraper {
 	width: 100%;
-	background-color: #3F6ACA;
-	border-bottom: 1px solid #9fd3ff;
+	/* background-color: #3F6ACA; */
+	border-bottom: 1px solid #ebeef5;
 }
 .zd-td-wraper{
 	width: 100%;
@@ -287,10 +292,11 @@ uni-toast .uni-toast {
 	font-size: 13px;
 	line-height: 15px;
 	height: 30px;
-	color: #e1e9f4;
+	color: #909399;
 	font-weight: 700;
 	text-align: center;
-	background: left center / 1px 100% url(./static/images/th_bg.png) repeat-x;
+	border-bottom: 1px solid #ebeef5;
+	background-color: #fff;
 }
 .zd-sec-th {
 	display: flex;
@@ -299,8 +305,8 @@ uni-toast .uni-toast {
 	font-size: 12px;
 	line-height: 13px;
 	height: 30px;
-	color: #fff;
-	/* background-color: #0F1521; */
+	color: #909399;
+	background-color: #fff;
 	font-weight: 700;
 	/* padding: 0 5px; */
 	text-align: center;
@@ -313,10 +319,10 @@ uni-toast .uni-toast {
 	font-size: 12px;
 	line-height: 13px;
 	height: 49px;
-	color: #fff;
+	color: #909399;
 	padding: 5px 2px;
 	text-align: center;
-	border-bottom: 1px solid #7A9FE0;
+	border-bottom: 1px solid #ebeef5;
 	word-break: break-all;
 	overflow: hidden;
 }
@@ -334,7 +340,7 @@ uni-toast .uni-toast {
 	font-size: 12px;
 	line-height: 13px;
 	height: 49px;
-	color: #fff;
+	color: #909399;
 	background-color: rgba(63,106,202,0.3);
 	border-bottom: 1px solid #9fd3ff;
 	padding: 5px 2px;
@@ -356,26 +362,30 @@ uni-toast .uni-toast {
 .zd-checkbox {
 	width: 18px;
 	height: 18px;
-	background-color: rgba(255, 255, 255, 20%);
-	border: 1px solid #fff;
+	background-color: #fff;
+	border: 1px solid #dcdfe6;
 	/* background: center / 100% 100% url(./static/images/icon-check1.png) no-repeat; */
 }
 .zd-checkbox_i {
-	border: 1px solid #ffffff;
-	background: rgba(255, 255, 255, 1);
+	background-color: #fff;
+	border: 1px solid #dcdfe6;
 }
-.zd-checkbox_active {
-	background: center / 100% 100% url(./static/images/icon-check2.png) no-repeat;
+.zd-checkbox .checkbox_icon {
+	color: #fff !important;
+	line-height: 18px;
+}
+.zd-checkbox_active .checkbox_icon {
+	color: #ff6a00 !important;
 }
 .fontcol1 {
-	color: #58e9ff;
+	color: #ffaa00;
 	font-weight: 700;
 }
 .fontcol2 {
 	color: #000;
 }
 .fontbg1 {
-	background-color: #007de7;
+	background-color: #f56c6c;
 	color: #fff;
 	font-size: 12px;
 	padding: 2px 10px;
@@ -383,9 +393,9 @@ uni-toast .uni-toast {
 }
 .zd-sec-wraper {
 	width: 100%;
-	background-color: rgba(63,106,202,0.3);
+	background-color: #f3f3f3;
 	padding: 15px 0px 0px 0px;
-	border-bottom: 1px solid #7A9FE0;
+	border-bottom: 1px solid #ebeef5;
 	transition: height 0.5s ease;
 }
 .status-wrap {
@@ -524,7 +534,7 @@ uni-toast .uni-toast {
 	left: 10%;
 	width: 80%;
 	padding: 1% 2%;
-	background: center / 100% 100% url(./static/images/pop_bg.png) no-repeat;
+	background: #f3f3f3;
 	z-index: 102;
 	transition: all .5s;
 }
@@ -539,7 +549,7 @@ uni-toast .uni-toast {
 }
 .pop-title {
 	font-size: 18px;
-	color: #fff;
+	color: #303133;
 	font-family: 'YouSheBiaoTiHei';
 	line-height: 35px;
 	padding-left: 20px;
@@ -550,13 +560,15 @@ uni-toast .uni-toast {
 	margin: 0 auto 20px auto;
 	padding: 0;
 	overflow-y: scroll;
+	background-color: #fff;
+	border: 1px solid #ebebeb;
 }
 .zd-pop-th-wraper {
-	background-color: #031328;
+	/* background-color: #031328; */
 }
 .zd-pop-td {
-	background-color: RGBA(23, 123, 172, 0.4);
-	border-bottom: 1px solid #177BAC;
+	background-color: #fff;
+	border-bottom: 1px solid #ebeef5;
 	white-space: pre-wrap;
 }
 .popChecked .zd-pop-td {
@@ -567,8 +579,9 @@ uni-toast .uni-toast {
 	height: 28px;
 	line-height: 28px;
 	font-size: 12px;
-	color: #fff;
-	border: 1px solid #21D0F2;
+	color: #606266;
+	border: 1px solid #dcdfe6;
+	background-color: #fff;
 	border-radius: 12px
 }
 .pop_label {
@@ -584,9 +597,6 @@ uni-toast .uni-toast {
 	width: 40px !important;
 	height: 40px !important;
 }
-.uni-select__selector-empty {
-	color: #fff
-}
 .uni-select__selector-empty, .uni-select__selector-item {
 	font-size: 13px !important;
 	line-height: 14px !important;
@@ -603,16 +613,16 @@ uni-toast .uni-toast {
 }
 /** 提示框 */
 uni-modal .uni-modal {
-	border: 1px solid #24A9EE;
-	background: linear-gradient(0deg, rgba(36, 184, 244, 90%), rgba(26, 148, 220, 90%));
-	color: #fff;
+	/* border: 1px solid #24A9EE;
+	background: linear-gradient(0deg, rgba(36, 184, 244, 90%), rgba(26, 148, 220, 90%)); */
+	/* color: #fff; */
 }
 .uni-modal .uni-modal__title {
 	font-weight: bold;
 }
 .uni-modal .uni-modal__bd {
-	color: #fff;
+	/* color: #fff; */
 }
 uni-modal .uni-modal__btn_primary {
-	background: radial-gradient(50% 140%, rgba(36, 184, 244, 90%), rgba(26, 148, 220, 90%));
+	background: #ff6a00;
 }
\ No newline at end of file
diff --git a/components/GridDetail.vue b/components/GridDetail.vue
index 2eb948b..ae6790e 100644
--- a/components/GridDetail.vue
+++ b/components/GridDetail.vue
@@ -513,7 +513,7 @@
 	top 0
 	left 0
 	background-color rgba(255,255,255,.95)
-	box-shadow 2px 0 4px 0px rgba(1, 27, 46, 90%)
+	// box-shadow 2px 0 4px 0px rgba(1, 27, 46, 90%)
 	overflow-y auto
 	padding 10px 10px
 	transition: all .3s linear;
@@ -529,21 +529,21 @@
 	border-collapse: separate;
 	border-spacing: 0;
 	width 100%
-	border-top 1px solid #0490DD
-	border-left 1px solid #0490DD
-	border-right 1px solid #0490DD
+	border-top 1px solid #ebeef5
+	border-left 1px solid #ebeef5
+	border-right 1px solid #ebeef5
 	td
 		vertical-align middle
 		text-align center
 		padding 5px 2px
-		border-bottom 1px solid #0490DD
+		border-bottom 1px solid #ebeef5
 		&:nth-child(1)
 			width 32%
 			font-size: 12px;
 			line-height: 13px;
 			color: #333;
 			font-weight: bold;
-			border-right 1px solid #0490DD
+			border-right 1px solid #ebeef5
 			word-break: break-all;
 		&:nth-child(2)
 			width 68%
diff --git a/components/NavBar.vue b/components/NavBar.vue
index e91e22f..4b1f890 100644
--- a/components/NavBar.vue
+++ b/components/NavBar.vue
@@ -55,23 +55,19 @@
 .header
 	_fj()
 	_wh(100%, 30px)
-	background: center / 100% 100% url(../static/images/header_bg_s.png) no-repeat
+	background-color #fff
 	z-index 200
 	padding 0 10px
 .page_name
-	_font(22px, 30px, #F6F9FE,700,center)
-	font-family: YouSheBiaoTiHei
-	background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
-	-webkit-background-clip: text;
-	-webkit-text-fill-color: transparent;
+	_font(22px, 30px, #0f0f0f,,center)
 .icon_back {
 	font-size: 26px;
 	line-height: 30px;
-	color: #fff;
+	color: #666;
 }
 .icon_home {
 	font-size: 26px;
 	line-height: 30px;
-	color: #fff;
+	color: #666;
 }
 </style>
diff --git a/components/Pagination.vue b/components/Pagination.vue
index 47172f6..4bee3af 100644
--- a/components/Pagination.vue
+++ b/components/Pagination.vue
@@ -85,16 +85,16 @@ export default {
 text,.page_input {
   display: inline-block;
   padding: 0 10px;
-  background: linear-gradient(180deg, #0E284B, #2D70A3);
-  border: 1px solid #3274CD;
+  background: #fff;
+  border: 1px solid #dcdfe6;
   border-radius: 3px;
   margin-right: 10px;
-  _font(13px, 26px, #fff,,)
+  _font(13px, 26px, #606266,,)
 }
  
 text.active {
-  background: linear-gradient(180deg, #2160D2, #3688DE);
-  color: #fff;
+  border-color: #ff6a00;
+  color: #ff6a00;
 }
  
 text.ellipsis {
diff --git a/components/ScanInput.vue b/components/ScanInput.vue
index 3d1eb9c..d0c066f 100644
--- a/components/ScanInput.vue
+++ b/components/ScanInput.vue
@@ -125,24 +125,24 @@
 .search_wraper
 	_wh(100%, 28px)
 	padding 0 2px 0 10px
-	border 1px solid #4980BD
-	background-color rgba(45,88,184,0.1)
+	border 1px solid #dcdfe6
+	background-color #fff
 	border-radius 6px
 .search_input
 	width 100%
 	height: 28px;
 	line-height: 28px;
 	font-size: 12px;
-	color: #fff
+	color: #606266
 .icon_scan
 	_wh(50px, 24px)
-	_font(20px,24px,#fff,,center)
-	background-color #137ABD
+	_font(20px,24px,#909399,,center)
+	background-color #f5f7fa
 	border-radius 6px
 .icon-del
 	_wh(30px, 28px)
-	_font(20px,28px,#fff,,center)
+	_font(20px,28px,#c0c4cc,,center)
 .input_focus
-	border: 1px solid #889dc7;
+	border: 1px solid #c0c4cc;
 	box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
 </style>
diff --git a/components/ScanInput_new.vue b/components/ScanInput_new.vue
index 55ed7ff..02fb7a3 100644
--- a/components/ScanInput_new.vue
+++ b/components/ScanInput_new.vue
@@ -128,24 +128,24 @@
 .search_wraper
 	_wh(100%, 28px)
 	padding 0 2px 0 10px
-	border 1px solid #4980BD
-	background-color rgba(45,88,184,0.1)
+	border 1px solid #dcdfe6
+	background-color #fff
 	border-radius 6px
 .search_input
 	width 100%
 	height: 28px;
 	line-height: 28px;
 	font-size: 12px;
-	color: #fff
+	color: #606266
 .icon_scan
 	_wh(70px, 24px)
-	_font(20px,24px,#fff,,center)
-	background-color #137ABD
+	_font(20px,24px,#909399,,center)
+	background-color #f5f7fa
 	border-radius 6px
 .icon-del
 	_wh(70px, 28px)
-	_font(20px,28px,#fff,,center)
+	_font(20px,28px,#c0c4cc,,center)
 .input_focus
-	border: 1px solid #889dc7;
+	border: 1px solid #c0c4cc;
 	box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
 </style>
diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 3345231..f34cfad 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -133,28 +133,28 @@
 .search_wraper
 	_wh(100%, 30px)
 	padding 0 2px 0 12px
-	border 1px solid #4980BD
-	background-color rgba(45,88,184,0.1)
+	border 1px solid #dcdfe6
+	background-color #fff
 	border-radius 6px
 .search_input
 	width 100%
 	height: 30px;
 	line-height: 30px;
 	font-size: 13px;
-	color: #fff
+	color: #606266
 .icon-del
 	_wh(35px, 28px)
 	margin-right 5px
-	_font(20px,28px,#a2b6cc,,center)
+	_font(20px,28px,#c0c4cc,,center)
 .icon_scan
 	_wh(70px, 24px)
-	_font(20px,24px,#fff,,center)
-	background-color #137ABD
+	_font(20px,24px,#909399,,center)
+	background-color #f5f7fa
 	border-radius 6px
 .icon_search
 	_wh(35px, 28px)
-	_font(20px,28px,#a2b6cc,,center)
+	_font(20px,28px,#c0c4cc,,center)
 .input_focus
-	border: 1px solid #889dc7;
+	border: 1px solid #c0c4cc;
 	box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
 </style>
diff --git a/manifest.json b/manifest.json
index ddb17bf..27c9d30 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "诺力三期",
     "appid" : "__UNI__E82B13F",
     "description" : "诺力三期平板系统",
-    "versionName" : "1.1.1",
-    "versionCode" : 111,
+    "versionName" : "1.1.2",
+    "versionCode" : 112,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages.json b/pages.json
index 1b7757b..ed27949 100644
--- a/pages.json
+++ b/pages.json
@@ -13,14 +13,6 @@
 			}
 		}
 		,{
-            "path" : "pages/management/in-storage",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
-		,{
             "path" : "pages/management/in-storage_new",
             "style" :                                                                                    
             {
@@ -35,15 +27,7 @@
 		        "navigationStyle": "custom"
 		    }
 		    
-		}
-        ,{
-            "path" : "pages/management/alloc-maintenance",
-            "style" :                                                                                    
-            {
-                "navigationStyle": "custom"
-            }
-            
-        }
+		}
 		,{
 		    "path" : "pages/management/alloc-maintenance_new",
 		    "style" :                                                                                    
@@ -51,15 +35,7 @@
 		        "navigationStyle": "custom"
 		    }
 		    
-		}
-        ,{
-            "path" : "pages/management/receive-confirm",
-            "style" :                                                                                    
-            {
-               "navigationStyle": "custom"
-            }
-            
-        }
+		}
 		,{
 		    "path" : "pages/management/receive-confirm_new",
 		    "style" :                                                                                    
@@ -84,6 +60,22 @@
             }
             
         }
+        ,{
+            "path" : "pages/home/home1",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
+        ,{
+            "path" : "pages/home/home2",
+            "style" :                                                                                    
+            {
+                "navigationStyle": "custom"
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
diff --git a/pages/home/home.vue b/pages/home/home.vue
index e951ea8..55d59a2 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,9 +1,10 @@
 <template>
 	<view class="home_content">
 		<view class="zd-row header">
+			<view class="zd-col-8 logo"></view>
 			<view class="zd-col-8 home_title">首页</view>
 			<view class="zd-col-8 zd-row jcflexend home_userinfo">
-				<view class="user_icon"></view>
+				<uni-icons type="person" size="24" color="#666"></uni-icons>
 				<view class="user_name">{{userName}}</view>
 				<view class="exit_text" @tap="Quit">退出</view>
 			</view>
@@ -14,26 +15,23 @@
 		<view class="zd_wrapper">
 			<view class="zd-row menu-wrap">
 				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
-					<!-- <view class="menu_name_bg" :class="'bg_texture_' + i"> -->
-					<view class="menu_name_bg" :class="'bg_texture_' + e.ywlx">
+					<view class="menu_name_bg" :style="{backgroundImage: `url('/static/images/theme/menu/${e.djlx}.png')`}" :class="`bg_${e.ywlx}`">
 						<view class="menu-name">{{e.name}}</view>
 						<view v-show="Number(e.counts) > 0" class="bill_count">{{e.counts}}</view>
 					</view>
 				</view>
 				<view class="menu-item" @tap="toPage1('/pages/management/move-inventory')">
-					<view class="menu_name_bg bg_texture_YC">
+					<view class="menu_name_bg bg_YC">
 						<view class="menu-name">移库</view>
 					</view>
 				</view>
 				<view class="menu-item" @tap="toPage1('/pages/management/check')">
-					<view class="menu_name_bg bg_texture_PD">
+					<view class="menu_name_bg bg_PD">
 						<view class="menu-name">盘点</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="left_bg"></view>
-		<view class="left_bg right_bg"></view>
 	</view>
 </template>
 
@@ -113,21 +111,22 @@
 	}
 </script>
 
-<style lang="stylus">
+<style lang="stylus" scoped>
 @import '../../common/style/mixin.styl';
 .home_content
 	position relative
 	_wh(100%, 100vh)
-	_bis(,'../../static/images/home_bg.jpg', 100%, 100%,bottom)
+	background-color #f3f3f3
 .header
-	height 60px
+	height 40px
 	padding 0 15px
-	align-items flex-start
-	justify-content flex-end
-	_bis(,'../../static/images/header_bg.png', 100%, 100%,bottom)
+	margin-bottom 10px
+	justify-content space-between
+	background: #fff
+.logo
+	height 40px
 .home_title
-	_font(25px,35px,#F6F9FE,,center)
-	font-family: YouSheBiaoTiHei;
+	_font(24px,35px,#0f0f0f,,center)
 .home_userinfo
 	height 35px
 .user_icon
@@ -135,96 +134,70 @@
 	margin-right 5px
 	_bis(,'../../static/images/user_icon.png', 100%, 100%,center)
 .user_name
-	_font(17px,17px,#fff,,center)
+	_font(17px,17px,#666,,center)
 	padding-right 5px
 	margin 9px 10px 9px 0
-	border-right 1px solid #AECAF5
 .exit_text
-	height 30px
-	_font(14px,30px,#fff,,center)
-	padding 0 10px
+	height 22px
+	_font(14px,22px,#fff,,center)
+	padding 0 20px
 	margin 2.5px 0
-	_bis(,'../../static/images/state-item_bg.png', 100%, 100%,center)
+	background-color #fc4300
+	border-radius 20px
 .welcome_text_wraper
 	height 40px
-	margin 0 50px
+	margin 0 15px
 .welcome_text
-	_font(26px, 40px,  #F6F9FE,,)
+	_font(22px, 40px,  #373737,,)
 	padding-left 20px
 	font-family: YouSheBiaoTiHei
-	background: linear-gradient(180deg, rgba(255,255,255,1) 0%, rgba(49,190,255,0.9) 0%, rgba(239,252,254,1) 40%);
-	-webkit-background-clip: text;
-	-webkit-text-fill-color: transparent;
 .zd_wrapper
-	_wh(calc(100% - 100px),calc(100% - 116px)) /** 120rpx + 200rpx + 130rpx */
-	margin 0px 50px 0 50px 
-	_bis(,'../../static/images/bg-task-r2.png', 100%, 100%,center)
+	_wh(calc(100% - 30px),calc(100% - 100px))
+	margin 0px 15px
+	padding 20px 16px
+	background-color #fff
+	border 1px solid #ebebeb
 .menu-wrap
 	flex-wrap wrap
 	justify-content flex-start
 	align-content center
 	height 100%
 .menu-item
-	width 20%
-	margin 10px 0
+	position relative
+	width calc(20% - 16px)
+	margin-right 20px
+	margin-top 15px
+	&:nth-child(5n)
+		margin-right 0
+	&:nth-child(-n+5)
+		margin-top 0
 .menu_name_bg
 	position relative
-	_wh(100px, 80px)
+	_wh(100%, 90px)
 	margin 0 auto
 	border-radius 10px
-	background-image: radial-gradient( ellipse farthest-corner at 11px 11px , #afafb9, #afafb9 50%, #ffffff 50%);
-	background-size: 11px 11px;
-.bg_texture_1, .bg_texture_7
-	background: repeating-linear-gradient( -45deg, #afafb9, #afafb9 5px, #ffffff 5px, #ffffff 8px );
-	.menu-name
-		background-color rgba(49, 95, 255, 0.8)
-.bg_texture_3, .bg_texture_6
-	background-image:  repeating-linear-gradient(45deg, #afafb9 25%, transparent 25%, transparent 75%, #afafb9 75%, #afafb9), repeating-linear-gradient(45deg, #afafb9 25%, #ffffff 25%, #ffffff 75%, #afafb9 75%, #afafb9);
-	background-position: 0 0, 11px 11px;
-	background-size: 22px 22px;
-	.menu-name
-		background-color rgba(0, 239, 48, 0.8)
-.bg_texture_2, .bg_texture_5, .bg_texture_9
-	background: radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent), radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent) 13.5px 13.5px, linear-gradient(#afafb9 2px, transparent 2px) 0 -2px, linear-gradient(90deg, #afafb9 2px, #ffffff 2px) -2px 0;
-	background-size: 27.5px 27.5px, 27.5px 27.5px, 13.75px 13.75px, 13.75px 13.75px;
-	.menu-name
-		background-color rgba(255, 189, 45, 0.8)
-.bg_texture_4
-	.menu-name
-		background-color rgba(255, 139, 69, 0.8)
-.bg_texture_DB
-	background: repeating-linear-gradient( -45deg, #afafb9, #afafb9 5px, #ffffff 5px, #ffffff 8px );
-	.menu-name
-		background-color rgba(49, 95, 255, 0.8)
-.bg_texture_IN
-	background-image:  repeating-linear-gradient(45deg, #afafb9 25%, transparent 25%, transparent 75%, #afafb9 75%, #afafb9), repeating-linear-gradient(45deg, #afafb9 25%, #ffffff 25%, #ffffff 75%, #afafb9 75%, #afafb9);
-	background-position: 0 0, 11px 11px;
-	background-size: 22px 22px;
-	.menu-name
-		background-color rgba(0, 239, 48, 0.8)
-.bg_texture_SH
-	background: radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent), radial-gradient(circle, transparent 20%, #ffffff 20%, #ffffff 80%, transparent 80%, transparent) 13.5px 13.5px, linear-gradient(#afafb9 2px, transparent 2px) 0 -2px, linear-gradient(90deg, #afafb9 2px, #ffffff 2px) -2px 0;
-	background-size: 27.5px 27.5px, 27.5px 27.5px, 13.75px 13.75px, 13.75px 13.75px;
-	.menu-name
-		background-color rgba(255, 189, 45, 0.8)
+	background-repeat no-repeat
+	background-size: auto calc(100% - 25px);
+	background-position top center
+.bg_OUT
+	background-color #ebfcf4
+.bg_IN
+	background-color #fff6ef
+.bg_DB, .bg_SH
+	background-color #eff3fe
 .menu-name
-	display flex
-	justify-content center
-	align-items center
-	_wh(100px, 80px)
-	padding 10px
-	border-radius 10px
-	_font(18px, 25px, #fff,bold,center)
-	background-color rgba(0,166,255,0.8)
+	position absolute
+	bottom 5px
+	_wh(100%, 25px)
+	_font(18px, 25px, #0f0f0f,400,center)
 .bill_count
 	position absolute
 	top -10px
-	right -10px
-	_wh(30px, 30px)
+	right -13px
+	_wh(40px, 22px)
 	background-color $red
-	border-radius 50%
-	_font(16px, 30px, #fff,bold,center)
-	box-shadow 3px 3px 1px 1px rgba(0,0,0,.3)
+	border-radius 14px
+	_font(14px, 22px, #fff,bold,center)
 .left_bg
 	position absolute
 	left 0
@@ -235,12 +208,10 @@
 	left auto
 	right 0
 	background-image url('../../static/images/hud_right.png')
-.bg_texture_YC
-	_bis(,'../../static/images/RF01.png', 100%, ,center)
-	.menu-name
-		background-color rgba(223, 131, 21, 80%)
-.bg_texture_PD
-	_bis(,'../../static/images/RF02.png', 100%, ,center)
-	.menu-name
-		background-color rgba(223, 131, 21, 80%)
-</style>
+.bg_YC
+	background-image: url('../../static/images/theme/menu/YC.png')
+	background-color: #fff0ee
+.bg_PD
+	background-image: url('../../static/images/theme/menu/PD.png')
+	background-color: #fff0ee
+</style>
\ No newline at end of file
diff --git a/pages/home/home1.vue b/pages/home/home1.vue
new file mode 100644
index 0000000..0cb9d96
--- /dev/null
+++ b/pages/home/home1.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="home_content">
+		<view class="zd-row header">
+			<view class="zd-col-8 logo"></view>
+			<view class="zd-col-8 home_title">首页</view>
+			<view class="zd-col-8 zd-row jcflexend home_userinfo">
+				<uni-icons type="person" size="24" color="#fff"></uni-icons>
+				<view class="user_name">{{userName}}admin</view>
+				<view class="exit_text" @tap="Quit">退出</view>
+			</view>
+		</view>
+		<view class="welcome_text_wraper">
+			<view class="welcome_text">{{userName}}admin, 欢迎进入诺力三期平板系统！</view>
+		</view>
+		<view class="zd_wrapper">
+			<view class="zd-row menu-wrap">
+				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
+					<view class="menu_name_bg" :style="{backgroundImage: `url('/static/images/theme/menu/${e.djlx}.png')`}">
+						<view class="menu-name">{{e.name}}</view>
+						<view v-show="Number(e.counts) > 0" class="bill_count">{{e.counts}}</view>
+					</view>
+				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/move-inventory')">
+					<view class="menu_name_bg bg_texture_YC">
+						<view class="menu-name">移库</view>
+					</view>
+				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/check')">
+					<view class="menu_name_bg bg_texture_PD">
+						<view class="menu-name">盘点</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getBillsCount} from '@/utils/getData2.js'
+	export default {
+		data() {
+			return {
+				intervalId: null,
+				// interTime: this.$store.getters.setTime,
+				interTime: 60000,
+				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '',
+				menuList: []
+			};
+		},
+		onLoad () {
+			this._getBillsCount()
+			this.timerFun(this._getBillsCount, this.interTime)()
+		},
+		beforeDestroy () {
+			if (this.intervalId !== null) {
+				clearTimeout(this.intervalId)
+				this.intervalId = null
+			}
+		},
+		methods: {
+			timerFun(f, time) {
+				let _this = this
+			    return function backFun() {
+			        clearTimeout(_this.intervalId)
+			        _this.intervalId = setTimeout(function () {
+			            f()
+			            backFun() 
+			        }, time)
+			    }
+			},
+			async _getBillsCount () {
+				let res = await getBillsCount()
+				if (res.code === 1) {
+					this.menuList = [...res.result]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			toPage (e) {
+				let url = ''
+				if (e.ywlx === 'DB') {
+					url = '/pages/management/alloc-maintenance_new?type=' + e.ywlx
+				} else if (e.ywlx === 'SH') {
+					url = '/pages/management/receive-confirm_new?type=' + e.ywlx
+				} else {
+					if (e.djlx === 'LLCKD') {
+						url = '/pages/management/in-storage_LLCKD?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
+					} else {
+						url = '/pages/management/in-storage_new?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
+					}
+				}
+				uni.redirectTo({
+					url: url
+				})
+			},
+			toPage1 (e) {
+				uni.redirectTo({
+					url: e
+				})
+			},
+			Quit () {
+			  this.$store.dispatch('delUserInfo', '')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.home_content
+	position relative
+	_wh(100%, 100vh)
+	background-color #f3f3f3
+.header
+	height 40px
+	padding 0 15px
+	margin-bottom 10px
+	justify-content space-between
+	_bis(#3375f7,'../../static/images/theme/1/header_bg.jpg', 100%, 100%,center)
+.logo
+	height 40px
+	// _bis(,'../../static/images/theme/logo.png', 68%, auto,left,center)
+.home_title
+	_font(24px,35px,#F6F9FE,,center)
+	// font-family: YouSheBiaoTiHei;
+.home_userinfo
+	height 35px
+.user_icon
+	_wh(25px, 25px)
+	margin-right 5px
+	_bis(,'../../static/images/user_icon.png', 100%, 100%,center)
+.user_name
+	_font(17px,17px,#fff,,center)
+	padding-right 5px
+	margin 9px 10px 9px 0
+.exit_text
+	height 22px
+	_font(14px,22px,#fc4300,,center)
+	padding 0 20px
+	margin 2.5px 0
+	background-color #fff
+	border-radius 20px
+.welcome_text_wraper
+	height 40px
+	margin 0 15px
+.welcome_text
+	_font(26px, 40px,  #373737,,)
+	padding-left 20px
+	font-family: YouSheBiaoTiHei
+.zd_wrapper
+	_wh(calc(100% - 30px),calc(100% - 100px))
+	margin 0px 15px
+	// background-color #fff
+	// border 1px solid #ebebeb
+.menu-wrap
+	flex-wrap wrap
+	justify-content flex-start
+	align-content center
+	height 100%
+.menu-item
+	position relative
+	width calc(20% - 16px)
+	margin-right 20px
+	margin-top 16px
+	&:nth-child(5n)
+		margin-right 0
+	&:nth-child(-n+5)
+		margin-top 0
+.menu_name_bg
+	position relative
+	_wh(100%, 90px)
+	margin 0 auto
+	border-radius 10px
+	background-color #fff
+	background-repeat no-repeat
+	background-size: auto calc(100% - 25px);
+	background-position top center
+.menu-name
+	position absolute
+	bottom 5px
+	_wh(100%, 25px)
+	_font(18px, 25px, #0f0f0f,400,center)
+.bill_count
+	position absolute
+	top -10px
+	right -13px
+	_wh(40px, 22px)
+	background-color $red
+	border-radius 14px
+	_font(14px, 22px, #fff,bold,center)
+.left_bg
+	position absolute
+	left 0
+	top 0
+	_wh(25px, 100%)
+	_bis(,'../../static/images/hud_left.png', 100%, ,center)
+.right_bg
+	left auto
+	right 0
+	background-image url('../../static/images/hud_right.png')
+.bg_texture_YC
+	background-image: url('../../static/images/theme/menu/YC.png')
+.bg_texture_PD
+	background-image: url('../../static/images/theme/menu/PD.png')
+</style>
diff --git a/pages/home/home2.vue b/pages/home/home2.vue
new file mode 100644
index 0000000..2270f86
--- /dev/null
+++ b/pages/home/home2.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="home_content">
+		<view class="zd-row header">
+			<view class="zd-col-8 logo"></view>
+			<view class="zd-col-8 home_title">首页</view>
+			<view class="zd-col-8 zd-row jcflexend home_userinfo">
+				<uni-icons type="person" size="24" color="#191c17"></uni-icons>
+				<view class="user_name">{{userName}}admin</view>
+				<view class="exit_text" @tap="Quit">退出</view>
+			</view>
+		</view>
+		<view class="welcome_text_wraper">
+			<view class="welcome_text">{{userName}}admin, 欢迎进入诺力三期平板系统！</view>
+		</view>
+		<view class="zd_wrapper">
+			<view class="zd-row menu-wrap">
+				<view class="menu-item" v-for="(e, i) in menuList" :key="i" @tap="toPage(e)">
+					<view class="menu_name_bg" :style="{backgroundImage: `url('/static/images/theme/menu/${e.djlx}.png')`}" :class="`bg_${e.ywlx}`">
+						<view class="menu-name">{{e.name}}</view>
+						<view v-show="Number(e.counts) > 0" class="bill_count">{{e.counts}}</view>
+					</view>
+				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/move-inventory')">
+					<view class="menu_name_bg bg_YC">
+						<view class="menu-name">移库</view>
+					</view>
+				</view>
+				<view class="menu-item" @tap="toPage1('/pages/management/check')">
+					<view class="menu_name_bg bg_PD">
+						<view class="menu-name">盘点</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {getBillsCount} from '@/utils/getData2.js'
+	export default {
+		data() {
+			return {
+				intervalId: null,
+				// interTime: this.$store.getters.setTime,
+				interTime: 60000,
+				userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).person_name : '',
+				menuList: []
+			};
+		},
+		onLoad () {
+			this._getBillsCount()
+			this.timerFun(this._getBillsCount, this.interTime)()
+		},
+		beforeDestroy () {
+			if (this.intervalId !== null) {
+				clearTimeout(this.intervalId)
+				this.intervalId = null
+			}
+		},
+		methods: {
+			timerFun(f, time) {
+				let _this = this
+			    return function backFun() {
+			        clearTimeout(_this.intervalId)
+			        _this.intervalId = setTimeout(function () {
+			            f()
+			            backFun() 
+			        }, time)
+			    }
+			},
+			async _getBillsCount () {
+				let res = await getBillsCount()
+				if (res.code === 1) {
+					this.menuList = [...res.result]
+				} else {
+					uni.showToast({
+						title: res.desc,
+						icon: 'none'
+					})
+				}
+			},
+			toPage (e) {
+				let url = ''
+				if (e.ywlx === 'DB') {
+					url = '/pages/management/alloc-maintenance_new?type=' + e.ywlx
+				} else if (e.ywlx === 'SH') {
+					url = '/pages/management/receive-confirm_new?type=' + e.ywlx
+				} else {
+					if (e.djlx === 'LLCKD') {
+						url = '/pages/management/in-storage_LLCKD?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
+					} else {
+						url = '/pages/management/in-storage_new?id=' + e.djlx + '&name=' + e.name + '&type=' + e.ywlx
+					}
+				}
+				uni.redirectTo({
+					url: url
+				})
+			},
+			toPage1 (e) {
+				uni.redirectTo({
+					url: e
+				})
+			},
+			Quit () {
+			  this.$store.dispatch('delUserInfo', '')
+			  uni.redirectTo({
+			  	url: '/pages/login/login'
+			  })
+			}
+		}
+	}
+</script>
+
+<style lang="stylus" scoped>
+@import '../../common/style/mixin.styl';
+.home_content
+	position relative
+	_wh(100%, 100vh)
+	background-color #f3f3f3
+.header
+	height 40px
+	padding 0 15px
+	margin-bottom 10px
+	justify-content space-between
+	background linear-gradient(70deg, #9eedde,#dcfade)
+	// _bis(#3375f7,'../../static/images/theme/1/header_bg.jpg', 100%, 100%,center)
+.logo
+	height 40px
+	// _bis(,'../../static/images/theme/logo.png', 68%, auto,left,center)
+.home_title
+	_font(24px,30px,#191c17,,center)
+	// font-family: YouSheBiaoTiHei;
+.home_userinfo
+	height 35px
+.user_icon
+	_wh(25px, 25px)
+	margin-right 5px
+	_bis(,'../../static/images/user_icon.png', 100%, 100%,center)
+.user_name
+	_font(17px,17px,#191c17,,center)
+	padding-right 5px
+	margin 9px 10px 9px 0
+.exit_text
+	height 22px
+	_font(14px,22px,#191c17,,center)
+	padding 0 20px
+	margin 2.5px 0
+	background-color rgba(142, 148, 143, 20%)
+	border-radius 20px
+.welcome_text_wraper
+	height 40px
+	margin 0 15px
+.welcome_text
+	_font(26px, 40px,  #373737,,)
+	padding-left 20px
+	font-family: YouSheBiaoTiHei
+.zd_wrapper
+	_wh(calc(100% - 30px),calc(100% - 100px))
+	margin 0px 15px
+	padding 20px 16px
+	background-color #fff
+	border 1px solid #ebebeb
+.menu-wrap
+	flex-wrap wrap
+	justify-content flex-start
+	align-content center
+	height 100%
+.menu-item
+	position relative
+	width calc(20% - 16px)
+	margin-right 20px
+	margin-top 15px
+	&:nth-child(5n)
+		margin-right 0
+	&:nth-child(-n+5)
+		margin-top 0
+.menu_name_bg
+	position relative
+	_wh(100%, 90px)
+	margin 0 auto
+	border-radius 10px
+	background-repeat no-repeat
+	background-size: auto calc(100% - 25px);
+	background-position top center
+.bg_OUT
+	background-color #ebfcf4
+.bg_IN
+	background-color #fff6ef
+.bg_DB, .bg_SH
+	background-color #eff3fe
+.menu-name
+	position absolute
+	bottom 5px
+	_wh(100%, 25px)
+	_font(18px, 25px, #0f0f0f,400,center)
+.bill_count
+	position absolute
+	top -10px
+	right -13px
+	_wh(40px, 22px)
+	background-color $red
+	border-radius 14px
+	_font(14px, 22px, #fff,bold,center)
+.left_bg
+	position absolute
+	left 0
+	top 0
+	_wh(25px, 100%)
+	_bis(,'../../static/images/hud_left.png', 100%, ,center)
+.right_bg
+	left auto
+	right 0
+	background-image url('../../static/images/hud_right.png')
+.bg_YC
+	background-image: url('../../static/images/theme/menu/YC.png')
+	background-color: #fff0ee
+.bg_PD
+	background-image: url('../../static/images/theme/menu/PD.png')
+	background-color: #fff0ee
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 36893e0..3cd61de 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -56,7 +56,6 @@
 					</view>
 				</view>
 			</view>
-			<view class="daoying_bg"></view>
 		</view>
 		<view v-if="version !== ''" class="version-name">v{{version}}</view>
 		<Up-grade v-if="grade === true" @closeUpdate="closeUpdate" :androidUrl="androidUrl"></up-grade>
@@ -176,12 +175,12 @@
 @import '../../common/style/mixin.styl';
 .login-bg
 	_wh(100%, 100vh)
-	_bis(#fff,'../../static/images/login_bg.jpg', 100%, 100%,bottom)
+	_bis(,'../../static/images/theme/login_bg.jpg', 100%, 100%,center)
 .logo-wraper
 	_wh(90%, auto)
 	margin 0 auto
 	text-align center
-	_bis(,'../../static/images/login_header_bg.png', 100%, 100%,bottom)
+	_bis(,'../../static/images/theme/login_header_bg.png', 100%, 100%,bottom)
 	img
 		_wh(30%, auto)
 .login_wrap
@@ -191,7 +190,8 @@
 	width 60%
 	padding 5% 8%
 	transform translate3d(-50%, -50%, 0)
-	_bis(,'../../static/images/form_bg.png', 100%, 100%,bottom)
+	background #fff
+	// _bis(,'../../static/images/form_bg.png', 100%, 100%,bottom)
 .login_w
 	_wh(100%, 100%)
 	overflow hidden
@@ -199,15 +199,14 @@
 	height 50px
 	padding 0 5px 25px 10%
 	margin-bottom 15px
-	_bis(,'../../static/images/login_tabs_bg.png', 100%, 100%,bottom)
+	// _bis(,'../../static/images/login_tabs_bg.png', 100%, 100%,bottom)
 .login_tab_item
 	cursor pointer
-	_font(25px,33px,#99B1DD,,center)
+	_font(25px,33px,#373737,,center)
 	font-family: YouSheBiaoTiHei;
 	padding 0 25px 0 5px
 .login_tab_active
-	color #fff
-	_bis(,'../../static/images/login_tab_active.png', 100%, 100%,bottom)
+	color #ff6a00
 .login_cnt
 	position relative
 	width 200%
@@ -219,16 +218,16 @@
 	min-height 130px
 	overflow hidden
 .login_label
-	_font(18px, 45px, #AFBED8,,)
+	_font(18px, 45px, #909399,700,)
 .inputStyle
-	_font(18px, 45px, #fff,,)
+	_font(18px, 45px, #909399,,)
 	_wh(100%, 45px)
-	background: rgba(45,88,184,0.1);
-	border: 1px solid #4980BD;
+	background: #fff;
+	border: 1px solid #dcdfe6;
 	padding 0 11px
 .inputStyle[focus]
-	background: rgba(45,88,184,0.25);
-	border: 1px solid #21D0F2;
+	border: 1px solid #c0c4cc;
+	box-shadow: 0 0 0 1px rgba(136, 157, 199,.2);
 	line-height 45px
 .login_icon
 	position absolute
@@ -238,20 +237,15 @@
 	_wh(auto, 50px)
 	padding 0 50px
 	_font(25px,50px,#fff,,center)
-	_bis(,'../../static/images/button.png', 100%, 100%,bottom)
+	background: #ff6a00;
+	// _bis(,'../../static/images/button.png', 100%, 100%,bottom)
 .san_text
-	_font(18px,36px,#fff,,center)
+	_font(18px,36px,#909399,,center)
 .drift
 	transition left .3s linear
 .version-name
 	width 100%
 	position: absolute
 	bottom 3%
-	_font(15px, 30px, #fff,,center)
-.daoying_bg
-	position: absolute
-	bottom -30%
-	left 0
-	_wh(100%, 30%)
-	_bis(,'../../static/images/daoy.png', 100%, 100%,bottom)
+	_font(15px, 30px, #909399,,center)
 </style>
diff --git a/pages/management/alloc-maintenance.vue b/pages/management/alloc-maintenance.vue
deleted file mode 100644
index db93f7e..0000000
--- a/pages/management/alloc-maintenance.vue
+++ /dev/null
@@ -1,581 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="调拨维护"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="zd-row">
-				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
-					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
-					</view>
-					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
-					</view>
-				</view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
-			</view>
-		</view>
-		<view class="zd-row jcflexstart table-title_wraper">调拨单</view>
-		<view class="grid-wrap">
-			<view class="zdrow-wrap">
-				<view class="zd-row sticky zd-th-wraper">
-					<view class="zd-col-1 zd-th"><text>序号</text></view>
-					<view class="zd-col-2 zd-th"><text class="fontcol1">单据编号</text></view>
-					<view class="zd-col-2 zd-th"><text>业务日期</text></view>
-					<view class="zd-col-2 zd-th"><text>调出组织</text></view>
-					<view class="zd-col-2 zd-th"><text>调出仓库</text></view>
-					<view class="zd-col-2 zd-th"><text>调入组织</text></view>
-					<view class="zd-col-2 zd-th"><text>调入仓库</text></view>
-					<view class="zd-col-2 zd-th"><text>状态</text></view>
-					<view class="zd-col-3 zd-th"><text>计划调入日期</text></view>
-					<view class="zd-col-4 zd-th"><text>审核结果</text></view>
-					<view class="zd-col-2 zd-th">更多</view>
-				</view>
-				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
-					<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)">
-						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
-						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.dckcmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.dcckmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.drkcmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.drckmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
-						<view class="zd-col-3 zd-td"><text>{{e.jhdrrq}}</text></view>
-						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
-						<view class="zd-col-2 zd-td" @tap.stop="getDetails(3,e)">
-							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
-						</view>
-					</view>
-					<!-- 二级表格start -->
-					<view v-if="pkId === e.djid" class="zd-sec-wraper pd0">
-						<view class="table-wrap">
-							<table class="grid-table">
-								<thead>
-									<tr>
-										<th>序号</th>
-										<th v-if="pkObj.djzt !== '审核后'">选择</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>
-										<th>跟踪号</th>
-										<th>更多</th>
-									</tr>
-								</thead>
-								<tbody v-if="pkObj.djzt !== '审核后'">
-									<tr v-for="(el, j) in dataList2" :key="el.id">
-										<td>{{j+1}}</td>
-										<td @tap="toCheck2(el)">
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
-											</view>
-										</td>
-										<td>{{el.wlmc}}</td>
-										<td>{{el.wlbm}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.kclx}}</td>
-										<td>{{el.kczt}}</td>
-										<td>
-											<input class="td_input" type="number" confirm-type="go" v-model="el.sl"  @blur="_allocationBillUpdate(el)" @confirm="_allocationBillUpdate(el)" />
-										</td>
-										<td @tap.stop="checkWarehouse(1, '修改调出仓库', el)">
-											<view class="zd-row td_change">
-												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.dcckbm}}</view>
-											</view>
-										</td>
-										<td>{{el.dcckmc}}</td>
-										<td>
-											<view class="td_scan_wraper">
-												<scan-input v-model="el.dckwbm" @handleChange="_allocationBillUpdate(el)" />
-											</view>
-										</td>
-										<td @tap.stop="checkWarehouse(2, '修改调入仓库', el)">
-											<view class="zd-row td_change">
-												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.drckbm}}</view>
-											</view>
-										</td>
-										<td>{{el.drckmc}}</td>
-										<td>
-											<view class="td_scan_wraper">
-												<scan-input v-model="el.drkwbm" @handleChange="_allocationBillUpdate(el)" />
-											</view>
-										</td>
-										<td @tap.stop="openCalendar(1,el)">
-											<view class="zd-row td_change">
-												<uni-icons type="calendar" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.jhdrrq}}</view>
-											</view>
-										</td>
-										<td @tap.stop="openCalendar(2,el)">
-											<view class="zd-row td_change">
-												<uni-icons type="calendar" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.jhdcrq}}</view>
-											</view>
-										</td>
-										<td>
-											<view class="zd-row td_change" :class="{'td_change_focus': fstate}">
-												<input class="td_input_1" type="text" confirm-type="go" v-model="el.gzh" @focus="fstate = true"  @blur="fstate = false, _allocationBillUpdate(el)" @confirm="fstate = false,_allocationBillUpdate(el)" />
-												<uni-icons class="mgl10" type="search" size="20" color="#a2b6cc" @tap="checkWarehouse(5, '库存信息', el)"></uni-icons>
-											</view>
-										</td>
-										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
-									</tr>
-								</tbody>
-								<tbody v-else>
-									<tr v-for="(el, j) in dataList2" :key="el.id">
-										<td>{{j+1}}</td>
-										<td>{{el.wlmc}}</td>
-										<td>{{el.wlbm}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.kclx}}</td>
-										<td>{{el.kczt}}</td>
-										<td>{{el.sl}}</td>
-										<td>{{el.dcckbm}}</td>
-										<td>{{el.dcckmc}}</td>
-										<td>{{el.dckwbm}}</td>
-										<td>{{el.drckbm}}</td>
-										<td>{{el.drckmc}}</td>
-										<td>{{el.drkwbm}}</td>
-										<td>{{el.jhdrrq}}</td>
-										<td>{{el.jhdcrq}}</td>
-										<td>{{el.gzh}}</td>
-										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
-									</tr>
-								</tbody>
-							</table>
-						</view>
-						<view v-if="pkObj.djzt !== '审核后'" class="zd-row jcflexstart mgt10 mgb20">
-							<view class="zd-col-1 zd-row jcenter mgl52">
-								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-							</view>
-							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_allocationBillConfirm">直接调拨</button>
-							<view class="zd-col-10">
-								<!-- <view class="zd-col-12 zd-row jcflexend">
-									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view> -->
-							</view>
-						</view>
-					</view>
-					<!-- 二级表格end -->
-				</view>
-			</view>
-			<view class="zd-row jcenter pd20">
-				<pagination v-show="dataList1.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
-			</view>
-		</view>
-		<view class="footer"></view>
-		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
-		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view class="allwidth pop-title">{{modalObj.title}}</view>
-			<view v-if="modalObj.type === 1 || modalObj.type === 2" class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-12 select_wraper">
-					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
-				</view>
-			</view>
-			<view v-if="modalObj.type === 3 || modalObj.type === 4" class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-12 grid-data">
-					<uni-datetime-picker type="date" v-model="date" @change="_allocationBillUpdate(el)" />
-				</view>
-			</view>
-			<view v-if="modalObj.type === 5" class="pop-grid-wraper">
-				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
-					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>物料名称</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>物料编码</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>计量单位</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>可用数量</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>批次</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>仓库</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>库位</text></view>
-					<view class="zd-col-3 zd-sec-th"><text>跟踪号</text></view>
-				</view>
-				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id" @tap="toCheck3(ele)" :class="{'popChecked': ele.id === iid}">
-					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialName}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.materialNo}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.unitNo}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.curStoreQty}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.pc}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.warehouseName}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.locationName}}</text></view>
-					<view class="zd-col-3 zd-sec-td zd-pop-td"><text>{{ele.trackno}}</text></view>
-				</view>
-			</view>
-			<view class="mgb20 zd-row jcenter">
-				<view class="zd-col-10 zd-row">
-					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
-					<button class="confirm-button mgl0" @tap="modalConfirm">确定</button>
-				</view>
-			</view>
-		</view>
-		<view v-if="show" class="modal" @click.stop="show = false"></view>
-		<uni-calendar ref="calendar" :insert="false" :date="date" @confirm="calendarConfirm" />
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import ScanInput from '@/components/ScanInput.vue'
-	import Pagination from '@/components/Pagination.vue'
-	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillPage, allocationBillUpdate, allocationBillConfirm, allocationBillInventoryInfo} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			ScanInput,
-			Pagination,
-			GridDetail
-		},
-		data() {
-			return {
-				val1: '',
-				dataList1: [],
-				totalCount1: 0,
-				queryParams1:{
-					pageSize: 10,
-					pageNum: 1
-				},
-				currentPage1: 1,
-				pkId: '',
-				pkObj: {},
-				dataList2: [],
-				totalCount2: 0,
-				queryParams2:{
-					pageSize: 200,
-					pageNum: 1
-				},
-				currentPage2: 1,
-				checkArr: [],
-				checkArrActive: false,
-				delShow: false,
-				detailObj: {},
-				value: '',
-				range: [],
-				date: '',
-				show: false,
-				modalObj: {},
-				disabled: false,
-				value1: '',
-				value2: '',
-				range1: [],
-				dataList3: [],
-				iid: '',
-				iobj: {},
-				fstate: false
-			};
-		},
-		onLoad () {
-			this.toSearch()
-		},
-		methods: {
-			// 仓库下拉框
-			async _getWarehouseInfo () {
-				let res = await getWarehouseInfo()
-				if (res.code === 1) {
-					this.range = [...res.result]
-					this.range.map(e => {
-						this.$set(e, 'text', e.ckmc)
-						this.$set(e, 'value', e.ckbm)
-					})
-				}
-			},
-			// 组织信息下拉框
-			async _getOrganizationInfo () {
-				let res = await getOrganizationInfo()
-				if (res.code === 1) {
-					this.range1 = [...res.result]
-					this.range1.map(e => {
-						this.$set(e, 'text', e.kczzmc)
-						this.$set(e, 'value', e.kczzbm)
-					})
-				}
-			},
-			// 查询一级表格
-			toSearch () {
-				this.queryParams1 = {
-					pageSize: 10,
-					pageNum: 1
-				}
-				this.currentPage1 = 1
-				this.dataList2 = []
-				this.pkId = ''
-				this._allocationPage()
-			},
-			// 一级表格接口
-			async _allocationPage () {
-				let res = await allocationPage(this.val1, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
-				if (res.code === 1) {
-					this.dataList1 = [...res.result]
-					this.totalCount1 = Number(res.totalElements)
-					this.queryParams1.pageSize = Number(res.pageSize)
-					this.queryParams1.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-				this._getWarehouseInfo()
-				this._getOrganizationInfo()
-			},
-			// 二级表格接口
-			async _allocationBillPage () {
-				let res = await allocationBillPage(this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
-				if (res.code === 1) {
-					res.result.map(el => {
-						this.$set(el, 'checked', true)
-					})
-					this.dataList2 = [...res.result]
-					this.checkArr = [...this.dataList2]
-					this.checkArrActive = true
-					this.totalCount2 = Number(res.totalElements)
-					this.queryParams2.pageSize = Number(res.pageSize)
-					this.queryParams2.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 一级表格切换分页
-			handlePageChange1(page) {
-				this.queryParams1.pageNum = page
-				this.currentPage1 = page
-				this.dataList2 = []
-				this.pkId = ''
-				this._allocationPage()
-			},
-			// 二级表格切换分页
-			handlePageChange2(page) {
-				this.queryParams2.pageNum = page
-				this.currentPage2 = page
-				this._allocationBillPage()
-			},
-			// 点击一级表格一行加载二级表格
-			toCollapse (e) {
-				this.pkId = this.pkId === e.djid ? '' : e.djid
-				this.pkObj = this.pkId === e.djid ? e : {}
-				this.dataList2 = []
-				if (this.pkId === e.djid) {
-					this.queryParams2 = {
-						pageSize: 200,
-						pageNum: 1
-					}
-					this.currentPage2 = 1
-					this._allocationBillPage()
-				}
-			},
-			// 二级表格多选
-			toCheck2 (e) {
-				e.checked = !e.checked
-				this.checkArr = this.dataList2.filter(el => el.checked === true)
-				if (this.checkArr.length === this.dataList2.length) {
-					this.checkArrActive = true
-				}
-			},
-			// 二级表格全选
-			selectAll () {
-				this.checkArrActive = !this.checkArrActive
-				this.dataList2.map(el => {
-					el.checked = this.checkArrActive
-				})
-				this.checkArr = this.dataList2.filter(el => el.checked === true)
-			},
-			// 二级表格详情修改接口
-			async _allocationBillUpdate (e) {
-				try {
-					let res = await allocationBillUpdate(e)
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			// 根据跟踪号查询库存列表
-			async _allocationBillInventoryInfo (obj) {
-				let res = await allocationBillInventoryInfo(obj)
-				if (res.code === 1) {
-					this.dataList3 = [...res.result]
-				}
-			},
-			// 跟踪号查询库存列表选中一行
-			toCheck3 (e) {
-				this.iid = e.id === this.iid ? '' : e.id
-				this.iobj = e.id === this.iid ? e : {}
-			},
-			// 修改调出仓库弹窗
-			checkWarehouse (type, title, e) {
-				this.modalObj = {type: type, title: title, id: e.flid}
-				if (type === 1) {
-					this.value = e.dcckbm
-				} else if (type === 2) {
-					this.value = e.drckbm
-				} else if (type === 5) {
-					let {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm} = {...e}
-					let obj = {gzh, dckcbm, dcckbm, dckwbm, pc, wlbm}
-					this._allocationBillInventoryInfo(obj)
-				}
-				this.show = true
-			},
-			// 修改调出仓库确定和修改跟踪号
-			modalConfirm () {
-				let mc = ''
-				this.range.map(el => {
-					if (el.value === this.value) {
-						mc = el.text
-					}
-				})
-				let obj = {}
-				if (this.modalObj.type === 1) {
-					this.dataList2.map(e => {
-						if (e.flid === this.modalObj.id) {
-							e.dcckbm = this.value
-							e.dcckmc = mc
-							obj = e
-						}
-					})
-				} else if (this.modalObj.type === 2) {
-					this.dataList2.map(e => {
-						if (e.flid === this.modalObj.id) {
-							e.drckbm = this.value
-							e.drckmc = mc
-							obj = e
-						}
-					})
-				} else if (this.modalObj.type === 5) {
-					this.dataList2.map(e => {
-						if (e.flid === this.modalObj.id) {
-							e.gzh = this.iobj.trackno
-							obj = e
-						}
-					})
-				}
-				this.show = false
-				this._allocationBillUpdate(obj)
-			},
-			// 修改日期
-			openCalendar (type, e) {
-				this.modalObj = {type: type, id: e.flid}
-				this.$refs.calendar.open()
-				if (type === 1) {
-					this.date = e.jhdrrq
-				} else if (type === 2) {
-					this.date = e.jhdcrq
-				}
-			},
-			calendarConfirm (e) {
-				let obj = {}
-				if (this.modalObj.type === 1) {
-					this.dataList2.map(el => {
-						if (el.flid === this.modalObj.id) {
-							el.jhdrrq = e.fulldate
-							obj = el
-						}
-					})
-				} else if (this.modalObj.type === 2) {
-					this.dataList2.map(el => {
-						if (el.flid === this.modalObj.id) {
-							el.jhdcrq = e.fulldate
-							obj = el
-						}
-					})
-				}
-				this._allocationBillUpdate(obj)
-			},
-			// 点击直接调拨按钮
-			async _allocationBillConfirm () {
-				this.disabled = true
-				if (!this.checkArr.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let arr = []
-					this.checkArr.map(el => {
-						let {djid, djbh, ywrq, btbz, flxh, flid, jldw, sl, dcckbm, dckwbm, drckbm, drkwbm, jhdrrq, jhdcrq, flbz} = {...el}
-						let obj = {djid, djbh, ywrq, btbz, flxh, flid, jldw, sl, dcckbm, dckwbm, drckbm, drkwbm, jhdrrq, jhdcrq, flbz}
-						arr.push(obj)
-					})
-					let res = await allocationBillConfirm(arr)
-					if (res.code === 1) {
-						this.queryParams2 = {
-							pageSize: 200,
-							pageNum: 1
-						}
-						this.currentPage2 = 1
-						this._allocationBillPage()
-						// uni.showToast({
-						// 	title: res.desc,
-						// 	icon: 'none'
-						// })
-					} else {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			// 详情弹窗
-			getDetails (type,e) {
-				this.delShow = !this.delShow
-				this.detailObj = {type: type, data:e}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.mgr30
-	margin-right 30rpx
-.select_wraper
-	/deep/ .uni-select__input-box
-		height 30px
-	/deep/ .uni-select__selector
-		z-index 11
-	/deep/ .uni-select
-		height: 30px;
-		min-height: 30px;
-		line-height: 30px;
-		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
-		border-radius: 6px;
-	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
-		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
-.zd-th
-	font-size: 12px;
-	line-height: 13px;
-	height: 36px;
-</style>
diff --git a/pages/management/alloc-maintenance_new.vue b/pages/management/alloc-maintenance_new.vue
index 03c1f1e..2ddb689 100644
--- a/pages/management/alloc-maintenance_new.vue
+++ b/pages/management/alloc-maintenance_new.vue
@@ -40,7 +40,9 @@
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
 						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
-							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}">
+								<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+							</view>
 						</view>
 						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
@@ -72,7 +74,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th>物料编码</th>
@@ -94,7 +98,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td class="underline fontcol1" @tap="showPop(4, e, el)">{{el.wlbm}}</td>
@@ -624,7 +630,6 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否确认删除？',
-					cancelColor: '#fff',
 					confirmColor: '#fff',
 					success: (res) => {
 						if (res.confirm) {
@@ -672,20 +677,11 @@
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
 .zd-th
 	font-size: 12px;
 	line-height: 13px;
diff --git a/pages/management/check.vue b/pages/management/check.vue
index b03730d..e5c299e 100644
--- a/pages/management/check.vue
+++ b/pages/management/check.vue
@@ -57,7 +57,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th>盘点库位编码</th>
@@ -77,7 +79,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td>{{el.struct_code}}</td>
@@ -370,20 +374,11 @@
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
 .zd-th
 	font-size: 12px;
 	line-height: 13px;
@@ -392,5 +387,6 @@
 	position: inherit;
 	box-shadow: none;
 .grid-table td:last-child
-	background-color: rgba(63,106,202,0.3);
+	background-color: #fff6ef;
+	color: #ffa600;
 </style>
diff --git a/pages/management/in-storage.vue b/pages/management/in-storage.vue
deleted file mode 100644
index f1d0aba..0000000
--- a/pages/management/in-storage.vue
+++ /dev/null
@@ -1,658 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="zd-row">
-				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-8"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
-					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
-					</view>
-					<view v-if="crType === 'OUT'" class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
-					</view>
-				</view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
-			</view>
-		</view>
-		<view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
-		<view class="grid-wrap">
-			<view class="zdrow-wrap">
-				<view class="zd-row sticky zd-th-wraper">
-					<view class="zd-col-1 zd-th"><text>序号</text></view>
-					<view class="zd-col-1 zd-th"><text>选择</text></view>
-					<view class="zd-col-2 zd-th"><text class="fontcol1">{{crType === 'IN'? '入库单号':'出库单号'}}</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>来源部门</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>去向部门</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>仓库名称</text></view>
-					<view class="zd-col-2 zd-th"><text>状态</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>制单日期</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>制单人</text></view>
-					<view class="zd-col-2 zd-th nowrap"><text>业务日期</text></view>
-					<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
-					<view class="zd-col-4 zd-th"><text>审核结果</text></view>
-					<view class="zd-th" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'">更多</view>
-				</view>
-				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
-					<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)">
-						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
-						<view class="zd-col-1 zd-td" @tap.stop="toCheck1(e)">
-							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
-						</view>
-						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.bmmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
-						<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
-						<view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
-						<view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
-						<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
-						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
-						<view class="zd-td" :class="crType === 'OUT' ? 'zd-col-1' : 'zd-col-2'" @tap.stop="getDetails(1,e)">
-							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
-						</view>
-					</view>
-					<!-- 二级表格start -->
-					<view v-if="pkId === e.djid" class="zd-sec-wraper pd0">
-						<view class="table-wrap">
-							<table class="grid-table">
-								<thead>
-									<tr>
-										<th>序号</th>
-										<th>选择</th>
-										<th v-if="id === 'CGRKD' || id === 'LLCKD'">物料编号</th>
-										<th>仓库名称</th>
-										<th>物料名称</th>
-										<th v-if="id !== 'CGRKD' && id !== 'LLCKD'">物料编号</th>
-										<th>单位</th>
-										<th>库位</th>
-										<th>数量</th>
-										<th>总数</th>
-										<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
-										<th>剩余数量</th>
-										<th>库存</th>
-										<th>跟踪号</th>
-										<th>操作人</th>
-										<th v-if="crType === 'OUT'">仓管员</th>
-										<th>操作日期</th>
-										<th>更多</th>
-									</tr>
-								</thead>
-								<tbody>
-									<tr v-for="(el, j) in dataList2" :key="el.id">
-										<td>{{j+1}}</td>
-										<td @tap="toCheck2(el)">
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
-											</view>
-										</td>
-										<td v-if="id === 'CGRKD' || id === 'LLCKD'">{{el.wlbm}}</td>
-										<td>{{el.ckmc}}</td>
-										<td>{{el.wlmc}}</td>
-										<td v-if="id !== 'CGRKD' && id !== 'LLCKD'">{{el.wlbm}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.kwbm}}</td>
-										<td>{{el.sl}}</td>
-										<td>{{el.wlzs}}</td>
-										<td>{{el.czsl}}</td>
-										<td>{{el.sysl}}</td>
-										<td>{{el.kcsl}}</td>
-										<td>{{el.gzhbm}}</td>
-										<td>{{el.update_name}}</td>
-										<td v-if="crType === 'OUT'">{{el.cgymc}}</td>
-										<td>{{el.update_time}}</td>
-										<td @tap.stop="getDetails(2,el)">
-											<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</view>
-						<view class="zd-row jcflexstart mgt20 mgb20">
-							<view class="zd-col-1 zd-row jcenter mgl52">
-								<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-							</view>
-							<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
-							<button v-if="crType === 'IN'" :class="{'confirm-button_disabled': checkArr2.length === 0}" class="confirm-button" @tap="onekeyUpdate">一键设置</button>
-							<view class="zd-col-10">
-								<!-- <view class="zd-col-12 zd-row jcflexend">
-									<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
-								</view> -->
-							</view>
-						</view>
-					</view>
-					<!-- 二级表格end -->
-				</view>
-			</view>
-			<view class="zd-row jcenter pd20">
-				<pagination v-show="dataList1.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
-			</view>
-		</view>
-		<view class="footer"></view>
-		<grid-detail :show="delShow" :data="detailObj" :crType="crType" @closeDetail="delShow=false"></grid-detail>
-		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view v-show="type === '1'" class="allwidth pop-title">{{crType === 'IN' ? '入库' : '出库'}}</view>
-			<view v-show="type === '3'" class="allwidth pop-title">批量设置入库库位</view>
-			<view v-if="type === '1'" class="pop-grid-wraper">
-				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
-					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
-					<view class="zd-col-5 zd-sec-th"><text>物料名称</text></view>
-					<view class="zd-col-5 zd-sec-th"><text>选择库位</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>库存数量</text></view>
-				</view>
-				<view class="zd-row zd-td-wraper" v-for="(ele, t) in dataList3" :key="ele.id">
-					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
-					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
-					<view class="zd-col-5 zd-sec-td zd-pop-td">
-						<scan-input
-						v-model="ele.kwbm"
-						/>
-					</view>
-					<!-- <view class="zd-col-4 zd-sec-td zd-pop-td">
-						<input v-show="!ele.checked" type="number" class="pop-input" v-model="ele.sysl" @blur="handleBlur(ele)">
-						<text v-show="ele.checked">{{ele.sysl}}</text>
-					</view> -->
-					<view class="zd-col-4 zd-sec-td zd-pop-td">
-						<input type="number" class="pop-input" v-model="ele.sysl">
-					</view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
-				</view>
-			</view>
-			<view v-if="type === '3'" class="kwcode_wraper">
-				<view class="zd-row jcenter mgt20">
-					<view class="zd-col-3 pop_label">入库库位</view>
-					<view class="zd-col-10 select_wraper">
-						<scan-input v-model="val3" />
-					</view>
-				</view>
-			</view>
-			<!-- <view v-else class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-12">
-					<scan-input
-					v-model="kwCode"
-					/>
-				</view>
-			</view> -->
-			<view class="mgb20 zd-row jcenter">
-				<view class="zd-col-10 zd-row">
-					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
-					<button v-if="type === '3'" class="confirm-button mgl0" :class="{'confirm-button_disabled': val3 === ''}" :disabled="disabled2" @tap="modalConfirm1">确定</button>
-					<button v-else class="confirm-button mgl0" :class="{'confirm-button_disabled': (type === '1' && dataList3.length === 0) || (type === '2' && kwCode === '')}" :disabled="disabled2" @tap="modalConfirm">确定</button>
-				</view>
-			</view>
-		</view>
-		<view v-if="show" class="modal" @click.stop="show = false"></view>
-		<uni-popup ref="alertDialog" type="dialog">
-			<uni-popup-dialog type="info" cancelText="关闭" confirmText="确定" title="提示" :content="crType === 'IN'? '是否确认入库？':'是否确认出库？'" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
-		</uni-popup>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import ScanInput from '@/components/ScanInput.vue'
-	import Pagination from '@/components/Pagination.vue'
-	import GridDetail from '@/components/GridDetail.vue'
-	// import {updateBillDetail} from '@/utils/getData2.js'
-	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo, updateBillDetail} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			ScanInput,
-			Pagination,
-			GridDetail
-		},
-		data() {
-			return {
-				title: '',
-				id: '',
-				crType: '',
-				val1: '',
-				dataList1: [],
-				dataList2: [],
-				dataList3: [],
-				pkId: '',
-				pkObj: {},
-				checkArr1: [],
-				disabled1: false,
-				btnActive1: false,
-				totalCount1: 0,
-				queryParams1:{
-					pageSize: 10,
-					pageNum: 1
-				},
-				currentPage1: 1,
-				totalCount2: 0,
-				queryParams2:{
-					pageSize: 500,
-					pageNum: 1
-				},
-				currentPage2: 1,
-				checkArr2: [],
-				checkArrActive: false,
-				disabled2: false,
-				show: false,
-				type: '',
-				kwCode: '',
-				checkArr3: [],
-				delShow: false,
-				detailObj: {},
-				value1: '',
-				range1: [],
-				value2: '',
-				range2: [],
-				val3: ''
-			};
-		},
-		onShow() {
-			if (this.$store.getters.publicArr) {
-				this.dataList1 = this.$store.getters.publicArr
-			}
-		},
-		destroyed () {
-			this.$store.dispatch('setPublicArr', '')
-		},
-		onLoad (options) {
-			this.id = options.id
-			this.title = options.name
-			this.crType = options.type
-			if (this.crType === 'IN') {
-				this.toSearch()
-			} else {
-				this._getUserInfo()
-			}
-		},
-		methods: {
-			// 仓库下拉框
-			async _getWarehouseInfo () {
-				let res = await getWarehouseInfo()
-				if (res.code === 1) {
-					this.range1 = [...res.result]
-					this.range1.map(e => {
-						this.$set(e, 'text', e.ckmc)
-						this.$set(e, 'value', e.ckbm)
-					})
-				}
-			},
-			// 仓管员下拉框
-			async _getUserInfo () {
-				let res = await getUserInfo()
-				if (res.code === 1) {
-					this.range2 = [...res.result]
-					if (this.$store.getters.userInfo !== '') {
-						let flag = this.range2.includes({text: JSON.parse(this.$store.getters.userInfo).person_name, value: JSON.parse(this.$store.getters.userInfo).username})
-						if (!flag) {
-							this.range2.push({text: JSON.parse(this.$store.getters.userInfo).person_name, value: JSON.parse(this.$store.getters.userInfo).username})
-						}
-						this.value2 = JSON.parse(this.$store.getters.userInfo).username
-					}
-					this.toSearch()
-				}
-			},
-			// 查询一级表格
-			toSearch () {
-				this.queryParams1 = {
-					pageSize: 10,
-					pageNum: 1
-				}
-				this.currentPage1 = 1
-				this.dataList2 = []
-				this.pkId = ''
-				this._easOutInBillPage()
-			},
-			// 一级表格接口
-			async _easOutInBillPage () {
-				let res = await easOutInBillPage(this.val1, this.id, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
-				if (res.code === 1) {
-					this.checkArr1 = []
-					res.result.map(el => {
-						this.$set(el, 'checked', false)
-					})
-					this.dataList1 = [...res.result]
-					this.totalCount1 = Number(res.totalElements)
-					this.queryParams1.pageSize = Number(res.pageSize)
-					this.queryParams1.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-				this._getWarehouseInfo()
-			},
-			// 二级表格接口
-			async _easOutInBillDetailPage () {
-				let res = await easOutInBillDetailPage(this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
-				if (res.code === 1) {
-					this.checkArr2 = []
-					this.checkArrActive = false
-					res.result.map(el => {
-						this.$set(el, 'checked', false)
-					})
-					this.dataList2 = [...res.result]
-					this.totalCount2 = Number(res.totalElements)
-					this.queryParams2.pageSize = Number(res.pageSize)
-					this.queryParams2.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 一级表格切换分页
-			handlePageChange1(page) {
-				this.queryParams1.pageNum = page
-				this.currentPage1 = page
-				this.dataList2 = []
-				this.pkId = ''
-				this._easOutInBillPage()
-			},
-			// 二级表格切换分页
-			handlePageChange2(page) {
-				this.queryParams2.pageNum = page
-				this.currentPage2 = page
-				this._easOutInBillDetailPage()
-			},
-			// 点击一级表格一行加载二级表格
-			toCollapse (e) {
-				this.pkId = this.pkId === e.djid ? '' : e.djid
-				this.pkObj = this.pkId === e.djid ? e : {}
-				this.dataList2 = []
-				if (this.pkId === e.djid) {
-					this.queryParams2 = {
-						pageSize: 500,
-						pageNum: 1
-					}
-					this.currentPage2 = 1
-					this._easOutInBillDetailPage()
-				}
-			},
-			// 一级表格选中一行
-			toCheck1 (e) {
-				e.checked = !e.checked
-				let arr = this.dataList1.filter(el => el.checked === true)
-				this.checkArr1 = arr.map(el => {return el.djid})
-				// if (arr.length === 1) {
-				// 	this.btnActive1 = arr[0].djzt === '提交' ? true : false
-				// } else {
-				// 	this.btnActive1 = false
-				// }
-			},
-			// 点击单据审核按钮
-			async toSure () {
-			  this.disabled1 = true
-			 //  if (this.checkArr1.length === 0 || this.btnActive1) {
-				// this.disabled1 = false
-				// return
-			 //  }
-			 if (this.checkArr1.length === 0) {
-			 				this.disabled1 = false
-			 				return
-			 }
-			  try {
-				let res = await easOutInBillUpdate(1, this.checkArr1)
-				if (res.code === 1) {
-					this.disabled1 = false
-					this.checkArr1 = []
-					this._easOutInBillPage()
-					// uni.showToast({
-					// 	title: res.desc,
-					// 	icon: 'none'
-					// })
-				} else {
-					this.disabled1 = false
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			  } catch (e) {
-				this.disabled1 = false
-			  }
-			},
-			// 二级表格多选
-			toCheck2 (e) {
-				e.checked = !e.checked
-				this.checkArr2 = this.dataList2.filter(el => el.checked === true)
-				if (this.checkArr2.length === this.dataList2.length) {
-					this.checkArrActive = true
-				}
-			},
-			// 二级表格全选
-			selectAll () {
-				this.checkArrActive = !this.checkArrActive
-				this.dataList2.map(el => {
-					el.checked = this.checkArrActive
-				})
-				this.checkArr2 = this.dataList2.filter(el => el.checked === true)
-			},
-			// 点击出入库按钮
-			kuwConfirm () {
-				if (this.checkArr2.length === 0) {
-					return
-				} else if (this.checkArr2.length === 1) {
-					if ((Number(this.checkArr2[0].sl) > Number(this.checkArr2[0].kcsl)) && this.crType === 'OUT') {
-						uni.showToast({
-							title: '库存不足',
-							icon: 'none'
-						})
-						return
-					} else {
-						this.type = '1'
-						this._queryInventoryInfo()
-					}
-				} else if (this.checkArr2.length >= 2) {
-					let flag = false
-					this.checkArr2.map(el => {
-						if (Number(el.sl) > Number(el.kcsl)) {
-							flag = true
-						}
-					})
-					if (flag && this.crType === 'OUT') {
-						uni.showToast({
-							title: '库存不足',
-							icon: 'none'
-						})
-						return
-					} else {
-						this.type = '2'
-						// this.show = true
-						// this.kwCode = ''
-						this.$refs.alertDialog.open()
-					}
-				}
-			},
-			// 选择二级表格一行，点击出入库按钮，弹窗加载出入库表格
-			async _queryInventoryInfo () {
-				let res = await queryInventoryInfo(this.checkArr2)
-				if (res.code ===1) {
-					res.result.map(el => {
-						this.$set(el, 'checked', false)
-						this.$set(el, 'yqty', el.sysl)
-					})
-					this.dataList3 = [...res.result]
-					this.show = true
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 出入库表格输入框计算，功能暂时隐藏
-			handleBlur (ele) {
-				if (Number(ele.sysl) >= Number(ele.yqty)) {
-					ele.sysl = ele.yqty
-					return
-				}
-				ele.checked = true
-				let index = ''
-				let obj = {}
-				this.dataList3.map((e, i) => {
-					if (e.id === ele.id) {
-						index = i
-						obj = Object.assign({}, e, {'checked': false}, {'kwbm': ''}, {id: e.id + Math.random() * 1000}, {sysl: Number(e.yqty) - Number(ele.sysl)}, {yqty: Number(e.yqty) - Number(ele.sysl)})
-					}
-				})
-				this.dataList3.splice(index+1, 0, obj)
-				this.dataList3 = [...this.dataList3]
-			},
-			// 点击出入库弹窗确定按钮
-			modalConfirm () {
-				this.disabled2 = true
-				let arr = []
-				if (this.type === '1' && this.dataList3.length === 0) {
-					this.disabled2 = false
-					return
-				} else if (this.type === '2' && this.kwCode === '') {
-					this.disabled2 = false
-					return
-				} else if (this.type === '1') {
-					// arr = this.dataList3
-					this.checkArr3 = [...this.dataList3]
-					this.$refs.alertDialog.open()
-					this.disabled2 = false
-					return
-				} else if (this.type === '2') {
-					this.checkArr2.map(el => {
-						el.kwbm = this.kwCode
-					})
-					arr = [...this.checkArr2]
-				}
-				this._easOutInBillDetailUpdate(arr)
-			},
-			// 提示弹窗确定按钮
-			dialogConfirm () {
-				if (this.type === '2') {
-					this._easOutInBillDetailUpdate(this.checkArr2)
-				} else {
-					this._easOutInBillDetailUpdate(this.checkArr3)
-				}
-			},
-			dialogClose () {},
-			// 出入库确定接口
-			async _easOutInBillDetailUpdate (arr) {
-			  try {
-				
-				let res = await easOutInBillDetailUpdate(arr)
-				if (res.code === 1) {
-					this.disabled2 = false
-					this.show = false
-					this.queryParams2 = {
-						pageSize: 500,
-						pageNum: 1
-					}
-					this.currentPage2 = 1
-					this._easOutInBillDetailPage()
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				} else {
-					this.disabled2 = false
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			  } catch (e) {
-				this.disabled2 = false
-			  }
-			},
-			// 详情弹窗
-			getDetails (type,e) {
-				this.delShow = !this.delShow
-				this.detailObj = {type: type, data:e}
-			},
-			// 一键设置
-			onekeyUpdate () {
-				if (this.checkArr2.length > 0) {
-					this.type = '3'
-					this.val3 = ''
-					this.show = true
-				}
-			},
-			async _updateBillDetail (e) {
-				try {
-					let res = await updateBillDetail(e)
-					if (res.code === 1) {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-					this.disabled2 = false
-				} catch (e) {
-					console.log(e)
-					this.disabled2 = false
-				}
-			},
-			// 一键设置弹窗确认
-			modalConfirm1 () {
-				this.disabled2 = true
-				if (this.val3 === '') {
-					uni.showToast({
-						title: '请设置入库库位',
-						icon: 'none'
-					})
-					this.disabled2 = false
-					return
-				}
-				let arr = []
-				this.dataList2.map(e => {
-					if (e.checked) {
-						e.kwbm = this.val3
-						let {djid, flid, kwbm} = {...e}
-						let obj = {djid, flid, kwbm}
-						arr.push(obj)
-					}
-				})
-				this.show = false
-				this._updateBillDetail(arr)
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.mgr30
-	margin-right 30rpx
-.select_wraper
-	/deep/ .uni-select__input-box
-		height 30px
-	/deep/ .uni-select__selector
-		z-index 11
-	/deep/ .uni-select
-		height: 30px;
-		min-height: 30px;
-		line-height: 30px;
-		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
-		border-radius: 6px;
-	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
-		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
-</style>
diff --git a/pages/management/in-storage_LLCKD.vue b/pages/management/in-storage_LLCKD.vue
index 8fa7c6b..87a642f 100644
--- a/pages/management/in-storage_LLCKD.vue
+++ b/pages/management/in-storage_LLCKD.vue
@@ -47,7 +47,9 @@
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
 						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
-							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}">
+								<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+							</view>
 						</view>
 						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.bmmc}}</text></view>
@@ -72,7 +74,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th class="fontcol1">物料编号</th>
@@ -97,7 +101,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td v-if="id !== 'CGRKD'" class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
@@ -206,9 +212,9 @@
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
 	import UpTop from '@/components/upTop.vue'
-	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
-	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
-	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
+	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
+	import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
+	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -625,7 +631,6 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否确认删除？',
-					cancelColor: '#fff',
 					confirmColor: '#fff',
 					success: (res) => {
 						if (res.confirm) {
@@ -672,8 +677,8 @@
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
diff --git a/pages/management/in-storage_new.vue b/pages/management/in-storage_new.vue
index 62f76ff..f7a6d10 100644
--- a/pages/management/in-storage_new.vue
+++ b/pages/management/in-storage_new.vue
@@ -43,7 +43,9 @@
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
 						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
-							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}">
+								<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+							</view>
 						</view>
 						<view class="zd-col-2 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.bmmc}}</text></view>
@@ -68,7 +70,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th class="fontcol1">物料编号</th>
@@ -93,7 +97,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
@@ -202,7 +208,7 @@
 	import GridDetail from '@/components/GridDetail.vue'
 	import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
 	// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync, easOutInBillDelete} from '@/utils/getData2.js'
-	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
+	// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/getData2.js'
 	export default {
 		components: {
 			NavBar,
@@ -595,7 +601,6 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否确认删除？',
-					cancelColor: '#fff',
 					confirmColor: '#fff',
 					success: (res) => {
 						if (res.confirm) {
@@ -644,18 +649,9 @@
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
 </style>
diff --git a/pages/management/move-inventory.vue b/pages/management/move-inventory.vue
index 7064137..eff6461 100644
--- a/pages/management/move-inventory.vue
+++ b/pages/management/move-inventory.vue
@@ -53,7 +53,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th>物料编码</th>
@@ -72,7 +74,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td>{{el.material_code}}</td>
@@ -110,7 +114,7 @@
 	import ScanInput from '@/components/ScanInput_new.vue'
 	import Pagination from '@/components/Pagination.vue'
 	import GridDetail from '@/components/GridDetail.vue'
-	// import {getWarehouseInfo, stIvtMoveinvMovePage, moveDtlByMoveId} from '@/utils/mork2.js'
+	// import {getWarehouseInfo, stIvtMoveinvMovePage, moveDtlByMoveId} from '@/utils/getData2.js'
 	import {getWarehouseInfo, stIvtMoveinvMovePage, moveDtlByMoveId, stIvtMoveinvUpdateDtl, stIvtMoveinvConfirmMove} from '@/utils/getData2.js'
 	export default {
 		components: {
@@ -318,26 +322,17 @@
 	/deep/ .uni-select__input-box
 		height 30px
 	/deep/ .uni-select__selector
-		z-index 11
+		z-index 150
 	/deep/ .uni-select
 		height: 30px;
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
 .zd-th
 	font-size: 12px;
 	line-height: 13px;
@@ -346,5 +341,6 @@
 	position: inherit;
 	box-shadow: none;
 .grid-table td:last-child
-	background-color: rgba(63,106,202,0.3);
+	background-color: #fff6ef;
+	color: #ffa600;
 </style>
diff --git a/pages/management/receive-confirm.vue b/pages/management/receive-confirm.vue
deleted file mode 100644
index 622a47c..0000000
--- a/pages/management/receive-confirm.vue
+++ /dev/null
@@ -1,525 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="收货确认"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="zd-row">
-				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
-					<view class="zd-col-8 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
-					</view>
-				</view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
-			</view>
-		</view>
-		<view class="zd-row jcflexstart table-title_wraper">收货确认</view>
-		<view class="grid-wrap">
-			<view class="zdrow-wrap">
-				<view class="zd-row sticky zd-th-wraper">
-					<view class="zd-col-1 zd-th"><text>序号</text></view>
-					<view class="zd-col-3 zd-th"><text class="fontcol1">送货单号</text></view>
-					<view class="zd-col-2 zd-th"><text>送货日期</text></view>
-					<view class="zd-col-2 zd-th"><text>提交时间</text></view>
-					<view class="zd-col-2 zd-th"><text>采购公司</text></view>
-					<view class="zd-col-2 zd-th"><text>所属厂区</text></view>
-					<view class="zd-col-2 zd-th"><text>供应商编码</text></view>
-					<view class="zd-col-2 zd-th"><text>供应商</text></view>
-					<view class="zd-col-2 zd-th"><text>到货日期</text></view>
-					<view class="zd-col-4 zd-th"><text>审核结果</text></view>
-					<view class="zd-col-2 zd-th">更多</view>
-				</view>
-				<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
-					<view class="zd-row" :class="{'zd-td-checked': pkId === e.id}" @tap="toCollapse(e)">
-						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
-						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.tjsj}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.cggs}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.sscq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.gysbm}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.gys}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.dhrq}}</text></view>
-						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
-						<view class="zd-col-2 zd-td" @tap.stop="getDetails(4,e)">
-							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
-						</view>
-					</view>
-					<!-- 二级表格start -->
-					<view v-if="pkId === e.djid" class="zd-sec-wraper">
-						<view class="search-confirm-wrap_2">
-							<view class="zd-row">
-								<view class="zd-col-24 zd-row jcflexstart">
-									<view class="zd-col-9"><search-box v-model="val2" :scanShow="false" placeholder="请输入物料信息" /></view>
-								</view>
-								<button class="confirm-button" @tap="toSearch2">查询</button>
-								<button v-if="pkObj.djzt !== '审核后'" class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" @tap="checkWarehouse(2, '批量设置收货仓库/库位')">一键设置</button>
-								<button v-if="pkObj.djzt !== '审核后'" class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
-							</view>
-						</view>
-						<view class="table-wrap table-wrap_1">
-							<table class="grid-table">
-								<thead>
-									<tr>
-										<th>序号</th>
-										<th v-if="pkObj.djzt !== '审核后'">
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
-											</view>
-										</th>
-										<th><text class="fontcol1">采购订单号</text></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 v-if="pkObj.djzt !== '审核后'">
-									<tr v-for="(el, j) in dataList2" :key="el.id">
-										<td>{{j+1}}</td>
-										<td @tap="toCheck2(el)">
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
-											</view>
-										</td>
-										<td><view class="fontcol1">{{el.cgbh}}</view></td>
-										<td>{{el.wlbm}}</td>
-										<td>{{el.wlmc}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.ddsl}}</td>
-										<td>{{el.wlzs}}</td>
-										<td>{{el.bcshsl}}</td>
-										<td>{{el.zzmc}}</td>
-										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
-										<td><input class="td_input" type="number" v-model="el.shsl"  @blur="updateNumkw(el)" /></td>
-										<td @tap.stop="checkWarehouse(1, '修改收货仓库', el)">
-											<view class="zd-row td_change">
-												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.ckbm}}</view>
-											</view>
-										</td>
-										<td>{{el.ckmc}}</td>
-										<td>
-											<view class="td_scan_wraper">
-												<scan-input v-model="el.kwmc" @handleChange="updateNumkw(el)" />
-											</view>
-										</td>
-										<td>{{el.num}}</td>
-										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
-									</tr>
-								</tbody>
-								<tbody v-else>
-									<tr v-for="(el, j) in dataList2" :key="el.id">
-										<td>{{j+1}}</td>
-										<td>{{el.cgbh}}</td>
-										<td>{{el.wlbm}}</td>
-										<td>{{el.wlmc}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.ddsl}}</td>
-										<td>{{el.wlzs}}</td>
-										<td>{{el.bcshsl}}</td>
-										<td>{{el.zzmc}}</td>
-										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
-										<td>{{el.shsl}}</td>
-										<td>{{el.ckbm}}</td>
-										<td>{{el.ckmc}}</td>
-										<td>{{el.kwmc}}</td>
-										<td>{{el.num}}</td>
-										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
-									</tr>
-								</tbody>
-							</table>
-						</view>
-					</view>
-					<!-- 二级表格end -->
-				</view>
-			</view>
-			<view class="zd-row jcenter pd20">
-				<pagination v-show="dataList1.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
-			</view>
-		</view>
-		<view class="footer"></view>
-		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
-		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view class="allwidth pop-title">{{modalObj.title}}</view>
-			<view v-if="modalObj.type === 1" class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-10 select_wraper">
-					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
-				</view>
-			</view>
-			<view v-if="modalObj.type === 2" class="kwcode_wraper">
-				<view class="zd-row jcenter">
-					<view class="zd-col-3 pop_label">收货仓库</view>
-					<view class="zd-col-10 select_wraper">
-						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value" filterable :localdata="range"></zxz-uni-data-select>
-					</view>
-				</view>
-				<view class="zd-row jcenter mgt20">
-					<view class="zd-col-3 pop_label">收货库位</view>
-					<view class="zd-col-10 select_wraper">
-						<scan-input v-model="val3" />
-					</view>
-				</view>
-			</view>
-			<view class="mgb20 zd-row jcenter">
-				<view class="zd-col-10 zd-row">
-					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
-					<button class="confirm-button mgl0" @tap="modalConfirm">确定</button>
-				</view>
-			</view>
-		</view>
-		<view v-if="show" class="modal" @click.stop="show = false"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import ScanInput from '@/components/ScanInput.vue'
-	import Pagination from '@/components/Pagination.vue'
-	import GridDetail from '@/components/GridDetail.vue'
-	import {getWarehouseInfo, getOrganizationInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			ScanInput,
-			Pagination,
-			GridDetail
-		},
-		data() {
-			return {
-				val1: '',
-				dataList1: [],
-				totalCount1: 0,
-				queryParams1:{
-					pageSize: 10,
-					pageNum: 1
-				},
-				currentPage1: 1,
-				pkId: '',
-				pkObj: {},
-				dataList2: [],
-				totalCount2: 0,
-				queryParams2:{
-					pageSize: 200,
-					pageNum: 1
-				},
-				currentPage2: 1,
-				checkArr: [],
-				checkArrActive: false,
-				delShow: false,
-				detailObj: {},
-				value: '',
-				range: [],
-				show: false,
-				modalObj: {},
-				disabled: false,
-				value1: '',
-				range1: [],
-				val2: '',
-				val3: ''
-			};
-		},
-		onLoad () {
-			this.toSearch()
-		},
-		methods: {
-			// 仓库下拉框
-			async _getWarehouseInfo () {
-				let res = await getWarehouseInfo()
-				if (res.code === 1) {
-					this.range = [...res.result]
-					this.range.map(e => {
-						this.$set(e, 'text', e.ckmc)
-						this.$set(e, 'value', e.ckbm)
-					})
-				}
-			},
-			// 组织信息下拉框
-			async _getOrganizationInfo () {
-				let res = await getOrganizationInfo()
-				if (res.code === 1) {
-					this.range1 = [...res.result]
-					this.range1.map(e => {
-						this.$set(e, 'text', e.kczzmc)
-						this.$set(e, 'value', e.kczzbm)
-					})
-				}
-			},
-			// 查询一级表格
-			toSearch () {
-				this.queryParams1 = {
-					pageSize: 10,
-					pageNum: 1
-				}
-				this.currentPage1 = 1
-				this.dataList2 = []
-				this.pkId = ''
-				this._receiptPage()
-			},
-			// 一级表格接口
-			async _receiptPage () {
-				let res = await receiptPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
-				if (res.code === 1) {
-					this.dataList1 = [...res.result]
-					this.totalCount1 = Number(res.totalElements)
-					this.queryParams1.pageSize = Number(res.pageSize)
-					this.queryParams1.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-				this._getWarehouseInfo()
-				this._getOrganizationInfo()
-			},
-			// 二级表格接口
-			async _receiptBillPage () {
-				let res = await receiptBillPage(this.val2, this.pkObj.djid, this.queryParams2.pageNum + '', this.queryParams2.pageSize + '')
-				if (res.code === 1) {
-					res.result.map(el => {
-						this.$set(el, 'checked', true)
-					})
-					this.dataList2 = [...res.result]
-					this.checkArr = [...this.dataList2]
-					this.checkArrActive = true
-					this.totalCount2 = Number(res.totalElements)
-					this.queryParams2.pageSize = Number(res.pageSize)
-					this.queryParams2.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 一级表格切换分页
-			handlePageChange1(page) {
-				this.queryParams1.pageNum = page
-				this.currentPage1 = page
-				this.dataList2 = []
-				this.pkId = ''
-				this._receiptPage()
-			},
-			// 二级表格切换分页
-			handlePageChange2(page) {
-				this.queryParams2.pageNum = page
-				this.currentPage2 = page
-				this._receiptBillPage()
-			},
-			// 点击一级表格一行加载二级表格
-			toCollapse (e) {
-				this.pkId = this.pkId === e.djid ? '' : e.djid
-				this.pkObj = this.pkId === e.djid ? e : {}
-				this.val2 = ''
-				this.dataList2 = []
-				if (this.pkId === e.djid) {
-					this.queryParams2 = {
-						pageSize: 200,
-						pageNum: 1
-					}
-					this.currentPage2 = 1
-					this._receiptBillPage()
-				}
-			},
-			// 二级表格查询
-			toSearch2 () {
-				this.queryParams2 = {
-					pageSize: 200,
-					pageNum: 1
-				}
-				this.currentPage2 = 1
-				this._receiptBillPage()
-			},
-			// 二级表格多选
-			toCheck2 (e) {
-				e.checked = !e.checked
-				this.checkArr = this.dataList2.filter(el => el.checked === true)
-				if (this.checkArr.length === this.dataList2.length) {
-					this.checkArrActive = true
-				}
-			},
-			// 二级表格全选
-			selectAll () {
-				this.checkArrActive = !this.checkArrActive
-				this.dataList2.map(el => {
-					el.checked = this.checkArrActive
-				})
-				this.checkArr = this.dataList2.filter(el => el.checked === true)
-			},
-			// 二级表格详情修改接口
-			async _receiptBillUpdate (e) {
-				try {
-					let res = await receiptBillUpdate(e)
-					if (res.code === 1) {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			// 收货数量和收货库位名称单行修改
-			updateNumkw (e) {
-				let arr = []
-				let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
-				let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
-				arr.push(obj)
-				this._receiptBillUpdate(arr)
-			},
-			// 修改调出仓库弹窗
-			checkWarehouse (type, title, e) {
-				if (type === 1) {
-					this.modalObj = {type: type, title: title, id: e.flid}
-					this.value = e.ckbm
-					this.show = true
-				} else if (type === 2 && this.checkArr.length > 0) {
-					this.modalObj = {type: type, title: title}
-					this.show = true
-				}
-			},
-			// 修改调出仓库确定
-			modalConfirm () {
-				if ((this.modalObj.type === 1 || this.modalObj.type === 2) && this.value === '') {
-					uni.showToast({
-						title: '请设置收货仓库',
-						icon: 'none'
-					})
-					return
-				}
-				if (this.modalObj.type === 2 && this.val3 === '') {
-					uni.showToast({
-						title: '请设置收货库位',
-						icon: 'none'
-					})
-					return
-				}
-				let mc = ''
-				this.range.map(el => {
-					if (el.value === this.value) {
-						mc = el.text
-					}
-				})
-				let arr = []
-				if (this.modalObj.type === 1) {
-					this.dataList2.map(e => {
-						if (e.flid === this.modalObj.id) {
-							e.ckbm = this.value
-							e.ckmc = mc
-							let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
-							let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
-							arr.push(obj)
-						}
-					})
-				} else if (this.modalObj.type === 2) {
-					this.dataList2.map(e => {
-						if (e.checked) {
-							e.ckbm = this.value
-							e.ckmc = mc
-							e.kwmc = this.val3
-							let {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh} = {...e}
-							let obj = {flid, flxh, ywrq, shsl, zzbm, ckmc, ckbm, kwbm, kwmc, bz, btbz, djid, djbh}
-							arr.push(obj)
-						}
-					})
-				}
-				this.show = false
-				this._receiptBillUpdate(arr)
-			},
-			// 点击确认收货按钮
-			async _receiptBillConfirm () {
-				this.disabled = true
-				if (!this.checkArr.length) {
-					this.disabled = false
-					return
-				}
-				try {
-					let arr = []
-					this.checkArr.map(el => {
-						let {djid, djbh, ywrq, shsl, zzbm, ckbm, kwmc, flid, flxh, bz, btbz} = {...el}
-						let obj = {djid, djbh, ywrq, shsl, zzbm, ckbm, kwmc, flid, flxh, bz, btbz}
-						arr.push(obj)
-					})
-					let res = await receiptBillConfirm(arr)
-					if (res.code === 1) {
-						this.queryParams2 = {
-							pageSize: 200,
-							pageNum: 1
-						}
-						this.currentPage2 = 1
-						this._receiptBillPage()
-						// uni.showToast({
-						// 	title: res.desc,
-						// 	icon: 'none'
-						// })
-					} else {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-					this.disabled = false
-				} catch (e) {
-					this.disabled = false
-				}
-			},
-			// 详情弹窗
-			getDetails (type,e) {
-				this.delShow = !this.delShow
-				this.detailObj = {type: type, data:e}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.mgr30
-	margin-right 30rpx
-.select_wraper
-	/deep/ .uni-select__input-box
-		height 30px
-	/deep/ .uni-select__selector
-		z-index 11
-	/deep/ .uni-select
-		height: 30px;
-		min-height: 30px;
-		line-height: 30px;
-		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
-		border-radius: 6px;
-	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
-		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
-.zd-th
-	font-size: 12px;
-	line-height: 13px;
-	height: 36px;
-</style>
diff --git a/pages/management/receive-confirm_241107.vue b/pages/management/receive-confirm_241107.vue
deleted file mode 100644
index 19a12bf..0000000
--- a/pages/management/receive-confirm_241107.vue
+++ /dev/null
@@ -1,611 +0,0 @@
-<template>
-	<view class="content">
-		<nav-bar title="收货确认"></nav-bar>
-		<view class="search-confirm-wrap">
-			<view class="zd-row">
-				<view class="zd-col-24 zd-row jcflexstart">
-					<view class="zd-col-11"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
-					<view class="zd-col-11 select_wraper mgl10">
-						<zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
-					</view>
-				</view>
-				<button class="confirm-button" @tap="toSearch">查询</button>
-				<button class="confirm-button confirm-button_1" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(3, '', '')">一键设置仓库</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
-				<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" :disabled="disabled1" @tap="_receiptBillConfirm">收货确认</button>
-			</view>
-		</view>
-		<view class="zd-row jcflexstart table-title_wraper">收货确认</view>
-		<view class="grid-wrap">
-			<view class="zdrow-wrap">
-				<view class="zd-row sticky zd-th-wraper">
-					<view class="zd-col-1 zd-th"><text>序号</text></view>
-					<view class="zd-col-3 zd-th"><text class="fontcol1">送货单号</text></view>
-					<view class="zd-col-2 zd-th"><text>送货日期</text></view>
-					<view class="zd-col-2 zd-th"><text>提交时间</text></view>
-					<view class="zd-col-2 zd-th"><text>采购公司</text></view>
-					<view class="zd-col-2 zd-th"><text>所属厂区</text></view>
-					<view class="zd-col-2 zd-th"><text>供应商编码</text></view>
-					<view class="zd-col-2 zd-th"><text>供应商</text></view>
-					<view class="zd-col-2 zd-th"><text>到货日期</text></view>
-					<view class="zd-col-4 zd-th"><text>审核结果</text></view>
-					<view class="zd-col-2 zd-th">更多</view>
-				</view>
-				<view class="zd-td-wraper" v-for="(e, i) in dataList" :key="e.id">
-					<view class="zd-row" @tap="loadSubData(e)">
-						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
-						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.tjsj}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.cggs}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.sscq}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.gysbm}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.gys}}</text></view>
-						<view class="zd-col-2 zd-td"><text>{{e.dhrq}}</text></view>
-						<view class="zd-col-4 zd-td"><text>{{e.shjg}}</text></view>
-						<view class="zd-col-2 zd-td" @tap.stop="getDetails(4,e)">
-							<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
-						</view>
-					</view>
-					<!-- 二级表格start -->
-					<view v-if="e.subData.length > 0" class="zd-sec-wraper pd0">
-						<view class="table-wrap">
-							<table class="grid-table">
-								<thead>
-									<tr>
-										<th>序号</th>
-										<th>
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
-											</view>
-										</th>
-										<th><text class="fontcol1">采购订单号</text></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="(el, j) in e.subData" :key="el.id">
-										<td>{{j+1}}</td>
-										<td @tap="toSubCheckbox(e, el)">
-											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
-											</view>
-										</td>
-										<td><view class="underline fontcol1" @tap="showPop(1, e, el)">{{el.cgbh}}</view></td>
-										<td>{{el.wlbm}}</td>
-										<td>{{el.wlmc}}</td>
-										<td>{{el.jldw}}</td>
-										<td>{{el.ddsl}}</td>
-										<td>{{el.wlzs}}</td>
-										<td>{{el.bcshsl}}</td>
-										<td>{{el.zzmc}}</td>
-										<td>{{['否', '是'][Number(el.sfzj)]}}</td>
-										<td><input class="td_input" type="number" v-model="el.shsl"  @blur="updateNumkw(el)" /></td>
-										<td @tap.stop="showPop(0, e, el)">
-											<view class="zd-row td_change">
-												<uni-icons type="shop" size="16" color="#fff"></uni-icons>
-												<view class="mgl10">{{el.ckbm}}</view>
-											</view>
-										</td>
-										<td>{{el.ckmc}}</td>
-										<td>{{el.kwmc}}</td>
-										<td>{{el.num}}</td>
-										<td @tap.stop="getDetails(4,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>
-									</tr>
-								</tbody>
-							</table>
-						</view>
-					</view>
-					<!-- 二级表格end -->
-				</view>
-			</view>
-			<view class="zd-row jcenter pd20">
-				<pagination v-show="dataList.length > 0" :total="totalCount1" :page-size="queryParams1.pageSize" :current-page="currentPage1" @page-change="handlePageChange1" />
-			</view>
-		</view>
-		<view class="footer"></view>
-		<grid-detail :show="delShow" :data="detailObj" @closeDetail="delShow=false"></grid-detail>
-		<view class="pop-wraper" :class="{'popshow': show, 'pophide': !show}">
-			<view v-if="type === 0" class="allwidth pop-title">修改收货仓库</view>
-			<view v-if="type === 1 || type === 2" class="allwidth pop-title">分配明细</view>
-			<view v-if="type === 3" class="allwidth pop-title">一键设置仓库</view>
-			<view v-if="type === 0" class="zd-row jcenter kwcode_wraper">
-				<view class="zd-col-10 select_wraper">
-					<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
-				</view>
-			</view>
-			<view v-if="type === 1 || type === 2" class="pop-grid-wraper">
-				<view class="zd-row sticky zd-sec-th-wraper zd-pop-th-wraper">
-					<view class="zd-col-2 zd-sec-th"><text>序号</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>物料编号</text></view>
-					<view class="zd-col-5 zd-sec-th"><text>物料名称</text></view>
-					<view class="zd-col-5 zd-sec-th"><text>库位编码</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>数量</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>库存数量</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>单据编号</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>分录序号</text></view>
-					<view class="zd-col-4 zd-sec-th"><text>备注</text></view>
-				</view>
-				<view v-if="type === 1" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
-					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
-					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
-					<view v-if="ele.status" class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.kwbm}}</text></view>
-					<view v-else class="zd-col-5 zd-sec-td zd-pop-td">
-						<scan-input
-						v-model="ele.kwbm"
-						/>
-					</view>
-					<view v-if="ele.status" class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.fpsl}}</text></view>
-					<view v-else class="zd-col-4 zd-sec-td zd-pop-td">
-						<input type="number" class="pop-input" v-model="ele.fpsl">
-					</view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.djbh}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
-				</view>
-				<view v-if="type === 2" class="zd-row zd-td-wraper" v-for="(ele, t) in popData" :key="ele.id">
-					<view class="zd-col-2 zd-sec-td zd-pop-td"><text>{{t+1}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.wlbm}}</text></view>
-					<view class="zd-col-5 zd-sec-td zd-pop-td"><text>{{ele.wlmc}}</text></view>
-					<view class="zd-col-5 zd-sec-td zd-pop-td">
-						<scan-input
-						v-model="ele.kwbm"
-						/>
-					</view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td">
-						<input type="number" class="pop-input" v-model="ele.fpsl">
-					</view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.kcsl}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.djbh}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.flxh}}</text></view>
-					<view class="zd-col-4 zd-sec-td zd-pop-td"><text>{{ele.bz}}</text></view>
-				</view>
-			</view>
-			<view v-if="type === 3" class="kwcode_wraper">
-				<view class="zd-row jcenter">
-					<view class="zd-col-3 pop_label">收货仓库</view>
-					<view class="zd-col-10 select_wraper">
-						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
-					</view>
-				</view>
-			</view>
-			<view class="mgb20 zd-row jcenter">
-				<view class="zd-col-10 zd-row">
-					<button class="confirm-button confirm-button_cancle mgl0" @tap="show = false">取消</button>
-					<button v-show="type === 0" class="confirm-button mgl0" @tap="modalConfirm">确定</button>
-					<button v-show="type === 1" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_updateAssignDtl">确定</button>
-					<button v-show="type === 2" class="confirm-button mgl0" :class="{'confirm-button_disabled': popData.length === 0}" :disabled="popdisabled" @tap="_stIvtaddAssignDtl">确定</button>
-					<button v-show="type === 3" class="confirm-button mgl0" @tap="_receiptBillDetailSetStor">确定</button>
-				</view>
-			</view>
-		</view>
-		<view v-if="show" class="modal" @click.stop="show = false"></view>
-	</view>
-</template>
-
-<script>
-	import NavBar from '@/components/NavBar.vue'
-	import SearchBox from '@/components/SearchBox.vue'
-	import ScanInput from '@/components/ScanInput.vue'
-	import Pagination from '@/components/Pagination.vue'
-	import GridDetail from '@/components/GridDetail.vue'
-	// import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, viewAssignDtl, warehouseAssignLocation} from '@/utils/mork2.js'
-	// import {updateAssignDtl, receiptBillDetailUpdate, receiptBillDetailSetStor, stIvtaddAssignDtl, receiptBillConfirm} from '@/utils/getData2.js'
-	import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, viewAssignDtl, warehouseAssignLocation, updateAssignDtl, receiptBillDetailUpdate, receiptBillDetailSetStor, stIvtaddAssignDtl, receiptBillConfirm} from '@/utils/getData2.js'
-	export default {
-		components: {
-			NavBar,
-			SearchBox,
-			ScanInput,
-			Pagination,
-			GridDetail
-		},
-		data() {
-			return {
-				val1: '', // 模糊查询
-				value1: '', // 收货组织信息
-				range1: [],
-				totalCount1: 0, // 分页
-				queryParams1:{
-					pageSize: 10,
-					pageNum: 1
-				},
-				currentPage1: 1,
-				dataList: [], // 一级表格数据
-				subCheckData: [], // 二级表格多选数组
-				popData: [], // 二级表格点击物料编码弹出弹窗
-				popdisabled: false,
-				popObj: {}, // 弹窗当前主表格内容
-				show: false, // 弹窗显示布尔值
-				type: '', // 弹窗类型
-				delShow: false, // 详情弹窗布尔值
-				detailObj: {}, // 详情弹窗
-				disabled1: false,
-				value2: '', // 收货仓库信息
-				range2: []
-			};
-		},
-		onLoad () {
-			this.toSearch()
-		},
-		methods: {
-			// 组织信息下拉框
-			async _getOrganizationInfo () {
-				let res = await getOrganizationInfo()
-				if (res.code === 1) {
-					this.range1 = [...res.result]
-					this.range1.map(e => {
-						this.$set(e, 'text', e.kczzmc)
-						this.$set(e, 'value', e.kczzbm)
-					})
-				}
-			},
-			// 仓库下拉框
-			async _getWarehouseInfo () {
-				let res = await getWarehouseInfo()
-				if (res.code === 1) {
-					this.range2 = [...res.result]
-					this.range2.map(e => {
-						this.$set(e, 'text', e.ckmc)
-						this.$set(e, 'value', e.ckbm)
-					})
-				}
-			},
-			// 查询一级表格
-			toSearch () {
-				this.queryParams1 = {
-					pageSize: 10,
-					pageNum: 1
-				}
-				this.currentPage1 = 1
-				this.pkId = ''
-				this._receiptPage()
-			},
-			// 一级表格接口
-			async _receiptPage () {
-				let res = await receiptPage(this.val1, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
-				if (res.code === 1) {
-					res.result.map(el => {
-						this.$set(el, 'checked', false)
-						this.$set(el, 'subData', [])
-						this.$set(el, 'subAllChecked', false)
-					})
-					this.dataList = [...res.result]
-					this.totalCount1 = Number(res.totalElements)
-					this.queryParams1.pageSize = Number(res.pageSize)
-					this.queryParams1.pageNum = Number(res.pageNum)
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-				this._getWarehouseInfo()
-				this._getOrganizationInfo()
-			},
-			// 一级表格切换分页
-			handlePageChange1(page) {
-				this.queryParams1.pageNum = page
-				this.currentPage1 = page
-				this.subCheckData = []
-				this._receiptPage()
-			},
-			// 点击一级表格一行加载二级表格
-			loadSubData (e) {
-				this.subCheckData = this.subCheckData.filter(item1 => !e.subData.some(item2 => item2.id === item1.id))
-				if (e.subData.length > 0) {
-					e.subData = []
-				} else if (e.subData.length === 0) {
-					this._receiptBillDetailPage(e)
-				}
-				e.subAllChecked = false
-			},
-			// 二级表格接口
-			async _receiptBillDetailPage (e) {
-				let res = await receiptBillDetailPage(this.val1, e.djid, '1', '200')
-				if (res.code === 1) {
-					res.result.map(el => {
-						this.$set(el, 'subChecked', false)
-					})
-					this.dataList.map(el => {
-						if (el.djid === e.djid) {
-							el.subData = [...res.result]
-						}
-					})
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 二级表格全选
-			toSubAllCheckbox (e) {
-				e.subAllChecked = !e.subAllChecked
-				e.subData.map(el => {
-					el.checked = e.subAllChecked 
-				})
-				if (e.subAllChecked) {
-					this.subCheckData = this.subCheckData.concat(e.subData)
-					for (let i = 0; i < this.subCheckData.length; i++) {
-						for (let j = i + 1; j < this.subCheckData.length; j++) {
-							if (this.subCheckData[i].id === this.subCheckData[j].id) {
-								this.subCheckData.splice(j, 1)
-								j--
-							}
-						}
-					}
-				} else if (!e.subAllChecked) {
-					this.subCheckData = this.subCheckData.filter(item1 => !e.subData.some(item2 => item2.id === item1.id))
-				}
-			},
-			// 二级表格多选
-			toSubCheckbox (e,el) {
-				if (el.checked) {
-					this.$set(el, 'checked', false)
-					this.subCheckData = this.subCheckData.filter(item => item.id !== el.id)
-				} else if (!el.checked)  {
-					this.$set(el, 'checked', true)
-					this.subCheckData.push(el)
-				}
-				let arr = e.subData.filter(ele => ele.checked === true)
-				e.subAllChecked = arr.length === e.subData.length
-			},
-			showPop (type, e, obj) {
-				this.type = type
-				if (type === 0) { // 修改二级表格单行收货仓库
-					this.show = true
-					this.popObj = {id: e.djid, iid: obj.id}
-				} else if (type === 1) { // 点击二级表格行中的物料编号显示弹窗
-					this._viewAssignDtl(e, obj)
-				} else if (type === 2) { // 点击库位分配按钮显示弹窗
-					if (!this.subCheckData.length) return
-					this._warehouseAssignLocation()
-				} else if (type === 3) { // 点击一键设置仓库按钮
-					if (!this.subCheckData.length) return
-					this.show = true
-				}
-			},
-			// 点击二级表格行中的物料编号，弹窗加载表格
-			async _viewAssignDtl (e, obj) {
-				let res = await viewAssignDtl(obj)
-				if (res.code ===1) {
-					this.popData = [...res.result]
-					this.sortArr(this.popData)
-					this.popObj = e
-					this.show = true
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 按单据编号排序，单据编号相同按照分录序号排序
-			sortArr (arr) {
-				arr.sort((a, b) => {
-				  if (a.djbh !== b.djbh) {
-				    return a.djbh < b.djbh ? -1 : 1
-				  } else {
-				    return a.flxh < b.flxh ? -1 : 1
-				  }
-				})
-			},
-			// 点击二级表格行中的物料编号，弹窗加载表格 -> 点击确定按钮
-			async _updateAssignDtl () {
-				this.popdisabled = true
-				if (this.popData.length === 0) {
-					this.popdisabled = false
-					return
-				}
-				try {
-					let res = await updateAssignDtl(this.popData)
-					if (res.code === 1) {
-						this.show = false
-						this._receiptBillDetailPage(this.popObj)
-					}
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-					this.popdisabled = false
-				} catch (e) {
-					this.popdisabled = false
-				}
-			},
-			// 分配库位弹窗表格
-			async _warehouseAssignLocation () {
-				let res = await warehouseAssignLocation(this.subCheckData)
-				if (res.code ===1) {
-					this.popData = [...res.result]
-					this.sortArr(this.popData)
-					this.show = true
-				} else {
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				}
-			},
-			// 修改二级表格单行收货数量
-			updateNumkw (e) {
-				let arr = []
-				arr.push(e)
-				this._receiptBillDetailUpdate(arr)
-			},
-			// 修改调出仓库确定
-			modalConfirm () {
-				if (this.value2 === '') {
-					uni.showToast({
-						title: '请设置收货仓库',
-						icon: 'none'
-					})
-					return
-				}
-				let mc = ''
-				this.range2.map(el => {
-					if (el.value === this.value2) {
-						mc = el.text
-					}
-				})
-				let arr = []
-				this.dataList.map(e => {
-					if (e.djid === this.popObj.id) {
-						e.subData.map(el => {
-							if (el.id === this.popObj.iid) {
-								el.ckbm = this.value2
-								el.ckmc = mc
-								arr.push(el)
-								this.show = false
-								this._receiptBillDetailUpdate(arr)
-							}
-						})
-					}
-				})
-			},
-			// 二级表格单行收货数量和收货仓库接口
-			async _receiptBillDetailUpdate (e) {
-				try {
-					let res = await receiptBillDetailUpdate(e)
-					if (res.code === 1) {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-					this.value2 = ''
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			// 一键设置仓库弹窗确定按钮
-			async _receiptBillDetailSetStor () {
-				if (this.value2 === '') {
-					uni.showToast({
-						title: '请设置收货仓库',
-						icon: 'none'
-					})
-					return
-				}
-				this.show = false
-				try {
-					let res = await receiptBillDetailSetStor(this.value2, this.subCheckData)
-					uni.showToast({
-						title: res.desc,
-						icon: 'none'
-					})
-				} catch (e) {
-					console.log(e)
-				}
-			},
-			// 分配库位弹窗表格 -> 点击确定按钮
-			async _stIvtaddAssignDtl () {
-				this.popdisabled = true
-				if (this.popData.length === 0) {
-					this.popdisabled = false
-					return
-				}
-			  try {
-				let res = await stIvtaddAssignDtl(this.popData)
-				if (res.code === 1) {
-					this.show = false
-					this.checkData = []
-					this.subCheckData = []
-					this._receiptPage()
-				}
-				uni.showToast({
-					title: res.desc,
-					icon: 'none'
-				})
-				this.popdisabled = false
-			  } catch (e) {
-				this.popdisabled = false
-			  }
-			},
-			// 点击收货确认按钮
-			async _receiptBillConfirm () {
-				this.disabled1 = true
-				if (!this.subCheckData.length) {
-					this.disabled1 = false
-					return
-				}
-				try {
-					let res = await receiptBillConfirm(this.subCheckData)
-					if (res.code === 1) {
-						this.disabled1 = false
-						this.checkData = []
-						this.subCheckData = []
-						this._receiptPage()
-					} else {
-						this.disabled1 = false
-						uni.showToast({
-							title: res.desc,
-							icon: 'none'
-						})
-					}
-				} catch (e) {
-					this.disabled1 = false
-				}
-			},
-			// 详情弹窗
-			getDetails (type,e) {
-				this.delShow = !this.delShow
-				this.detailObj = {type: type, data:e}
-			}
-		}
-	}
-</script>
-
-<style lang="stylus" scoped>
-@import '../../common/style/mixin.styl';
-.confirm-button_1
-	min-width 100px
-.select_wraper
-	/deep/ .uni-select__input-box
-		height 30px
-	/deep/ .uni-select__selector
-		z-index 11
-	/deep/ .uni-select
-		height: 30px;
-		min-height: 30px;
-		line-height: 30px;
-		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
-		border-radius: 6px;
-	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
-		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
-.zd-th
-	font-size: 12px;
-	line-height: 13px;
-	height: 36px;
-</style>
diff --git a/pages/management/receive-confirm_new.vue b/pages/management/receive-confirm_new.vue
index 7016941..a847f31 100644
--- a/pages/management/receive-confirm_new.vue
+++ b/pages/management/receive-confirm_new.vue
@@ -36,7 +36,9 @@
 					<view class="zd-row" @tap="loadSubData(e)">
 						<view class="zd-col-1 zd-td"><text>{{i+1}}</text></view>
 						<view class="zd-col-1 zd-td" @tap.stop="toCheckbox(e)">
-							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}"></view>
+							<view class="zd-checkbox" :class="{'zd-checkbox_active': e.checked}">
+								<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+							</view>
 						</view>
 						<view class="zd-col-3 zd-td fontcol1"><text>{{e.djbh}}</text></view>
 						<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
@@ -72,7 +74,9 @@
 										<th>序号</th>
 										<th>
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': e.subAllChecked}" @tap="toSubAllCheckbox(e)">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</th>
 										<th><text class="fontcol1">采购订单号</text></th>
@@ -99,7 +103,9 @@
 										<td>{{j+1}}</td>
 										<td @tap="toSubCheckbox(e, el)">
 											<view class="zd-row jcenter">
-												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
+												<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}">
+													<uni-icons type="checkmarkempty" size="12" class="checkbox_icon"></uni-icons>
+												</view>
 											</view>
 										</td>
 										<td><view class="underline fontcol1" @tap="showPop(3, e, el)">{{el.cgbh}}</view></td>
@@ -667,7 +673,6 @@
 				uni.showModal({
 					title: '提示',
 					content: '是否确认删除？',
-					cancelColor: '#fff',
 					confirmColor: '#fff',
 					success: (res) => {
 						if (res.confirm) {
@@ -715,20 +720,11 @@
 		min-height: 30px;
 		line-height: 30px;
 		padding: 0 2px 0 12px;
-		border: 1px solid #4980bd;
-		background-color: rgba(45,88,184,0.1);
+		border: 1px solid #dcdfe6;
+		background-color: #fff;
 		border-radius: 6px;
 	/deep/ .uni-select__input-placeholder, /deep/ .uni-select__input-text
 		font-size 13px
-	/deep/ .uni-select__selector
-		background-color #071F3E
-		border-color #0c3162
-	/deep/ .uni-popper__arrow
-		border-bottom-color #0c3162
-		&:after
-			border-bottom-color #071F3E
-	/deep/ .uni-select__selector-item
-		color #fff
 .zd-th
 	font-size: 12px;
 	line-height: 13px;
diff --git a/static/images/RF01.png b/static/images/RF01.png
deleted file mode 100644
index 18a06e7..0000000
Binary files a/static/images/RF01.png and /dev/null differ
diff --git a/static/images/RF02.png b/static/images/RF02.png
deleted file mode 100644
index 972a492..0000000
Binary files a/static/images/RF02.png and /dev/null differ
diff --git a/static/images/theme/1/header_bg.jpg b/static/images/theme/1/header_bg.jpg
new file mode 100644
index 0000000..442986f
Binary files /dev/null and b/static/images/theme/1/header_bg.jpg differ
diff --git a/static/images/theme/header_bg.png b/static/images/theme/header_bg.png
new file mode 100644
index 0000000..870de6c
Binary files /dev/null and b/static/images/theme/header_bg.png differ
diff --git a/static/images/theme/login_bg.jpg b/static/images/theme/login_bg.jpg
new file mode 100644
index 0000000..fe1371f
Binary files /dev/null and b/static/images/theme/login_bg.jpg differ
diff --git a/static/images/theme/login_header_bg.png b/static/images/theme/login_header_bg.png
new file mode 100644
index 0000000..ba21e00
Binary files /dev/null and b/static/images/theme/login_header_bg.png differ
diff --git a/static/images/theme/logo.png b/static/images/theme/logo.png
new file mode 100644
index 0000000..437c39a
Binary files /dev/null and b/static/images/theme/logo.png differ
diff --git a/static/images/theme/menu/CGRKD.png b/static/images/theme/menu/CGRKD.png
new file mode 100644
index 0000000..9e2585b
Binary files /dev/null and b/static/images/theme/menu/CGRKD.png differ
diff --git a/static/images/theme/menu/CGSHD.png b/static/images/theme/menu/CGSHD.png
new file mode 100644
index 0000000..1db6565
Binary files /dev/null and b/static/images/theme/menu/CGSHD.png differ
diff --git a/static/images/theme/menu/CGTHD.png b/static/images/theme/menu/CGTHD.png
new file mode 100644
index 0000000..e888a26
Binary files /dev/null and b/static/images/theme/menu/CGTHD.png differ
diff --git a/static/images/theme/menu/CGTLD.png b/static/images/theme/menu/CGTLD.png
new file mode 100644
index 0000000..4142f7d
Binary files /dev/null and b/static/images/theme/menu/CGTLD.png differ
diff --git a/static/images/theme/menu/DBCKD.png b/static/images/theme/menu/DBCKD.png
new file mode 100644
index 0000000..ba5fbcc
Binary files /dev/null and b/static/images/theme/menu/DBCKD.png differ
diff --git a/static/images/theme/menu/DBRKD.png b/static/images/theme/menu/DBRKD.png
new file mode 100644
index 0000000..b06dada
Binary files /dev/null and b/static/images/theme/menu/DBRKD.png differ
diff --git a/static/images/theme/menu/DBWHD.png b/static/images/theme/menu/DBWHD.png
new file mode 100644
index 0000000..5f06944
Binary files /dev/null and b/static/images/theme/menu/DBWHD.png differ
diff --git a/static/images/theme/menu/EASCGRKD.png b/static/images/theme/menu/EASCGRKD.png
new file mode 100644
index 0000000..9da5177
Binary files /dev/null and b/static/images/theme/menu/EASCGRKD.png differ
diff --git a/static/images/theme/menu/LLCKD.png b/static/images/theme/menu/LLCKD.png
new file mode 100644
index 0000000..51d3574
Binary files /dev/null and b/static/images/theme/menu/LLCKD.png differ
diff --git a/static/images/theme/menu/LLTHD.png b/static/images/theme/menu/LLTHD.png
new file mode 100644
index 0000000..6c5b68e
Binary files /dev/null and b/static/images/theme/menu/LLTHD.png differ
diff --git a/static/images/theme/menu/PD.png b/static/images/theme/menu/PD.png
new file mode 100644
index 0000000..fd32bb9
Binary files /dev/null and b/static/images/theme/menu/PD.png differ
diff --git a/static/images/theme/menu/SHQRD.png b/static/images/theme/menu/SHQRD.png
new file mode 100644
index 0000000..4de6e93
Binary files /dev/null and b/static/images/theme/menu/SHQRD.png differ
diff --git a/static/images/theme/menu/WWFLD.png b/static/images/theme/menu/WWFLD.png
new file mode 100644
index 0000000..cc28762
Binary files /dev/null and b/static/images/theme/menu/WWFLD.png differ
diff --git a/static/images/theme/menu/WWRKD.png b/static/images/theme/menu/WWRKD.png
new file mode 100644
index 0000000..77d0e34
Binary files /dev/null and b/static/images/theme/menu/WWRKD.png differ
diff --git a/static/images/theme/menu/XSCKD.png b/static/images/theme/menu/XSCKD.png
new file mode 100644
index 0000000..1c7ffe3
Binary files /dev/null and b/static/images/theme/menu/XSCKD.png differ
diff --git a/static/images/theme/menu/YC.png b/static/images/theme/menu/YC.png
new file mode 100644
index 0000000..c46f392
Binary files /dev/null and b/static/images/theme/menu/YC.png differ
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index e42bfaf..6fb71cd 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -285,7 +285,7 @@
 	}
 
 	.uni-button-color {
-		color: #007aff;
+		color: #ff6a00;
 	}
 
 	.uni-dialog-input {