From 4cb31e733110b1da4e9014af7e540fb9aba04a3e Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 08:58:42 +0800
Subject: [PATCH 01/15] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/StatusQuery/index.vue | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 5d221b14..97a81cd5 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -180,8 +180,10 @@ export default {
} else if (response.data.result[i].考核状态 === 5) {
response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 6) {
- response.data.result[i].考核状态 = 3
+ response.data.result[i].考核状态 = 2
} else if (response.data.result[i].考核状态 === 7) {
+ response.data.result[i].考核状态 = 3
+ } else if (response.data.result[i].考核状态 === 8) {
response.data.result[i].考核状态 = 4
} else if (response.data.result[i].考核状态 === 8) {
response.data.result[i].考核状态 = 5
From 78ba74a980cdf99c6e914095f2f17a124e313c52 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 09:00:44 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ManufacturingCenter/StatusQuery/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 97a81cd5..e917afe3 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -185,7 +185,7 @@ export default {
response.data.result[i].考核状态 = 3
} else if (response.data.result[i].考核状态 === 8) {
response.data.result[i].考核状态 = 4
- } else if (response.data.result[i].考核状态 === 8) {
+ } else if (response.data.result[i].考核状态 === 9) {
response.data.result[i].考核状态 = 5
}
}
From 4f9d63933e45e4c5138227779f8fa6378fedbef3 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 09:49:16 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E8=BF=BD=E6=BA=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ManufacturingCenter/TraceabilityOfParts/index.vue | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
index 82b97258..0e548a1c 100644
--- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
+++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
@@ -192,13 +192,13 @@ export default {
type: '',
size: 'large'
}, {
- id: 5,
+ id: 4,
content: '工艺定额',
timestamp: '工艺部：工艺员',
type: '',
size: 'large'
}, {
- id: 7,
+ id: 6,
content: '生产加工',
timestamp: '金工车间：操作工',
type: '',
@@ -343,8 +343,8 @@ export default {
}
})
SelectPart(0, '', 0, '', 0, '', 1, this.searchPick, 0, '', 0, '', 0, '', '', '', '').then(response => {
- console.log(response, 8)
for (let i = 0; i < this.activities.length; i++) {
+ console.log(response.data[0].考核状态.toString(), this.activities[i].id.toString())
if (response.data[0].考核状态.toString() === this.activities[i].id.toString()) {
for (let j = 0; j <= i; j++) {
this.activities[j].type = 'success'
@@ -353,12 +353,10 @@ export default {
}
}
})
- console.log(item, 11)
this.tableData1 = []
gettabledata1(item.name).then(response => {
if (response.data.length !== 0) {
for (let i = 0; i < response.data.length; i++) {
- console.log(response.data[i])
this.tableData1.push({
工艺名称: response.data[i].工艺名称,
工序顺序: response.data[i].工序顺序,
From 8432ac298efdb44a896f790becad93cbfe0a5e3c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 09:52:35 +0800
Subject: [PATCH 04/15] a
---
src/views/ManufacturingCenter/TraceabilityOfParts/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
index 0e548a1c..72915b9d 100644
--- a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
+++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue
@@ -140,7 +140,7 @@
跳转链接
- 零件状态查询
+ 自制件状态查询
From ba367fa90ebaaff86ea81ec2aec3491cc58b948c Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 27 Mar 2020 10:32:27 +0800
Subject: [PATCH 05/15] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/BasicData/MenuManagement.js | 23 ++++++++---
src/views/BasicData/MenuManagement/index.vue | 43 ++++++++++++++++----
2 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/src/api/BasicData/MenuManagement.js b/src/api/BasicData/MenuManagement.js
index a2ea3311..31ec416b 100644
--- a/src/api/BasicData/MenuManagement.js
+++ b/src/api/BasicData/MenuManagement.js
@@ -111,7 +111,7 @@ export function submitAdd(name) {
})
}
// 查询二级模块分给那些角色
-export function searchJS(name) {
+export function getRoleTitle() {
return request({
url: '',
method: 'post',
@@ -119,12 +119,25 @@ export function searchJS(name) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '3',
- name: ` select 角色功能,title from
+ name: ` select distinct title from
基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
- order by title`,
- param: `模块名称=${name}`
+ order by title`
+ }
+ })
+}
+export function getRoleNameasd(name) {
+ return request({
+ url: '',
+ method: 'post',
+ data: {
+ UserID: state.state.user.id,
+ ModularID: router.currentRoute.path,
+ type: '3',
+ name: ` select distinct 角色功能 from
+ 基础表_模块信息 inner join 基础表_角色模块信息 on 基础表_角色模块信息.id = 基础表_模块信息.id
+ inner join 菜单系统模块_项目角色 on 基础表_角色模块信息.角色编号 = 菜单系统模块_项目角色.角色编号
+ where title=\'${name}\'`
}
})
}
-
diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index b97ecd55..4b409515 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -63,6 +63,7 @@
创建二级菜单
+ 模块分配情况
@@ -80,16 +81,22 @@
-
+
-
+
+
+
-
+
-
+
- {{ scope.row.title }}
+ {{ scope.row.角色功能 }}
@@ -114,7 +121,7 @@