Browse Source

声像记录完成上传图标和 检验记录完成上传图标

zhangxike 5 days ago
parent
commit
504a15ede7

+ 9 - 0
pages/work/download/DownloadList.uvue

@@ -24,6 +24,11 @@
     <!-- #endif -->
       <view class="download-card" v-for="(item, index) in downloads" :key="index" >
 		<view @click="enterItem(item.pdid)">
+			<view class="info-row" v-if="item.uploadFlag == 1 && (item.photoStatus +  item.keyStatus + item.recordStatus)
+			 == (item.photoTotal + item.keyTotal + item.recordTotal)">
+				<uni-icons class="my-icon" size="24" color="green" type="checkbox"></uni-icons>
+				<text style="color: green;">已上传</text>
+			</view>
 			<view class="info-row">
 			  <text class="label">工序:</text>
 			  <text class="value">{{ item.gxno }}</text>
@@ -464,4 +469,8 @@
 	margin-left: auto;
   }
   
+  .my-icon {
+	  margin-right: 5rpx;
+	  margin-left: auto;
+  }
 </style>

+ 9 - 0
pages/work/record/InfoList.uvue

@@ -24,6 +24,10 @@
 		<!-- #endif -->
 			<view class="download-card" v-for="(item, index) in downloads" :key="index">
 				<view @click="enterItem(item.pdid)">
+					<view class="info-row" v-if="item.uploadFlag == 1 && item.uploadCount == item.totalRecord">
+						<uni-icons class="my-icon" size="24" color="green" type="checkbox"></uni-icons>
+						<text style="color: green;">已上传</text>
+					</view>
 					<view class="info-row">
 						<text class="label">工作令:</text>
 						<text class="value">{{ item.workorder }}</text>
@@ -462,4 +466,9 @@
 		margin-right: 5rpx;
 		margin-left: auto;
 	}
+	
+	.my-icon {
+		  margin-right: 5rpx;
+		  margin-left: auto;
+	}
 </style>

+ 13 - 1
pages/work/report/InspectionList.uvue

@@ -38,7 +38,12 @@
 				<view class="info-row">
 					<text class="label">性质</text>
 					<view class="value">
-						{{item.nature}}
+						<text :class="{
+							'bg-green bg-text': item.nature == '定量',
+							'bg-yellow bg-text': item.nature == '定性',
+						  }">
+							{{item.nature}}
+						</text>
 					</view>
 				</view>
 				<!-- 上限要求:绑定计算属性 parsedMinNum -->
@@ -599,6 +604,13 @@
 		position: relative;
 		z-index: 10;
 	}
+	
+	.bg-text {
+		width: 120rpx;
+		min-width: 100rpx;
+		border-radius: 10rpx;
+		text-align: center;
+	}
 
 	.bg-green {
 		background-color: seagreen;