样式和数据

common/style/layout.css

@@ -24,8 +24,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 .content{
 	width: 100%;
 	min-height: 100%;
-	background: center / 100% auto url(./static/images/page_bg.jpg) no-repeat;
-	background-color: #040d1e;
+	background: top center / 100% auto url(./static/images/page_bg.jpg) repeat-y;
+	/* background-color: #040d1e; */
 }
 .footer{
 	width: 100%;
@@ -36,8 +36,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	margin: 10px auto 0 auto;
 	border-radius: 6px;
 	padding: 10px;
-	background: linear-gradient(to right, rgba(8, 38, 68, 0.5) 1%, rgba(8, 38, 68, 0.98) 100%);
-	border: 1px solid #0490DD;
+	background-color: rgba(1, 114, 195, 40%);
+	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;
 }
 .search-label{
@@ -118,8 +118,11 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	width: calc(100% - 20px);
 	min-height: calc(100vh - 145px);
 	margin: 0 auto;
-	padding-top: 5px;
-	background: center / 100% 100% url(./static/images/bg-task-r2.png) no-repeat;
+	padding: 10px 0;
+	border: 1px solid #01c2f3;
+	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%);
 }
 .zdrow-wrap {
 	width: 100%;
@@ -131,7 +134,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 .table-wrap {
 	width: 100%;
 	margin: 0 auto;
-	padding: 5px 0 10px 0;
+	padding: 15px 0 10px 0;
 	overflow-y: auto;
 }
 .grid-table {
@@ -146,15 +149,16 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	z-index: 6;
 }
 .grid-table th{
-	font-size: 13px;
+	font-size: 12px;
 	line-height: 20px;
 	height: 30px;
-	color: #AFBED8;
-	font-weight: bold;
+	color: #fff;
+	font-weight: 700;
 	padding: 5px 10px;
 	text-align: center;
 	white-space: nowrap;
-	background-color: #673939;
+	background-color: #3F6ACA;
+	border-bottom: 1px solid #9fd3ff;
 }
 .grid-table td{
 	font-size: 12px;
@@ -163,26 +167,32 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	color: #fff;
 	padding: 5px 10px;
 	text-align: center;
-	background-color: #382d4f;
-	border-bottom: 1px solid #C2563E;
+	background-color: rgba(63,106,202,0.3);
+	border-bottom: 1px solid #9fd3ff;
 	white-space: nowrap;
 }
 .grid-table th:first-child, .grid-table td:first-child {
 	position: sticky;
 	left: 0;
 	z-index: 5;
+	min-width: 46px;
+	max-width: 46px;
+	white-space: nowrap;
+}
+.grid-table td:first-child, .grid-table td:nth-child(2), .grid-table td:last-child {
+	background-color: #2951ac;
 }
 .grid-table th:last-child, .grid-table td:last-child {
 	position: sticky;
 	right: 0;
 	z-index: 5;
-	box-shadow: -2px 0px 2px 0px rgba(19, 19, 19, 30%);
+	box-shadow: inset 2px 0px 2px 0px rgba(19, 19, 19, 30%);
 }
 .grid-table th:nth-child(2), .grid-table td:nth-child(2) {
 	position: sticky;
 	left: 46px;
 	z-index: 5;
-	box-shadow: 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;
@@ -233,12 +243,13 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 }
 .zd-th-wraper{
 	width: 100%;
-	background: #142954 center / 100% 100% url(./static/images/grid_bg.png) no-repeat;
+	/* background: #142954 center / 100% 100% url(./static/images/grid_bg.png) no-repeat; */
 	overflow: hidden;
 }
 .zd-sec-th-wraper {
 	width: 100%;
-	background-color: #673939;
+	background-color: #3F6ACA;
+	border-bottom: 1px solid #9fd3ff;
 }
 .zd-td-wraper{
 	width: 100%;
@@ -251,10 +262,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	font-size: 13px;
 	line-height: 15px;
 	height: 30px;
-	color: #AFBED8;
-	font-weight: bold;
-	/* padding: 0 5px; */
+	color: #e1e9f4;
+	font-weight: 700;
 	text-align: center;
+	background: left center / 1px 100% url(./static/images/th_bg.png) repeat-x;
 }
 .zd-sec-th {
 	display: flex;
@@ -265,7 +276,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	height: 30px;
 	color: #fff;
 	/* background-color: #0F1521; */
-	font-weight: bold;
+	font-weight: 700;
 	/* padding: 0 5px; */
 	text-align: center;
 	white-space: nowrap;
@@ -299,10 +310,10 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	line-height: 13px;
 	height: 49px;
 	color: #fff;
-	background-color: rgba(194, 86, 62, 0.2);
+	background-color: rgba(63,106,202,0.3);
+	border-bottom: 1px solid #9fd3ff;
 	padding: 5px 2px;
 	text-align: center;
-	border-bottom: 1px solid #C2563E;
 	word-break: break-all;
 	overflow: hidden;
 }
@@ -326,7 +337,8 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 	background: center / 100% 100% url(./static/images/icon-check2.png) no-repeat;
 }
 .fontcol1 {
-	color: #3CC1FF;
+	color: #58e9ff;
+	font-weight: 700;
 }
 .fontcol2 {
 	color: #000;
@@ -341,7 +353,7 @@ uni-button[disabled]:not([type]), uni-button[disabled][type=default] {
 .zd-sec-wraper {
 	width: 100%;
 	background-color: rgba(63,106,202,0.3);
-	padding: 5px 0px;
+	padding: 15px 0px 0px 0px;
 	border-bottom: 1px solid #7A9FE0;
 	transition: height 0.5s ease;
 }

components/NavBar.vue

@@ -55,11 +55,9 @@
 .header
 	_fj()
 	_wh(100%, 30px)
-	background-color #041427
-	border-bottom 1px solid #13568B
+	background: center / 100% 100% url(../static/images/header_bg_s.png) no-repeat
 	z-index 200
 	padding 0 10px
-	box-shadow: 0 1px 2px 0 RGBA(19, 86, 139, 0.5);
 .page_name
 	_font(22px, 30px, #F6F9FE,700,center)
 	font-family: YouSheBiaoTiHei

pages/login/login.vue

@@ -181,7 +181,7 @@
 	_wh(90%, auto)
 	margin 0 auto
 	text-align center
-	_bis(,'../../static/images/login_bg.png', 100%, 100%,bottom)
+	_bis(,'../../static/images/login_header_bg.png', 100%, 100%,bottom)
 	img
 		_wh(30%, auto)
 .login_wrap

pages/management/alloc-maintenance.vue

@@ -54,10 +54,12 @@
 										<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>
@@ -66,7 +68,11 @@
 								<tbody v-if="pkObj.djzt !== '审核后'">
 									<tr v-for="(el, j) in dataList2" :key="el.id">
 										<td>{{j+1}}</td>
-										<td><view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}" @tap="toCheck2(el)"></view></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.wlbm}}</view></td>
 										<td>{{el.wlmc}}</td>
 										<td>{{el.ggxh}}</td>
@@ -74,9 +80,16 @@
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
 										<td><input class="td_input" type="number" v-model="el.sl"  @blur="_allocationBillUpdate(el)" /></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.dckwbm" @handleChange="_allocationBillUpdate(el)" />
+												<scan-input v-model="el.drkwbm" @handleChange="_allocationBillUpdate(el)" />
 											</view>
 										</td>
 										<td @tap.stop="checkWarehouse(1, '调出仓库', el)">
@@ -85,15 +98,10 @@
 												<view class="mgl10">{{el.dcckbm}}</view>
 											</view>
 										</td>
+										<td>{{el.dcckmc}}</td>
 										<td>
 											<view class="td_scan_wraper">
-												<scan-input v-model="el.drkwbm" @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>
+												<scan-input v-model="el.dckwbm" @handleChange="_allocationBillUpdate(el)" />
 											</view>
 										</td>
 										<td @tap.stop="openCalendar(1,el)">
@@ -121,10 +129,12 @@
 										<td>{{el.kclx}}</td>
 										<td>{{el.kczt}}</td>
 										<td>{{el.sl}}</td>
-										<td>{{el.dckwbm}}</td>
-										<td>{{el.dcckbm}}</td>
-										<td>{{el.drkwbm}}</td>
 										<td>{{el.drckbm}}</td>
+										<td>{{el.drckmc}}</td>
+										<td>{{el.drkwbm}}</td>
+										<td>{{el.dcckbm}}</td>
+										<td>{{el.drckmc}}</td>
+										<td>{{el.dckwbm}}</td>
 										<td>{{el.jhdrrq}}</td>
 										<td>{{el.jhdcrq}}</td>
 										<td @tap.stop="getDetails(3,el)"><uni-icons type="more-filled" size="14" color="#fff"></uni-icons></td>

pages/management/in-storage.vue

@@ -3,20 +3,20 @@
 		<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
 		<view class="search-confirm-wrap">
 			<view class="zd-row">
-				<view class="zd-col-24 zd-row">
-					<view class="zd-col-8"><search-box v-model="val1" /></view>
-					<view class="zd-col-8 select_wraper">
+				<view class="zd-col-19 zd-row">
+					<view class="zd-col-10"><search-box v-model="val1" /></view>
+					<view class="zd-col-10 select_wraper">
 						<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
 					</view>
-					<view class="zd-col-7 select_wraper">
+					<!-- <view class="zd-col-7 select_wraper">
 						<uni-data-select
 						placeholder="请选择状态"
 						 v-model="value"
 						 :localdata="range"
 						></uni-data-select>
-					</view>
+					</view> -->
+					<button class="confirm-button" @tap="toSearch">查询</button>
 				</view>
-				<button class="confirm-button mgr30" @tap="toSearch">查询</button>
 				<!-- <button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0 || btnActive1}" :disabled="disabled1" @tap="toSure">单据审核</button> -->
 				<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
 			</view>
@@ -73,9 +73,9 @@
 							<view class="zd-col-2 zd-sec-th"><text>{{crType === 'IN'? '已入数量':'已出数量'}}</text></view>
 							<view class="zd-col-2 zd-sec-th"><text>剩余数量</text></view>
 							<view class="zd-col-2 zd-sec-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-1 zd-th"><text>更多</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>操作人</text></view>
+							<view class="zd-col-2 zd-sec-th"><text>操作日期</text></view>
+							<view class="zd-col-1 zd-sec-th"><text>更多</text></view>
 						</view>
 						<view class="zd-row zd-td-wraper" v-for="(el, j) in dataList2" :key="el.id">
 							<view class="zd-col-1 zd-sec-td"><text>{{j+1}}</text></view>
@@ -538,10 +538,14 @@
 .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);

pages/management/receive-confirm.vue

@@ -68,7 +68,11 @@
 								<tbody v-if="pkObj.djzt !== '审核后'">
 									<tr v-for="(el, j) in dataList2" :key="el.id">
 										<td>{{j+1}}</td>
-										<td><view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}" @tap="toCheck2(el)"></view></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>