diff --git a/pages/assembleList/assembleList.vue b/pages/assembleList/assembleList.vue
index a503657..ebe5364 100644
--- a/pages/assembleList/assembleList.vue
+++ b/pages/assembleList/assembleList.vue
@@ -42,7 +42,7 @@
查看详情
-
+
审核
@@ -56,7 +56,7 @@
-
+
@@ -100,21 +100,20 @@
this.isMenu();
},
methods: {
- getArr() {
- let newArr = this.power.map(item => {
- if (item.children) {
+getArr() {
+ 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 = {
diff --git a/pages/hardwareList/hardwareList.vue b/pages/hardwareList/hardwareList.vue
index bb52165..3bddb01 100644
--- a/pages/hardwareList/hardwareList.vue
+++ b/pages/hardwareList/hardwareList.vue
@@ -42,7 +42,7 @@
查看详情
-
+
审核
@@ -56,7 +56,7 @@
-
+
@@ -101,20 +101,19 @@
},
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 => {
+ this.jurisdiction.push(item.id)
+
+ })
+
+ }
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 = {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5957451..3ddf574 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,7 +3,7 @@
检验
-
+
@@ -19,7 +19,7 @@
首检记录
-->
-
+
@@ -27,7 +27,7 @@
冲压巡检
-
+
@@ -35,7 +35,7 @@
喷涂巡检
-
+
@@ -43,7 +43,7 @@
组装巡检
-
+
@@ -67,7 +67,7 @@
成品巡检
-
+
@@ -189,13 +189,13 @@
onLoad() {
power({}).then(res => {
res.map(item => {
- this.menuNameList.push(item.title);
+ this.menuNameList.push(item.id);
})
})
},
methods: {
- isMenu(title) {
- return this.menuNameList.includes(title);
+ isMenu(id) {
+ return this.menuNameList.includes(id);
},
rawMaterial() {
uni.navigateTo({
diff --git a/pages/rawMaterial/rawMaterial.vue b/pages/rawMaterial/rawMaterial.vue
index 9aac6ee..8852b2e 100644
--- a/pages/rawMaterial/rawMaterial.vue
+++ b/pages/rawMaterial/rawMaterial.vue
@@ -7,9 +7,11 @@
材料名称:{{item.title}}
-
+
+ 待提交
+ 查看
diff --git a/pages/sprayList/sprayList.vue b/pages/sprayList/sprayList.vue
index d7f1ab8..fe86a00 100644
--- a/pages/sprayList/sprayList.vue
+++ b/pages/sprayList/sprayList.vue
@@ -42,7 +42,7 @@
查看详情
-
+
审核
@@ -56,7 +56,7 @@
-
+
@@ -100,22 +100,21 @@
this.getArr()
},
methods: {
- getArr() {
+ 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)
- },
- isMenu(title) {
- return this.jurisdiction.includes(title);
- },
+
+ }
+ console.log("xinshuzu", this.jurisdiction)
+
+ },
+ isMenu(id) {
+ console.log("id", id)
+ return this.jurisdiction.includes(id);
+ },
getData() {
let param = {
plan_id: this.plan_id,
diff --git a/pages/tcqList/tcqList.vue b/pages/tcqList/tcqList.vue
index 06f2623..89948f9 100644
--- a/pages/tcqList/tcqList.vue
+++ b/pages/tcqList/tcqList.vue
@@ -56,7 +56,7 @@
-
+
@@ -101,20 +101,19 @@
},
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 => {
+ this.jurisdiction.push(item.id)
+
+ })
+
+ }
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 = {