ddd

pages/rawMaterialInfo/index.scss

@@ -123,4 +123,55 @@
 			}
 		}
 	}
+}
+
+.cc-card{
+	border: 1upx solid #C0C0C0;
+	width: 720upx;
+	margin: auto;
+	margin-top: 20upx;
+	padding-top: 10upx;
+	padding-bottom: 10upx;
+}
+.btitle-cc{
+	width: 720upx;
+	margin: auto;
+	@include fonts(26upx,#666)
+}
+.pd-ul{
+	@include flex(center,flex-start);
+	margin-top: 20upx;
+	.pd-title{
+		@include fonts(24upx,#666)
+	}
+	.pd-list{
+		@include flex(center,flex-start);
+		margin-left: 40upx;
+		image{
+			@include wh(33upx,33upx);
+			
+		}
+		text{
+			@include fonts(24upx,#666);
+			margin-left: 10upx;
+		}
+	}
+}
+.cc-input-ul{
+	@include flex(center,flex-start);
+	flex-wrap: wrap;
+	.cc-input-list{
+		@include flex(center,flex-start);
+		.title{
+				@include fonts(24upx,#666)
+		}
+		.cc-input{
+			input{
+				width: 100upx;
+				border: 1upx solid #C0C0C0;
+				border-radius: 10upx;
+				font-size: 24upx;
+			}
+		}
+	}
 }

pages/rawMaterialInfo/rawMaterialInfo.vue

@@ -41,14 +41,32 @@
 				</view>
 			</view>
 		</view>
+		
 		<view class="contet-up-card" style="margin-top: 20upx;">
-			<view class="contet-up-card-cont">
+			<view class="btitle-cc">尺寸检测数据</view>
+			<!-- <view class="contet-up-card-cont">
 				<view class="contet-up-card-cont-list" v-for="(item,key,index) in froms.dimensional_inspection[0]"
 					:key="index">
 					<view>尺寸检测数据:</view>
 					<input v-model="froms.dimensional_inspection[0][key]" type="number" />
 				</view>
-
+			</view> -->
+			<view class="cc-card">
+				<view class="cc-input-ul">
+					<view class="cc-input-list">
+						<view class="title">rule</view>
+						<view class="cc-input">
+							<input type="number" />
+						</view>
+					</view>					
+				</view>
+				<view class="pd-ul">
+					<view class="pd-title">判定</view>
+					<view class="pd-list">
+						<image src="../../static/xz.png"></image>
+						<text>OK</text>
+					</view>
+				</view>	
 			</view>
 		</view>
 		<view class="testing">
@@ -60,7 +78,7 @@
 					</view>
 					<view class="testing-list">
 						<view class="testing-list-title">检测工具:</view>
-						<input v-model="item.check_tool" />
+						<input :disabled="true" v-model="item.check_tool" />
 					</view>
 					<view class="testing-list">
 						<view class="testing-list-title">抽样标准:</view>
@@ -96,7 +114,7 @@
 			</view>
 			<picker @change="bindResult" :value="resltIds" :range="result">
 				<view class="testing-list" style="align-items: center;font-size: 26upx;margin-left: 50upx;">
-					<view>检验结果:</view>
+					<view>产品检验结果:</view>
 					<view
 						style="height: 50upx;border: 1upx solid #F1F1F1;width:200upx;font-size: 26upx;padding-top: 10upx;padding-left: 10upx;margin-left: 100upx;">
 						{{result[resltIds]}}
@@ -149,7 +167,10 @@
 				check_status: 0,
 				jyxItem: {},
 				buttonState: true,
+				jurisdiction:[],
 				standard: {},
+				tooList:[],
+				power:[],
 				froms: {
 					result: 1,
 					purchase_id: '', //采购数据ID
@@ -181,32 +202,38 @@
 			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
 			this.type = this.CyInfo.examine_status
 			this.check_status = this.CyInfo.m_id
+			this.power = this.userInfo.power
 			this.getitem()
-			this.isMenu();
 			this.getArr()
-			console.log('检验项', this.jyxItem)
+			this.isMenu();
+			
+			console.log('检验项', this.userInfo)
 		},
 		methods: {
 			getArr() {
-				let newArr = this.power.map(item => {
-					if (item.children) {
-			
-						item.children.map(items => {
-							this.jurisdiction.push(items.title)
-							return items
-						})
-					}
-			
-				})
+				if(this.power.length>0){
+					let newArr = this.power.map(item => {
+						if (item.children) {
+								
+							item.children.map(items => {
+								this.jurisdiction.push(items.title)
+								return items
+							})
+						}
+								
+					})
+				}
+				
 				console.log("xinshuzu", this.jurisdiction)
 			},
 			isMenu(title) {
 				return this.jurisdiction.includes(title);
 			},
 			getitem() {
-				materialItem().then(res => {
+				materialItem({name:this.CyInfo.purchase_number}).then(res => {
 					this.itemList = res.item;
 					this.standard = res.standard;
+					this.tooList=res.tool;
 					for (let b in res.item) {
 						this.item.push({
 							check_item: res.item[b],
@@ -214,7 +241,7 @@
 							check_number: '',
 							status: 0,
 							check_result: '',
-							check_tool: '',
+							check_tool: res.tool[b],
 							check: false
 						})
 					}