zhongtianhaoyuan 2 anni fa
parent
commit
8f67c2c016
2 ha cambiato i file con 34 aggiunte e 33 eliminazioni
  1. 24 24
      pages/task/audit/salecontract.vue
  2. 10 9
      pages/task/audit/warehouse_approval.vue

+ 24 - 24
pages/task/audit/salecontract.vue

@@ -954,17 +954,17 @@
 		margin: 20rpx 0;
 		border-radius: 20rpx;
 		padding: 20rpx;
-
+	
 		.row {
 			display: flex;
-
+	
 			.left {
 				display: flex;
 				align-items: center;
-
+	
 				.item1 {
 					position: relative;
-
+	
 					.item-content {
 						background: #617AE0;
 						width: 44px;
@@ -975,7 +975,7 @@
 						font-size: 15px;
 						color: #fff;
 					}
-
+	
 					.status {
 						position: absolute;
 						border-radius: 50%;
@@ -984,27 +984,27 @@
 						bottom: -3px;
 						background: #fff;
 					}
-
+	
 					.status.success {
 						border: 1px solid rgb(60, 156, 255);
 					}
-
+	
 					.status.error {
 						border: 1px solid rgb(245, 108, 108);
 					}
-
+	
 					.status.question {
 						border: 1px solid #f9ae3d;
 					}
 				}
-
+	
 			}
-
+	
 			.right {
 				width: 80%;
 				// color: #B0B1B5;
 				margin-top: 10px;
-
+	
 				.right-content {
 					background: #F2F3F7;
 					margin-left: 10px;
@@ -1013,33 +1013,33 @@
 					border-radius: 5px;
 					color: #B0B1B5;
 				}
-
+	
 				.right-item {
 					display: flex;
 					justify-content: space-between;
-
+	
 					.time {
 						color: #999;
 					}
-
+	
 					.item2 {
 						margin-left: 20rpx;
 						margin-top: -7px;
-
+	
 						.name {
 							font-size: 28rpx;
 							font-weight: 800;
 							margin-bottom: 4px;
 						}
-
+	
 						.status.success {
 							color: #6CC48C;
 						}
-
+	
 						.status.error {
 							color: rgb(245, 108, 108);
 						}
-
+	
 						.status.question {
 							color: #f9ae3d;
 						}
@@ -1047,10 +1047,10 @@
 				}
 			}
 		}
-
+	
 		.row2 {
 			display: flex;
-
+	
 			.item-content {
 				background: #22C572;
 				width: 30px;
@@ -1063,22 +1063,22 @@
 				padding: 0 2px;
 				margin: 0 auto;
 			}
-
+	
 			.status {
 				position: absolute;
 				top: 0;
 				right: 0;
 			}
 		}
-
+	
 		.row-line {
 			width: 1px;
 			height: 30px;
 			background: #F2F2F2;
 			margin: 10rpx 50rpx;
-
+	
 		}
-
+	
 		.audit {
 			margin-top: 20rpx;
 		}

+ 10 - 9
pages/task/audit/warehouse_approval.vue

@@ -42,7 +42,7 @@
 				<view class="left">扣重比</view>
 				<view class="right">{{list.deductWeight}}</view>
 			</view>
-			<view class="form_view" style="background: #F9F9FA;">
+			<view class="form_view" style="background: #F9F9FA;" v-if="list.bulkDensityStandard ==1">
 				<table border="1" width="100%" style="border-collapse: collapse;" cellspacing="0" cellpadding="0" class="table_css">
 				<tr>
 					<td>容重(g/L)</td>
@@ -663,14 +663,14 @@
 				.item1{
 					position:relative;
 					.item-content{
-						background:#22C572;
-					    width: 50px;
-					    height: 50px;
-					    border-radius: 10px;
-					    line-height: 50px;
-					    text-align: center;
-					    font-size: 18px;
-					    color: #fff;
+						background: #617AE0;
+						width: 44px;
+						height: 44px;
+						border-radius: 22px;
+						line-height: 44px;
+						text-align: center;
+						font-size: 15px;
+						color: #fff;
 					}
 					.status{
 						position:absolute;
@@ -713,6 +713,7 @@
 					}
 					.item2 {
 						margin-left: 20rpx;
+						margin-top: -7px;
 						
 						.name {
 							font-size: 28rpx;