Merge branch 'develop' into gtz
This commit is contained in:
commit
cf888de5d8
2
.gitignore
vendored
2
.gitignore
vendored
@ -22,4 +22,4 @@ selenium-debug.log
|
||||
package-lock.json
|
||||
yarn.lock
|
||||
/.env.development
|
||||
/vue.config.js
|
||||
vue.config.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
|
||||
})
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:00:14
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-01-28 09:38:31
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 14:29:17
|
||||
* @Description:
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function locationList(data) { // 获取库位信息列表
|
||||
return request({
|
||||
url: '/basic/stock/page',
|
||||
url: '/api/wms/area/locationByShelf',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -17,7 +17,7 @@ export function locationList(data) { // 获取库位信息列表
|
||||
|
||||
export function locationDetail(id) { // 获取库位信息单条数据
|
||||
return request({
|
||||
url: '/basic/stock/get',
|
||||
url: '/api/wms/area/locationById',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
@ -25,7 +25,7 @@ export function locationDetail(id) { // 获取库位信息单条数据
|
||||
|
||||
export function locationUpdate(data) { // 更新库位信息单条数据
|
||||
return request({
|
||||
url: '/basic/stock/update',
|
||||
url: '/api/wms/area/updatelocation',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -33,7 +33,7 @@ export function locationUpdate(data) { // 更新库位信息单条数据
|
||||
|
||||
export function locationAdd(data) { // 新增库位信息单条数据
|
||||
return request({
|
||||
url: '/basic/stock/add',
|
||||
url: '/api/wms/area/addlocation',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -41,14 +41,14 @@ export function locationAdd(data) { // 新增库位信息单条数据
|
||||
|
||||
export function locationCode() { // 获取库位信息code
|
||||
return request({
|
||||
url: '/basic/stock/get-code',
|
||||
url: '/api/wms/area/getCode',
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
export function locationDelete(id) { // 删除库位信息单条数据
|
||||
return request({
|
||||
url: '/basic/stock/delete',
|
||||
url: '/api/wms/area/deletelocation',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
|
||||
48
src/api/basicData/Cache/processLocation.js
Normal file
48
src/api/basicData/Cache/processLocation.js
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-06 18:13:49
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 18:29:43
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function list(data) { // 获取工序库位信息列表
|
||||
return request({
|
||||
url: '/api/wms/processlocation/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function detail(id) { // 获取工序库位信息单条数据
|
||||
return request({
|
||||
url: '/api/wms/processlocation/getById',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
}
|
||||
export function update(data) { // 更新工序库位信息单条数据
|
||||
return request({
|
||||
url: '/api/wms/processlocation/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function add(data) { // 手动绑定工序库位
|
||||
return request({
|
||||
url: '/api/wms/processlocation/add',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function locaDelete(id) { // 删除工序库位信息单条数据
|
||||
return request({
|
||||
url: '/api/wms/processlocation/delete',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:00:14
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-10 17:00:16
|
||||
* @LastEditTime: 2022-03-04 09:06:58
|
||||
* @Description:
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
@ -15,6 +15,14 @@ export function equipmentInfoList(data) { // 获取设备信息列表
|
||||
})
|
||||
}
|
||||
|
||||
export function equipmentlistList(data) { // 获取设备信息列表
|
||||
return request({
|
||||
url: '/api/process/work-sequence/equipmentlistList',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function equipmentInfoDetail(id) { // 获取设备信息单条数据
|
||||
return request({
|
||||
url: '/api/wms/equipment/get',
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:00:14
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-01-20 12:00:52
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 10:22:28
|
||||
* @Description:
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
@ -10,7 +10,7 @@ import request from '@/utils/request'
|
||||
export function equipmentInfoAttrList(data) { // 获取设备属性列表
|
||||
return request({
|
||||
// url: '/basic/equipment-attr/page',
|
||||
url: '/api/wms/equipment/page',
|
||||
url: '/api/wms/equipment/attr',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -27,7 +27,7 @@ export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据
|
||||
|
||||
export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数据
|
||||
return request({
|
||||
url: '/basic/equipment-attr/update',
|
||||
url: '/api/wms/equipment/updateattr',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -35,7 +35,7 @@ export function equipmentInfoAttrUpdate(data) { // 更新设备属性单条数
|
||||
|
||||
export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
|
||||
return request({
|
||||
url: '/basic/equipment-attr/add',
|
||||
url: '/api/wms/equipment/addattr',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -43,14 +43,14 @@ export function equipmentInfoAttrAdd(data) { // 新增设备属性单条数据
|
||||
|
||||
export function equipmentInfoAttrCode() { // 获取设备属性code
|
||||
return request({
|
||||
url: '/basic/equipment-attr/get-code',
|
||||
url: '/api/wms/equipment/getCode',
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
export function equipmentInfoAttrDelete(id) { // 删除设备属性单条数据
|
||||
return request({
|
||||
url: '/basic/equipment-attr/delete',
|
||||
url: '/api/wms/equipment/deleteattr',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
/*
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:00:14
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-17 16:04:51
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 10:05:02
|
||||
* @Description:
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function staffList(data) { // 获取员工列表
|
||||
return request({
|
||||
url: '/basic/worker/page',
|
||||
url: '/api/wms/worker/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -17,7 +17,7 @@ export function staffList(data) { // 获取员工列表
|
||||
|
||||
export function staffDetail(id) { // 获取员工单条数据
|
||||
return request({
|
||||
url: '/basic/worker/get',
|
||||
url: '/api/wms/worker/get',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
@ -25,7 +25,7 @@ export function staffDetail(id) { // 获取员工单条数据
|
||||
|
||||
export function staffUpdate(data) { // 更新员工单条数据
|
||||
return request({
|
||||
url: '/basic/worker/update',
|
||||
url: '/api/wms/worker/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -33,7 +33,7 @@ export function staffUpdate(data) { // 更新员工单条数据
|
||||
|
||||
export function staffAdd(data) { // 新增员工单条数据
|
||||
return request({
|
||||
url: '/basic/worker/add',
|
||||
url: '/api/wms/worker/add',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -41,14 +41,14 @@ export function staffAdd(data) { // 新增员工单条数据
|
||||
|
||||
export function staffCode() { // 获取员工code
|
||||
return request({
|
||||
url: '/basic/worker/get-code',
|
||||
url: '/api/wms/worker/get-code',
|
||||
method: 'post'
|
||||
})
|
||||
}
|
||||
|
||||
export function staffDelete(id) { // 删除员工单条数据
|
||||
return request({
|
||||
url: '/basic/worker/delete',
|
||||
url: '/api/wms/worker/delete',
|
||||
method: 'post',
|
||||
data: { id }
|
||||
})
|
||||
@ -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',
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -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
|
||||
})
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -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
|
||||
})
|
||||
|
||||
@ -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
|
||||
})
|
||||
|
||||
@ -1,15 +1,23 @@
|
||||
/*
|
||||
* @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-04 09:35:14
|
||||
* @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
|
||||
})
|
||||
}
|
||||
|
||||
export function workOrderListList(data) { // 00A获取工单列表
|
||||
return request({
|
||||
url: '/api/wms/work/order/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
@ -20,7 +28,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 +36,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 +44,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 +52,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 +67,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 +75,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 +83,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 +94,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 +102,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 +110,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 +118,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
|
||||
})
|
||||
|
||||
@ -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 }
|
||||
})
|
||||
|
||||
@ -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
|
||||
})
|
||||
|
||||
@ -1,19 +1,36 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-07 18:39:03
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-02-25 09:05:53
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 19:27:01
|
||||
* @Description: file content
|
||||
*/
|
||||
import request from '@/utils/request'
|
||||
|
||||
export function page(data) {
|
||||
// 获取当前库存存储箱列表
|
||||
export function list(data) {
|
||||
return request({
|
||||
url: '/api/report/report-sheet/page',
|
||||
url: '/api/report/report-storage-box/list',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 获取当前库存存储箱分页报表
|
||||
export function page(data) {
|
||||
return request({
|
||||
url: '/api/report/report-storage-box/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 导出当前库存存储箱列表
|
||||
export function download(data) {
|
||||
return request({
|
||||
url: '/api/report/report-storage-box/excel-download',
|
||||
method: 'post',
|
||||
data,
|
||||
'responseType': 'arraybuffer'
|
||||
})
|
||||
}
|
||||
|
||||
export function del(data) {
|
||||
return request({
|
||||
@ -47,3 +64,44 @@ export function listCategory(data) {
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
// 获取当前存储箱对应基板列表
|
||||
export function listSubstrate(data) {
|
||||
return request({
|
||||
url: '/api/report/report-substrate/list',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 删除基板信息
|
||||
export function deleSubstrate(data) {
|
||||
return request({
|
||||
url: '/api/report/report-substrate/delete',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 获取当前存储箱对应基板分页报表
|
||||
export function pageSubstrate(data) {
|
||||
return request({
|
||||
url: '/api/report/report-substrate/page',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 更新基板信息
|
||||
export function updateSubstrate(data) {
|
||||
return request({
|
||||
url: '/api/report/report-substrate/update',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
// 导出当前存储箱对应基板列表
|
||||
export function downloadSubstrate(data) {
|
||||
return request({
|
||||
url: '/api/report/report-substrate/excel-download',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2020-12-14 09:07:03
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-22 09:12:23
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 11:13:00
|
||||
* @FilePath: \basic-admin\src\filters\index.js
|
||||
* @Description: 过滤器定义、多语言过滤器修改
|
||||
*/
|
||||
|
||||
@ -280,6 +280,10 @@ export default {
|
||||
equipment: {
|
||||
zh: '设备管理',
|
||||
en: 'Equipment Manager',
|
||||
EquipmentUtilizationRate: {
|
||||
zh: '设备稼动率',
|
||||
en: 'EQ OEE'
|
||||
},
|
||||
EquipmentVisualization: {
|
||||
zh: '设备可视化',
|
||||
en: 'Equipment Visualization',
|
||||
@ -567,10 +571,18 @@ export default {
|
||||
zh: '货架信息',
|
||||
en: 'Shelf Add'
|
||||
},
|
||||
shelfInfo: {
|
||||
zh: '货位管理',
|
||||
en: 'Shelf Info'
|
||||
},
|
||||
locationAdd: {
|
||||
zh: '库位信息',
|
||||
en: 'Location Add'
|
||||
},
|
||||
location: {
|
||||
zh: '添加库位',
|
||||
en: 'Location Management'
|
||||
},
|
||||
storageBox: {
|
||||
zh: '存储箱',
|
||||
en: 'Storage Box'
|
||||
@ -580,6 +592,18 @@ export default {
|
||||
en: 'Position Detail Info'
|
||||
}
|
||||
},
|
||||
process: {
|
||||
zh: '工序信息',
|
||||
en: 'ProcessLocation Info',
|
||||
processInfo: {
|
||||
zh: '工序库位信息',
|
||||
en: 'ProcessLocation Info'
|
||||
},
|
||||
processInfoAdd: {
|
||||
zh: '工序库位信息管理',
|
||||
en: 'ProcessLocation Manage'
|
||||
}
|
||||
},
|
||||
equipment: {
|
||||
zh: '设备信息',
|
||||
en: 'Equipment Info',
|
||||
@ -723,6 +747,10 @@ export default {
|
||||
HistoricalTask: {
|
||||
zh: '历史任务',
|
||||
en: 'Historical Task'
|
||||
},
|
||||
ProcessStorageManagement: {
|
||||
zh: '工序存储区域管理',
|
||||
en: 'Process Storage Management'
|
||||
}
|
||||
},
|
||||
order: {
|
||||
@ -916,6 +944,26 @@ export default {
|
||||
form: {
|
||||
zh: '报表管理',
|
||||
en: 'Report Form',
|
||||
currentInventory: {
|
||||
zh: '当前库存',
|
||||
en: 'Current Inventory'
|
||||
},
|
||||
currentEmptyBox: {
|
||||
zh: '当前仓库空箱信息',
|
||||
en: 'Current Empty Box'
|
||||
},
|
||||
currentSubstrate: {
|
||||
zh: '当前基板流转情况',
|
||||
en: 'Current Substrate'
|
||||
},
|
||||
viewSubstrate: {
|
||||
zh: '查看基板',
|
||||
en: 'View Substrate'
|
||||
},
|
||||
editSubstrate: {
|
||||
zh: '编辑基板',
|
||||
en: 'Edit Substrate'
|
||||
},
|
||||
report: {
|
||||
zh: '报表列表',
|
||||
en: 'Report List'
|
||||
@ -952,6 +1000,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'
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-08 09:45:54
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-15 19:34:46
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 15:07:12
|
||||
* @Description: file content
|
||||
*/
|
||||
|
||||
@ -47,6 +47,7 @@ export default {
|
||||
sameEqError: 'Can not choice same equipment!',
|
||||
processList: {
|
||||
processName: 'Process Step Name',
|
||||
processCode: 'process Code',
|
||||
processEq: 'Process Step Equipment',
|
||||
description: 'Description',
|
||||
addProcess: 'Add a Process Step',
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-17 15:12:18
|
||||
* @LastEditTime: 2022-03-04 15:24:39
|
||||
* @Description: file content
|
||||
*/
|
||||
export default {
|
||||
@ -225,6 +225,7 @@ export default {
|
||||
wasteGrade: 'Waste Grade',
|
||||
RegisterPerson: 'Register Person',
|
||||
updateTime: 'Update Time',
|
||||
registrationPlace: 'Registration Place',
|
||||
cause: 'Cause',
|
||||
causeCode: 'Cause Code',
|
||||
WasteName: 'Waste Name',
|
||||
@ -286,6 +287,7 @@ export default {
|
||||
BoxStatus: 'Box Status',
|
||||
BoxNumber: 'Box Number',
|
||||
PreviousOperation: 'Previous Operation',
|
||||
ExecutionOperation: 'Execution Operation',
|
||||
NextOperation: 'Next Operation',
|
||||
CompletionTime: 'Completion Time',
|
||||
StartLocation: 'Start Location',
|
||||
@ -314,6 +316,8 @@ export default {
|
||||
IsEmpty: 'Is Empty',
|
||||
IsEmptyBox: 'Is Empty Box',
|
||||
LocationName: 'Location Name',
|
||||
LocationCode: 'Location Code'
|
||||
LocationCode: 'Location Code',
|
||||
PerformTaskManual: 'Perform Task Manual',
|
||||
processStorageLink: 'Process Storage Link'
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2021-03-05 10:04:30
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-23 09:13:56
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:31:23
|
||||
* @FilePath: \basic-admin\src\lang\i18n\en\module\equipmentManager.js
|
||||
* @Description:
|
||||
*/
|
||||
@ -19,6 +19,68 @@ export default {
|
||||
Water: 'Water',
|
||||
Gas: 'Gas'
|
||||
},
|
||||
monitoringInfo: {
|
||||
allCycles: 'Total cycle Times',
|
||||
badTimes: 'Failure Times',
|
||||
time: 'Time',
|
||||
MCBF: 'MCBF',
|
||||
previousStatus: 'State Before',
|
||||
runTime: 'UpTime (hours)',
|
||||
produceTime: 'Production time (hours)',
|
||||
productiveCount: 'Actual Capacity',
|
||||
timeRate: 'Time Start Rate',
|
||||
performanceRate: 'Performance Start Rate',
|
||||
oee: 'OEE',
|
||||
E10StartTime: 'E10 StartTime',
|
||||
E10endTime: 'E10 EndTime',
|
||||
laterE10Status: 'Changed E10 State',
|
||||
duration: 'Duration',
|
||||
goodsNumbers: 'OK Quantity',
|
||||
noOkNumbers: 'NOK Quantity',
|
||||
onceOkCount: 'OK Quantity Of Fist Process ',
|
||||
reworkOkCount: 'OK Quantity Of Rework ',
|
||||
GetTimePeriod: 'Time Period',
|
||||
ProductionTimePeriod: 'Production Time Period',
|
||||
MaintenanceTimes: 'Maintenance Times',
|
||||
RunningTime: 'Running Time',
|
||||
E10status: 'E10 State',
|
||||
number: 'Quantity Produced Of Current day',
|
||||
yieId: 'Daily yield',
|
||||
bom: 'Daily Consumption Of Materials,',
|
||||
controlState: 'Control State',
|
||||
equipmentName: 'EQ Name',
|
||||
e10Code: 'E10 State',
|
||||
materialName: 'MaterialName',
|
||||
port: 'Loading Port',
|
||||
productCount: 'Product Quantity',
|
||||
spec: 'Spec',
|
||||
materialNo: 'MaterialNo',
|
||||
upTime: 'Loading Time',
|
||||
upCount: 'Loading Amount',
|
||||
useCount: 'Used Amount',
|
||||
unit: 'Unit',
|
||||
eventName: 'EventName',
|
||||
paramName: 'ParamName',
|
||||
paramValue: 'ParamValue',
|
||||
standardFormat: 'StandardFormat',
|
||||
paramFormat: 'ParamFormat',
|
||||
receiveTime: 'ReceivedTime',
|
||||
recipe: 'EQ Recipe',
|
||||
controlStatus: 'Control State',
|
||||
traceDataState: 'Trace Data OpenState',
|
||||
controlStateUpdateTime: 'Control State UpdateTime',
|
||||
e10UpdateTime: 'E10 Update Time',
|
||||
StateFlg: 'StateFlag',
|
||||
EnableSpooling: 'EnableSpooling',
|
||||
maxspooltransmit: 'MaxSpoolTransmit',
|
||||
spoolingstate: 'SpoolingState',
|
||||
spoolingcountactual: 'SpoolingCountActual',
|
||||
SpoolingCountTotal: 'SpoolingCountTotal',
|
||||
F1F3Succ: 'F1F3 Request Success',
|
||||
F2F13Succ: 'F2F13 Request Success',
|
||||
baseChart: 'Processed Substrates Quantity',
|
||||
monitorChart: 'EQ Running Time'
|
||||
},
|
||||
sparepart: {
|
||||
'sparepart': 'Sparepart',
|
||||
'code': 'Sparepart number',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2021-03-13 13:49:16
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-04-15 09:59:15
|
||||
* @LastEditTime: 2022-03-04 09:21:36
|
||||
* @FilePath: \basic-admin\src\lang\i18n\en\module\quality.js
|
||||
* @Description:
|
||||
*/
|
||||
@ -90,5 +90,10 @@ export default {
|
||||
subTitle: 'Scrap Category Statistics',
|
||||
completeWaste: 'Complete Waste',
|
||||
CanBeUsedAfterProcessing: 'Can be used after processing'
|
||||
},
|
||||
QCPplan: {
|
||||
QCPcode: 'QCP Code',
|
||||
getTime: 'Get Time',
|
||||
detail: 'Detail'
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-08 09:46:00
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-15 19:35:00
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 15:07:02
|
||||
* @Description: file content
|
||||
*/
|
||||
|
||||
@ -47,6 +47,7 @@ export default {
|
||||
sameEqError: '不能选择相同的设备!',
|
||||
processList: {
|
||||
processName: '工序名称',
|
||||
processCode: '工序编码',
|
||||
processEq: '工序设备',
|
||||
description: '描述',
|
||||
addProcess: '添加一道工序',
|
||||
|
||||
@ -2,8 +2,7 @@
|
||||
* @Author: gtz
|
||||
* @Date: 2021-03-04 16:13:51
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-17 15:12:12
|
||||
* @Description: file content
|
||||
* @LastEditTime: 2022-03-07 09:14:33
|
||||
*/
|
||||
export default {
|
||||
visual: {
|
||||
@ -135,6 +134,8 @@ export default {
|
||||
AreaName: '货架名称',
|
||||
rowNum: '行数',
|
||||
columnNum: '列数',
|
||||
rowMark: '行标',
|
||||
columnMark: '列标',
|
||||
Shelf: '货架',
|
||||
ManageShelves: '管理货架',
|
||||
ShelfCode: '货架编码',
|
||||
@ -145,13 +146,16 @@ export default {
|
||||
ManageLocation: '管理货位',
|
||||
LocationCode: '库位编码',
|
||||
LocationName: '库位名称',
|
||||
anotherName: '别名',
|
||||
locationType: '库位类型',
|
||||
anotherName: '库位别名',
|
||||
place: '位置',
|
||||
addCacheArea: '添加货架'
|
||||
addCacheArea: '添加货架',
|
||||
addLocation: '添加库位',
|
||||
status: '状态'
|
||||
},
|
||||
storageBox: {
|
||||
name: '名称',
|
||||
code: '编码',
|
||||
name: '存储箱名称',
|
||||
code: '存储箱编码',
|
||||
alias: '别名',
|
||||
StorageQuantity: '存储数量',
|
||||
status: '状态',
|
||||
@ -162,6 +166,8 @@ export default {
|
||||
PositionCodeAlias: '位置编码别名'
|
||||
},
|
||||
equipment: {
|
||||
shortName: '名称缩写',
|
||||
enName: '英文名称',
|
||||
EquipmentName: '设备名称',
|
||||
EquipmentCode: '设备编码',
|
||||
EquipmentType: '设备类型',
|
||||
@ -225,6 +231,7 @@ export default {
|
||||
wasteGrade: '废品等级',
|
||||
RegisterPerson: '登记人',
|
||||
updateTime: '登记时间',
|
||||
registrationPlace: '登记地点',
|
||||
cause: '报废原因',
|
||||
causeCode: '报废原因编码',
|
||||
WasteName: '废品报废名称',
|
||||
@ -238,6 +245,14 @@ export default {
|
||||
manual: '手动',
|
||||
workOrderId: '工单名称'
|
||||
},
|
||||
processLocation: {
|
||||
sequence: '顺序',
|
||||
locationName: '库位名',
|
||||
isProcess: '是否为工序准备箱',
|
||||
locationId: '库位ID',
|
||||
workSequenId: '工序ID',
|
||||
equipmentMark: '设备标记'
|
||||
},
|
||||
productPool: {
|
||||
productName: '产品名称',
|
||||
productCode: '产品编码'
|
||||
@ -286,6 +301,7 @@ export default {
|
||||
BoxStatus: '箱状态',
|
||||
BoxNumber: '箱号',
|
||||
PreviousOperation: '上一个工序',
|
||||
ExecutionOperation: '执行工序',
|
||||
NextOperation: '下一个工序',
|
||||
CompletionTime: '完成时间',
|
||||
StartLocation: '开始库位',
|
||||
@ -314,7 +330,8 @@ export default {
|
||||
IsEmpty: '是否有基板',
|
||||
IsEmptyBox: '是否空箱',
|
||||
LocationName: '库位名',
|
||||
LocationCode: '库位编码'
|
||||
|
||||
LocationCode: '库位编码',
|
||||
PerformTaskManual: '手动执行任务',
|
||||
processStorageLink: '工序关联库位'
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2021-03-05 10:04:37
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-23 09:13:20
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:31:16
|
||||
* @FilePath: \basic-admin\src\lang\i18n\zh\module\equipmentManager.js
|
||||
* @Description:
|
||||
*/
|
||||
@ -19,6 +19,68 @@ export default {
|
||||
'Water': '水',
|
||||
'Gas': '气'
|
||||
},
|
||||
monitoringInfo: {
|
||||
allCycles: '总循环次数',
|
||||
badTimes: '故障次数',
|
||||
time: '时间',
|
||||
MCBF: 'MCBF',
|
||||
previousStatus: '转换前状态',
|
||||
runTime: '开机时长(时)',
|
||||
produceTime: '生产时长(时)',
|
||||
productiveCount: '实际产能',
|
||||
timeRate: '时间开动率',
|
||||
performanceRate: '性能开动率',
|
||||
oee: '综合效率OEE',
|
||||
E10StartTime: 'E10开始时间',
|
||||
E10endTime: 'E10结束时间',
|
||||
laterE10Status: '变化后E10状态',
|
||||
duration: '持续时间',
|
||||
goodsNumbers: '良品数量',
|
||||
noOkNumbers: '不良品数量',
|
||||
onceOkCount: '一次加工良品数量',
|
||||
reworkOkCount: '重工良品数量',
|
||||
GetTimePeriod: '获取时间段',
|
||||
ProductionTimePeriod: '生产时间段',
|
||||
MaintenanceTimes: '维护次数',
|
||||
RunningTime: '运行时长',
|
||||
E10status: 'E10状态',
|
||||
number: '当日生产的数量',
|
||||
yieId: '当日良率',
|
||||
bom: '当日消耗物料',
|
||||
controlState: '控制状态',
|
||||
equipmentName: '设备名称',
|
||||
e10Code: 'E10状态名称',
|
||||
port: '上料位置',
|
||||
recipe: '设备配方',
|
||||
materialName: '物料名称',
|
||||
productCount: '加工数量',
|
||||
spec: '物料规格',
|
||||
materialNo: '物料批次号',
|
||||
upTime: '上料时间',
|
||||
upCount: '上料数量',
|
||||
useCount: '使用数量',
|
||||
unit: '单位',
|
||||
eventName: '事件名称',
|
||||
paramName: '参数名称',
|
||||
receiveTime: '获取参数时间',
|
||||
paramValue: '获取参数值',
|
||||
standardFormat: '标准参数模式',
|
||||
paramFormat: '获取参数格式',
|
||||
controlStatus: '设备控制状态',
|
||||
traceDataState: 'Trace Data 开启状态',
|
||||
controlStateUpdateTime: '控制状态更新时间',
|
||||
e10UpdateTime: 'E10更新时间',
|
||||
StateFlg: 'StateFlg',
|
||||
EnableSpooling: 'EnableSpooling',
|
||||
maxspooltransmit: 'maxspooltransmit',
|
||||
spoolingstate: 'spoolingstate',
|
||||
spoolingcountactual: 'spoolingcountactual',
|
||||
SpoolingCountTotal: 'SpoolingCountTotal',
|
||||
F1F3Succ: 'F1F3请求成功',
|
||||
F2F13Succ: 'F2F13请求成功',
|
||||
baseChart: '设备加工基板数量',
|
||||
monitorChart: '设备运行时长'
|
||||
},
|
||||
sparepart: {
|
||||
'sparepart': '备品备件',
|
||||
'code': '备件编号',
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* @Date: 2021-03-13 13:49:07
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-04-15 09:58:18
|
||||
* @LastEditTime: 2022-03-04 09:21:04
|
||||
* @FilePath: \basic-admin\src\lang\i18n\zh\module\quality.js
|
||||
* @Description:
|
||||
*/
|
||||
@ -90,5 +90,10 @@ export default {
|
||||
subTitle: '废品分类统计',
|
||||
completeWaste: '完全废品',
|
||||
CanBeUsedAfterProcessing: '加工可用'
|
||||
},
|
||||
QCPplan: {
|
||||
QCPcode: 'QCP项目编码',
|
||||
getTime: '获取时间',
|
||||
detail: '详情'
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: gtz
|
||||
* @Date: 2021-04-22 19:48:46
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-27 12:13:25
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 16:50:50
|
||||
* @Description: file content
|
||||
*/
|
||||
|
||||
@ -11,7 +11,30 @@ export default {
|
||||
reportName: '报表名称',
|
||||
reportSort: '报表分类',
|
||||
createTime: '添加时间',
|
||||
operation: '操作'
|
||||
operation: '操作',
|
||||
storageBoxNumber: '存储箱号',
|
||||
queryFiltering: '查询过滤'
|
||||
},
|
||||
inventory: {
|
||||
code: '存储箱号',
|
||||
status: '存储箱状态',
|
||||
inprocessCode: '完成工序',
|
||||
nextprocessCode: '下一个工序',
|
||||
currentLocation: '当前库位',
|
||||
storeTime: '存放时间',
|
||||
orderName: '工单名',
|
||||
substrateDetails: '详情基板',
|
||||
viewSubstrates: '查看基板',
|
||||
manual: '使用流程',
|
||||
downl: '导出'
|
||||
},
|
||||
substrate: {
|
||||
substrateCode: '基板编码',
|
||||
location: '当前位置',
|
||||
storeTime: '入库时间',
|
||||
substrateStatus: '基板状态',
|
||||
editSubstrate: '编辑基板',
|
||||
interCode: '内部编码'
|
||||
},
|
||||
reportSort: {
|
||||
all: '全部'
|
||||
|
||||
@ -98,11 +98,19 @@ export const constantRoutes = [
|
||||
name: 'basicData',
|
||||
meta: { title: routerTitle.basicData?.[language] || routerTitle.basicData.en, icon: 'form', iconPart: 'basicData', affix: true, required: true, requireToken: true },
|
||||
children: [
|
||||
// 缓存区信息
|
||||
{
|
||||
path: 'cache',
|
||||
component: () => import('@/views/basicData/Cache/cache'),
|
||||
name: 'cache',
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.basicData.ports.ports?.[language] || routerTitle.basicData.ports.ports.en, icon: 'form', affix: true }
|
||||
},
|
||||
{
|
||||
path: 'ports',
|
||||
component: () => import('@/views/basicData/Cache/cache'),
|
||||
component: () => import('@/views/basicData/Cache/shelf'),
|
||||
name: 'ports',
|
||||
meta: { title: routerTitle.basicData.ports.ports?.[language] || routerTitle.basicData.ports.ports.en, icon: 'form', affix: true }
|
||||
meta: { title: routerTitle.basicData.ports.shelfInfo?.[language] || routerTitle.basicData.ports.shelfInfo.en, icon: 'form', affix: true }
|
||||
},
|
||||
{
|
||||
path: 'area',
|
||||
@ -147,6 +155,19 @@ export const constantRoutes = [
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.basicData.ports.PositionDetailInfo?.[language] || routerTitle.basicData.ports.PositionDetailInfo.en, icon: 'form', affix: true }
|
||||
},
|
||||
{
|
||||
path: 'processInfo',
|
||||
component: () => import('@/views/basicData/Process/processInfo'),
|
||||
name: 'processInfo',
|
||||
meta: { title: routerTitle.basicData.process.processInfo?.[language] || routerTitle.basicData.process.processInfo.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'processInfoAdd',
|
||||
component: () => import('@/views/basicData/Process/components/processInfo-add'),
|
||||
name: 'processInfoAdd',
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.basicData.process.processInfoAdd?.[language] || routerTitle.basicData.process.processInfoAdd.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'equipmentInfo',
|
||||
component: () => import('@/views/basicData/Equipment/equipmentInfo'),
|
||||
@ -164,6 +185,7 @@ export const constantRoutes = [
|
||||
path: '/Materials',
|
||||
component: () => import('@/views/basicData/index'),
|
||||
name: 'Materials',
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.basicData.materials?.[language] || routerTitle.basicData.materials.en, icon: 'form', affix: true, required: true, requireToken: true },
|
||||
children: [
|
||||
{
|
||||
@ -187,6 +209,30 @@ export const constantRoutes = [
|
||||
meta: { title: routerTitle.basicData.materials.materialType?.[language] || routerTitle.basicData.materials.materialType.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
path: 'staff',
|
||||
component: () => import('@/views/basicData/GroupModule/staff'),
|
||||
name: 'staff',
|
||||
meta: { title: routerTitle.basicData.teamManage.staff?.[language] || routerTitle.basicData.teamManage.staff.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 }
|
||||
}]
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -252,6 +298,21 @@ export const constantRoutes = [
|
||||
import('@/views/basicData/Warehouse/HistoricalTask'),
|
||||
name: 'HistoricalTask',
|
||||
meta: { title: routerTitle.Warehouse.HistoricalTask?.[language] || routerTitle.Warehouse.HistoricalTask.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: '/ProcessStorageManagement',
|
||||
component: () =>
|
||||
import('@/views/basicData/Warehouse/ProcessStorageManagement'),
|
||||
name: 'ProcessStorageManagement',
|
||||
meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: '/ProcessStorageManagementInfo',
|
||||
hidden: true,
|
||||
component: () =>
|
||||
import('@/views/basicData/Warehouse/components/ProcessStorageManagement-info'),
|
||||
name: 'ProcessStorageManagementInfo',
|
||||
meta: { title: routerTitle.Warehouse.ProcessStorageManagement?.[language] || routerTitle.Warehouse.ProcessStorageManagement.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -301,95 +362,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: '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: '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: '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 }
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -400,36 +411,75 @@ export const constantRoutes = [
|
||||
name: 'formManage',
|
||||
meta: { title: routerTitle.form?.[language] || routerTitle.form.en, icon: 'form', iconPart: 'formManage', affix: true, required: true, requireToken: true, unuse: false },
|
||||
children: [{
|
||||
path: 'report',
|
||||
component: () => import('@/views/report-manage/ReportSortChoise'),
|
||||
name: 'Report',
|
||||
meta: { title: routerTitle.form.report?.[language] || routerTitle.form.report.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
path: 'currentInventory',
|
||||
component: () => import('@/views/report-manage/CurrentInventory'),
|
||||
name: 'currentInventory',
|
||||
meta: { title: routerTitle.form.currentInventory?.[language] || routerTitle.form.currentInventory.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'report-sort-list',
|
||||
component: () => import('@/views/report-manage/Report'),
|
||||
name: 'ReportSortList',
|
||||
path: 'currentEmptyBox',
|
||||
component: () => import('@/views/report-manage/CurrentEmptyBox'),
|
||||
name: 'currentEmptyBox',
|
||||
meta: { title: routerTitle.form.currentEmptyBox?.[language] || routerTitle.form.currentEmptyBox.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'currentSubstrate',
|
||||
component: () => import('@/views/report-manage/CurrentSubstrate'),
|
||||
name: 'currentSubstrate',
|
||||
meta: { title: routerTitle.form.currentSubstrate?.[language] || routerTitle.form.currentSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'editSubstrate',
|
||||
component: () => import('@/views/report-manage/components/edit-substrate'),
|
||||
name: 'editSubstrate',
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.form.reportSortList?.[language] || routerTitle.form.reportSortList.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
meta: { title: routerTitle.form.editSubstrate?.[language] || routerTitle.form.editSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'report-view',
|
||||
component: () => import('@/views/report-manage/ReportView'),
|
||||
name: 'ReportDesign',
|
||||
meta: { title: routerTitle.form.reportView?.[language] || routerTitle.form.reportView.en, icon: 'form', affix: true, required: true, requireToken: true },
|
||||
hidden: true
|
||||
},
|
||||
{
|
||||
path: 'report-design',
|
||||
component: () => import('@/views/report-manage/ReportDesign'),
|
||||
name: 'ReportDesign',
|
||||
meta: { title: routerTitle.form.reportDesign?.[language] || routerTitle.form.reportDesign.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
},
|
||||
{
|
||||
path: 'report-sort',
|
||||
component: () => import('@/views/report-manage/ReportSort/index'),
|
||||
name: 'ReportSort',
|
||||
meta: { title: routerTitle.form.reportSort?.[language] || routerTitle.form.reportSort.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
path: 'viewSubstrate',
|
||||
component: () => import('@/views/report-manage/components/viewSubstrate'),
|
||||
name: 'viewSubstrate',
|
||||
hidden: true,
|
||||
meta: { title: routerTitle.form.viewSubstrate?.[language] || routerTitle.form.viewSubstrate.en, icon: 'form', affix: true, required: true, requireToken: true }
|
||||
}]
|
||||
},
|
||||
{
|
||||
path: '/equipment',
|
||||
component: Layout,
|
||||
redirect: '/equipment',
|
||||
name: 'equipmentManage',
|
||||
meta: { title: routerTitle.equipment?.[language] || routerTitle.equipment.en, icon: 'form', iconPart: 'equipmentManage', affix: true, required: true, requireToken: true, unuse: false },
|
||||
children: [{
|
||||
path: 'equipmentUtilizationRate',
|
||||
component: () => import('@/views/basicData/index'),
|
||||
name: 'EquipmentUtilizationRate',
|
||||
meta: { title: routerTitle.equipment.EquipmentUtilizationRate?.[language] || routerTitle.equipment.EquipmentUtilizationRate.en, icon: 'form', affix: true, required: true, requireToken: true },
|
||||
children: [
|
||||
{
|
||||
path: 'e10',
|
||||
component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/E10'),
|
||||
name: 'E10',
|
||||
meta: { title: 'E10' }
|
||||
},
|
||||
{
|
||||
path: 'oee',
|
||||
component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/OEE'),
|
||||
name: 'OEE',
|
||||
meta: { title: 'OEE' }
|
||||
},
|
||||
{
|
||||
path: 'mttr',
|
||||
component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/MTTR'),
|
||||
name: 'MTTR',
|
||||
meta: { title: 'MTTR' }
|
||||
},
|
||||
{
|
||||
path: 'mcbf',
|
||||
component: () => import('@/views/EquipmentManager/equipmentUtilizationRate/MCBF'),
|
||||
name: 'MCBF',
|
||||
meta: { title: 'MCBF' }
|
||||
}
|
||||
]
|
||||
}]
|
||||
},
|
||||
{
|
||||
@ -437,7 +487,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: [
|
||||
{
|
||||
|
||||
152
src/views/EquipmentManager/equipmentUtilizationRate/E10.vue
Normal file
152
src/views/EquipmentManager/equipmentUtilizationRate/E10.vue
Normal file
@ -0,0 +1,152 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-16 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 15:26:05
|
||||
* @Description: E10
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="toE10()">E10</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toOEE()">OEE</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMTTR()">MTTR</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMCBF()">MCBF</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
|
||||
<el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in eqList"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
|
||||
<el-date-picker
|
||||
v-model="formData.timeSlot"
|
||||
type="datetimerange"
|
||||
:start-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:end-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:range-separator="$t('module.orderManage.order.To')"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<e10Chart v-if="e10Visible" ref="e10Chart" :time1="startTime" :time2="endTime" :name="formData.equipmentName" @equipmentName="seeDetail" />
|
||||
<e10-detail-chart v-if="e10Detail" ref="e10DetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import e10Chart from './components/e10-chart'
|
||||
import e10DetailChart from './components/e10Detail-chart'
|
||||
// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
|
||||
export default {
|
||||
name: 'E10',
|
||||
components: { e10Chart, e10DetailChart },
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
formData: {
|
||||
timeSlot: [],
|
||||
equipmentName: undefined,
|
||||
current: 1,
|
||||
size: 10
|
||||
},
|
||||
e10Visible: false,
|
||||
e10Detail: false,
|
||||
equipmentName: '',
|
||||
eqList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// this.getEqList()
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
async getEqList() {
|
||||
const res = await equipmentList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
if (res.code === 0) {
|
||||
this.eqList = res.data
|
||||
}
|
||||
},
|
||||
toE10() {
|
||||
this.$router.push({
|
||||
name: 'E10'
|
||||
})
|
||||
},
|
||||
toOEE() {
|
||||
this.$router.push({
|
||||
name: 'OEE'
|
||||
})
|
||||
},
|
||||
toMTTR() {
|
||||
this.$router.push({
|
||||
name: 'MTTR'
|
||||
})
|
||||
},
|
||||
toMCBF() {
|
||||
this.$router.push({
|
||||
name: 'MCBF'
|
||||
})
|
||||
},
|
||||
seeDetail(name) {
|
||||
this.equipmentName = name
|
||||
this.e10Visible = false
|
||||
this.e10Detail = true
|
||||
setTimeout(() => {
|
||||
this.$refs.e10DetailChart.getList()
|
||||
}, 60)
|
||||
},
|
||||
getList() {
|
||||
if (this.formData.timeSlot.length !== 0) {
|
||||
this.startTime = this.formData.timeSlot[0]
|
||||
this.endTime = this.formData.timeSlot[1]
|
||||
this.$nextTick(() => {
|
||||
this.e10Visible = true
|
||||
setTimeout(() => {
|
||||
this.$refs.e10Chart.getList()
|
||||
}, 60)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
151
src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue
Normal file
151
src/views/EquipmentManager/equipmentUtilizationRate/MCBF.vue
Normal file
@ -0,0 +1,151 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-16 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 15:26:28
|
||||
* @Description: MCBF
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item>
|
||||
<el-button @click="toE10()">E10</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toOEE()">OEE</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMTTR()">MTTR</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="toMCBF()">MCBF</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
|
||||
<el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in eqList"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
|
||||
<el-date-picker
|
||||
v-model="formData.timeSlot"
|
||||
type="datetimerange"
|
||||
:start-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:end-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:range-separator="$t('module.orderManage.order.To')"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<mcbfChart v-if="mcbfVisible" ref="mcbfChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
|
||||
<mcbf-detail-chart v-if="mcbfDetail" ref="mcbfDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import mcbfChart from './components/mcbf-chart'
|
||||
import mcbfDetailChart from './components/mcbfDetail-chart'
|
||||
// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
|
||||
export default {
|
||||
name: 'MCBF',
|
||||
components: { mcbfChart, mcbfDetailChart },
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
formData: {
|
||||
timeSlot: [],
|
||||
current: 1,
|
||||
size: 10
|
||||
},
|
||||
mcbfVisible: false,
|
||||
mcbfDetail: false,
|
||||
equipmentName: '',
|
||||
eqList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// this.getEqList()
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
async getEqList() {
|
||||
const res = await equipmentList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
if (res.code === 0) {
|
||||
this.eqList = res.data
|
||||
}
|
||||
},
|
||||
toE10() {
|
||||
this.$router.push({
|
||||
name: 'E10'
|
||||
})
|
||||
},
|
||||
toOEE() {
|
||||
this.$router.push({
|
||||
name: 'OEE'
|
||||
})
|
||||
},
|
||||
toMTTR() {
|
||||
this.$router.push({
|
||||
name: 'MTTR'
|
||||
})
|
||||
},
|
||||
toMCBF() {
|
||||
this.$router.push({
|
||||
name: 'MCBF'
|
||||
})
|
||||
},
|
||||
seeDetail(name) {
|
||||
this.equipmentName = name
|
||||
this.mcbfVisible = false
|
||||
this.mcbfDetail = true
|
||||
setTimeout(() => {
|
||||
this.$refs.mcbfDetailChart.getList()
|
||||
}, 60)
|
||||
},
|
||||
getList() {
|
||||
if (this.formData.timeSlot.length !== 0) {
|
||||
this.startTime = this.formData.timeSlot[0]
|
||||
this.endTime = this.formData.timeSlot[1]
|
||||
this.$nextTick(() => {
|
||||
this.mcbfVisible = true
|
||||
setTimeout(() => {
|
||||
this.$refs.mcbfChart.getList()
|
||||
}, 60)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
151
src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue
Normal file
151
src/views/EquipmentManager/equipmentUtilizationRate/MTTR.vue
Normal file
@ -0,0 +1,151 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-16 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 15:26:44
|
||||
* @Description: MTTR
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item>
|
||||
<el-button @click="toE10()">E10</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toOEE()">OEE</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="toMTTR()">MTTR</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMCBF()">MCBF</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
|
||||
<el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in eqList"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
|
||||
<el-date-picker
|
||||
v-model="formData.timeSlot"
|
||||
type="datetimerange"
|
||||
:start-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:end-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:range-separator="$t('module.orderManage.order.To')"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<mttrChart v-if="mttrVisible" ref="mttrChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
|
||||
<mttr-detail-chart v-if="mttrDetail" ref="mttrDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import mttrChart from './components/mttr-chart'
|
||||
import mttrDetailChart from './components/mttrDetail-chart'
|
||||
// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
|
||||
export default {
|
||||
name: 'MTTR',
|
||||
components: { mttrChart, mttrDetailChart },
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
formData: {
|
||||
timeSlot: [],
|
||||
current: 1,
|
||||
size: 10
|
||||
},
|
||||
mttrVisible: false,
|
||||
mttrDetail: false,
|
||||
equipmentName: '',
|
||||
eqList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// this.getEqList()
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
async getEqList() {
|
||||
const res = await equipmentList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
if (res.code === 0) {
|
||||
this.eqList = res.data
|
||||
}
|
||||
},
|
||||
toE10() {
|
||||
this.$router.push({
|
||||
name: 'E10'
|
||||
})
|
||||
},
|
||||
toOEE() {
|
||||
this.$router.push({
|
||||
name: 'OEE'
|
||||
})
|
||||
},
|
||||
toMTTR() {
|
||||
this.$router.push({
|
||||
name: 'MTTR'
|
||||
})
|
||||
},
|
||||
toMCBF() {
|
||||
this.$router.push({
|
||||
name: 'MCBF'
|
||||
})
|
||||
},
|
||||
seeDetail(name) {
|
||||
this.equipmentName = name
|
||||
this.mttrVisible = false
|
||||
this.mttrDetail = true
|
||||
setTimeout(() => {
|
||||
this.$refs.mttrDetailChart.getList()
|
||||
}, 60)
|
||||
},
|
||||
getList() {
|
||||
if (this.formData.timeSlot.length !== 0) {
|
||||
this.startTime = this.formData.timeSlot[0]
|
||||
this.endTime = this.formData.timeSlot[1]
|
||||
this.$nextTick(() => {
|
||||
this.mttrVisible = true
|
||||
setTimeout(() => {
|
||||
this.$refs.mttrChart.getList()
|
||||
}, 60)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
151
src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue
Normal file
151
src/views/EquipmentManager/equipmentUtilizationRate/OEE.vue
Normal file
@ -0,0 +1,151 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-16 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 15:26:56
|
||||
* @Description: OEE
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="80px"
|
||||
>
|
||||
<el-form-item>
|
||||
<el-button @click="toE10()">E10</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="toOEE()">OEE</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMTTR()">MTTR</el-button>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="toMCBF()">MCBF</el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item :label="$t('module.equipmentManager.recipe.equipmentId')" prop="equipmentName">
|
||||
<el-select v-model="formData.equipmentName" :placeholder="$t('module.equipmentManager.recipe.EQselect')" filterable clearable>
|
||||
<el-option
|
||||
v-for="(item, index) in eqList"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.name"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.equipmentManager.equipmentVisualization.timeSlot')" label-width="100px" prop="time">
|
||||
<el-date-picker
|
||||
v-model="formData.timeSlot"
|
||||
type="datetimerange"
|
||||
:start-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:end-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:range-separator="$t('module.orderManage.order.To')"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.exportBtn' | i18nFilter }} </el-button>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<oeeChart v-if="oeeVisible" ref="oeeChart" :time1="startTime" :time2="endTime" @equipmentName="seeDetail" />
|
||||
<oee-detail-chart v-if="oeeDetail" ref="oeeDetailChart" :time1="startTime" :time2="endTime" :equipment-name="equipmentName" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import oeeChart from './components/oee-chart'
|
||||
import oeeDetailChart from './components/oeeDetail-chart'
|
||||
// import { equipmentList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
|
||||
export default {
|
||||
name: 'OEE',
|
||||
components: { oeeChart, oeeDetailChart },
|
||||
data() {
|
||||
return {
|
||||
list: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
formData: {
|
||||
timeSlot: [],
|
||||
current: 1,
|
||||
size: 10
|
||||
},
|
||||
oeeVisible: false,
|
||||
oeeDetail: false,
|
||||
equipmentName: '',
|
||||
eqList: []
|
||||
}
|
||||
},
|
||||
created() {
|
||||
// this.getEqList()
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
async getEqList() {
|
||||
const res = await equipmentList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
if (res.code === 0) {
|
||||
this.eqList = res.data
|
||||
}
|
||||
},
|
||||
toE10() {
|
||||
this.$router.push({
|
||||
name: 'E10'
|
||||
})
|
||||
},
|
||||
toOEE() {
|
||||
this.$router.push({
|
||||
name: 'OEE'
|
||||
})
|
||||
},
|
||||
toMTTR() {
|
||||
this.$router.push({
|
||||
name: 'MTTR'
|
||||
})
|
||||
},
|
||||
toMCBF() {
|
||||
this.$router.push({
|
||||
name: 'MCBF'
|
||||
})
|
||||
},
|
||||
seeDetail(name) {
|
||||
this.equipmentName = name
|
||||
this.oeeVisible = false
|
||||
this.oeeDetail = true
|
||||
setTimeout(() => {
|
||||
this.$refs.oeeDetailChart.getList()
|
||||
}, 60)
|
||||
},
|
||||
getList() {
|
||||
if (this.formData.timeSlot.length !== 0) {
|
||||
this.startTime = this.formData.timeSlot[0]
|
||||
this.endTime = this.formData.timeSlot[1]
|
||||
this.$nextTick(() => {
|
||||
this.oeeVisible = true
|
||||
setTimeout(() => {
|
||||
this.$refs.oeeChart.getList()
|
||||
}, 60)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,134 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:22:24
|
||||
* @Description: E10详情表格
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<base-table
|
||||
:page="listQuery.current"
|
||||
:limit="listQuery.size"
|
||||
:table-config="tableProps"
|
||||
:table-data="list"
|
||||
:is-loading="listLoading"
|
||||
/>
|
||||
<pagination :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" @pagination="init" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import i18n from '@/lang'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import Pagination from '@/components/Pagination'
|
||||
import { timeFormatter } from '@/filters'
|
||||
// import { getE10StackDetail } from '@/api/equipment/infoPandect'
|
||||
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'equipmentName',
|
||||
label: i18n.t('module.equipmentManager.maintainplan.equipmentId'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'status',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.E10status'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'previousStatus',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.laterE10Status'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'endTime',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.E10endTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'durationTime',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.duration'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: '',
|
||||
components: { BaseTable, Pagination },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: false,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// this.init()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.listQuery.startTime = this.time1
|
||||
this.listQuery.endTime = this.time2
|
||||
this.listQuery.equipmentName = this.equipmentName
|
||||
getE10StackDetail(this.listQuery).then(res => {
|
||||
if (res.data !== []) {
|
||||
this.list = res.data.detail.records
|
||||
this.total = res.data.detail.total
|
||||
this.list.forEach(item => {
|
||||
item.equipmentName = this.equipmentName
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,94 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:47:23
|
||||
* @Description: MCBF详情表格
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<base-table
|
||||
:table-config="tableProps"
|
||||
:table-data="list"
|
||||
:is-loading="listLoading"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import i18n from '@/lang'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'tmc',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.allCycles'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'emc',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.badTimes'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'time',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.time'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'mtbf',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.MCBF'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: '',
|
||||
components: { BaseTable },
|
||||
props: {
|
||||
tableData: {
|
||||
type: Array,
|
||||
default: () => { [] }
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// this.init()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.list = this.tableData
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,132 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:46:06
|
||||
* @Description: Mttr详情表格
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<base-table
|
||||
:page="listQuery.current"
|
||||
:limit="listQuery.size"
|
||||
:table-config="tableProps"
|
||||
:table-data="list"
|
||||
:is-loading="listLoading"
|
||||
/>
|
||||
<pagination :total="total" :page.sync="listQuery.current" :limit.sync="listQuery.size" @pagination="init" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import i18n from '@/lang'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import Pagination from '@/components/Pagination'
|
||||
import { timeFormatter } from '@/filters'
|
||||
// import { getMttrDetail } from '@/api/equipment/infoPandect'
|
||||
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'previousStatus',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.previousStatus'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'status',
|
||||
label: i18n.t('module.art.status'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'startTime',
|
||||
label: i18n.t('module.equipmentManager.equipmentParams.startTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'endTime',
|
||||
label: i18n.t('module.equipmentManager.equipmentParams.endTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'durationTime',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.duration'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: '',
|
||||
components: { BaseTable, Pagination },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: false,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10
|
||||
}
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// this.init()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.listQuery.startTime = this.time1
|
||||
this.listQuery.endTime = this.time2
|
||||
this.listQuery.equipmentName = this.equipmentName
|
||||
getMttrDetail(this.listQuery).then(res => {
|
||||
if (res.data !== []) {
|
||||
this.list = res.data.detail.records
|
||||
this.total = res.data.detail.total
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,100 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:38:52
|
||||
* @Description: OEE详情表格
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<base-table
|
||||
:table-config="tableProps"
|
||||
:table-data="list"
|
||||
:is-loading="listLoading"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import i18n from '@/lang'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'equipmentName',
|
||||
label: i18n.t('module.equipmentManager.maintainplan.equipmentId'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'runTime',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.runTime'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'productiveTime',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.produceTime'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'productiveCount',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.productiveCount'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'timeRate',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.timeRate'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'performanceRate',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.performanceRate'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'oee',
|
||||
label: i18n.t('module.equipmentManager.monitoringInfo.oee'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: '',
|
||||
components: { BaseTable },
|
||||
props: {
|
||||
tableData: {
|
||||
type: Array,
|
||||
default: () => { [] }
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => { '' }
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
total: 0,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: false
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
// this.init()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.list = this.tableData
|
||||
if (this.list !== []) {
|
||||
this.list.forEach(item => {
|
||||
item.equipmentName = this.equipmentName
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -0,0 +1,212 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 15:43:32
|
||||
* @Description: E10折线柱状图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getE10Stack } from '@/api/equipment/infoPandect'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
name: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
list: [],
|
||||
xDataList: [],
|
||||
engineeringList: [],
|
||||
nonscheduledDownList: [],
|
||||
productiveList: [],
|
||||
rampUpDownList: [],
|
||||
scheduledDownList: [],
|
||||
standByList: [],
|
||||
unscheduledDownList: []
|
||||
}
|
||||
},
|
||||
mounted() {},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
removeData() {
|
||||
this.xDataList = ['ACOT1', 'ACOT2']
|
||||
this.engineeringList = [20, 30]
|
||||
this.nonscheduledDownList = [20, 20]
|
||||
this.productiveList = [10, 2]
|
||||
this.rampUpDownList = [30, 3]
|
||||
this.scheduledDownList = [8, 15]
|
||||
this.standByList = [2, 12]
|
||||
this.unscheduledDownList = [10, 18]
|
||||
},
|
||||
getList() {
|
||||
this.removeData()
|
||||
this.init()
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
const that = this
|
||||
that.chart.on('click', function(params) {
|
||||
that.$emit('equipmentName', params.name)
|
||||
})
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
max: 10,
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value',
|
||||
min: 0,
|
||||
max: 100,
|
||||
axisLabel: {
|
||||
formatter: '{value}%'
|
||||
}
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: 'engineering',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
barWidth: 40,
|
||||
data: this.engineeringList
|
||||
},
|
||||
{
|
||||
name: 'nonscheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.nonscheduledDownList
|
||||
},
|
||||
{
|
||||
name: 'productive',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.productiveList
|
||||
},
|
||||
{
|
||||
name: 'rampUpDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.rampUpDownList
|
||||
},
|
||||
{
|
||||
name: 'scheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.scheduledDownList
|
||||
},
|
||||
{
|
||||
name: 'standBy',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.standByList
|
||||
},
|
||||
{
|
||||
name: 'unscheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.unscheduledDownList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,253 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:26:34
|
||||
* @Description: E10详情堆积图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<el-button-group>
|
||||
<el-button @click="byYear">年</el-button>
|
||||
<el-button @click="byQuarterly">季度</el-button>
|
||||
<el-button @click="byMonth">月</el-button>
|
||||
<el-button @click="byWeek">周</el-button>
|
||||
<el-button @click="byDay">天</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
|
||||
<e10-table v-if="tableVisible" :time1="startTime" :time2="endTime" :equipment-name="name" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getE10StackDetail } from '@/api/equipment/infoPandect'
|
||||
import E10Table from './E10Table'
|
||||
|
||||
export default {
|
||||
components: { E10Table },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
tableVisible: false,
|
||||
equipmentDetail: [],
|
||||
list: [],
|
||||
xDataList: [],
|
||||
engineeringList: [],
|
||||
nonscheduledDownList: [],
|
||||
productiveList: [],
|
||||
rampUpDownList: [],
|
||||
scheduledDownList: [],
|
||||
standByList: [],
|
||||
unscheduledDownList: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.startTime = this.time1
|
||||
this.endTime = this.time2
|
||||
this.name = this.equipmentName
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
getDataList(params) {
|
||||
console.log(params)
|
||||
},
|
||||
byYear() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.年)
|
||||
},
|
||||
byQuarterly() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.季度)
|
||||
},
|
||||
byMonth() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.月)
|
||||
},
|
||||
byWeek() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.周)
|
||||
},
|
||||
byDay() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.天)
|
||||
},
|
||||
setChart(list) {
|
||||
this.init()
|
||||
},
|
||||
removeData() {
|
||||
// this.xDataList = [this.name]
|
||||
this.engineeringList = [20]
|
||||
this.nonscheduledDownList = [20]
|
||||
this.productiveList = [10]
|
||||
this.rampUpDownList = [30]
|
||||
this.scheduledDownList = [8]
|
||||
this.standByList = [2]
|
||||
this.unscheduledDownList = [10]
|
||||
},
|
||||
getList() {
|
||||
this.xDataList = [this.name]
|
||||
this.tableVisible = true
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
|
||||
this.chart.on('click', function(params) {
|
||||
console.log('113d', params.name)
|
||||
})
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
max: 10,
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: 'engineering',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.engineeringList
|
||||
},
|
||||
{
|
||||
name: 'nonscheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.nonscheduledDownList
|
||||
},
|
||||
{
|
||||
name: 'productive',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.productiveList
|
||||
},
|
||||
{
|
||||
name: 'rampUpDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.rampUpDownList
|
||||
},
|
||||
{
|
||||
name: 'scheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.scheduledDownList
|
||||
},
|
||||
{
|
||||
name: 'standBy',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.standByList
|
||||
},
|
||||
{
|
||||
name: 'unscheduledDown',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.unscheduledDownList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,137 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:48:01
|
||||
* @Description: Mcbf折线柱状图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getAllMtbf } from '@/api/equipment/infoPandect'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
list: [],
|
||||
xDataList: [],
|
||||
yDataList: []
|
||||
}
|
||||
},
|
||||
mounted() {},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
removeData() {
|
||||
this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
|
||||
this.yDataList = [22, 40, 66, 44]
|
||||
},
|
||||
getList() {
|
||||
this.removeData()
|
||||
this.init()
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
const that = this
|
||||
that.chart.on('click', function(params) {
|
||||
that.$emit('equipmentName', params.name)
|
||||
})
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
max: 10,
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: [{
|
||||
type: 'value',
|
||||
min: 0,
|
||||
max: 100,
|
||||
axisLabel: {
|
||||
formatter: '{value}次'
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'value',
|
||||
min: 0,
|
||||
max: 100,
|
||||
axisLabel: {
|
||||
formatter: '{value}次'
|
||||
}
|
||||
}
|
||||
],
|
||||
series: [
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
barWidth: 40,
|
||||
data: this.yDataList
|
||||
},
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'line',
|
||||
yAxisIndex: 1,
|
||||
data: this.yDataList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,185 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:48:53
|
||||
* @Description: MCBF详情堆积图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<el-button-group>
|
||||
<el-button @click="byYear">年</el-button>
|
||||
<el-button @click="byQuarterly">季度</el-button>
|
||||
<el-button @click="byMonth">月</el-button>
|
||||
<el-button @click="byWeek">周</el-button>
|
||||
<el-button @click="byDay">天</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
|
||||
<mcbf-table v-if="tableVisible" ref="tableRef" :table-data="tableData" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getMcbfDetail } from '@/api/equipment/infoPandect'
|
||||
import McbfTable from './McbfTable'
|
||||
|
||||
export default {
|
||||
components: { McbfTable },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
tableVisible: false,
|
||||
tableData: [],
|
||||
equipmentDetail: [],
|
||||
list: [],
|
||||
xDataList: [],
|
||||
yDataList: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.startTime = this.time1
|
||||
this.endTime = this.time2
|
||||
this.name = this.equipmentName
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
getDataList(params) {
|
||||
console.log(params)
|
||||
},
|
||||
byYear() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.年)
|
||||
this.tableData = this.list.年
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byQuarterly() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.季度)
|
||||
this.tableData = this.list.季度
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byMonth() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.月)
|
||||
this.tableData = this.list.月
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byWeek() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.周)
|
||||
this.tableData = this.list.周
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byDay() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.天)
|
||||
this.tableData = this.list.天
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
setChart(list) {
|
||||
this.init()
|
||||
},
|
||||
removeData() {
|
||||
this.xDataList = [this.name]
|
||||
this.yDataList = [11, 33, 20, 53, 24]
|
||||
},
|
||||
getList() {
|
||||
this.tableVisible = true
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
max: 10,
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'line',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.yDataList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,133 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:41:38
|
||||
* @Description: MTTR折线柱状图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getMttr } from '@/api/equipment/infoPandect'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
list: [],
|
||||
xDataList: [],
|
||||
yDataList: []
|
||||
}
|
||||
},
|
||||
mounted() {},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
removeData() {
|
||||
this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
|
||||
this.yDataList = [22, 40, 66, 44]
|
||||
},
|
||||
getList() {
|
||||
this.removeData()
|
||||
this.init()
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
const that = this
|
||||
that.chart.on('click', function(params) {
|
||||
that.$emit('equipmentName', params.name)
|
||||
})
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
max: 10,
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: [{
|
||||
type: 'value',
|
||||
axisLabel: {
|
||||
formatter: '{value}小时'
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'value',
|
||||
axisLabel: {
|
||||
formatter: '{value}小时'
|
||||
}
|
||||
}
|
||||
],
|
||||
series: [
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
barWidth: 40,
|
||||
data: this.yDataList
|
||||
},
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'line',
|
||||
yAxisIndex: 1,
|
||||
data: this.yDataList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,165 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:43:34
|
||||
* @Description: MTTR详情堆积图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<el-button-group>
|
||||
<el-button @click="byYear">年</el-button>
|
||||
<el-button @click="byQuarterly">季度</el-button>
|
||||
<el-button @click="byMonth">月</el-button>
|
||||
<el-button @click="byWeek">周</el-button>
|
||||
<el-button @click="byDay">天</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
|
||||
<mttr-table v-if="tableVisible" :time1="startTime" :time2="endTime" :equipment-name="name" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getMttrDetail } from '@/api/equipment/infoPandect'
|
||||
import MttrTable from './MttrTable'
|
||||
|
||||
export default {
|
||||
components: { MttrTable },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
tableVisible: false,
|
||||
equipmentDetail: [],
|
||||
list: [],
|
||||
xDataList: [],
|
||||
yDataList: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.startTime = this.time1
|
||||
this.endTime = this.time2
|
||||
this.name = this.equipmentName
|
||||
this.removeData()
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
getDataList(params) {
|
||||
console.log(params)
|
||||
},
|
||||
byYear() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.年)
|
||||
},
|
||||
byQuarterly() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.季度)
|
||||
},
|
||||
byMonth() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.月)
|
||||
},
|
||||
byWeek() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.周)
|
||||
},
|
||||
byDay() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.天)
|
||||
},
|
||||
setChart(list) {
|
||||
this.init()
|
||||
},
|
||||
removeData() {
|
||||
this.xDataList = [this.name]
|
||||
this.yDataList = [30, 40, 30, 33, 44]
|
||||
},
|
||||
getList() {
|
||||
this.tableVisible = true
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
max: 10,
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: '稼动率值',
|
||||
type: 'line',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.yDataList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,137 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:34:30
|
||||
* @Description: OEE折线柱状图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div id="monitorChart" :style="{width: '1000px', height: '800px'}" style="margin-left:10%" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getOEE } from '@/api/equipment/infoPandect'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
list: [],
|
||||
xDataList: [],
|
||||
oeeList: []
|
||||
}
|
||||
},
|
||||
mounted() {},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
removeData() {
|
||||
this.xDataList = ['ACOT1', 'ACOT2', 'ACOT-a', 'ACOT-b']
|
||||
this.oeeList = [20, 30, 80, 44]
|
||||
},
|
||||
getList() {
|
||||
this.removeData()
|
||||
this.init()
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
const that = this
|
||||
that.chart.on('click', function(params) {
|
||||
that.$emit('equipmentName', params.name)
|
||||
})
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
max: 10,
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: [{
|
||||
type: 'value',
|
||||
min: 0,
|
||||
max: 100,
|
||||
axisLabel: {
|
||||
formatter: '{value}%'
|
||||
}
|
||||
},
|
||||
{
|
||||
type: 'value',
|
||||
min: 0,
|
||||
max: 100,
|
||||
axisLabel: {
|
||||
formatter: '{value}%'
|
||||
}
|
||||
}
|
||||
],
|
||||
series: [
|
||||
{
|
||||
name: 'oee',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
barWidth: 40,
|
||||
data: this.oeeList
|
||||
},
|
||||
{
|
||||
name: 'oee',
|
||||
type: 'line',
|
||||
yAxisIndex: 1,
|
||||
data: this.oeeList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,258 @@
|
||||
<!--
|
||||
* @Author: DY
|
||||
* @Date: 2021-12-13 16:39:34
|
||||
* @LastEditors: DY
|
||||
* @LastEditTime: 2022-03-03 16:37:49
|
||||
* @Description:OEE详情堆积图
|
||||
-->
|
||||
<template>
|
||||
<div>
|
||||
<div>
|
||||
<el-button-group>
|
||||
<el-button @click="byYear">年</el-button>
|
||||
<el-button @click="byQuarterly">季度</el-button>
|
||||
<el-button @click="byMonth">月</el-button>
|
||||
<el-button @click="byWeek">周</el-button>
|
||||
<el-button @click="byDay">天</el-button>
|
||||
</el-button-group>
|
||||
</div>
|
||||
<div id="monitorChart" :style="{width: '700px', height: '550px'}" style="margin-left:10%" />
|
||||
<oee-table v-if="tableVisible" ref="tableRef" :table-data="tableData" :equipment-name="name" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import echarts from 'echarts'
|
||||
// import { getOEEDetail } from '@/api/equipment/infoPandect'
|
||||
import OeeTable from './OeeTable'
|
||||
|
||||
export default {
|
||||
components: { OeeTable },
|
||||
props: {
|
||||
time1: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
time2: {
|
||||
type: Date,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
},
|
||||
equipmentName: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
chart: null,
|
||||
tableVisible: false,
|
||||
equipmentDetail: [],
|
||||
tableData: [],
|
||||
list: [],
|
||||
xDataList: [],
|
||||
oeeList: [],
|
||||
startTime: '',
|
||||
endTime: '',
|
||||
name: ''
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
this.startTime = this.time1
|
||||
this.endTime = this.time2
|
||||
this.name = this.equipmentName
|
||||
this.removeData()
|
||||
},
|
||||
beforeDestroy() {
|
||||
if (!this.chart) {
|
||||
return
|
||||
}
|
||||
this.chart.dispose()
|
||||
this.chart = null
|
||||
},
|
||||
methods: {
|
||||
getDataList(params) {
|
||||
console.log(params)
|
||||
},
|
||||
async byYear() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.年)
|
||||
this.tableData = this.list.年
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byQuarterly() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.季度)
|
||||
this.tableData = this.list.季度
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byMonth() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.月)
|
||||
this.tableData = this.list.月
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byWeek() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.周)
|
||||
this.tableData = this.list.周
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
byDay() {
|
||||
this.removeData()
|
||||
this.setChart(this.list.天)
|
||||
this.tableData = this.list.天
|
||||
setTimeout(() => {
|
||||
this.$refs.tableRef.init()
|
||||
}, 60)
|
||||
},
|
||||
setChart(list) {
|
||||
this.init()
|
||||
},
|
||||
removeData() {
|
||||
this.xDataList = [this.name]
|
||||
this.oeeList = [30, 40, 30, 33, 44]
|
||||
},
|
||||
getList() {
|
||||
this.tableVisible = true
|
||||
},
|
||||
init() {
|
||||
this.chart = echarts.init(document.getElementById('monitorChart'))
|
||||
|
||||
this.chart.setOption({
|
||||
tooltip: {
|
||||
trigger: 'axis',
|
||||
axisPointer: {
|
||||
type: 'cross',
|
||||
crossStyle: {
|
||||
color: '#999'
|
||||
}
|
||||
}
|
||||
},
|
||||
toolbox: {
|
||||
feature: {
|
||||
saveAsImage: { show: true }
|
||||
}
|
||||
},
|
||||
grid: {
|
||||
left: '3%',
|
||||
right: '4%',
|
||||
bottom: '3%',
|
||||
containLabel: true
|
||||
},
|
||||
xAxis: {
|
||||
type: 'category',
|
||||
max: 10,
|
||||
axisLabel: {
|
||||
interval: 0,
|
||||
rotate: -30
|
||||
},
|
||||
data: this.xDataList
|
||||
},
|
||||
yAxis: {
|
||||
type: 'value'
|
||||
},
|
||||
series: [
|
||||
{
|
||||
name: 'oee',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.oeeList
|
||||
},
|
||||
{
|
||||
name: 'performanceRate',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.performanceRateList
|
||||
},
|
||||
{
|
||||
name: 'productiveCount',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.productiveCountList
|
||||
},
|
||||
{
|
||||
name: 'productiveTime',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.productiveTimeList
|
||||
},
|
||||
{
|
||||
name: 'runTime',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.runTimeList
|
||||
},
|
||||
{
|
||||
name: 'time',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.timeList
|
||||
},
|
||||
{
|
||||
name: 'timeRate',
|
||||
type: 'bar',
|
||||
stack: 'total',
|
||||
label: {
|
||||
show: true
|
||||
},
|
||||
emphasis: {
|
||||
focus: 'series'
|
||||
},
|
||||
data: this.timeRateList
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
178
src/views/QualityManager/QCPplan.vue
Normal file
178
src/views/QualityManager/QCPplan.vue
Normal file
@ -0,0 +1,178 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 09:22:58
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="formData"
|
||||
:rules="rules"
|
||||
:model="listQuery"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TimeSlot')" prop="time">
|
||||
<el-date-picker
|
||||
v-model="listQuery.timeSlot"
|
||||
type="daterange"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
:start-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:end-placeholder="$t('module.orderManage.order.StartTime')"
|
||||
:range-separator="$t('module.orderManage.order.To')"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<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()"
|
||||
/>
|
||||
<Factory-add v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import FactoryAdd from './components/ExecutionInfoDetail.vue'
|
||||
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 i18n from '@/lang'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
const tableBtn = [
|
||||
{
|
||||
type: 'see',
|
||||
btnName: 'btn.see'
|
||||
}
|
||||
]
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.quality.QCPplan.QCPcode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: i18n.t('module.quality.QCPplan.getTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'ExecutionInfo',
|
||||
components: { Pagination, BaseTable, MethodBtn, FactoryAdd },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
rules: {},
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
timeSlot: []
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
this.addNew(raw.data.id)
|
||||
},
|
||||
getList() {
|
||||
// this.listLoading = true
|
||||
if (this.listQuery.timeSlot) {
|
||||
this.listQuery.startTime = this.listQuery.timeSlot[0]
|
||||
this.listQuery.endTime = this.listQuery.timeSlot[1]
|
||||
} else {
|
||||
this.listQuery.startTime = ''
|
||||
this.listQuery.endTime = ''
|
||||
}
|
||||
// ExecutionInfoList(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
|
||||
// })
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
115
src/views/QualityManager/components/ExecutionInfoDetail.vue
Normal file
115
src/views/QualityManager/components/ExecutionInfoDetail.vue
Normal file
@ -0,0 +1,115 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-17 15:21:50
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="'btn.see' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="8">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.OrderName')" prop="name">
|
||||
<el-input v-model="dataForm.name" :placeholder="$t('module.basicData.Warehouse.OrderName')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.IssueOrderTime')" prop="createTime">
|
||||
<el-input v-model="dataForm.createTime" :placeholder="$t('module.basicData.Warehouse.IssueOrderTime')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.PlanProcessQuantity')" prop="planQuantity">
|
||||
<el-input v-model="dataForm.planQuantity" :placeholder="$t('module.basicData.Warehouse.PlanProcessQuantity')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.OrderCode')" prop="taskCode">
|
||||
<el-input v-model="dataForm.taskCode" :placeholder="$t('module.basicData.Warehouse.OrderCode')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.OrderStatus')" prop="taskType">
|
||||
<el-input v-model="dataForm.taskType" :placeholder="$t('module.basicData.Warehouse.OrderStatus')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TotalProcessName')" prop="craftName">
|
||||
<el-input v-model="dataForm.craftName" :placeholder="$t('module.basicData.Warehouse.TotalProcessName')" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.SubProcessName')" prop="subProccessName">
|
||||
<el-input
|
||||
v-model="dataForm.subProccessName"
|
||||
:placeholder="$t('module.basicData.Warehouse.SubProcessName')"
|
||||
readonly
|
||||
:style="{width: '100%'}"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { ExecutionInfoDetail } from '@/api/orderManage/00A'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: 0,
|
||||
name: undefined,
|
||||
createTime: undefined,
|
||||
taskCode: undefined,
|
||||
taskType: undefined,
|
||||
craftName: undefined,
|
||||
planQuantity: undefined,
|
||||
subProccessName: undefined
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init(id) {
|
||||
this.dataForm.id = id || ''
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.dataForm.id) {
|
||||
ExecutionInfoDetail(this.dataForm.id).then(res => {
|
||||
this.dataForm = res.data
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-20 11:03:09
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 10:39:52
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -122,6 +122,9 @@
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item :label="$t('module.basicData.ScrapInfo.registrationPlace')" prop="placeOfRegis">
|
||||
<el-input v-model="dataForm.placeOfRegis" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.registrationPlace')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.remark')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
@ -141,7 +144,7 @@ import { getScrapInfo, editScrapInfo, addScrapInfo, getScrap } from '@/api/quali
|
||||
import { scrapReasonList } from '@/api/dict'
|
||||
import { getDictWorker } from '@/api/dict'
|
||||
import { getEqList } from '@/api/equipment/maintain'
|
||||
import { workOrderList } from '@/api/orderManage/workOrder/workOrder'
|
||||
import { workOrderListList } from '@/api/orderManage/workOrder/workOrder'
|
||||
|
||||
const wasteGradeArr = [{
|
||||
value: '加工可用',
|
||||
@ -173,6 +176,7 @@ export default {
|
||||
scrapGrade: undefined,
|
||||
description: undefined,
|
||||
substrateId: undefined,
|
||||
placeOfRegis: '00A',
|
||||
remark: undefined
|
||||
},
|
||||
wasteGradeArr,
|
||||
@ -279,7 +283,7 @@ export default {
|
||||
})
|
||||
},
|
||||
async getDict() {
|
||||
const result3 = await workOrderList({
|
||||
const result3 = await workOrderListList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-26 13:39:35
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 10:40:51
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -11,7 +11,7 @@
|
||||
:model="formData"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="130px"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item v-if="false" :label="$t('module.basicData.ScrapInfo.PlateId')" prop="basalId">
|
||||
<el-input v-model="formData.basalId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.ScrapInfo.PlateId')])" style="width:200px" clearable />
|
||||
@ -117,11 +117,6 @@ const tableProps = [
|
||||
label: i18n.t('module.basicData.ScrapInfo.source'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'scrapGradeDic',
|
||||
label: i18n.t('module.basicData.ScrapInfo.wasteGrade'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'equipmentName',
|
||||
label: i18n.t('module.basicData.ScrapInfo.name'),
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: Please set LastEditors
|
||||
* @LastEditTime: 2021-07-26 14:39:36
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-03 16:43:26
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -16,14 +16,14 @@
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.art.processList.processEq')" prop="equipmentIds">
|
||||
<el-select v-model="dataForm.equipmentIds" clearable filterable multiple>
|
||||
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.name" />
|
||||
<el-option v-for="item in eqList" :key="item.id" :value="item.id" :label="item.enName" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.art.processList.type')" prop="type">
|
||||
<!-- <el-form-item :label="$t('module.art.processList.type')" prop="type">
|
||||
<el-select v-model="dataForm.type" clearable filterable>
|
||||
<el-option v-for="item in typeList" :key="item.id" :value="item.id" :label="item.name" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.art.processList.description')" prop="address">
|
||||
<el-input v-model="dataForm.description" :placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.description')])" clearable />
|
||||
</el-form-item>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: gtz
|
||||
* @Date: 2021-04-06 20:07:22
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-06-23 16:22:06
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-03 17:00:54
|
||||
* @Description: file content
|
||||
-->
|
||||
<template>
|
||||
@ -23,7 +23,7 @@
|
||||
|
||||
<script>
|
||||
// edit here
|
||||
import DataDict from './filters'
|
||||
// import DataDict from './filters'
|
||||
const tableBtn = [{
|
||||
type: 'edit',
|
||||
btnName: 'btn.edit'
|
||||
@ -35,12 +35,14 @@ const tableProps = [{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.art.processList.processName'),
|
||||
align: 'center'
|
||||
}, {
|
||||
prop: 'type',
|
||||
label: i18n.t('module.art.processList.type'),
|
||||
align: 'center',
|
||||
filter: DataDict('typeFilter')
|
||||
}, {
|
||||
},
|
||||
// {
|
||||
// prop: 'type',
|
||||
// label: i18n.t('module.art.processList.type'),
|
||||
// align: 'center',
|
||||
// filter: DataDict('typeFilter')
|
||||
// },
|
||||
{
|
||||
prop: 'description',
|
||||
label: i18n.t('module.art.processList.description'),
|
||||
align: 'center'
|
||||
@ -48,7 +50,7 @@ const tableProps = [{
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
// edit here
|
||||
import { list, del } from '@/api/art-manage/process'
|
||||
import { equipmentInfoList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
import { equipmentlistList } from '@/api/basicData/Equipment/equipmentInfo'
|
||||
import HeadForm from '@/components/basicData/HeadForm'
|
||||
import ProcessAdd from './components/Process-add'
|
||||
import Pagination from '@/components/Pagination'
|
||||
@ -124,10 +126,7 @@ export default {
|
||||
},
|
||||
async getEqList(key) {
|
||||
// edit here
|
||||
const res = await equipmentInfoList({
|
||||
current: 1,
|
||||
size: 999
|
||||
})
|
||||
const res = await equipmentlistList()
|
||||
if (res.code === 0) {
|
||||
this.eqList = res.data.records
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-11 15:48:58
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 16:35:32
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -158,8 +158,9 @@ export default {
|
||||
},
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.name = key
|
||||
this.listQuery.tareaName = key
|
||||
this.listQuery.code = key
|
||||
console.log(this.listQuery)
|
||||
cacheList(this.listQuery).then(response => {
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-11 16:26:29
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 14:21:53
|
||||
* @enName:
|
||||
-->
|
||||
<template>
|
||||
@ -104,11 +104,11 @@
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import { cacheDetail, cacheUpdate, cacheAdd, cacheCode } from '@/api/basicData/Cache/cache'
|
||||
import { areaList, areaDelete } from '@/api/basicData/Cache/area'
|
||||
import { shelfList, shelfDelete } from '@/api/basicData/Cache/shelf'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
import shelfAttrAdd from './shelfAttr-add.vue'
|
||||
import shelfBtn from './shelfBtn.vue'
|
||||
import locationBtn from './locationBtn.vue'
|
||||
const tableBtn = [
|
||||
{
|
||||
type: 'edit',
|
||||
@ -121,7 +121,7 @@ const tableBtn = [
|
||||
]
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'name',
|
||||
prop: 'shelfName',
|
||||
label: i18n.t('module.basicData.cache.AreaName'),
|
||||
align: 'center'
|
||||
},
|
||||
@ -131,7 +131,7 @@ const tableProps = [
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'shelfNum',
|
||||
prop: 'total',
|
||||
label: i18n.t('module.basicData.cache.StorageQuantity'),
|
||||
align: 'center'
|
||||
},
|
||||
@ -148,7 +148,7 @@ const tableProps = [
|
||||
{
|
||||
prop: 'shelf',
|
||||
label: i18n.t('module.basicData.cache.Location'),
|
||||
subcomponent: shelfBtn,
|
||||
subcomponent: locationBtn,
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
@ -219,9 +219,20 @@ export default {
|
||||
if (this.id) {
|
||||
cacheDetail(this.id).then(res => {
|
||||
this.dataForm = res.data
|
||||
// console.log(this.dataForm)
|
||||
})
|
||||
this.listQuery.id = this.id
|
||||
areaList(this.listQuery).then(response => {
|
||||
console.log(this.listQuery.id)
|
||||
// shelfDetail(this.listQuery).then(response => {
|
||||
// console.log(response)
|
||||
// if (response.data.records) {
|
||||
// this.list = response.data.records
|
||||
// } else {
|
||||
// this.list.splice(0, this.list.length)
|
||||
// }
|
||||
// })
|
||||
shelfList(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
} else {
|
||||
@ -236,7 +247,7 @@ export default {
|
||||
})
|
||||
},
|
||||
getList() {
|
||||
areaList(this.listQuery).then(response => {
|
||||
shelfList(this.listQuery).then(response => {
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
}
|
||||
@ -249,7 +260,7 @@ export default {
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
areaDelete(raw.data.id).then(response => {
|
||||
shelfDelete(raw.data.id).then(response => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
|
||||
@ -1,16 +1,23 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-11 16:44:10
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-04 19:08:00
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div style="margin:10px 50px">
|
||||
<!-- <div style="margin:10px 50px">
|
||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
|
||||
</div>
|
||||
</div> -->
|
||||
<head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyNameAdd"
|
||||
@getDataList="getList"
|
||||
@add="addNew"
|
||||
/>
|
||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||
<base-table
|
||||
:page="listQuery.current"
|
||||
:limit="listQuery.size"
|
||||
@ -30,11 +37,11 @@
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import HeadForm from '@/components/basicData/HeadForm'
|
||||
import { locationList, locationDelete } from '@/api/basicData/Cache/location'
|
||||
import locationAttrAdd from './locationAttr-add.vue'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
import { timeFormatter } from '@/filters'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
@ -62,10 +69,15 @@ const tableBtn = [
|
||||
}
|
||||
]
|
||||
const tableProps = [
|
||||
// {
|
||||
// prop: 'createTime',
|
||||
// label: i18n.t('module.basicData.factory.createTime'),
|
||||
// filter: timeFormatter,
|
||||
// align: 'center'
|
||||
// },
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: i18n.t('module.basicData.factory.createTime'),
|
||||
filter: timeFormatter,
|
||||
prop: 'locationName',
|
||||
label: i18n.t('module.basicData.cache.LocationName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
@ -74,30 +86,35 @@ const tableProps = [
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.cache.LocationName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'anotherName',
|
||||
prop: 'locationNameAlias',
|
||||
label: i18n.t('module.basicData.cache.anotherName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'place',
|
||||
label: i18n.t('module.basicData.cache.place'),
|
||||
prop: 'layers',
|
||||
label: i18n.t('module.basicData.cache.rowMark'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'remark',
|
||||
label: i18n.t('module.basicData.visual.Remarks'),
|
||||
prop: 'columns',
|
||||
label: i18n.t('module.basicData.cache.columnMark'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'locationType',
|
||||
label: i18n.t('module.basicData.cache.locationType'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'status',
|
||||
label: i18n.t('module.basicData.cache.status'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Location',
|
||||
components: { BaseTable, MethodBtn, locationAttrAdd },
|
||||
components: { BaseTable, MethodBtn, locationAttrAdd, HeadForm },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
@ -111,6 +128,8 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
keyNameAdd: i18n.t('module.basicData.visual.keyword'),
|
||||
placeholderName: this.$t('module.basicData.cache.LocationName'),
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
@ -119,7 +138,8 @@ export default {
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 990,
|
||||
shelfId: ''
|
||||
shelfId: '',
|
||||
id: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -130,7 +150,8 @@ export default {
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
console.log(raw.data)
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
@ -153,9 +174,12 @@ export default {
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.name = key
|
||||
// shelfId与查询参数id关联
|
||||
this.listQuery.id = this.listQuery.shelfId
|
||||
locationList(this.listQuery).then(response => {
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
console.log(this.list)
|
||||
} else {
|
||||
this.list.splice(0, this.list.length)
|
||||
}
|
||||
|
||||
@ -1,30 +1,36 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-25 16:23:03
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-04 18:59:53
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="!dataForm.shelfId ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
|
||||
<el-form-item :label="$t('module.basicData.cache.LocationName')" prop="name">
|
||||
<el-input v-model="dataForm.name" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationName')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.cache.LocationName')" prop="locationName">
|
||||
<el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationName')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.LocationCode')" prop="code">
|
||||
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.LocationCode')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.anotherName')" prop="anotherName">
|
||||
<el-input v-model="dataForm.anotherName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.cache.anotherName')" prop="locationNameAlias">
|
||||
<el-input v-model="dataForm.locationNameAlias" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.anotherName')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.place')" prop="place">
|
||||
<el-input v-model="dataForm.place" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.place')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.cache.rowMark')" prop="layers">
|
||||
<el-input v-model="dataForm.layers" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowMark')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
|
||||
<el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
|
||||
<el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.status')" prop="status">
|
||||
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
@ -51,11 +57,14 @@ export default {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: 0,
|
||||
name: '',
|
||||
locationName: '',
|
||||
code: '',
|
||||
anotherName: '',
|
||||
place: '',
|
||||
remark: ''
|
||||
locationNameAlias: '',
|
||||
rowNum: '',
|
||||
columns: '',
|
||||
layers: '',
|
||||
status: '',
|
||||
locationType: ''
|
||||
},
|
||||
dataRule: {
|
||||
name: [
|
||||
@ -89,13 +98,15 @@ export default {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const data = {
|
||||
'name': this.dataForm.name,
|
||||
'locationName': this.dataForm.locationName,
|
||||
'code': this.dataForm.code,
|
||||
'anotherName': this.dataForm.anotherName,
|
||||
'place': this.dataForm.place,
|
||||
'remark': this.dataForm.remark,
|
||||
'locationNameAlias': this.dataForm.locationNameAlias,
|
||||
'columns': this.dataForm.columns,
|
||||
'layers': this.dataForm.layers,
|
||||
'shelfId': this.shelfId,
|
||||
'id': this.dataForm.id
|
||||
'id': this.dataForm.id,
|
||||
'status': this.dataForm.status,
|
||||
'locationType': this.dataForm.locationType
|
||||
}
|
||||
if (this.dataForm.id) {
|
||||
locationUpdate(data).then(res => {
|
||||
@ -111,6 +122,8 @@ export default {
|
||||
})
|
||||
} else {
|
||||
locationAdd(data).then(res => {
|
||||
console.log(data)
|
||||
console.log(res)
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<!--
|
||||
* @Date: 2021-01-07 20:09:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-06 13:12:47
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 18:39:03
|
||||
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<span>
|
||||
<el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.ManageLocation') }}</el-button>
|
||||
<el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-16 15:01:45
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 19:00:08
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<!-- 新增/编辑识别 :title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter" -->
|
||||
<el-dialog
|
||||
:title="!dataForm.areaId ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
|
||||
@ -17,6 +18,7 @@
|
||||
<el-form-item :label="$t('module.basicData.cache.ShelfCode')" prop="code">
|
||||
<el-input v-model="dataForm.code" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.ShelfCode')])" clearable />
|
||||
</el-form-item>
|
||||
<!-- 选择货架code的下拉框
|
||||
<el-form-item v-if="isPage" :label="$t('module.basicData.cache.AreaName')" prop="areaId">
|
||||
<el-select v-model="dataForm.areaId" filterable :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.AreaName')])" clearable>
|
||||
<el-option
|
||||
@ -26,9 +28,15 @@
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.basicData.cache.StorageQuantity')" prop="total">
|
||||
<el-input-number v-model="dataForm.total" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.StorageQuantity')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.StorageQuantity')" prop="shelfNumber">
|
||||
<el-input-number v-model="dataForm.shelfNumber" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.StorageQuantity')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.cache.rowNum')" prop="rowNum">
|
||||
<el-input-number v-model="dataForm.rowNum" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.rowNum')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.cache.columnNum')" prop="columnNum">
|
||||
<el-input-number v-model="dataForm.columnNum" :step="1" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnNum')])" clearable />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
@ -39,8 +47,7 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
|
||||
import { areaList } from '@/api/basicData/Cache/area'
|
||||
import { shelfList, shelfDetail, shelfUpdate, shelfAdd, shelfCode } from '@/api/basicData/Cache/shelf'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@ -90,7 +97,7 @@ export default {
|
||||
current: 1,
|
||||
size: 500
|
||||
}
|
||||
areaList(params).then(response => {
|
||||
shelfList(params).then(response => {
|
||||
if (response.data.records) {
|
||||
this.areaArr = response.data.records
|
||||
}
|
||||
@ -114,7 +121,7 @@ export default {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const data = this.dataForm
|
||||
console.log(data)
|
||||
// console.log(data)
|
||||
if (this.dataForm.id) {
|
||||
shelfUpdate(data).then(res => {
|
||||
this.$message({
|
||||
@ -129,6 +136,7 @@ export default {
|
||||
})
|
||||
} else {
|
||||
shelfAdd(data).then(res => {
|
||||
console.log(res)
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
<!--
|
||||
* @Date: 2021-01-07 20:09:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-06 13:03:40
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-02 19:00:47
|
||||
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<span>
|
||||
<el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.ManageShelves') }}</el-button>
|
||||
<el-button type="text" size="small" @click="emitClick">{{ $t('module.basicData.cache.addLocation') }}</el-button>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
||||
@ -1,18 +1,18 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-25 16:13:19
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-04 19:00:14
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<head-form
|
||||
<!-- <head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyName"
|
||||
@getDataList="getList"
|
||||
@add="addNew"
|
||||
/>
|
||||
/> -->
|
||||
<base-table
|
||||
:page="listQuery.current"
|
||||
:limit="listQuery.size"
|
||||
@ -39,15 +39,13 @@
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import HeadForm from '@/components/basicData/HeadForm'
|
||||
// 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 { shelfList, shelfDelete } from '@/api/basicData/Cache/shelf'
|
||||
import { areaList } from '@/api/basicData/Cache/area'
|
||||
import shelfAttrAdd from './components/shelfAttr-add.vue'
|
||||
import locationBtn from './components/locationBtn.vue'
|
||||
import { timeFormatter } from '@/filters'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
@ -76,34 +74,33 @@ const tableBtn = [
|
||||
]
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: i18n.t('module.basicData.factory.createTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.cache.ShelfName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'code',
|
||||
label: i18n.t('module.basicData.cache.ShelfCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'areaName',
|
||||
prop: 'shelfName',
|
||||
label: i18n.t('module.basicData.cache.AreaName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'shelfNumber',
|
||||
prop: 'code',
|
||||
label: i18n.t('module.basicData.cache.AreaCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'total',
|
||||
label: i18n.t('module.basicData.cache.StorageQuantity'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'location',
|
||||
label: i18n.t('module.basicData.cache.Location'),
|
||||
prop: 'rowNum',
|
||||
label: i18n.t('module.basicData.cache.rowNum'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'columnNum',
|
||||
label: i18n.t('module.basicData.cache.columnNum'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'shelf',
|
||||
label: i18n.t('module.basicData.visual.location'),
|
||||
subcomponent: locationBtn,
|
||||
align: 'center'
|
||||
}
|
||||
@ -111,7 +108,7 @@ const tableProps = [
|
||||
|
||||
export default {
|
||||
name: 'Area',
|
||||
components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
|
||||
components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
@ -141,21 +138,22 @@ export default {
|
||||
}
|
||||
},
|
||||
created() {
|
||||
const params = {
|
||||
current: 1,
|
||||
size: 500
|
||||
}
|
||||
areaList(params).then(response => {
|
||||
if (response.data.records) {
|
||||
this.areaList = response.data.records
|
||||
}
|
||||
this.getList()
|
||||
})
|
||||
// const params = {
|
||||
// current: 1,
|
||||
// size: 500
|
||||
// }
|
||||
// shelfList(params).then(response => {
|
||||
// if (response.data.records) {
|
||||
// this.areaList = response.data.records
|
||||
// }
|
||||
// this.getList()
|
||||
// })
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.shelfName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
@ -179,9 +177,10 @@ export default {
|
||||
},
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.name = key
|
||||
this.listQuery.shelfName = key
|
||||
console.log(this.listQuery)
|
||||
shelfList(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
// console.log(response)
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
this.list.forEach(item => {
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
|
||||
<!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
|
||||
<el-select
|
||||
v-model="dataForm.equipmentType"
|
||||
:disabled="isdetail"
|
||||
@ -53,9 +53,25 @@
|
||||
:disabled="item.disabled"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item> -->
|
||||
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
|
||||
<el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
|
||||
<el-date-picker
|
||||
v-model="dataForm.enterTime"
|
||||
:disabled="isdetail"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-ddT00:00:00"
|
||||
:style="{width: '100%'}"
|
||||
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.equipment.EquipmentGrouping')" prop="groupId">
|
||||
<el-select
|
||||
v-model="dataForm.groupId"
|
||||
@ -73,18 +89,18 @@
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Specs')" prop="spec">
|
||||
<el-input v-model="dataForm.spec" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Specs')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.productionTime')" prop="productionTime">
|
||||
<el-form-item :label="$t('module.basicData.visual.productionTime')" prop="createTime">
|
||||
<el-date-picker
|
||||
v-model="dataForm.productionTime"
|
||||
v-model="dataForm.createTime"
|
||||
:disabled="isdetail"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
@ -93,23 +109,10 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
|
||||
<el-date-picker
|
||||
v-model="dataForm.enterTime"
|
||||
:disabled="isdetail"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}"
|
||||
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.debugTime')" prop="debugTime">
|
||||
<el-date-picker
|
||||
v-model="dataForm.debugTime"
|
||||
@ -126,7 +129,7 @@
|
||||
<el-form-item :label="$t('module.basicData.equipment.DebugPeriod')" prop="debugPeriod">
|
||||
<el-input v-model="dataForm.debugPeriod" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.DebugPeriod')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Manufacturer')" prop="manufacturer">
|
||||
<el-input
|
||||
@ -138,9 +141,19 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
|
||||
<el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.equipment.intellectualProperty')" prop="intellectualProperty">
|
||||
<el-input
|
||||
v-model="dataForm.intellectualProperty"
|
||||
@ -162,20 +175,8 @@
|
||||
:style="{width: '100%'}"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
|
||||
<el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
</el-col> -->
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.equipment.plcVersion')" prop="plcVersion">
|
||||
<el-input v-model="dataForm.plcVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.plcVersion')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
@ -184,9 +185,9 @@
|
||||
<el-form-item :label="$t('module.basicData.equipment.eapVersion')" prop="eapVersion">
|
||||
<el-input v-model="dataForm.eapVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.eapVersion')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<!-- <el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item :label="$t('module.basicData.equipment.maintenanceCycle')" prop="maintenanceCycle">
|
||||
<el-input v-model="dataForm.maintenanceCycle" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceCycle')])" clearable :style="{width: '100%'}" />
|
||||
@ -197,9 +198,9 @@
|
||||
<el-input v-model="dataForm.maintenanceTime" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceTime')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-row> -->
|
||||
<el-row>
|
||||
<el-col :span="4">
|
||||
<!-- <el-col :span="4">
|
||||
<el-form-item :label="$t('module.basicData.equipment.E10Status')" prop="estatus">
|
||||
<el-switch
|
||||
v-model="dataForm.estatus"
|
||||
@ -248,11 +249,11 @@
|
||||
inactive-color="#AAAAAA"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-col> -->
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="9">
|
||||
<el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
|
||||
<!-- <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
|
||||
<el-upload
|
||||
ref="eImg"
|
||||
name="files"
|
||||
@ -265,7 +266,7 @@
|
||||
>
|
||||
<el-button size="small" type="primary" icon="el-icon-upload">{{ 'btn.upload' | i18nFilter }}</el-button>
|
||||
</el-upload>
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
<el-form-item v-if="isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="upInfo">
|
||||
<div v-for="item in imgList" :key="item.id">
|
||||
{{ item.fileName }} <el-button size="small" type="primary" icon="el-icon-upload" @click="downloadFile(item.fileId)">{{ 'btn.download' | i18nFilter }}</el-button>
|
||||
@ -330,12 +331,9 @@ import {
|
||||
equipmentInfoUpdate,
|
||||
equipmentInfoAdd,
|
||||
equipmentInfoCode,
|
||||
equipmentInfoFileAdd,
|
||||
getEquipmentInfoFile
|
||||
equipmentInfoFileAdd
|
||||
} from '@/api/basicData/Equipment/equipmentInfo'
|
||||
import { equipmentGroupList } from '@/api/basicData/Equipment/equipmentGroup'
|
||||
import { equipmentInfoAttrList, equipmentInfoAttrDelete } from '@/api/basicData/Equipment/equipmentInfoAttr'
|
||||
import { equipmentTypeList } from '@/api/basicData/Equipment/equipmentType'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
import equipmentInfoAttrAdd from './equipmentInfoAttr-add'
|
||||
@ -365,15 +363,15 @@ const tableProps = [
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'attrValue',
|
||||
prop: 'attrContent',
|
||||
label: i18n.t('module.basicData.visual.AttributeValue'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'remark',
|
||||
label: i18n.t('module.basicData.visual.Remarks'),
|
||||
align: 'center'
|
||||
}
|
||||
// {
|
||||
// prop: 'remark',
|
||||
// label: i18n.t('module.basicData.visual.Remarks'),
|
||||
// align: 'center'
|
||||
// }
|
||||
]
|
||||
|
||||
export default {
|
||||
@ -393,7 +391,7 @@ export default {
|
||||
abbr: '',
|
||||
equipmentType: '',
|
||||
spec: '',
|
||||
productionTime: '',
|
||||
createTime: '',
|
||||
enterTime: '',
|
||||
debugTime: '',
|
||||
debugPeriod: '',
|
||||
@ -429,17 +427,17 @@ export default {
|
||||
required: true,
|
||||
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentType')]),
|
||||
trigger: 'change'
|
||||
}],
|
||||
maintenanceCycle: [{
|
||||
required: true,
|
||||
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
|
||||
trigger: 'blur'
|
||||
}],
|
||||
maintenanceTime: [{
|
||||
required: true,
|
||||
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
|
||||
trigger: 'blur'
|
||||
}]
|
||||
// maintenanceCycle: [{
|
||||
// required: true,
|
||||
// message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
|
||||
// trigger: 'blur'
|
||||
// }],
|
||||
// maintenanceTime: [{
|
||||
// required: true,
|
||||
// message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
|
||||
// trigger: 'blur'
|
||||
// }]
|
||||
},
|
||||
typeCode: {},
|
||||
eImgAction: uploadPath,
|
||||
@ -462,34 +460,36 @@ export default {
|
||||
created() {
|
||||
this.listQuery.equipmentId = this.$route.query.id
|
||||
this.init()
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.isdetail = false
|
||||
this.isdetail = Boolean(this.$route.query.isdetail)
|
||||
if (this.isdetail) {
|
||||
const data =
|
||||
{
|
||||
'equipmentId': this.listQuery.equipmentId
|
||||
}
|
||||
getEquipmentInfoFile(data).then(res => {
|
||||
this.downloadList = res.data
|
||||
this.downloadList.forEach(item => {
|
||||
if (item.typeCode === 'equipmentInfoImage') {
|
||||
this.imgList.push(item)
|
||||
} else {
|
||||
this.fileList.push(item)
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
this.list.splice(0, this.list.length)
|
||||
equipmentTypeList(this.listQuery).then(response => {
|
||||
this.equipmentTypeOption = response.data.records
|
||||
})
|
||||
equipmentGroupList(this.listQuery).then(response => {
|
||||
this.equipmentGroupOption = response.data.records
|
||||
})
|
||||
// 设备信息下载接口，暂时未调用
|
||||
// if (this.isdetail) {
|
||||
// const data =
|
||||
// {
|
||||
// 'equipmentId': this.listQuery.equipmentId
|
||||
// }
|
||||
// getEquipmentInfoFile(data).then(res => {
|
||||
// this.downloadList = res.data
|
||||
// this.downloadList.forEach(item => {
|
||||
// if (item.typeCode === 'equipmentInfoImage') {
|
||||
// this.imgList.push(item)
|
||||
// } else {
|
||||
// this.fileList.push(item)
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
// }
|
||||
// this.list.splice(0, this.list.length)
|
||||
// equipmentTypeList(this.listQuery).then(response => {
|
||||
// this.equipmentTypeOption = response.data.records
|
||||
// })
|
||||
// equipmentGroupList(this.listQuery).then(response => {
|
||||
// this.equipmentGroupOption = response.data.records
|
||||
// })
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.listQuery.equipmentId) {
|
||||
@ -514,7 +514,9 @@ export default {
|
||||
},
|
||||
getList() {
|
||||
this.listLoading = true
|
||||
console.log(this.listQuery)
|
||||
equipmentInfoAttrList(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
} else {
|
||||
@ -525,7 +527,7 @@ export default {
|
||||
},
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.attrName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-25 16:31:46
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 14:08:41
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -19,12 +19,12 @@
|
||||
<el-form-item :label="$t('module.basicData.visual.AttributeName')" prop="attrName">
|
||||
<el-input v-model="dataForm.attrName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeName')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrValue">
|
||||
<el-input v-model="dataForm.attrValue" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
|
||||
<el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrContent">
|
||||
<el-input v-model="dataForm.attrContent" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
|
||||
<!-- <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
|
||||
</el-form-item>
|
||||
</el-form-item> -->
|
||||
</el-form>
|
||||
<div class="drawer-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
@ -52,14 +52,14 @@ export default {
|
||||
dataForm: {
|
||||
id: 0,
|
||||
attrName: '',
|
||||
attrValue: '',
|
||||
attrContent: '',
|
||||
remark: ''
|
||||
},
|
||||
dataRule: {
|
||||
attrName: [
|
||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeName')]), trigger: 'blur' }
|
||||
],
|
||||
attrValue: [
|
||||
attrContent: [
|
||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeValue')]), trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
@ -74,6 +74,7 @@ export default {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.dataForm.id) {
|
||||
equipmentInfoAttrDetail(this.dataForm.id).then(res => {
|
||||
console.log(res)
|
||||
this.dataForm = res.data
|
||||
})
|
||||
}
|
||||
@ -86,7 +87,7 @@ export default {
|
||||
if (valid) {
|
||||
const data = {
|
||||
'attrName': this.dataForm.attrName,
|
||||
'attrValue': this.dataForm.attrValue,
|
||||
'attrContent': this.dataForm.attrContent,
|
||||
'remark': this.dataForm.remark,
|
||||
'equipmentId': this.equipmentId,
|
||||
'id': this.dataForm.id
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-07-08 09:46:10
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 11:01:57
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -43,7 +43,7 @@ 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 { timeFormatter } from '@/filters'
|
||||
// import dataDict from '@/filters/DataDict'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
@ -76,20 +76,15 @@ const tableBtn = [
|
||||
}
|
||||
]
|
||||
const tableProps = [
|
||||
// {
|
||||
// prop: 'createTime',
|
||||
// label: i18n.t('module.basicData.factory.createTime'),
|
||||
// filter: timeFormatter,
|
||||
// align: 'center'
|
||||
// },
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.equipment.EquipmentName'),
|
||||
prop: 'createTime',
|
||||
label: i18n.t('module.basicData.factory.createTime'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'equipmentTypeName',
|
||||
label: i18n.t('module.basicData.equipment.EquipmentType'),
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.equipment.EquipmentName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
@ -98,8 +93,8 @@ const tableProps = [
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'equipmentGroupName',
|
||||
label: i18n.t('module.basicData.equipment.EquipmentGrouping'),
|
||||
prop: 'equipmentType',
|
||||
label: i18n.t('module.basicData.equipment.EquipmentType'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
@ -108,26 +103,11 @@ const tableProps = [
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'maintenanceCycle',
|
||||
label: i18n.t('module.basicData.equipment.maintenanceCycle'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'maintenanceTime',
|
||||
label: i18n.t('module.basicData.equipment.maintenanceTime'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'description',
|
||||
label: i18n.t('module.basicData.equipment.FunctionDescription'),
|
||||
prop: 'abbr',
|
||||
label: i18n.t('module.basicData.equipment.shortName'),
|
||||
align: 'center'
|
||||
}
|
||||
// {
|
||||
// prop: 'abbr',
|
||||
// label: i18n.t('module.basicData.visual.Abbreviation'),
|
||||
// align: 'center'
|
||||
// }
|
||||
// {
|
||||
// prop: 'estatus',
|
||||
// label: i18n.t('module.basicData.visual.CurrentState'),
|
||||
// filter: dataDict('enableState'),
|
||||
@ -197,6 +177,7 @@ export default {
|
||||
this.listQuery.name = key
|
||||
this.listQuery.code = key
|
||||
equipmentInfoList(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
} else {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: gtz
|
||||
* @LastEditTime: 2021-04-17 16:33:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 10:06:01
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -62,23 +62,8 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-form-item :label="$t('module.basicData.staff.Profession')" prop="majorId">
|
||||
<el-select
|
||||
v-model="staffData.majorId"
|
||||
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.staff.Profession')])"
|
||||
multiple
|
||||
filterable
|
||||
clearable
|
||||
:style="{width: '100%'}"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in majorArr"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
:disabled="item.disabled"
|
||||
/>
|
||||
</el-select>
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
|
||||
<el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -122,11 +107,6 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="description">
|
||||
<el-input v-model="staffData.description" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-form>
|
||||
@ -140,7 +120,6 @@
|
||||
|
||||
<script>
|
||||
import { staffDetail, staffUpdate, staffAdd, staffCode } from '@/api/basicData/GroupModule/staff'
|
||||
import { majorList } from '@/api/basicData/GroupModule/major'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
@ -152,7 +131,6 @@ export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
majorArr: [],
|
||||
staffData: {
|
||||
name: undefined,
|
||||
sex: '',
|
||||
@ -211,13 +189,6 @@ export default {
|
||||
staffCode().then(res => {
|
||||
this.staffData.code = res.data
|
||||
})
|
||||
majorList({
|
||||
current: 1,
|
||||
size: 999,
|
||||
name: ''
|
||||
}).then(response => {
|
||||
this.majorArr = response.data.records
|
||||
})
|
||||
this.staffData.id = id || ''
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-03-11 16:48:22
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-03 18:33:17
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -180,6 +180,7 @@ export default {
|
||||
this.listLoading = true
|
||||
this.listQuery.name = key
|
||||
this.listQuery.code = key
|
||||
console.log(this.listQuery)
|
||||
materialList(this.listQuery).then(response => {
|
||||
if (response.data.records) {
|
||||
this.list = response.data.records
|
||||
|
||||
120
src/views/basicData/Process/components/processInfo-add.vue
Normal file
120
src/views/basicData/Process/components/processInfo-add.vue
Normal file
@ -0,0 +1,120 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-04 11:12:42
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 19:17:36
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="!dataForm.locationId ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-form ref="dataForm" :model="dataForm" label-width="130px" @keyup.enter.native="dataFormSubmit()">
|
||||
<el-form-item :label="$t('module.basicData.processLocation.sequence')" prop="sequence">
|
||||
<el-input v-model="dataForm.sequence" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.sequence')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.processLocation.workSequenId')" prop="workSequenId">
|
||||
<el-input v-model="dataForm.workSequenId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.workSequenId')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.processLocation.locationName')" prop="locationName">
|
||||
<el-input v-model="dataForm.locationName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationName')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.processLocation.locationId')" prop="locationId">
|
||||
<el-input v-model="dataForm.locationId" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.locationId')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.processLocation.isProcess')" prop="isProcess">
|
||||
<el-input v-model="dataForm.isProcess" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.isProcess')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.basicData.processLocation.equipmentMark')" prop="equipmentMark">
|
||||
<el-input v-model="dataForm.equipmentMark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.processLocation.equipmentMark')])" clearable />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { detail, update, add } from '@/api/basicData/Cache/processLocation'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: 0,
|
||||
sequence: '',
|
||||
locationName: '',
|
||||
isProcess: '',
|
||||
equipmentMark: ''
|
||||
},
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
locationId: '',
|
||||
workSequenId: '',
|
||||
locationName: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init(LocationId) {
|
||||
this.listQuery.LocationId = LocationId || ''
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
if (this.listQuery.LocationId) {
|
||||
// list(this.listQuery).then(res =>{
|
||||
// this.list = response.data.records
|
||||
// })
|
||||
detail(this.dataForm.id).then(res => {
|
||||
this.dataForm = res.data
|
||||
})
|
||||
} else {
|
||||
// storageBoxCode().then(res => {
|
||||
// this.dataForm.code = res.data
|
||||
// })
|
||||
}
|
||||
})
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmit() {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const data = this.dataForm
|
||||
data.id = this.dataForm.id
|
||||
if (this.dataForm.id) {
|
||||
update(data).then(res => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList')
|
||||
}
|
||||
})
|
||||
})
|
||||
} else {
|
||||
add(data).then(res => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList')
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
212
src/views/basicData/Process/processInfo.vue
Normal file
212
src/views/basicData/Process/processInfo.vue
Normal file
@ -0,0 +1,212 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-03 09:51:25
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 19:15:25
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyName"
|
||||
@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()"
|
||||
/>
|
||||
<processInfo-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import HeadForm from '@/components/basicData/HeadForm'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import processInfoAdd from './components/processInfo-add'
|
||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
import { list, locaDelete } from '@/api/basicData/Cache/processLocation'
|
||||
import { timeFormatter } from '@/filters'
|
||||
/**
|
||||
* 表格表头配置项 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: 'sequence',
|
||||
label: i18n.t('module.basicData.processLocation.sequence'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'locationName',
|
||||
label: i18n.t('module.basicData.processLocation.locationName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'isProcess',
|
||||
label: i18n.t('module.basicData.processLocation.isProcess'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'locationId',
|
||||
label: i18n.t('module.basicData.processLocation.locationId'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'workSequenId',
|
||||
label: i18n.t('module.basicData.processLocation.workSequenId'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'equipmentMark',
|
||||
label: i18n.t('module.basicData.processLocation.equipmentMark'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Area',
|
||||
components: { Pagination, BaseTable, MethodBtn, HeadForm, processInfoAdd },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
keyName: i18n.t('module.basicData.visual.keyword'),
|
||||
placeholderName: i18n.t('module.basicData.processLocation.locationName'),
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
areaList: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
locationId: '',
|
||||
workSequenId: '',
|
||||
locationName: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.locationName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
console.log(raw.data)
|
||||
locaDelete(raw.data.id).then(response => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else if (raw.type === 'edit') {
|
||||
this.addNew(raw.data.locationId)
|
||||
} else {
|
||||
this.addNew(raw.data.locationId, true)
|
||||
}
|
||||
},
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.locationName = key
|
||||
list(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
|
||||
console.log(response)
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id, true)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-14 15:54:12
|
||||
* @LastEditTime: 2022-03-04 10:56:41
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -46,6 +46,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
<el-button type="primary" @click="manualTask()"> {{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<base-table
|
||||
@ -70,12 +71,14 @@
|
||||
@pagination="getList()"
|
||||
/>
|
||||
<current-task-info v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getList" />
|
||||
<current-task-add v-if="manualTaskVisible" ref="manualTaskRef" @refreshDataList="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { CurrentTaskList } from '@/api/basicData/Warehouse/HistoricalTask'
|
||||
import CurrentTaskInfo from './components/CurrentTaskInfo.vue'
|
||||
import CurrentTaskAdd from './components/CurrentTask-add.vue'
|
||||
import i18n from '@/lang'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||
@ -168,11 +171,12 @@ const tableProps = [
|
||||
|
||||
export default {
|
||||
name: 'ScrapInfo',
|
||||
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo },
|
||||
components: { Pagination, BaseTable, MethodBtn, CurrentTaskInfo, CurrentTaskAdd },
|
||||
data() {
|
||||
return {
|
||||
trueWidth: 100,
|
||||
addOrUpdateVisible: false,
|
||||
manualTaskVisible: false,
|
||||
tableProps,
|
||||
tableBtn,
|
||||
list: [],
|
||||
@ -237,6 +241,13 @@ export default {
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
},
|
||||
// 手动执行任务
|
||||
manualTask() {
|
||||
this.manualTaskVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.manualTaskRef.init()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
202
src/views/basicData/Warehouse/ProcessStorageManagement.vue
Normal file
202
src/views/basicData/Warehouse/ProcessStorageManagement.vue
Normal file
@ -0,0 +1,202 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 15:45:23
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
ref="formData"
|
||||
:rules="rules"
|
||||
:model="listQuery"
|
||||
:inline="true"
|
||||
size="medium"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item :label="$t('module.art.processList.processName')" prop="processId">
|
||||
<el-select
|
||||
v-model="listQuery.processId"
|
||||
:placeholder="$i18nForm(['placeholder.input', $t('module.art.processList.processName')])"
|
||||
clearable
|
||||
filterable
|
||||
:style="{width: '100%'}"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in processArr"
|
||||
:key="index"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getList()"> {{ 'btn.search' | i18nFilter }} </el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<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 { list } from '@/api/art-manage/process'
|
||||
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 i18n from '@/lang'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
const tableBtn = [
|
||||
{
|
||||
type: 'see',
|
||||
btnName: i18n.t('module.basicData.Warehouse.processStorageLink')
|
||||
}
|
||||
]
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'code',
|
||||
label: i18n.t('module.art.processList.processCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.art.processList.processName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'createTime',
|
||||
label: i18n.t('module.art.eqName'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'ExecutionInfo',
|
||||
components: { Pagination, BaseTable, MethodBtn },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
processArr: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
rules: {},
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
processId: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
this.init()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
this.addNew(raw.data.id)
|
||||
},
|
||||
init() {
|
||||
const lparams = {
|
||||
current: 1,
|
||||
size: 999
|
||||
}
|
||||
list(lparams).then(response => {
|
||||
if (response.data.records) {
|
||||
this.processArr = response.data.records
|
||||
} else {
|
||||
this.processArr.splice(0, this.list.length)
|
||||
}
|
||||
this.total = response.data.total
|
||||
})
|
||||
},
|
||||
getList() {
|
||||
// this.listLoading = true
|
||||
// ExecutionInfoList(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.list = [
|
||||
{
|
||||
code: 11,
|
||||
name: '11'
|
||||
}
|
||||
]
|
||||
this.listLoading = false
|
||||
// })
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.$router.push({
|
||||
name: 'ProcessStorageManagementInfo',
|
||||
query: {
|
||||
dictTypeId: id
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
125
src/views/basicData/Warehouse/components/CurrentTask-add.vue
Normal file
125
src/views/basicData/Warehouse/components/CurrentTask-add.vue
Normal file
@ -0,0 +1,125 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 11:05:23
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="'btn.see' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-row :gutter="10">
|
||||
<el-form
|
||||
ref="dataForm"
|
||||
:model="dataForm"
|
||||
size="medium"
|
||||
label-width="110px"
|
||||
label-position="left"
|
||||
>
|
||||
<el-col :span="12">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskBoxNumber')" prop="taskCode">
|
||||
<el-input v-model="dataForm.taskCode" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxNumber')" prop="orderName">
|
||||
<el-input v-model="dataForm.orderName" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.ExecutionOperation')" prop="fullCode">
|
||||
<el-input v-model="dataForm.fullCode" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskStatus')" prop="name">
|
||||
<el-input v-model="dataForm.name" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.ScrapInfo.remark')" prop="remark">
|
||||
<el-input v-model="dataForm.remark" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.TaskLocation')" prop="createTime">
|
||||
<el-input v-model="dataForm.createTime" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.FullBoxStartLocation')" prop="taskType">
|
||||
<el-input v-model="dataForm.taskType" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.Priority')" prop="emptyCode">
|
||||
<el-input v-model="dataForm.emptyCode" readonly :style="{width: '100%'}" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item :label="$t('module.basicData.Warehouse.NextOperation')" prop="anotherCurrLocation">
|
||||
<el-input
|
||||
v-model="dataForm.anotherCurrLocation"
|
||||
readonly
|
||||
:style="{width: '100%'}"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="visible = false">{{ $t('module.basicData.Warehouse.PerformTaskManual') | i18nFilter }} </el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
// import { CurrentTaskDetail } from '@/api/basicData/Warehouse/HistoricalTask'
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: '',
|
||||
taskCode: undefined,
|
||||
orderName: undefined,
|
||||
fullCode: undefined,
|
||||
name: undefined,
|
||||
remark: undefined,
|
||||
field119: undefined,
|
||||
createTime: undefined,
|
||||
taskType: undefined,
|
||||
emptyCode: undefined,
|
||||
anotherCurrLocation: undefined,
|
||||
field121: undefined,
|
||||
taskSource: undefined,
|
||||
anotherCurrProcessCode: undefined,
|
||||
anotherNextProcessCode: undefined,
|
||||
anotherTargetLocation: undefined,
|
||||
field126: undefined
|
||||
}
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init(id) {
|
||||
this.dataForm.id = id
|
||||
this.visible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs['dataForm'].resetFields()
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -0,0 +1,166 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 15:41:11
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 16:01:28
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div style="margin:10px 50px">
|
||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
|
||||
</div>
|
||||
<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>
|
||||
<processStorage-link v-if="addOrUpdateVisible" ref="addOrUpdate" :area-id="listQuery.areaId" @refreshDataList="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import i18n from '@/lang'
|
||||
import processStorageLink from './processStorageLink.vue'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
import { timeFormatter } from '@/filters'
|
||||
/**
|
||||
* 表格表头配置项 TypeScript接口注释
|
||||
* tableConfig<ConfigItem> = []
|
||||
*
|
||||
* Interface ConfigItem = {
|
||||
* prop: string,
|
||||
* label: string,
|
||||
* width: string,
|
||||
* align: string,
|
||||
* subcomponent: function,
|
||||
* filter: function
|
||||
* }
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
const tableBtn = [
|
||||
{
|
||||
type: 'delete',
|
||||
btnName: 'btn.delete'
|
||||
}
|
||||
]
|
||||
const tableProps = [
|
||||
{
|
||||
prop: 'code',
|
||||
label: i18n.t('module.basicData.cache.LocationCode'),
|
||||
filter: timeFormatter,
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'name',
|
||||
label: i18n.t('module.basicData.cache.LocationName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'shelfName',
|
||||
label: i18n.t('module.basicData.cache.locationType'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Shelf',
|
||||
components: { BaseTable, MethodBtn, processStorageLink },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 990,
|
||||
areaId: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.listQuery.areaId = this.$route.query.id
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.name}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
// shelfDelete(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
|
||||
// shelfList(this.listQuery).then(response => {
|
||||
// if (response.data.records) {
|
||||
// this.list = response.data.records
|
||||
// } else {
|
||||
// this.list.splice(0, this.list.length)
|
||||
// }
|
||||
this.listLoading = false
|
||||
// })
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
},
|
||||
goback() {
|
||||
this.$router.go(-1)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
175
src/views/basicData/Warehouse/components/processStorageLink.vue
Normal file
175
src/views/basicData/Warehouse/components/processStorageLink.vue
Normal file
@ -0,0 +1,175 @@
|
||||
<!--
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-03-04 16:54:51
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
<el-dialog
|
||||
:title="$t('module.basicData.visual.stock') | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
top="5vh"
|
||||
>
|
||||
<div>
|
||||
<div class="mainDiv" style="margin:10px 0 100px">
|
||||
<div class="title">货架一</div>
|
||||
<div class="flexDiv">
|
||||
<div
|
||||
v-for="count in 5"
|
||||
:key="count"
|
||||
class="wareBox"
|
||||
:class="[
|
||||
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
|
||||
{ active: count === isActive }
|
||||
]"
|
||||
@click="selectBox(count)"
|
||||
>
|
||||
<div class="plat">库位{{ count }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexDiv">
|
||||
<div
|
||||
v-for="count in 5"
|
||||
:key="count"
|
||||
class="wareBox"
|
||||
:class="[
|
||||
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
|
||||
{ active: count + 5 === isActive }
|
||||
]"
|
||||
@click="selectBox(count + 5)"
|
||||
>
|
||||
<div class="plat">库位{{ count + 5 }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="line" />
|
||||
<div class="mainDiv" style="margin:100px 0 10px">
|
||||
<div class="title">货架二</div>
|
||||
<div class="flexDiv">
|
||||
<div
|
||||
v-for="count in 5"
|
||||
:key="count"
|
||||
class="wareBox"
|
||||
:class="[
|
||||
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
|
||||
{ active: count+10 === isActive }
|
||||
]"
|
||||
@click="selectBox(count+10)"
|
||||
>
|
||||
<div class="plat">库位{{ count+10 }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flexDiv">
|
||||
<div
|
||||
v-for="count in 5"
|
||||
:key="count"
|
||||
class="wareBox"
|
||||
:class="[
|
||||
count > Math.round(Math.random() * 10) ? 'enableBox' : 'disableBox',
|
||||
{ active: count+15 === isActive }
|
||||
]"
|
||||
@click="selectBox(count+15)"
|
||||
>
|
||||
<div class="plat">库位{{ count+15 }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
|
||||
export default {
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
isActiveArr: []
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
init() {
|
||||
this.visible = true
|
||||
},
|
||||
selectBox(count) {
|
||||
this.isActive.push(count)
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmit() {
|
||||
this.visible = false
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.mainDiv {
|
||||
border: 2px solid rgb(145, 174, 255);
|
||||
padding: 20px 0;
|
||||
}
|
||||
.flexDiv {
|
||||
display: -webkit-flex;
|
||||
display: flex;
|
||||
-webkit-justify-content: space-around;
|
||||
justify-content: space-around;
|
||||
}
|
||||
.title {
|
||||
float: left;
|
||||
width: 50px;
|
||||
font-size: 40px;
|
||||
line-height: 45px;
|
||||
}
|
||||
/* 边框特效 */
|
||||
.wareBox:hover {
|
||||
background: linear-gradient(to left, deepskyblue, deepskyblue) left top
|
||||
no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) right top no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to bottom, deepskyblue, deepskyblue) left bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat,
|
||||
linear-gradient(to left, deepskyblue, deepskyblue) right bottom no-repeat;
|
||||
background-size: 5px 30px, 30px 5px;
|
||||
color: black;
|
||||
border-radius: 5px;
|
||||
background-color: rgb(190, 224, 241);
|
||||
}
|
||||
.wareBox {
|
||||
cursor: pointer;
|
||||
margin: 10px;
|
||||
height: 80px;
|
||||
line-height: 70px;
|
||||
text-align: center;
|
||||
border: 2px solid #cdcdc5;
|
||||
border-radius: 5px;
|
||||
}
|
||||
.plat {
|
||||
min-width: 80px;
|
||||
}
|
||||
.line {
|
||||
margin: 20px 0;
|
||||
height: 2px;
|
||||
background-color: gray;
|
||||
border-left: 200px solid #ddd;
|
||||
border-right: 200px solid #ddd;
|
||||
}
|
||||
.enableBox {
|
||||
background: rgb(0, 189, 16);
|
||||
}
|
||||
.disableBox {
|
||||
background: #ddd;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.end-plat {
|
||||
background-color: rgb(195, 246, 255);
|
||||
}
|
||||
.active {
|
||||
border: 2px solid red;
|
||||
}
|
||||
</style>
|
||||
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2020-12-29 16:37:56
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2021-07-06 11:26:28
|
||||
* @LastEditTime: 2022-03-03 16:49:10
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -83,7 +83,7 @@ export default {
|
||||
dataDictionaryDataList({
|
||||
current: 1,
|
||||
size: 999,
|
||||
dictTypeId: '1412216979622785026'
|
||||
dictTypeId: '2'
|
||||
}).then(response => {
|
||||
if (response.data.records) {
|
||||
this.scrapsArr = response.data.records
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Date: 2021-01-07 20:09:37
|
||||
* @LastEditors: zwq
|
||||
* @LastEditTime: 2022-01-17 15:16:29
|
||||
* @LastEditTime: 2022-03-07 09:25:31
|
||||
* @FilePath: \basic-admin\src\components\BaseTable\subcomponents\CheckDetail.vue
|
||||
* @Description:
|
||||
-->
|
||||
@ -44,10 +44,10 @@ export default {
|
||||
visible: false,
|
||||
options: [{
|
||||
value: '选项1',
|
||||
label: '黄金糕'
|
||||
label: '工艺1'
|
||||
}, {
|
||||
value: '选项2',
|
||||
label: '双皮奶'
|
||||
label: '工艺2'
|
||||
}
|
||||
],
|
||||
value: ''
|
||||
|
||||
199
src/views/report-manage/CurrentEmptyBox.vue
Normal file
199
src/views/report-manage/CurrentEmptyBox.vue
Normal file
@ -0,0 +1,199 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-04 20:54:54
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 16:37:29
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyName"
|
||||
:show-add="false"
|
||||
@getDataList="getList"
|
||||
/>
|
||||
<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()"
|
||||
/>
|
||||
<!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import HeadForm from '@/components/basicData/HeadForm'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||
import { list } from '@/api/report-manage/report'
|
||||
/**
|
||||
* 表格表头配置项 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: 'code',
|
||||
label: i18n.t('module.report.inventory.code'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'status',
|
||||
label: i18n.t('module.report.inventory.status'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'inprocessCode',
|
||||
label: i18n.t('module.report.inventory.inprocessCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'currentLocation',
|
||||
label: i18n.t('module.report.inventory.currentLocation'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'storeTime',
|
||||
label: i18n.t('module.report.inventory.storeTime'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'manual',
|
||||
label: i18n.t('module.report.inventory.manual'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Inventory',
|
||||
components: { Pagination, BaseTable, HeadForm },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
keyName: i18n.t('module.report.reportList.storageBoxNumber'),
|
||||
placeholderName: this.$t('module.report.reportList.queryFiltering'),
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
// handleClick(raw) {
|
||||
// if (raw.type === 'delete') {
|
||||
// this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
// confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
// cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
// type: 'warning'
|
||||
// }).then(() => {
|
||||
// storageBoxDelete(raw.data.id).then(response => {
|
||||
// this.$message({
|
||||
// message: this.$t('module.basicData.visual.success'),
|
||||
// type: 'success',
|
||||
// duration: 1500,
|
||||
// onClose: () => {
|
||||
// this.getList()
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
// }).catch(() => {})
|
||||
// } else if (raw.type === 'edit') {
|
||||
// this.addNew(raw.data.id)
|
||||
// } else {
|
||||
// this.addNew(raw.data.id, true)
|
||||
// }
|
||||
// },
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.code = key
|
||||
console.log(this.listQuery)
|
||||
list(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
if (response.data) {
|
||||
this.list = response.data
|
||||
} else {
|
||||
this.list.splice(0, this.list.length)
|
||||
}
|
||||
// this.total = response.data.total
|
||||
this.listLoading = false
|
||||
})
|
||||
}
|
||||
// 新增 / 修改
|
||||
// addNew(id) {
|
||||
// this.addOrUpdateVisible = true
|
||||
// this.$nextTick(() => {
|
||||
// this.$refs.addOrUpdate.init(id, true)
|
||||
// })
|
||||
// }
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
232
src/views/report-manage/CurrentInventory.vue
Normal file
232
src/views/report-manage/CurrentInventory.vue
Normal file
@ -0,0 +1,232 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-04 20:54:54
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 19:32:34
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyName"
|
||||
:show-add="false"
|
||||
@getDataList="getList"
|
||||
@downl="downl"
|
||||
/>
|
||||
<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()"
|
||||
/>
|
||||
<!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import HeadForm from './components/HeadForm'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
|
||||
import { list, download } from '@/api/report-manage/report'
|
||||
import substrateBtn from './components/substrateBtn.vue'
|
||||
/**
|
||||
* 表格表头配置项 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: 'code',
|
||||
label: i18n.t('module.report.inventory.code'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'status',
|
||||
label: i18n.t('module.report.inventory.status'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'inprocessCode',
|
||||
label: i18n.t('module.report.inventory.inprocessCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'nextprocessCode',
|
||||
label: i18n.t('module.report.inventory.nextprocessCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'currentLocation',
|
||||
label: i18n.t('module.report.inventory.currentLocation'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'storeTime',
|
||||
label: i18n.t('module.report.inventory.storeTime'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'orderName',
|
||||
label: i18n.t('module.report.inventory.orderName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'substrateDetails',
|
||||
label: i18n.t('module.report.inventory.substrateDetails'),
|
||||
subcomponent: substrateBtn,
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Inventory',
|
||||
components: { Pagination, BaseTable, HeadForm },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
keyName: i18n.t('module.report.reportList.storageBoxNumber'),
|
||||
placeholderName: this.$t('module.report.reportList.queryFiltering'),
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
enabled: 1
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
// handleClick(raw) {
|
||||
// if (raw.type === 'delete') {
|
||||
// this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
// confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
// cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
// type: 'warning'
|
||||
// }).then(() => {
|
||||
// storageBoxDelete(raw.data.id).then(response => {
|
||||
// this.$message({
|
||||
// message: this.$t('module.basicData.visual.success'),
|
||||
// type: 'success',
|
||||
// duration: 1500,
|
||||
// onClose: () => {
|
||||
// this.getList()
|
||||
// }
|
||||
// })
|
||||
// })
|
||||
// }).catch(() => {})
|
||||
// } else if (raw.type === 'edit') {
|
||||
// this.addNew(raw.data.id)
|
||||
// } else {
|
||||
// this.addNew(raw.data.id, true)
|
||||
// }
|
||||
// },
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.code = key
|
||||
// console.log(this.listQuery)
|
||||
list(this.listQuery).then(response => {
|
||||
console.log(response)
|
||||
if (response.data) {
|
||||
this.list = response.data
|
||||
} else {
|
||||
this.list.splice(0, this.list.length)
|
||||
}
|
||||
// this.total = response.data.total
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
downl(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.code = key
|
||||
// console.log(this.listQuery)
|
||||
download(this.listQuery).then(res => {
|
||||
console.log(res)
|
||||
// const fileName = `${+new Date()}.xlsx`
|
||||
// const blob = new Blob([res], { type: 'application/vnd.ms-excel;charset=utf-8' })
|
||||
// if (navigator.msSaveBlob) {
|
||||
// navigator.msSaveBlob(blob, fileName)
|
||||
// } else {
|
||||
// const link = document.createElement('a')
|
||||
// link.href = URL.createObjectURL(blob)
|
||||
// link.download = fileName
|
||||
// link.click()
|
||||
// URL.revokeObjectURL(link.href)
|
||||
// }
|
||||
})
|
||||
}
|
||||
// 新增 / 修改
|
||||
// addNew(id) {
|
||||
// this.addOrUpdateVisible = true
|
||||
// this.$nextTick(() => {
|
||||
// this.$refs.addOrUpdate.init(id, true)
|
||||
// })
|
||||
// }
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
203
src/views/report-manage/CurrentSubstrate.vue
Normal file
203
src/views/report-manage/CurrentSubstrate.vue
Normal file
@ -0,0 +1,203 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-04 20:54:54
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-04 21:09:41
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<head-form
|
||||
:placeholder-name="placeholderName"
|
||||
:key-name="keyName"
|
||||
@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()"
|
||||
/>
|
||||
<!-- <storageBox-add v-if="addOrUpdateVisible" ref="addOrUpdate" :cache-id="listQuery.cacheId" @refreshDataList="getList" /> -->
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
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 { storageBoxList, storageBoxDelete } from '@/api/basicData/Cache/storageBox'
|
||||
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: 'storageBoxName',
|
||||
label: i18n.t('module.basicData.storageBox.name'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'code',
|
||||
label: i18n.t('module.basicData.storageBox.code'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'enName',
|
||||
label: i18n.t('module.basicData.visual.EnglishName'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'status',
|
||||
label: i18n.t('module.basicData.storageBox.status'),
|
||||
filter: basicData('storage'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'note',
|
||||
label: i18n.t('module.basicData.storageBox.remark'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'Area',
|
||||
components: { Pagination, BaseTable, MethodBtn, HeadForm },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
keyName: i18n.t('module.basicData.visual.keyword'),
|
||||
placeholderName: this.$t('module.basicData.storageBox.name') + this.$t('module.basicData.visual.Or') + this.$t('module.basicData.storageBox.code'),
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
areaList: [],
|
||||
total: 0,
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.storageBoxName}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
storageBoxDelete(raw.data.id).then(response => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else if (raw.type === 'edit') {
|
||||
this.addNew(raw.data.id)
|
||||
} else {
|
||||
this.addNew(raw.data.id, true)
|
||||
}
|
||||
},
|
||||
getList(key) {
|
||||
this.listLoading = true
|
||||
this.listQuery.storageBoxName = key
|
||||
storageBoxList(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
|
||||
})
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id, true)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
</style>
|
||||
67
src/views/report-manage/components/HeadForm.vue
Normal file
67
src/views/report-manage/components/HeadForm.vue
Normal file
@ -0,0 +1,67 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-06 17:06:51
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 17:10:16
|
||||
-->
|
||||
<template>
|
||||
<el-form :inline="true" @keyup.enter.native="getDataList()">
|
||||
<el-form-item :label="keyName">
|
||||
<el-input v-model="key" style="width:300px" :placeholder="placeholderName" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="getDataList()">{{ 'btn.search' | i18nFilter }}</el-button>
|
||||
<el-button v-if="showAdd" type="primary" @click="add()">{{ 'btn.add' | i18nFilter }}</el-button>
|
||||
<el-button type="success" @click="downl()">{{ '导出' | i18nFilter }}</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { string } from 'jszip/lib/support'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
keyName: {
|
||||
type: string,
|
||||
default: () => {
|
||||
return '关键字'
|
||||
}
|
||||
},
|
||||
showAdd: {
|
||||
type: Boolean,
|
||||
default: () => {
|
||||
return true
|
||||
}
|
||||
},
|
||||
placeholderName: {
|
||||
type: string,
|
||||
default: () => {
|
||||
return '请输入关键字'
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
key: ''
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getDataList() {
|
||||
this.$emit('getDataList', this.key)
|
||||
},
|
||||
add() {
|
||||
this.$emit('add')
|
||||
},
|
||||
downl() {
|
||||
this.$emit('downl', this.key)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style>
|
||||
|
||||
</style>
|
||||
156
src/views/report-manage/components/edit-substrate.vue
Normal file
156
src/views/report-manage/components/edit-substrate.vue
Normal file
@ -0,0 +1,156 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-05 17:45:46
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-06 16:46:54
|
||||
-->
|
||||
<template>
|
||||
<!-- <el-dialog
|
||||
:title="!dataForm.id ? 'btn.add' : 'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
> -->
|
||||
<el-dialog
|
||||
:title="'btn.edit' | i18nFilter"
|
||||
:visible.sync="visible"
|
||||
>
|
||||
<el-form ref="dataForm" :model="dataForm" :rules="dataRule" label-width="130px" @keyup.enter.native="dataFormSubmit()">
|
||||
<el-form-item :label="$t('module.report.substrate.substrateCode')" prop="substrateCode">
|
||||
<el-input v-model="dataForm.substrateCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateCode')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.report.substrate.location')" prop="location">
|
||||
<el-input v-model="dataForm.location" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.location')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.report.substrate.storeTime')" prop="storeTime">
|
||||
<el-input v-model="dataForm.storeTime" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.storeTime')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.report.substrate.substrateStatus')" prop="substrateStatus">
|
||||
<el-input v-model="dataForm.substrateStatus" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.substrateStatus')])" clearable />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('module.report.substrate.interCode')" prop="interCode">
|
||||
<el-input v-model="dataForm.interCode" :placeholder="$i18nForm(['placeholder.input', $t('module.report.substrate.interCode')])" clearable />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="dialog-footer">
|
||||
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="dataFormSubmit()">{{ 'btn.confirm' | i18nFilter }}</el-button>
|
||||
</span>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { updateSubstrate, listSubstrate } from '@/api/report-manage/report'
|
||||
|
||||
export default {
|
||||
props: {
|
||||
id: {
|
||||
type: String,
|
||||
default: () => {
|
||||
return ''
|
||||
}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
dataForm: {
|
||||
id: '',
|
||||
substrateCode: '',
|
||||
location: '',
|
||||
storeTime: '',
|
||||
substrateStatus: '',
|
||||
code: '',
|
||||
storageBoxId: '',
|
||||
storageCode: '',
|
||||
interCode: ''
|
||||
},
|
||||
list: {
|
||||
id: '',
|
||||
location: '',
|
||||
storeTime: '',
|
||||
substrateCode: '',
|
||||
substrateStatus: ''
|
||||
},
|
||||
dataRule: {
|
||||
substrateCode: [
|
||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
|
||||
],
|
||||
code: [
|
||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
|
||||
],
|
||||
interCode: [
|
||||
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.report.substrate.substrateCode')]), trigger: 'blur' }
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.init()
|
||||
},
|
||||
methods: {
|
||||
// init(id) {
|
||||
// // this.dataForm.id = id || ''
|
||||
// this.dataForm.storageBoxId = this.$route.query.id
|
||||
// this.dataForm.storageCode = this.$route.query.code
|
||||
// this.visible = true
|
||||
// this.$nextTick(() => {
|
||||
// this.$refs['dataForm'].resetFields()
|
||||
// // console.log(this.dataForm)
|
||||
// listSubstrate(this.dataForm).then(res => {
|
||||
// this.dataForm.id = res.data.id
|
||||
// this.dataForm.location = res.data.location
|
||||
// this.dataForm.storeTime = res.data.storeTime
|
||||
// this.dataForm.substrateCode = res.data.substrateCode
|
||||
// this.dataForm.substrateStatus = res.data.substrateStatus
|
||||
// // console.log(this.dataForm)
|
||||
// })
|
||||
// })
|
||||
// },
|
||||
init(id) {
|
||||
// this.dataForm.id = id || ''
|
||||
this.dataForm.storageBoxId = this.$route.query.id
|
||||
this.dataForm.storageCode = this.$route.query.code
|
||||
this.visible = true
|
||||
listSubstrate(this.dataForm).then(res => {
|
||||
console.log(res.data[0])
|
||||
this.dataForm.id = res.data[0].id
|
||||
this.dataForm.location = res.data[0].location
|
||||
this.dataForm.storeTime = res.data[0].storeTime
|
||||
this.dataForm.substrateCode = res.data[0].substrateCode
|
||||
this.dataForm.substrateStatus = res.data[0].substrateStatus
|
||||
this.dataForm.interCode = res.data[0].interCode
|
||||
// console.log(this.dataForm)
|
||||
})
|
||||
},
|
||||
// 表单提交
|
||||
dataFormSubmit() {
|
||||
this.$refs['dataForm'].validate((valid) => {
|
||||
if (valid) {
|
||||
const data = {
|
||||
'substrateStatus': this.dataForm.substrateStatus,
|
||||
'storeTime': this.dataForm.storeTime,
|
||||
'id': this.dataForm.id,
|
||||
'substrateCode': this.dataForm.substrateCode,
|
||||
'location': this.dataForm.location,
|
||||
'interCode': this.dataForm.interCode,
|
||||
'storageBoxId': this.dataForm.storageBoxId
|
||||
}
|
||||
console.log(data)
|
||||
updateSubstrate(data).then(res => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.visible = false
|
||||
this.$emit('refreshDataList')
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
35
src/views/report-manage/components/substrateBtn.vue
Normal file
35
src/views/report-manage/components/substrateBtn.vue
Normal file
@ -0,0 +1,35 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-05 14:35:07
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 16:44:43
|
||||
-->
|
||||
<template>
|
||||
<span>
|
||||
<el-button type="text" size="small" @click="emitClick">{{ $t('module.report.inventory.viewSubstrates') }}</el-button>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
props: {
|
||||
injectData: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
emitClick() {
|
||||
this.$router.push({
|
||||
name: 'viewSubstrate',
|
||||
query: {
|
||||
id: this.injectData.id,
|
||||
code: this.injectData.code
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
191
src/views/report-manage/components/viewSubstrate.vue
Normal file
191
src/views/report-manage/components/viewSubstrate.vue
Normal file
@ -0,0 +1,191 @@
|
||||
<!--
|
||||
* @Descripttion:
|
||||
* @version:
|
||||
* @Author: fzq
|
||||
* @Date: 2022-03-05 15:55:45
|
||||
* @LastEditors: fzq
|
||||
* @LastEditTime: 2022-03-05 19:44:47
|
||||
-->
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- <div style="margin:10px 50px">
|
||||
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
|
||||
</div> -->
|
||||
<div style="title">存储箱号:{{ num }}
|
||||
<el-button type="success" style="back" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
|
||||
</div>
|
||||
<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>
|
||||
<edit-substrate v-if="addOrUpdateVisible" :id="listQuery.id" ref="addOrUpdate" @refreshDataList="getList" />
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>import i18n from '@/lang'
|
||||
import { listSubstrate, deleSubstrate } from '@/api/report-manage/report'
|
||||
import editSubstrate from './edit-substrate.vue'
|
||||
import BaseTable from '@/components/BaseTable'
|
||||
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
|
||||
/**
|
||||
* 表格表头配置项 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: 'substrateCode',
|
||||
label: i18n.t('module.report.substrate.substrateCode'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'location',
|
||||
label: i18n.t('module.report.substrate.location'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'storeTime',
|
||||
label: i18n.t('module.report.substrate.storeTime'),
|
||||
align: 'center'
|
||||
},
|
||||
{
|
||||
prop: 'substrateStatus',
|
||||
label: i18n.t('module.report.substrate.substrateStatus'),
|
||||
align: 'center'
|
||||
}
|
||||
]
|
||||
|
||||
export default {
|
||||
name: 'ViewSubstrate',
|
||||
components: { BaseTable, MethodBtn, editSubstrate },
|
||||
filters: {
|
||||
statusFilter(status) {
|
||||
const statusMap = {
|
||||
published: 'success',
|
||||
draft: 'info',
|
||||
deleted: 'danger'
|
||||
}
|
||||
return statusMap[status]
|
||||
}
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
addOrUpdateVisible: false,
|
||||
num: '',
|
||||
tableBtn,
|
||||
trueWidth: 200,
|
||||
tableProps,
|
||||
list: [],
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
substrateCode: ''
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.listQuery.substrateCode = this.$route.query.code
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
handleClick(raw) {
|
||||
if (raw.type === 'delete') {
|
||||
this.$confirm(`${this.$t('module.basicData.visual.TipsBefore')}[${raw.data.substrateCode}]?`, this.$t('module.basicData.visual.Tips'), {
|
||||
confirmButtonText: this.$t('module.basicData.visual.confirmButtonText'),
|
||||
cancelButtonText: this.$t('module.basicData.visual.cancelButtonText'),
|
||||
type: 'warning'
|
||||
}).then(() => {
|
||||
// console.log(raw.data)
|
||||
deleSubstrate(raw.data).then(response => {
|
||||
this.$message({
|
||||
message: this.$t('module.basicData.visual.success'),
|
||||
type: 'success',
|
||||
duration: 1500,
|
||||
onClose: () => {
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
})
|
||||
}).catch(() => {})
|
||||
} else {
|
||||
this.addNew(raw.data.id)
|
||||
}
|
||||
},
|
||||
getList() {
|
||||
this.listLoading = true
|
||||
this.num = this.listQuery.substrateCode
|
||||
this.listQuery.code = this.$route.query.code
|
||||
console.log(this.listQuery)
|
||||
listSubstrate(this.listQuery).then(response => {
|
||||
if (response.data) {
|
||||
this.list = response.data
|
||||
console.log(this.list)
|
||||
} else {
|
||||
this.list.splice(0, this.list.length)
|
||||
}
|
||||
this.listLoading = false
|
||||
})
|
||||
},
|
||||
// 新增 / 修改
|
||||
addNew(id) {
|
||||
this.addOrUpdateVisible = true
|
||||
this.$nextTick(() => {
|
||||
this.$refs.addOrUpdate.init(id)
|
||||
})
|
||||
},
|
||||
goback() {
|
||||
this.$router.go(-1)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.title {
|
||||
left: 150px;
|
||||
}
|
||||
.edit-input {
|
||||
padding-right: 100px;
|
||||
}
|
||||
.cancel-btn {
|
||||
position: absolute;
|
||||
right: 15px;
|
||||
top: 10px;
|
||||
}
|
||||
.back {
|
||||
right: 20px;
|
||||
}
|
||||
</style>
|
||||
@ -46,16 +46,16 @@ module.exports = {
|
||||
// 这里写入需要代理的api和对应的目标地址
|
||||
proxy: {
|
||||
'/api': {
|
||||
// target: 'http://localhost:8080',
|
||||
target: 'http://localhost:8080',
|
||||
// target: 'http://192.168.0.148:8080',
|
||||
target: 'http://a.wms.picaiba.com/api',
|
||||
// target: 'http://a.wms.picaiba.com/api',
|
||||
// target: 'http://192.168.0.127:8080',
|
||||
// target: 'http://192.168.0.165:8080',
|
||||
// target: 'http://192.168.43.105:8080',
|
||||
// target: 'http://127.0.0.1:8080',
|
||||
// target: 'http://192.168.0.70:8080',
|
||||
// target: 'http://192.168.0.199:8080',
|
||||
|
||||
|
||||
ws: true,
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
@ -188,4 +188,4 @@ module.exports = {
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user