From 9ef34a381e48e6032554dd0646a5230eeed74de8 Mon Sep 17 00:00:00 2001
From: huangli865118801 <865118801@qq.com>
Date: Thu, 9 Sep 2021 17:33:00 +0800
Subject: [PATCH] ddd

---
 pages/rawMaterialInfo/rawMaterialInfo.vue     | 34 +++++++++----------
 .../stampingInspectionList.vue                | 32 ++++++++---------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pages/rawMaterialInfo/rawMaterialInfo.vue b/pages/rawMaterialInfo/rawMaterialInfo.vue
index 41651ca..7cd5f2b 100644
--- a/pages/rawMaterialInfo/rawMaterialInfo.vue
+++ b/pages/rawMaterialInfo/rawMaterialInfo.vue
@@ -14,6 +14,10 @@
 					<view>规格型号:</view>
 					<text>{{CyInfo.spec}}</text>
 				</view>
+				<view class="contet-up-card-cont-list">
+					<view>检验员:</view>
+					<text>{{userInfo.name}}</text>
+				</view>
 				<picker @change="bindDetectionMode" :value="detectionModeIndex" :range="detectionMode">
 					<view class="contet-up-card-cont-list">
 						<view>检测方式:</view>
@@ -190,7 +194,7 @@
 			</view>
 			<view class="submit-btn">
 				<button type="primary" @tap="submit" :disabled="buttonState==false?true:false"
-					v-if="!check_status&&isMenu('原材料提交')">提交</button>
+					v-if="check_status==null&&isMenu(29)">提交</button>
 			</view>
 		</view>
 	</view>
@@ -259,32 +263,28 @@
 			this.getitem()
 			this.getArr()
 			this.isMenu();
-
-			console.log('检验项', this.userInfo)
+       
+			console.log('检验项', this.CyInfo)
 		},
 		methods: {
 			getArr() {
 				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
-							})
-						}
+						this.jurisdiction.push(item.id)
 
 					})
+					
 				}
-
-				console.log("xinshuzu", this.jurisdiction)
+console.log("xinshuzu", this.jurisdiction) 
+				
 			},
-			isMenu(title) {
-				return this.jurisdiction.includes(title);
+			isMenu(id) {
+				console.log("id",id)
+				return this.jurisdiction.includes(id);
 			},
 			getitem() {
 				materialItem({
-					name: this.CyInfo.purchase_number
+					name: this.CyInfo.title
 				}).then(res => {
 					this.itemList = res.item;
 					this.standard = res.standard;
@@ -418,9 +418,9 @@
 					materialCheckForm(params).then(res => {
 						this.$functions.success("提交成功").then(() => {
 							uni.navigateBack()
-						}).catch(res => {
-							this.buttonState = true
 						})
+					}).catch(res => {
+							this.buttonState = true
 					})
 				})
 
diff --git a/pages/stampingInspectionList/stampingInspectionList.vue b/pages/stampingInspectionList/stampingInspectionList.vue
index 7988523..fecbf53 100644
--- a/pages/stampingInspectionList/stampingInspectionList.vue
+++ b/pages/stampingInspectionList/stampingInspectionList.vue
@@ -42,7 +42,8 @@
 							<view @tap="firstInspectionInfo(item.id,item)">
 								查看详情
 							</view>
-							<view class="red" @tap="firstInspectionInfoSh(item.id,item)" v-if="isMenu('冲压审核')&&item.two_id==0">
+							<view class="red" @tap="firstInspectionInfoSh(item.id,item)"
+								v-if="isMenu(36)&&item.two_id==0">
 								审核
 							</view>
 						</view>
@@ -56,7 +57,7 @@
 				</view>
 			</view>
 			<view class="submit-btn">
-				<button type="primary" v-if="isMenu('冲压提交')" @tap="addRecord()">新增巡检记录</button>
+				<button type="primary" v-if="isMenu(31)" @tap="addRecord()">新增巡检记录</button>
 			</view>
 		</view>
 	</view>
@@ -78,7 +79,7 @@
 				info: {},
 				power: [],
 				jurisdiction: [],
-				product_id:0,
+				product_id: 0,
 				list: [],
 				limit: 10,
 				page: 1
@@ -94,27 +95,26 @@
 		onLoad(e) {
 			this.plan_id = e.plan_id;
 			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
-			this.product_id=this.CyInfo.product_id;
+			this.product_id = this.CyInfo.product_id;
 			this.power = this.userInfo.power
 			this.getArr();
 			this.isMenu();
 		},
 		methods: {
 			getArr() {
-				let newArr = this.power.map(item => {
-					if (item.children) {
+				if (this.power.length > 0) {
+					let newArr = this.power.map(item => {
+						this.jurisdiction.push(item.id)
 
-						item.children.map(items => {
-							this.jurisdiction.push(items.title)
-							return items
-						})
-					}
+					})
 
-				})
+				}
 				console.log("xinshuzu", this.jurisdiction)
+
 			},
-			isMenu(title) {
-				return this.jurisdiction.includes(title);
+			isMenu(id) {
+				console.log("id", id)
+				return this.jurisdiction.includes(id);
 			},
 			getData() {
 				let param = {
@@ -136,7 +136,7 @@
 					complete: () => {}
 				});
 			},
-			firstInspectionInfo(id,type) {
+			firstInspectionInfo(id, type) {
 				uni.navigateTo({
 					url: `../stampingInspectionInfo/stampingInspectionInfo?plan_id=${this.plan_id}&product_id=${this.product_id}&id=${id}&planInfo=${encodeURIComponent(JSON.stringify(this.CyInfo))}&type=2`,
 					success: res => {},
@@ -144,7 +144,7 @@
 					complete: () => {}
 				});
 			},
-			firstInspectionInfoSh(id,type) {
+			firstInspectionInfoSh(id, type) {
 				uni.navigateTo({
 					url: `../stampingInspectionInfo/stampingInspectionInfo?plan_id=${this.plan_id}&&type=3&product_id=${this.product_id}&id=${id}&planInfo=${encodeURIComponent(JSON.stringify(this.CyInfo))}`,
 					success: res => {},