Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp

common/style/new_style.css

@@ -2028,15 +2028,22 @@ button::after {
 .card_itemCode {
 	font-size: 36rpx;
 	/* font-weight: 500; */
-	padding: 10rpx;
+	padding: 5rpx 10rpx;
 }
 
 .card_itemName {
 	color: #909399;
 	font-size: 30rpx;
- 	padding: 0rpx 20rpx;
+ 	padding: 5rpx 20rpx;
+}
+
+.card_ProdLine {
+	color: #909399;
+	font-size: 30rpx;
+ 	padding: 5rpx 30rpx;
 }
 
+
 /* .std_pack {
 	display: flex;
 	flex-direction: row;
@@ -2051,6 +2058,7 @@ button::after {
 
 .card_content {
 	font-size: 32rpx;
+	padding: 5px;
 }
 
 .card_icon_normal {
@@ -2061,35 +2069,43 @@ button::after {
 
 .card_packing_code {
 	color: #3315EB;
+	padding: 5px;
 }
 
 .card_packing_code_content {
 	font-size: 32rpx;
+	padding: 5px;
 }
 
 .card_batch {
 	color: #00B574;
+	padding: 5px;
 }
 
 
 .card_batch_content {
 	font-size: 32rpx;
+	padding: 5px;
 }
 
 .card_business {
 	color: #F1A532;
+	padding: 5px;
 }
 
 .card_business_content {
 	font-size: 32rpx;
+	padding: 5px;
 }
 
 .card_location {
 	color: #00A3FF;
+	padding: 5px;
 }
 
 .card_location_content {
 	font-size: 32rpx;
+	padding: 5px;
 }
 
 .card_supportCode {

mycomponents/balance/batch.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="card_view uni-inline-item">
+	<view class="card_view ">
 		<text class="card_batch card_content ">批次</text>
 		<text class="card_content ">{{batch}}</text>
 	</view>

mycomponents/balance/location.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="card_view uni-inline-item">
+	<view class="card_view ">
 		<text class="card_location card_content ">{{title}}</text>
 		<text class="card_content ">{{locationCode}}</text>
 	</view>

mycomponents/balance/pack.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="card_view uni-inline-item">
+	<view class="card_view">
 		<text class="card_packing_code card_content ">箱码</text>
 		<text class="card_content ">{{packingCode}}</text>
 	</view>

mycomponents/recommend/recommend.vue

@@ -17,9 +17,9 @@
 					:handleQty="Number(detail.handleQty)" :isShowStdPack="false">
 				</compare-qty>
 				<view class="uni-flex uni-row" style="vertical-align:center">
-					<text style="font-size: 10rpx;color: #2979ff; " 
+					<text style="font-size: 30rpx;color: #2979ff; " 
 						@click="copy">复制采购</text>
-					<text style="font-size: 10rpx;color: #2979ff;" @click="copyPro">|制品</text>
+					<text style="font-size: 30rpx;color: #2979ff;" @click="copyPro">|制品</text>
 				</view>
 			</view>
 		</view>

pages/issue/coms/comIssueDetailCard.vue

@@ -9,11 +9,9 @@
 					<template v-slot:title>
 						<!-- 物品 -->
 						<item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
-						<view class="" style="margin-left: 30rpx;font-size: 30rpx;">
+
-							生产线 : {{item.productionLineCode}}
+						<view class="card_ProdLine">
-						</view>
+							{{item.productionLineCode}} | {{item.workStationCode}}
-						<view class="" style="margin-left: 30rpx;font-size: 30rpx;">
-							工位 : {{item.workStationCode}}
 						</view>
 					</template>
 					<u-line />