22

pages/warehouse/enterHouse/addStock.vue

@@ -57,7 +57,7 @@
 			<uni-collapse-item :typeOpen="1" title="" name="collapse1" :open="true" :key="detailOpen"
 				:show-animation="true">
 				<template v-slot:title>
-					<view class="detail-box">
+					<view class="detail-box flex_between">
 						<view data-v-41027c34="" class="uni-collapse-item__title-wrap">
 							<view data-v-41027c34=""
 								class="uni-collapse-item__title-box uni-collapse-item__title-box-base">
@@ -72,13 +72,13 @@
 					</view>
 				</template>
 
-				<u-form labelPosition="left" :model="{ productList: productList }" ref="lisrFormRef" labelWidth="120"
+				<u-form labelPosition="left" :model="{ productList: productList }" ref="lisrFormRef" labelWidth="160"
 					:rules="listRules" errorType="none" labelAlign="right" :labelStyle="{
 						fontSize: '28rpx'
 					}">
 					<view class="listContent">
 						<view class="listBox" v-for="(item, index) in productList" :key="index">
-							<view class="listTit">
+							<view class="listTit flex_between">
 								<view class="name">{{ item.categoryName }}</view>
 								<view class="btn">
 									<u-button v-if="item.isSave" type="primary" size="small" :hairline="true" text="编辑"
@@ -102,7 +102,8 @@
 									</u-form-item>
 								</view>
 								<view class="item">
-									<u-form-item label="批次号" :prop="`productList.${index}.batchNo`" required>
+									<u-form-item label="批次号" :prop="`productList.${index}.batchNo`"
+										class="required-form">
 										<!-- <u--input :disabled="item.isSave" placeholder="请输入" border="surround"
 											v-model="item.batchNo"></u--input> -->
 										<u-input :disabled="item.isSave" placeholder="请输入" style="height: 30px;"
@@ -110,16 +111,16 @@
 									</u-form-item>
 								</view>
 								<view class="item">
-									<u-form-item label="数量" :prop="`productList.${index}.packingQuantity`" required
-										class="aa">
+									<u-form-item label="数量" :prop="`productList.${index}.packingQuantity`"
+										class="aa required-form">
 										<u--input :disabled="item.isSave" placeholder="请输入" border="surround"
 											v-model="item.packingQuantity"
 											@change="computeNum(item, index, true)"></u--input>
 									</u-form-item>
 								</view>
 								<view class="item">
-									<u-form-item label="包装单位" :prop="`productList.${index}.packingUnit`" required
-										class="dd">
+									<u-form-item label="包装单位" :prop="`productList.${index}.packingUnit`"
+										class="dd required-form">
 										<!-- <u--input :disabled="item.isSave" placeholder="请选择" border="surround"
 											v-model="item.packingUnit"
 											@click.native="showPackingUnitPicker(item, index)"></u--input> -->
@@ -132,8 +133,8 @@
 									</u-form-item>
 								</view>
 								<view class="item">
-									<u-form-item label="仓库" :prop="`productList.${index}.warehouseName`" required
-										class="dd ">
+									<u-form-item label="仓库" :prop="`productList.${index}.warehouseName`"
+										class="dd required-form">
 										<!-- 	<u--input :disabled="item.isSave" placeholder="请选择" border="surround"
 											v-model="item.warehouseName"
 											@click.native="showWarehousePicker(index)"></u--input> -->
@@ -158,18 +159,23 @@
 										</view>
 									</u-form-item>
 								</view>
-								<view class="item">
-									<u-form-item label="计量数量"
-										prop="measureQuantity">{{ item.measureQuantity }}</u-form-item>
-								</view>
-								<view class="item">
-									<u-form-item label="计量单位" prop="measureUnit">{{ item.measureUnit }}</u-form-item>
-								</view>
-								<view class="item">
-									<u-form-item label="重量" prop="weight">{{ item.weight }}</u-form-item>
+								<view class="flex_between w100">
+									<view class="item">
+										<u-form-item label="计量数量"
+											prop="measureQuantity">{{ item.measureQuantity }}</u-form-item>
+									</view>
+									<view class="item">
+										<u-form-item label="计量单位"
+											prop="measureUnit">{{ item.measureUnit }}</u-form-item>
+									</view>
 								</view>
-								<view class="item">
-									<u-form-item label="重量单位" prop="weightUnit">{{ item.weightUnit }}</u-form-item>
+								<view class="flex_between w100">
+									<view class="item">
+										<u-form-item label="重量" prop="weight">{{ item.weight }}</u-form-item>
+									</view>
+									<view class="item">
+										<u-form-item label="重量单位" prop="weightUnit">{{ item.weightUnit }}</u-form-item>
+									</view>
 								</view>
 								<view class="item">
 									<u-form-item label="是否拆包"
@@ -181,7 +187,8 @@
 								<view class="timeBox">
 									<u-button class="firstBtn" size="small" type="primary" text="选择时间类型"
 										@click="timeTypeShow = true"></u-button>
-									<u-button type="warning" size="small" :text="`批量设置${curDateTypeLabel[curDateType]}`"
+									<u-button type="warning" size="small"
+										:text="`批量设置${curDateType?curDateTypeLabel[curDateType]:''}`"
 										@click="typeTimeClick(index)"></u-button>
 								</view>
 							</view>
@@ -1808,11 +1815,11 @@
 <style lang="scss" scoped>
 	.mainBox {
 		padding-bottom: 120rpx;
+	}
 
-		/deep/.required-form .u-form-item__body__left__content__label::before {
-			content: '*';
-			color: red;
-		}
+	/deep/.required-form .u-form-item__body__left__content__label::before {
+		content: '*';
+		color: red;
 	}
 
 	.required-form-text {
@@ -1879,8 +1886,6 @@
 
 	.detail-box {
 		position: relative;
-		display: flex;
-		justify-content: space-between;
 		align-items: center;
 
 		/deep/uni-button {
@@ -1939,8 +1944,6 @@
 
 		.listTit {
 			width: 100%;
-			display: flex;
-			justify-content: space-between;
 			align-items: center;
 
 			/deep/uni-button {
@@ -1959,7 +1962,8 @@
 				white-space: nowrap;
 				-o-text-overflow: ellipsis;
 				text-overflow: ellipsis;
-				font-size: 24rpx;
+				font-size: 28rpx;
+				font-weight: bold;
 			}
 
 			.btn {
@@ -2254,4 +2258,9 @@
 	.top-css {
 		border-bottom: 1px solid rgb(207, 204, 204);
 	}
+
+	.flex_between {
+		display: flex;
+		justify-content: space-between;
+	}
 </style>