mt-ck-00a/mt-ck-wms-ui
8
0
派生 0
代码 工单 合并请求 版本发布 百科 动态

修改菜单，增加质量管理

浏览代码
这个提交包含在：
朱文强 2022-03-03 16:15:01 +08:00
父节点 68193ecfb3
当前提交 9513fb484b
共有 18 个文件被更改，包括 343 次插入 和 178 次删除
显示统计 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

2
src/api/art-manage/art.js
查看文件

@ -94,7 +94,7 @@ export function listAllEquipmentRecipe(data) {
// 保存某个工艺下的所有节点
export function addProcessFlows(data) {
return request({
url: 'process/process-flow-equipment/add',
url: '/api/process/process-flow-equipment/add',
method: 'post',
data
})

12
src/api/basicData/EquipmentScrapGrade.js
查看文件

@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2021-07-06 11:10:22
* @LastEditTime: 2022-03-03 13:46:55
* @Description:
*/
import request from '@/utils/request'
export function EquipmentScrapGradeList(data) { // 获取废片等级列表
return request({
url: '/basic/equipment-scraps-grade/pageForEquipmentGrade',
url: '/api/wms/equipment-scraps-grade/pageForEquipmentGrade',
method: 'post',
data
})
@ -17,7 +17,7 @@ export function EquipmentScrapGradeList(data) { // 获取废片等级列表
export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数据
return request({
url: '/basic/equipment-scraps-grade/get',
url: '/api/wms/equipment-scraps-grade/get',
method: 'post',
data: { id }
})
@ -25,7 +25,7 @@ export function EquipmentScrapGradeDetail(id) { // 获取废片等级单条数
export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数据
return request({
url: '/basic/equipment-scraps-grade/update',
url: '/api/wms/equipment-scraps-grade/update',
method: 'post',
data
})
@ -33,7 +33,7 @@ export function EquipmentScrapGradeUpdate(data) { // 更新废片等级单条数
export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据
return request({
url: '/basic/equipment-scraps-grade/add',
url: '/api/wms/equipment-scraps-grade/add',
method: 'post',
data
})
@ -41,7 +41,7 @@ export function EquipmentScrapGradeAdd(data) { // 新增废片等级单条数据
export function EquipmentScrapGradeDelete(id) { // 删除废片等级单条数据
return request({
url: '/basic/equipment-scraps-grade/delete',
url: '/api/wms/equipment-scraps-grade/delete',
method: 'post',
data: { id }
})

8
src/api/basicData/GroupModule/staff.js
查看文件

@ -1,8 +1,8 @@
/*
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: gtz
* @LastEditTime: 2021-04-17 16:04:51
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 15:10:05
* @Description:
*/
import request from '@/utils/request'
@ -56,7 +56,7 @@ export function staffDelete(id) { // 删除员工单条数据
export function workerList(data) { // 添加组员列表
return request({
url: '/basic/team-det/workerList',
url: '/api/wms/team-det/workerList',
method: 'post',
data
})
@ -64,7 +64,7 @@ export function workerList(data) { // 添加组员列表
export function getRoleList() {
return request({
url: '/basic/platform-dict/selectPlatformDictDataListByPage',
url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
method: 'post',
data: {
dictTypeId: '1383318968677273601',

14
src/api/basicData/Scrap/ScrapInfo.js
查看文件

@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2021-03-10 14:25:18
* @LastEditTime: 2022-03-03 13:46:40
* @Description:
*/
import request from '@/utils/request'
export function scrapInfoList(data) { // 获取报废信息列表
return request({
url: '/basic/scrap-information/page',
url: '/api/wms/scrap-information/page',
method: 'post',
data
})
@ -20,7 +20,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据
'id': id
}
return request({
url: '/basic/scrap-information/get',
url: '/api/wms/scrap-information/get',
method: 'post',
data
})
@ -28,7 +28,7 @@ export function scrapInfoDetail(id) { // 获取报废信息单条数据
export function scrapInfoUpdate(data) { // 更新报废信息单条数据
return request({
url: '/basic/scrap-information/update',
url: '/api/wms/scrap-information/update',
method: 'post',
data
})
@ -36,7 +36,7 @@ export function scrapInfoUpdate(data) { // 更新报废信息单条数据
export function scrapInfoAdd(data) { // 新增报废信息单条数据
return request({
url: '/basic/scrap-information/add',
url: '/api/wms/scrap-information/add',
method: 'post',
data
})
@ -44,14 +44,14 @@ export function scrapInfoAdd(data) { // 新增报废信息单条数据
export function scrapInfoCode() { // 获取报废信息code
return request({
url: '/basic/scrap-information/get-code',
url: '/api/wms/scrap-information/get-code',
method: 'post'
})
}
export function scrapInfoDelete(id) { // 删除报废信息单条数据
return request({
url: '/basic/scrap-information/delete',
url: '/api/wms/scrap-information/delete',
method: 'post',
data: { id }
})

14
src/api/basicData/Scrap/ScrapType.js
查看文件

@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2021-03-10 14:25:59
* @LastEditTime: 2022-03-03 13:46:46
* @Description:
*/
import request from '@/utils/request'
export function scrapTypeList(data) { // 获取报废类型列表
return request({
url: '/basic/scrap-type-information/page',
url: '/api/wms/scrap-type-information/page',
method: 'post',
data
})
@ -20,7 +20,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据
'id': id
}
return request({
url: '/basic/scrap-type-information/get',
url: '/api/wms/scrap-type-information/get',
method: 'post',
data
})
@ -28,7 +28,7 @@ export function scrapTypeDetail(id) { // 获取报废类型单条数据
export function scrapTypeUpdate(data) { // 更新报废类型单条数据
return request({
url: '/basic/scrap-type-information/update',
url: '/api/wms/scrap-type-information/update',
method: 'post',
data
})
@ -36,7 +36,7 @@ export function scrapTypeUpdate(data) { // 更新报废类型单条数据
export function scrapTypeAdd(data) { // 新增报废类型单条数据
return request({
url: '/basic/scrap-type-information/add',
url: '/api/wms/scrap-type-information/add',
method: 'post',
data
})
@ -44,14 +44,14 @@ export function scrapTypeAdd(data) { // 新增报废类型单条数据
export function scrapTypeCode() { // 获取报废类型code
return request({
url: '/basic/scrap-type-information/get-code',
url: '/api/wms/scrap-type-information/get-code',
method: 'post'
})
}
export function scrapTypeDelete(id) { // 删除报废类型单条数据
return request({
url: '/basic/scrap-type-information/delete',
url: '/api/wms/scrap-type-information/delete',
method: 'post',
data: { id }
})

4
src/api/basicData/StateConfig.js
查看文件

@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2021-01-13 16:11:45
* @LastEditTime: 2022-03-03 16:10:54
* @Description:
*/
import request from '@/utils/request'
export function StateConfigList(data) { // 获取状态列表
return request({
url: '/basic/configure-display/page',
url: '/api/wms/configure-display/page',
method: 'post',
data
})

14
src/api/basicData/dataDictionary.js
查看文件

@ -1,15 +1,15 @@
/*
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-05-19 15:57:56
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 15:10:16
* @Description:
*/
import request from '@/utils/request'
export function dataDictionaryDataList(data) { // 获取字典类型列表
return request({
url: '/basic/platform-dict/selectPlatformDictDataListByPage',
url: '/api/wms/platform-dict/selectPlatformDictDataListByPage',
method: 'post',
data
})
@ -17,7 +17,7 @@ export function dataDictionaryDataList(data) { // 获取字典类型列表
export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据
return request({
url: '/basic/platform-dict/selectPlatformDictDataById',
url: '/api/wms/platform-dict/selectPlatformDictDataById',
method: 'post',
data: { id }
})
@ -25,7 +25,7 @@ export function dataDictionaryDataDetail(id) { // 获取字典类型单条数据
export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数据
return request({
url: '/basic/platform-dict/updatePlatformDictData',
url: '/api/wms/platform-dict/updatePlatformDictData',
method: 'post',
data
})
@ -33,7 +33,7 @@ export function dataDictionaryDataUpdate(data) { // 更新字典类型单条数
export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据
return request({
url: '/basic/platform-dict/savePlatformDictData',
url: '/api/wms/platform-dict/savePlatformDictData',
method: 'post',
data
})
@ -41,7 +41,7 @@ export function dataDictionaryDataAdd(data) { // 新增字典类型单条数据
export function dataDictionaryDataDelete(id) { // 删除字典类型单条数据
return request({
url: '/basic/platform-dict/deletePlatformDictData',
url: '/api/wms/platform-dict/deletePlatformDictData',
method: 'post',
data: { id }
})

12
src/api/basicData/dataDictionaryType.js
查看文件

@ -2,14 +2,14 @@
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: zwq
* @LastEditTime: 2021-04-16 12:51:29
* @LastEditTime: 2022-03-03 15:29:30
* @Description:
*/
import request from '@/utils/request'
export function dataDictionaryTypeList(data) { // 获取字典类型列表
return request({
url: '/basic/platform-dict/selectPlatformDictTypeListByPage',
url: '/api/wms/platform-dict/selectPlatformDictTypeListByPage',
method: 'post',
data
})
@ -17,7 +17,7 @@ export function dataDictionaryTypeList(data) { // 获取字典类型列表
export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据
return request({
url: '/basic/platform-dict/selectDictTypeById',
url: '/api/wms/platform-dict/selectDictTypeById',
method: 'post',
data: { id }
})
@ -25,7 +25,7 @@ export function dataDictionaryTypeDetail(id) { // 获取字典类型单条数据
export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数据
return request({
url: '/basic/platform-dict/updatePlatformDictType',
url: '/api/wms/platform-dict/updatePlatformDictType',
method: 'post',
data
})
@ -33,7 +33,7 @@ export function dataDictionaryTypeUpdate(data) { // 更新字典类型单条数
export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据
return request({
url: '/basic/platform-dict/savePlatformDictType',
url: '/api/wms/platform-dict/savePlatformDictType',
method: 'post',
data
})
@ -41,7 +41,7 @@ export function dataDictionaryTypeAdd(data) { // 新增字典类型单条数据
export function dataDictionaryTypeDelete(id) { // 删除字典类型单条数据
return request({
url: '/basic/platform-dict/deletePlatformDictType',
url: '/api/wms/platform-dict/deletePlatformDictType',
method: 'post',
data: { id }
})

6
src/api/equipment/maintain.js
查看文件

@ -1,7 +1,7 @@
/*
* @Date: 2021-01-15 17:42:07
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-12 10:31:01
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 13:52:50
* @FilePath: \basic-admin\src\api\equipment\maintain.js
* @Description: 保养计划 & 保养记录 接口定义
*/
@ -109,7 +109,7 @@ export function getMaintainLog(data) {
// 获取设备列表
export function getEqList(data) {
return request({
url: '/basic/equipment/page',
url: '/api/wms/equipment/page',
method: 'post',
data
})

11
src/api/material-manage/material.js
查看文件

@ -1,15 +1,22 @@
/*
* @Author: zwq
* @Date: 2021-09-18 16:09:07
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 09:52:41
* @Description:
*/
import request from '@/utils/request'
export function list(data) {
return request({
url: 'material/material-date/materialList',
url: 'api/process/process-flow-equipment/equipmentList',
method: 'post',
data
})
}
export function listEquipment(data) {
return request({
url: 'material/equipment-material-replace/equipmentList',
url: 'api/process/process-flow-equipment/equipmentList',
method: 'post',
data
})

30
src/api/orderManage/workOrder/workOrder.js
查看文件

@ -1,15 +1,15 @@
/*
* @Author: zwq
* @Date: 2020-12-29 16:00:14
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-20 10:30:39
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 13:57:00
* @Description:
*/
import request from '@/utils/request'
export function workOrderList(data) { // 获取工单列表
return request({
url: '/order/work-order/page',
url: '/api/order/work-order/page',
method: 'post',
data
})
@ -20,7 +20,7 @@ export function workOrderDetail(id) { // 获取工单单条数据
'id': id
}
return request({
url: '/order/work-order/get',
url: '/api/order/work-order/get',
method: 'post',
data
})
@ -28,7 +28,7 @@ export function workOrderDetail(id) { // 获取工单单条数据
export function workOrderUpdate(data) { // 更新工单单条数据
return request({
url: '/order/work-order/update',
url: '/api/order/work-order/update',
method: 'post',
data
})
@ -36,7 +36,7 @@ export function workOrderUpdate(data) { // 更新工单单条数据
export function workOrderAdd(data) { // 新增工单单条数据
return request({
url: '/order/work-order/add',
url: '/api/order/work-order/add',
method: 'post',
data
})
@ -44,14 +44,14 @@ export function workOrderAdd(data) { // 新增工单单条数据
export function workOrderCode() { // 获取工单code
return request({
url: '/order/work-order/get-code',
url: '/api/order/work-order/get-code',
method: 'post'
})
}
export function workOrderDelete(id) { // 删除工单单条数据
return request({
url: '/order/work-order/delete',
url: '/api/order/work-order/delete',
method: 'post',
data: { id }
})
@ -59,7 +59,7 @@ export function workOrderDelete(id) { // 删除工单单条数据
export function workOrderIssueList(data) { // 获取工单下发列表
return request({
url: '/order/wo-sync/page',
url: '/api/order/wo-sync/page',
method: 'post',
data
})
@ -67,7 +67,7 @@ export function workOrderIssueList(data) { // 获取工单下发列表
export function packagingBoxList(data) { // 获取包装基板列表
return request({
url: '/order/wo-packaging-box-substrate/page',
url: '/api/order/wo-packaging-box-substrate/page',
method: 'post',
data
})
@ -75,7 +75,7 @@ export function packagingBoxList(data) { // 获取包装基板列表
export function packagingList(data) { // 获取包装标签列表
return request({
url: '/order/wo-packaging-box/page',
url: '/api/order/wo-packaging-box/page',
method: 'post',
data
})
@ -86,7 +86,7 @@ export function packagingDetail(id) { // 获取包装标签详情
'id': id
}
return request({
url: '/order/wo-packaging-box/get',
url: '/api/order/wo-packaging-box/get',
method: 'post',
data
})
@ -94,7 +94,7 @@ export function packagingDetail(id) { // 获取包装标签详情
export function syncAdd(data) { // 新增下发工单单条数据
return request({
url: '/order/wo-sync/add',
url: '/api/order/wo-sync/add',
method: 'post',
data
})
@ -102,7 +102,7 @@ export function syncAdd(data) { // 新增下发工单单条数据
export function packagingInventoryList(data) { // 获取包装清单列表
return request({
url: '/order/wo-packaging-box/page-for-inventory',
url: '/api/order/wo-packaging-box/page-for-inventory',
method: 'post',
data
})
@ -110,7 +110,7 @@ export function packagingInventoryList(data) { // 获取包装清单列表
export function updateForStatus(data) { // 激活
return request({
url: '/order/work-order/updateForStatus',
url: '/api/order/work-order/updateForStatus',
method: 'post',
data
})

18
src/api/quality-manage/scrap.js
查看文件

@ -1,7 +1,7 @@
/*
* @Date: 2021-03-15 10:27:40
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-09 14:35:26
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 15:40:29
* @FilePath: \basic-admin\src\api\quality-manage\scrap.js
* @Description:
*/
@ -9,7 +9,7 @@ import request from '@/utils/request'
export function getScrapList(data) {
return request({
url: '/quality/scrap/page',
url: '/api/wms/scrap/page',
method: 'post',
data
})
@ -17,7 +17,7 @@ export function getScrapList(data) {
export function delScrapInfo(data) {
return request({
url: '/quality/scrap/delete',
url: '/api/wms/scrap/delete',
method: 'post',
data
})
@ -25,7 +25,7 @@ export function delScrapInfo(data) {
export function editScrapInfo(data) {
return request({
url: '/quality/scrap/update',
url: '/api/wms/scrap/update',
method: 'post',
data
})
@ -33,14 +33,14 @@ export function editScrapInfo(data) {
export function addScrapInfo(data) {
return request({
url: '/quality/scrap/create',
url: '/api/wms/scrap/create',
method: 'post',
data
})
}
export function getScrapInfo(data) {
return request({
url: '/quality/scrap/findById',
url: '/api/wms/scrap/findById',
method: 'post',
data
})
@ -49,7 +49,7 @@ export function getScrapInfo(data) {
// 废品报废 原因
export function getscrapReason(data) {
return request({
url: '/basic/scrap-information/get',
url: '/api/wms/scrap-information/get',
method: 'post',
data
})
@ -58,7 +58,7 @@ export function getscrapReason(data) {
// 根据设备id查询肺片等级
export function getScrap(id) {
return request({
url: '/basic/equipment-scraps-grade/getScrapsGradeByEquipmentId',
url: '/api/wms/equipment-scraps-grade/getScrapsGradeByEquipmentId',
method: 'post',
data: { id }
})

8
src/api/quality-manage/scrapCategoryStatistics.js
查看文件

@ -1,7 +1,7 @@
/*
* @Date: 2021-03-15 10:27:40
* @LastEditors: Please set LastEditors
* @LastEditTime: 2021-07-09 14:35:26
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 15:40:35
* @FilePath: \basic-admin\src\api\quality-manage\scrap.js
* @Description:
*/
@ -9,7 +9,7 @@ import request from '@/utils/request'
export function getList(data) {
return request({
url: '/quality/scrap/findReportByEquipmentId',
url: '/api/wms/scrap/findReportByEquipmentId',
method: 'post',
data
})
@ -18,7 +18,7 @@ export function getList(data) {
// 废品报废 原因
export function getscrapReason(data) {
return request({
url: '/basic/scrap-information/get',
url: '/api/wms/scrap-information/get',
method: 'post',
data
})

12
src/lang/i18n.js
查看文件

@ -952,6 +952,18 @@ export default {
zh: '质量检测计划',
en: 'Quality Detect Plan'
},
scrapManagement: {
zh: '废片管理',
en: 'Scrap management',
gradeInfo: {
zh: '等级信息',
en: 'Grade Info'
},
scrapInfo: {
zh: '废片信息',
en: 'Scrap Info'
}
},
knowledge: {
zh: '维护保养知识库',
en: 'Maintain the knowledge base'

105
src/router/index.js
查看文件

@ -187,6 +187,24 @@ export const constantRoutes = [
meta: { title: routerTitle.basicData.materials.materialType?.[language] || routerTitle.basicData.materials.materialType.en, icon: 'form', affix: true, required: true, requireToken: true }
}
]
},
{
path: '/dataDictionary',
component: () => import('@/views/basicData/index'),
name: 'dataDictionary',
meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [{
path: 'dataDictionary',
component: () => import('@/views/basicData/dataDictionary'),
name: 'dataDictionary',
meta: { title: routerTitle.basicData.dataDictionaryType?.[language] || routerTitle.basicData.dataDictionaryType.en, icon: 'form', affix: true, required: true, requireToken: true }
}, {
path: 'dataDictionaryData',
component: () => import('@/views/basicData/components/dataDictionaryData'),
hidden: true,
name: 'dataDictionaryData',
meta: { title: routerTitle.basicData.dataDictionaryType.dataDictionary?.[language] || routerTitle.basicData.dataDictionaryType.dataDictionary.en, icon: 'form', affix: true, required: true, requireToken: true }
}]
}
]
},
@ -301,95 +319,45 @@ export const constantRoutes = [
component: Layout,
redirect: '/quality',
name: 'qualityManage',
hidden: true,
meta: { title: routerTitle.quality?.[language] || routerTitle.quality.en, icon: 'form', iconPart: 'qualityManage', affix: true, required: true, requireToken: true },
children: [
{
path: 'scrap',
component: () => import('@/views/QualityManager/scrap'),
name: 'scrapManage',
meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
},
{
path: 'scrapcategorystatistics',
component: () => import('@/views/QualityManager/scrap/scrapCategoryStatistics'),
name: 'scrapCategoryStatistics',
meta: { title: routerTitle.quality.scrapcategorystatistics?.[language] || routerTitle.quality.scrapcategorystatistics.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
},
{
path: 'plan',
component: () => import('@/views/QualityManager/plan'),
component: () => import('@/views/QualityManager/QCPplan'),
name: 'PlanManage',
meta: { title: routerTitle.quality.plan?.[language] || routerTitle.quality.plan.en, icon: 'form', affix: true }
}, {
path: 'planparam',
component: () => import('@/views/QualityManager/plan/subpage/detail'),
name: 'PlanParamManage',
hidden: true,
meta: { title: routerTitle.quality.planform?.[language] || routerTitle.quality.planform.en, icon: 'form', affix: true }
}, {
path: 'issue',
component: () => import('@/views/QualityManager/plan/issuedplan'),
name: 'PlanIssuedManage',
meta: { title: routerTitle.quality.issuedplan?.[language] || routerTitle.quality.issuedplan.en, icon: 'form', affix: true }
},
{
path: '/offlineDetec',
component: () => import('@/views/basicData/index'),
name: 'offlineDetec',
meta: { title: routerTitle.quality.offlineDetec?.[language] || routerTitle.quality.offlineDetec.en, icon: 'form', affix: true, required: true, requireToken: true },
meta: { title: routerTitle.quality.scrapManagement?.[language] || routerTitle.quality.scrapManagement.en, icon: 'form', affix: true, required: true, requireToken: true },
children: [
{
path: 'detecParam',
component: () =>
import('@/views/QualityManager/offlineDetec/detecParam'),
name: 'detecParam',
hidden: true,
meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true }
path: 'ScrapInfo',
component: () => import('@/views/basicData/Scrap/ScrapInfo'),
name: 'ScrapInfo',
meta: { title: routerTitle.basicData.scrap.scrapInfo?.[language] || routerTitle.basicData.scrap.scrapInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'detecParamAdd',
component: () =>
import('@/views/QualityManager/offlineDetec/components/detecParam-add'),
name: 'detecParamAdd',
hidden: true,
meta: { title: routerTitle.quality.offlineDetec.detecParam?.[language] || routerTitle.quality.offlineDetec.detecParam.detecParam.en, icon: 'form', affix: true, required: true, requireToken: true }
path: 'ScrapType',
component: () => import('@/views/basicData/Scrap/ScrapType'),
name: 'ScrapType',
meta: { title: routerTitle.basicData.scrap.scrapType?.[language] || routerTitle.basicData.scrap.scrapType.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'equipmentDetectParam',
component: () =>
import('@/views/basicData/Equipment/equipmentDetectParam'),
name: 'equipmentDetectParam',
hidden: true,
meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true }
path: 'EquipmentScrapGrade',
component: () => import('@/views/basicData/EquipmentScrapGrade'),
name: 'EquipmentScrapGrade',
meta: { title: routerTitle.basicData.EquipmentScrapGrade?.[language] || routerTitle.basicData.EquipmentScrapGrade.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'equipmentDetectParamAdd',
component: () =>
import('@/views/basicData/Equipment/components/equipmentDetectParam-add'),
name: 'equipmentDetectParamAdd',
meta: { title: routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam?.[language] || routerTitle.basicData.equipment.equipmentDetectInfo.equipmentDetectParam.en, icon: 'form', affix: true, required: true, requireToken: true }
},
{
path: 'detecRegistration',
component: () =>
import('@/views/QualityManager/offlineDetec/detecRegistration'),
name: 'detecRegistration',
meta: { title: routerTitle.quality.offlineDetec.detecRegistration?.[language] || routerTitle.quality.offlineDetec.detecRegistration.en, icon: 'form', affix: true, required: true, requireToken: true }
path: 'scrap',
component: () => import('@/views/QualityManager/scrap'),
name: 'scrapManage',
meta: { title: routerTitle.quality.scrap?.[language] || routerTitle.quality.scrap.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, unuse: true }
}
]
},
{
path: '/spc',
component: () => import('@/views/spc/index'),
name: 'spcManage',
meta: { title: routerTitle.spc?.[language] || routerTitle.spc.en, icon: 'form', iconPart: 'formwhite', affix: true, required: true, requireToken: true, openUrl: 'http://58.210.206.230:8000/thirdLogin?username=ZJCadmin&password=123456' }
},
{
path: 'knowledge',
component: () => import('@/views/QualityManager/base/knowledge'),
name: 'knowledge',
meta: { title: routerTitle.quality.knowledge?.[language] || routerTitle.quality.knowledge.en, icon: 'form', iconPart: 'formwhite', affix: true }
}
]
},
@ -437,7 +405,6 @@ export const constantRoutes = [
component: Layout,
redirect: '/user/manager',
name: 'ArticleManager',
hidden: true,
meta: { title: routerTitle.basic?.[language] || routerTitle.basic.en, icon: 'form', iconPart: 'ArticleManager', affix: true, required: true, requireToken: true },
children: [
{

178
src/views/QualityManager/QCPplan.vue 普通文件
查看文件

@ -0,0 +1,178 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: zwq
* @LastEditTime: 2022-03-03 14:28:58
* @Description:
-->
<template>
<div class="app-container">
<head-form
:placeholder-name="placeholderName"
:key-name="keyName"
:show-add="showAdd"
@getDataList="getList"
@add="addNew"
/>
<base-table
:page="listQuery.current"
:limit="listQuery.size"
:table-config="tableProps"
:table-data="list"
:is-loading="listLoading"
>
<method-btn
slot="handleBtn"
:width="trueWidth"
:method-list="tableBtn"
@clickBtn="handleClick"
/>
</base-table>
<pagination
v-show="total > 0"
:total="total"
:page.sync="listQuery.current"
:limit.sync="listQuery.size"
@pagination="getList()"
/>
</div>
</template>
<script>
import i18n from '@/lang'
import { StateConfigList, StateConfigDelete } from '@/api/basicData/StateConfig'
import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import { timeFormatter } from '@/filters'
import basicData from '@/filters/basicData'
/**
* 表格表头配置项 TypeScript接口注释
* tableConfig<ConfigItem> = []
*
* Interface ConfigItem = {
* prop: string,
* label: string,
* width: string,
* align: string,
* subcomponent: function,
* filter: function
* }
*
*
*/
const tableBtn = [
{
type: 'edit',
btnName: 'btn.edit'
}
// {
// type: 'delete',
// btnName: 'btn.delete'
// }
]
const tableProps = [
{
prop: 'createTime',
label: i18n.t('module.basicData.factory.createTime'),
filter: timeFormatter,
align: 'center'
},
{
prop: 'status',
label: i18n.t('module.basicData.StateConfig.status'),
align: 'center'
},
{
prop: 'twinkle',
label: i18n.t('module.basicData.StateConfig.Twinkle'),
filter: basicData('onDuty'),
align: 'center'
},
{
prop: 'colour',
label: i18n.t('module.basicData.StateConfig.DisplayColor'),
align: 'center'
},
{
prop: 'description',
label: i18n.t('module.basicData.visual.Remarks'),
align: 'center'
}
]
export default {
name: 'QCPplan',
components: { Pagination, BaseTable, MethodBtn, HeadForm },
data() {
return {
keyName: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.StateConfig.status'),
addOrUpdateVisible: false,
tableBtn,
trueWidth: 150,
tableProps,
list: [],
total: 0,
showAdd: false,
listLoading: true,
listQuery: {
current: 1,
size: 10
}
}
},
created() {
this.getList()
},
methods: {
handleClick(raw) {
console.log(raw)
if (raw.type === 'delete') {
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.status}]?`, this.$t('module.basicData.visual.Tips'), {
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
type: 'warning'
}).then(() => {
StateConfigDelete(raw.data.id).then(response => {
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',
duration: 1500,
onClose: () => {
this.getList()
}
})
})
}).catch(() => {})
}
},
getList(key) {
this.listLoading = true
this.listQuery.status = key
StateConfigList(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records
} else {
this.list.splice(0, this.list.length)
}
this.total = response.data.total
this.listLoading = false
})
}
}
}
</script>
<style scoped>
.edit-input {
padding-right: 100px;
}
.cancel-btn {
position: absolute;
right: 15px;
top: 10px;
}
</style>

20
src/views/art/process/process-chart.vue
查看文件

@ -13,11 +13,11 @@
{{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
</el-button>
</el-col>
<el-col :span="4" class="process-table-main-item-item">
<!-- <el-col :span="4" class="process-table-main-item-item">
<el-button v-if="!processPortObj[item.workSequenceId]" disabled>
{{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
</el-button>
</el-col>
</el-col> -->
<!-- <el-col :span="4" class="process-table-main-item-item">
<el-button v-if="!processPortObj[item.workSequenceId]" disabled>
{{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@ -36,7 +36,7 @@
</template>
<script>
import {
listAllEquipmentRecipe,
// listAllEquipmentRecipe,
listProcessFlowNode,
listProcess
} from '@/api/art-manage/art.js'
@ -57,7 +57,7 @@ export default {
processObj: {},
processPortObj: {},
equipmentRecipeList: [],
equipmentRecipeObj: [],
// equipmentRecipeObj: [],
equipmentList: [],
equipmentObj: {},
showAddList: [],
@ -102,12 +102,12 @@ export default {
console.log(this.processList)
console.log(this.processObj)
// 获取配方列表
const allRecipeRes = await listAllEquipmentRecipe()
this.equipmentRecipeList = allRecipeRes.data
allRecipeRes.data.map(item => {
this.equipmentRecipeObj[item.id] = item.name
})
console.log(this.equipmentRecipeList)
// const allRecipeRes = await listAllEquipmentRecipe()
// this.equipmentRecipeList = allRecipeRes.data
// allRecipeRes.data.map(item => {
// this.equipmentRecipeObj[item.id] = item.name
// })
// console.log(this.equipmentRecipeList)
// 获取设备列表
const allEquipmentRes = await listEquipment()
this.equipmentList = allEquipmentRes.data

53
src/views/art/process/process-table.vue
查看文件

@ -19,11 +19,11 @@
{{ i.equipmentId ? equipmentObj[i.equipmentId] : $t('module.art.eqName') }}
</el-button>
</el-col>
<el-col :span="4" class="process-table-main-item-item">
<!-- <el-col :span="4" class="process-table-main-item-item">
<el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceRecipe(index, idx, i.equipmentRecipeId)">
{{ i.equipmentRecipeId ? equipmentRecipeObj[i.equipmentRecipeId] : $t('module.art.recipeName') }}
</el-button>
</el-col>
</el-col> -->
<!-- <el-col :span="4" class="process-table-main-item-item">
<el-button v-if="!processPortObj[item.workSequenceId]" icon="el-icon-edit" @click="choiceArtType(index, idx, i.nodeType)">
{{ i.nodeType ? nodeTypesObj[i.nodeType] : $t('module.art.artType') }}
@ -55,7 +55,7 @@ import processTableSelect from './process-table-select.vue'
import processTableAdd from './process-table-add.vue'
import vuedraggable from 'vuedraggable'
import {
listAllEquipmentRecipe,
// listAllEquipmentRecipe,
addProcessFlows,
listProcessFlowNode,
listProcess
@ -82,7 +82,7 @@ export default {
processObj: {},
processPortObj: {},
equipmentRecipeList: [],
equipmentRecipeObj: [],
// equipmentRecipeObj: [],
equipmentList: [],
equipmentObj: {},
showAddList: [],
@ -131,12 +131,12 @@ export default {
console.log(this.processList)
console.log(this.processObj)
// 获取配方列表
const allRecipeRes = await listAllEquipmentRecipe()
this.equipmentRecipeList = allRecipeRes.data
allRecipeRes.data.map(item => {
this.equipmentRecipeObj[item.id] = item.name
})
console.log(this.equipmentRecipeList)
// const allRecipeRes = await listAllEquipmentRecipe()
// this.equipmentRecipeList = allRecipeRes.data
// allRecipeRes.data.map(item => {
// this.equipmentRecipeObj[item.id] = item.name
// })
// console.log(this.equipmentRecipeList)
// 获取设备列表
const allEquipmentRes = await listEquipment()
this.equipmentList = allEquipmentRes.data
@ -197,8 +197,8 @@ export default {
nodeType: '',
processFlowId: this.processFlowId,
workSequenceId: this.dataList[index].workSequenceId,
description: this.dataList[index].processFlowEquipmentParams[0]?.description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
remark: this.dataList[index].processFlowEquipmentParams[0]?.remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
description: this.dataList[index].processFlowEquipmentParams[0].description ? this.dataList[index].processFlowEquipmentParams[0].description : '',
remark: this.dataList[index].processFlowEquipmentParams[0].remark ? this.dataList[index].processFlowEquipmentParams[0].remark : ''
})
e.stopPropagation()
},
@ -232,16 +232,16 @@ export default {
this.$refs.processtableselect.init('equipmentId', first, sec, id, this.processObj[processId].equipments)
},
// 选择配方
choiceRecipe(first, sec, id) {
if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
} else {
this.$message.error(this.$t('module.art.choiceEqError'))
}
},
// choiceRecipe(first, sec, id) {
// if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
// this.$refs.processtableselect.init('equipmentRecipeId', first, sec, id, this.equipmentRecipeList.filter(f => f.equipmentId === this.dataList[first].processFlowEquipmentParams[sec].equipmentId))
// } else {
// this.$message.error(this.$t('module.art.choiceEqError'))
// }
// },
// 选择工艺类型
choiceArtType(first, sec, id) {
if (this.dataList[first].processFlowEquipmentParams[sec]?.equipmentId) {
if (this.dataList[first].processFlowEquipmentParams[sec].equipmentId) {
this.$refs.processtableselect.init('nodeType', first, sec, id, this.nodeTypes)
} else {
this.$message.error(this.$t('module.art.choiceEqError'))
@ -307,13 +307,14 @@ export default {
hasNull = true
}
})
} else {
item.processFlowEquipmentParams.map(i => {
if (!i.equipmentId || !i.equipmentRecipeId) {
hasNull = true
}
})
}
// else {
// item.processFlowEquipmentParams.map(i => {
// if (!i.equipmentId || !i.equipmentRecipeId) {
// hasNull = true
// }
// })
// }
})
// console.log(JSON.stringify(vm.dataList))
// if (vm.dataList.length === 0) {