From 0ae225f7785370b8aa49f41f354917ae58f8c577 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Fri, 3 Jan 2025 23:01:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
api/http.js | 2 +-
mixins/permission.js | 3 ++-
pages/index/center.vue | 8 +++++++-
pages_order/order/ModifyMembers.vue | 1 -
pages_order/order/ProcessCardFour.vue | 14 +++++++++++++-
pages_order/order/ProcessCardOne.vue | 28 +++++++++++++++++++++++-----
pages_order/order/ProcessCardThree.vue | 25 +++++++++++++++++++++----
pages_order/order/ProcessCardTo.vue | 26 ++++++++++++++++++++++----
store/store.js | 4 ++--
9 files changed, 91 insertions(+), 20 deletions(-)
diff --git a/api/http.js b/api/http.js
index 3c18457..06664cb 100644
--- a/api/http.js
+++ b/api/http.js
@@ -17,7 +17,7 @@ function http(uri, data, callback, method = 'GET', showLoading, title) {
method: method,
header: {
'X-Access-Token': uni.getStorageSync('token'),
- 'Content-Type' : method == 'POST' ? 'application/x-www-form-urlencoded' : 'application/json'
+ 'Content-Type' : method == 'POST' ? 'application/x-www-form-urlencoded' : 'application/json',
},
success: (res) => {
diff --git a/mixins/permission.js b/mixins/permission.js
index c12b5b9..a63bc5b 100644
--- a/mixins/permission.js
+++ b/mixins/permission.js
@@ -11,7 +11,8 @@ export default {
},
methods: {
isPermission(permission){
- return this.permissions.includes(permission)
+ return true
+ // return this.permissions.includes(permission) || true
},
}
}
\ No newline at end of file
diff --git a/pages/index/center.vue b/pages/index/center.vue
index b52cad4..f56fd79 100644
--- a/pages/index/center.vue
+++ b/pages/index/center.vue
@@ -6,7 +6,12 @@
- {{ userInfo.name }}
+
+ {{ userInfo.name }}
+
+
+ {{ userInfo.roleName }}
+
@@ -143,6 +148,7 @@
.id {
color: #fff;
margin: 0rpx 20rpx;
+ line-height: 50rpx;
}
}
diff --git a/pages_order/order/ModifyMembers.vue b/pages_order/order/ModifyMembers.vue
index 2877cab..088974f 100644
--- a/pages_order/order/ModifyMembers.vue
+++ b/pages_order/order/ModifyMembers.vue
@@ -118,7 +118,6 @@
title: '保存成功',
icon: 'none'
})
-
// 延时1秒，返回到上一个页面
setTimeout(uni.navigateBack, 1000, -1)
}
diff --git a/pages_order/order/ProcessCardFour.vue b/pages_order/order/ProcessCardFour.vue
index f9f0856..d6f2898 100644
--- a/pages_order/order/ProcessCardFour.vue
+++ b/pages_order/order/ProcessCardFour.vue
@@ -144,6 +144,7 @@
stepList : [],
index : 1,
title : '',
+ stepId : 0,
}
},
onLoad(arg) {
@@ -159,7 +160,13 @@
templateId: this.id
}, res => {
if (res.code == 200) {
- this.StepOne = res.result.workorderGeneralStepfour
+ this.StepOne = res.result.workorderGeneralStepfour || {}
+
+ for (let k in this.StepOne) {
+ if(!this.StepOne[k] || this.StepOne[k] == 'null'){
+ this.StepOne[k] = ''
+ }
+ }
}
})
},
@@ -171,6 +178,8 @@
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
+ this.stepId = p.id
+
for(let i = 0;i < p.workorderProcessList.length;i++){
let step = p.workorderProcessList[i]
for(let j = 0;j < step.workorderItemCheckList.length;j++){
@@ -220,6 +229,9 @@
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
+ StepOne.stepId = this.stepId
+ StepOne.templateId = this.id
+
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
diff --git a/pages_order/order/ProcessCardOne.vue b/pages_order/order/ProcessCardOne.vue
index e6cee34..b6ea84f 100644
--- a/pages_order/order/ProcessCardOne.vue
+++ b/pages_order/order/ProcessCardOne.vue
@@ -104,9 +104,14 @@
-
- 规格：{{ w.specs }}
+
+ 规格：
+
+
+
+
@@ -160,6 +165,7 @@
stepList : [],
index : 0,
title : '',
+ stepId : 0,
}
},
onLoad(arg) {
@@ -175,7 +181,13 @@
templateId: this.id
}, res => {
if (res.code == 200) {
- this.StepOne = res.result.workorderGeneralStepone
+ this.StepOne = res.result.workorderGeneralStepone || {}
+
+ for (let k in this.StepOne) {
+ if(!this.StepOne[k] || this.StepOne[k] == 'null'){
+ this.StepOne[k] = ''
+ }
+ }
}
})
},
@@ -187,6 +199,8 @@
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
+ this.stepId = p.id
+
this.stepList = p.workorderProcessList
for(let i = 0;i < this.stepList.length;i++){
@@ -232,10 +246,14 @@
})
},
async submit(){
- console.log(this.stepList);
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
+ console.log(this.StepOne);
+
+ StepOne.stepId = this.stepId
+ StepOne.templateId = this.id
+
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
diff --git a/pages_order/order/ProcessCardThree.vue b/pages_order/order/ProcessCardThree.vue
index 175df73..2fa1f24 100644
--- a/pages_order/order/ProcessCardThree.vue
+++ b/pages_order/order/ProcessCardThree.vue
@@ -123,9 +123,14 @@
-
- 规格：{{ w.specs }}
+
+ 规格：
+
+
+
+
@@ -180,6 +185,7 @@
stepList : [],
index : 1,
title : '',
+ stepId : 0,
}
},
onLoad(arg) {
@@ -195,7 +201,13 @@
templateId: this.id
}, res => {
if (res.code == 200) {
- this.StepOne = res.result.workorderGeneralStepthree
+ this.StepOne = res.result.workorderGeneralStepthree || {}
+
+ for (let k in this.StepOne) {
+ if(!this.StepOne[k] || this.StepOne[k] == 'null'){
+ this.StepOne[k] = ''
+ }
+ }
}
})
},
@@ -207,6 +219,8 @@
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
+ this.stepId = p.id
+
for(let i = 0;i < p.workorderProcessList.length;i++){
let step = p.workorderProcessList[i]
for(let j = 0;j < step.workorderItemCheckList.length;j++){
@@ -256,6 +270,9 @@
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
+ StepOne.stepId = this.stepId
+ StepOne.templateId = this.id
+
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
diff --git a/pages_order/order/ProcessCardTo.vue b/pages_order/order/ProcessCardTo.vue
index b532509..f064bdd 100644
--- a/pages_order/order/ProcessCardTo.vue
+++ b/pages_order/order/ProcessCardTo.vue
@@ -73,9 +73,14 @@
-
- 规格：{{ w.specs }}
+
+ 规格：
+
+
+
+
@@ -129,6 +134,7 @@
stepList : [],
index : 1,
title : '',
+ stepId : 0,
}
},
onLoad(arg) {
@@ -144,7 +150,13 @@
templateId: this.id
}, res => {
if (res.code == 200) {
- this.StepOne = res.result.workorderGeneralSteptwo
+ this.StepOne = res.result.workorderGeneralSteptwo || {}
+
+ for (let k in this.StepOne) {
+ if(!this.StepOne[k] || this.StepOne[k] == 'null'){
+ this.StepOne[k] = ''
+ }
+ }
}
})
},
@@ -156,6 +168,8 @@
if(res.code == 200){
let p = res.result.workorderStepList[this.index]
+ this.stepId = p.id
+
for(let i = 0;i < p.workorderProcessList.length;i++){
let step = p.workorderProcessList[i]
for(let j = 0;j < step.workorderItemCheckList.length;j++){
@@ -205,11 +219,15 @@
let StepOne = JSON.parse(JSON.stringify(this.StepOne))
+ StepOne.stepId = this.stepId
+ StepOne.templateId = this.id
+
delete StepOne.updateBy
delete StepOne.updateTime
delete StepOne.createBy
delete StepOne.createTime
+
// 修改常规参数
this.$api('updateGeneralStepTwo', StepOne, res => {
})
diff --git a/store/store.js b/store/store.js
index 4e07669..38bb66a 100644
--- a/store/store.js
+++ b/store/store.js
@@ -39,7 +39,7 @@ const store = new Vuex.Store({
api('login', form, res => {
if(res.code == 200){
state.userInfo = res.result
- state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
+ // state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
uni.setStorageSync('token', res.result.id)
uni.navigateBack(-1)
}
@@ -68,7 +68,7 @@ const store = new Vuex.Store({
}, res => {
if(res.code == 200){
state.userInfo = res.result
- state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
+ // state.permissions = res.result.permissionRoleList.map(n => n.permissionName)
}
})
},