gjy vor 3 Jahren
Ursprung
Commit
23f372d5b0
1 geänderte Dateien mit 43 neuen und 27 gelöschten Zeilen
  1. 43 27
      pages/erpbusiness/examine_quality_testing.vue

+ 43 - 27
pages/erpbusiness/examine_quality_testing.vue

@@ -2,31 +2,47 @@
 	<view>
 		<view class='wrap'>
 			<view class='title_b'>基本信息</view>
+			<view class="c-row ">
+				<view class="title">入库类型</view>
+				<view v-if='gridList.serviceManagementType==1' class="con-list">
+					贸易入库
+				</view>
+				<view v-if='gridList.serviceManagementType==3' class="con-list">
+					收购入库
+				</view>
+			</view>
 			<view class="c-row ">
 				<view class="title">仓库</view>
 				<view class="con-list">
 					{{gridList.warehouseName}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row ">
-				<view class="title">编号</view>
+			<view v-if='gridList.serviceManagementType==1' class="c-row ">
+				<view class="title">任务编号</view>
+				<view class="con-list">
+					{{gridList.inOutTaskNo}}
+				</view>
+			</view>
+			<view class="c-row ">
+				<view class="title">业务编号</view>
 				<view class="con-list">
 					{{gridList.qualityNo}}
 				</view>
 			</view>
-			<view v-if='managementType==3' class="c-row ">
-				<view class="title">合同编号</view>
+			<view v-if='gridList.serviceManagementType==1' class="c-row ">
+				<view v-if='gridList.inOutType=="移库入库"' class="title">移库编号</view>
+				<view v-else class="title">合同编号</view>
 				<view class="con-list">
 					{{gridList.contractNo}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row ">
+			<view  v-if='gridList.serviceManagementType==3' class="c-row ">
 				<view class="title">客户</view>
 				<view class="con-list">
 					{{gridList.customerName}}({{gridList.customerPhone}})
 				</view>
 			</view>
-			<view v-if='managementType==3' class="c-row ">
+			<view class="c-row ">
 				<view class="title">货名</view>
 				<view class="con-list">
 					{{gridList.goodsName}}
@@ -47,13 +63,12 @@
 			<view v-else class="c-row ">
 				<view class="title">扣杂</view>
 				<view class="con-list">
-					{{gridList.buckleMiscellaneous}}
-				</view>
-				<view class="con-list">
-					{{gridList.reBuckleMiscellaneous}}
+					<view>{{gridList.buckleMiscellaneous}}</view>
+					<view>{{gridList.reBuckleMiscellaneous}}</view>
+					
 				</view>
 			</view>
-			<view v-else class="c-row ">
+			<view v-else class="c-row">
 				<view class="title">扣杂</view>
 				<view class="con-list">
 					<input v-model='gridList.buckleMiscellaneous' placeholder="初检扣杂" @input=""
@@ -62,7 +77,7 @@
 						name="input"></input>
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row ">
+			<view v-if='gridList.serviceManagementType==3' class="c-row ">
 				<view class="title">购粮性质</view>
 				<view class="con-list">
 					{{gridList.natureOfGrainPurchase}}
@@ -80,13 +95,7 @@
 					{{gridList.storageTagNo}}
 				</view>
 			</view>
-			<view v-if='managementType==1' class="c-row ">
-				<view class="title">货名</view>
-				<view class="con-list">
-					{{gridList.goodsName}}
-				</view>
-			</view>
-			<view v-if='managementType==1' class="c-row ">
+			<view class="c-row ">
 				<view class="title">类型</view>
 				<view class="con-list">
 					{{gridList.type}}
@@ -116,7 +125,8 @@
 				<view class="c-row ">
 					<view class="title">等级</view>
 					<view class="con-list">
-						{{gridList.grade}}
+						<view>{{gridList.grade}}</view>
+						<view>{{gridList.reGrade}}</view>
 					</view>
 				</view>
 				<view class="c-row ">
@@ -127,39 +137,45 @@
 						<input v-model='gridList.reWaterContent' placeholder="复检水分" @input=""
 							name="input"></input>
 					</view>
-					<view class="con-list">
+					<!-- <view class="con-list">
 						{{gridList.rewaterContent}}
-					</view>
+					</view> -->
 
 				</view>
 				<view class="c-row ">
 					<view class="title">容重(克/升)</view>
 					<view class="con-list">
-						{{gridList.bulkDensity}}
+						<view>{{gridList.bulkDensity}}</view>
+						<view>{{gridList.reBulkDensity}}</view>
+						
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">不完善粒(%)</view>
 					<view class="con-list">
-						{{gridList.imperfectGrain}}
+						<view>{{gridList.imperfectGrain}}</view>
+						<view>{{gridList.reImperfectGrain}}</view>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">杂质(%)</view>
 					<view class="con-list">
-						{{gridList.impurity}}
+						<view>{{gridList.impurity}}</view>
+						<view>{{gridList.reImpurity}}</view>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">霉变粒(%)</view>
 					<view class="con-list">
-						{{gridList.mildewGrain}}
+						<view>{{gridList.mildewGrain}}</view>
+						<view>{{gridList.reMildewGrain}}</view>
 					</view>
 				</view>
 				<view class="c-row ">
 					<view class="title">热损伤(%)</view>
 					<view class="con-list">
-						{{gridList.jiaorenli}}
+						<view>{{gridList.jiaorenli}}</view>
+						<view>{{gridList.reJiaorenli}}</view>
 					</view>
 				</view>
 			</view>