入库

common/style/layout.styl

@@ -142,30 +142,30 @@ uni-button:after {
 	padding: 14rpx 14rpx 0 14rpx;
 }
 .filter_item {
-	display: flex;
+	// display: flex;
-	align-items: center;
+	// align-items: center;
 	width: 100%;
 	margin-bottom: 10rpx;
 }
 .filter_item:last-child {
-	margin-bottom: 0;
+	// margin-bottom: 0;
 }
 .filter_label_wraper {
-	flex: none;
+	// flex: none;
-	width: 140rpx;
+	// width: 140rpx;
-	text-align:justify;
+	// text-align:justify;
-	text-align-last: justify;
+	// text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
+	// text-justify: inter-ideograph;/*兼容ie*/
 }
 .filter_label {
-	display: block;
+	// display: block;
-	width: 140rpx;
+	// width: 140rpx;
 	line-height: 80rpx;
 	font-size: 28rpx;
 	color: #323232;
-	text-align:justify;
+	// text-align:justify;
-	text-align-last: justify;
+	// text-align-last: justify;
-	text-justify: inter-ideograph;/*兼容ie*/
+	// text-justify: inter-ideograph;/*兼容ie*/
 }
 .filter_label_1 {
 	line-height: 30rpx;
@@ -189,11 +189,11 @@ uni-button:after {
 }
 .filter_input_wraper {
 	/* flex: 1; */
-	width: calc(100% - 170rpx);
+	// width: calc(100% - 170rpx);
 	height: 80rpx;
 	line-height: 80rpx;
 	padding: 5rpx 0;
-	margin-left: 30rpx;
+	// margin-left: 30rpx;
 	display: flex;
 	justify-content: flex-start;
 	align-items: center;

locale/en.json

@@ -6,6 +6,7 @@
 	"utils.no-more": "No more",
 	"button.confirm": "OK",
 	"button.cancel": "Cancel",
+	"button.clear": "Clear",
 	"button.search": "Query",
 	"button.confirm-receipt": "Confirm receipt",
 	"button.confirm-outbound": "Confirm outbound",
@@ -108,6 +109,8 @@
 	"filter.document-type": "Document type",
 	"filter.keywords": "Keywords",
 	"filter.warehouse-area": "Warehouse area",
+	"filter.vehicle-type": "Vehicle type",
+	"filter.layers": "Layers",
 	"grid.number": "No.",
 	"grid.select": "Select",
 	"grid.work-order-number": "Work order number",

locale/id.json

@@ -6,6 +6,7 @@
 	"utils.no-more": "Tidak lagi",
 	"button.confirm": "OK",
 	"button.cancel": "Batalkan",
+	"button.clear": "Hapus",
 	"button.search": "pertanyaan",
 	"button.confirm-receipt": "Konfirmasi penerimaan",
 	"button.confirm-outbound": "Konfirmasi keluar",
@@ -90,10 +91,6 @@
 	"menu.task-management": "Manajemen tugas",
 	"menu.rgv-status-query": "Pertanyaan status RGV",
 	"filter.area": "Daerah",
-	"grid.number": "Nomor",
-	"grid.select": "Pilihan",
-	"filter.keywords": "Kata kunci",
-	"filter.warehouse-area": "Daerah gudang",
 	"filter.point": "Posisi titik",
 	"filter.mother-roll": "Mother roll",
 	"filter.state": "Keadaan",
@@ -110,6 +107,12 @@
 	"filter.virtual-library": "Pustaka Virtual",
 	"filter.remark": "komentar",
 	"filter.document-type": "Jenis dokumen",
+	"filter.keywords": "Kata kunci",
+	"filter.warehouse-area": "Daerah gudang",
+	"filter.vehicle-type": "Jenis kendaraan",
+	"filter.layers": "lapisan",
+	"grid.number": "Nomor",
+	"grid.select": "Pilihan",
 	"grid.work-order-number": "Nomor urutan kerja",
 	"grid.mother-roll-number": "Nomor roll ibu",
 	"grid.sub-roll-number": "Nomor sub roll",

locale/zh-Hans.json

@@ -6,6 +6,7 @@
 	"utils.no-more": "没有更多",
 	"button.confirm": "确定",
 	"button.cancel": "取消",
+	"button.clear": "清空",
 	"button.search": "查询",
 	"button.confirm-receipt": "确认入库",
 	"button.confirm-outbound": "确认出库",
@@ -108,6 +109,8 @@
 	"filter.document-type": "单据类型",
 	"filter.keywords": "关键字",
 	"filter.warehouse-area": "库区",
+	"filter.vehicle-type": "载具类型",
+	"filter.layers": "层数",
 	"grid.number": "序号",
 	"grid.select": "选择",
 	"grid.work-order-number": "工单号",

pages/SecondPhase/EmptyBoxInStore.vue

@@ -6,7 +6,7 @@
 			<view class="zd_wrapper">
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">木箱号</span>
+						<span class="filter_label">{{$t('filter.wooden-box-code')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<link-scan ref="scanChild" @getScanlist="getScanlist"/>
@@ -14,23 +14,23 @@
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">{{$t('grid.point-code')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val3" />
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">层数</view>
+					<view class="filter_label">{{$t('filter.layers')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">清空</button>
+			<button class="zd-col-6 btn-submit btn-default letter-30" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val2 || !val3}" :disabled="disabled" @tap="_twoPdaBoxIn">入库</button>
+			<button class="zd-col-15 btn-submit btn-success letter-30" :class="{'btn-info': !val2 || !val3}" :disabled="disabled" @tap="_twoPdaBoxIn">{{$t('button.storage-confirm')}}</button>
 		</view>
 	</view>
 </template>

pages/SecondPhase/EmptyVehicleInStore.vue

@@ -6,21 +6,21 @@
 			<view class="zd_wrapper">
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">载具号</span>
+						<span class="filter_label">{{$t('filter.vehicle-code')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val1" />
 					</view>
 				</view>
 				<view class="filter_item">
-					<view class="filter_label">载具类型</view>
+					<view class="filter_label">{{$t('filter.vehicle-type')}}</view>
 					<view class="filter_input_wraper">
-						<uni-data-select v-model="index" :localdata="options" @change="selectChange"></uni-data-select>
+						<uni-data-select v-model="index" :placeholder="$t('uni.dataSelect.placeholder')" :emptyTips="$t('uni.dataSelect.emptyTips')" :localdata="options" @change="selectChange"></uni-data-select>
 					</view>
 				</view>
 				<view class="filter_item">
 					<view class="filter_label_wraper">
-						<span class="filter_label">点位</span>
+						<span class="filter_label">{{$t('grid.point-code')}}</span>
 					</view>
 					<view class="filter_input_wraper">
 						<search-box v-model="val2" />
@@ -29,8 +29,8 @@
 			</view>
 		</view>
 		<view class="zd-row submitbar">
-			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">清空</button>
+			<button class="zd-col-6 btn-submit btn-default" @tap="clearUp">{{$t('button.clear')}}</button>
-			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_twoPdaVehicleIn">入库</button>
+			<button class="zd-col-15 btn-submit btn-success" :class="{'btn-info': !val1 || !val2 || !index}" :disabled="disabled" @tap="_twoPdaVehicleIn">{{$t('button.storage-confirm')}}</button>
 		</view>
 	</view>
 </template>