suojin
/
jonhon-mes-web
24
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

Browse Source
master
zhangdi 5 months ago
parent afd0584776
commit 064f432117
18 changed files with 3452 additions and 5028 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      .gitignore
  2. 5
      .npmrc
  3. 45
      src/api/processManagement/addQuantity.js
  4. 31
      src/api/processManagement/bathRefineTask.js
  5. 15
      src/api/processManagement/inPlantProcess.js
  6. 45
      src/api/processManagement/planClass.js
  7. 56
      src/api/processManagement/similarParts.js
  8. 56
      src/api/processManagement/workCenterDevice.js
  9. 2
      src/views/processManagement/basicProcesses.vue
  10. 1441
      src/views/processManagement/bathRefine/accumulateClass.vue
  11. 1100
      src/views/processManagement/bathRefine/addQuantity.vue
  12. 1478
      src/views/processManagement/bathRefine/bathRefineTask.vue
  13. 1595
      src/views/processManagement/bathRefine/periodicalClass.vue
  14. 1086
      src/views/processManagement/bathRefine/planClass.vue
  15. 951
      src/views/processManagement/bathRefine/workCenterDevice.vue
  16. 37
      src/views/processManagement/components/setCrew.vue
  17. 440
      src/views/processManagement/inPlantProcess.vue
  18. 81
      src/views/qualityManagement/similarParts/index.vue

2
.gitignore vendored
Unescape View File

@ -23,5 +23,5 @@ yarn-error.log*
*.sln *.sln
*.sw* *.sw*
.npmrc # .npmrc
/src/views/plugin/lowcode /src/views/plugin/lowcode

5
.npmrc
Unescape View File

@ -0,0 +1,5 @@
@saber:registry=https://center.javablade.com/api/packages/blade/npm/
//center.javablade.com/api/packages/blade/npm/:_authToken=ea2747473ebc1c0887ec9604fd4c565a4a5f3ecf
@nutflow:registry=https://git.nutflow.vip/api/packages/blade-workflow/npm/
//git.nutflow.vip/api/packages/blade-workflow/npm/:_authToken=ee821016f7aa7257a448b7548e30f011676727a0

45
src/api/processManagement/addQuantity.js
Unescape View File

@ -0,0 +1,45 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsMainSaltAddQuantity/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 保存
export const add = row => {
return request({
url: '/blade-desk/dsMainSaltAddQuantity/save',
method: 'post',
data: row,
});
};
// 修改
export const update = row => {
return request({
url: '/blade-desk/dsMainSaltAddQuantity/update',
method: 'post',
data: row,
});
};
// 删除
export const remove = ids => {
return request({
url: '/blade-desk/dsMainSaltAddQuantity/remove',
method: 'post',
params: {
ids,
},
});
};

31
src/api/processManagement/bathRefineTask.js
Unescape View File

@ -0,0 +1,31 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsBatchPreserveTask/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 批量维护
export const dsBatchTask = row => {
return request({
url: '/blade-desk/dsBatchPreserveTask/update',
method: 'post',
data: row,
});
};
// 批量审核
export const dsBatchReview = row => {
return request({
url: '/blade-desk/dsBatchPreserveTask/update',
method: 'post',
data: row,
});
};

15
src/api/processManagement/inPlantProcess.js
Unescape View File

@ -0,0 +1,15 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsTaskBill/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};

45
src/api/processManagement/planClass.js
Unescape View File

@ -0,0 +1,45 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsBatchPreservePlan/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 保存
export const add = row => {
return request({
url: '/blade-desk/dsBatchPreservePlan/save',
method: 'post',
data: row,
});
};
// 修改
export const update = row => {
return request({
url: '/blade-desk/dsBatchPreservePlan/update',
method: 'post',
data: row,
});
};
// 删除
export const remove = ids => {
return request({
url: '/blade-desk/dsBatchPreservePlan/remove',
method: 'post',
params: {
ids,
},
});
};

56
src/api/processManagement/similarParts.js
Unescape View File

@ -0,0 +1,56 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsSimilarParts/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 保存
export const add = row => {
return request({
url: '/blade-desk/dsSimilarParts/save',
method: 'post',
data: row,
});
};
// 修改
export const update = row => {
return request({
url: '/blade-desk/dsSimilarParts/update',
method: 'post',
data: row,
});
};
// 删除
export const remove = ids => {
return request({
url: '/blade-desk/dsSimilarParts/remove',
method: 'post',
params: {
ids,
},
});
};
// 详情
export const getDetail = Id => {
return request({
url: '/blade-desk/dsSimilarParts/detail',
method: 'get',
params: {
Id,
},
});
};

56
src/api/processManagement/workCenterDevice.js
Unescape View File

@ -0,0 +1,56 @@
import request from '@/axios';
// 获取列表数据 bsCraftAbility/queryAllCa
export const getList = (current, size, params) => {
return request({
url: '/blade-desk/dsBatchWorkCenterSet/list',
method: 'get',
params: {
...params,
current,
size,
},
});
};
// 保存
export const add = row => {
return request({
url: '/blade-desk/dsBatchWorkCenterSet/save',
method: 'post',
data: row,
});
};
// 修改
export const update = row => {
return request({
url: '/blade-desk/dsBatchWorkCenterSet/update',
method: 'post',
data: row,
});
};
// 删除
export const remove = ids => {
return request({
url: '/blade-desk/dsBatchWorkCenterSet/remove',
method: 'post',
params: {
ids,
},
});
};
// 详情
export const getDetail = Id => {
return request({
url: '/blade-desk/dsSimilarParts/detail',
method: 'get',
params: {
Id,
},
});
};

2
src/views/processManagement/basicProcesses.vue
Unescape View File

@ -379,7 +379,7 @@ export default {
// 设置班组人员弹框关闭 // 设置班组人员弹框关闭
setCrewOpeSancel(isRefresh) { setCrewOpeSancel(isRefresh) {
if (isRefresh) { if (isRefresh) {
this.$refs.myTable.load(); this.onLoad(this.page, this.query);
} }
this.setCrewOpen = false; this.setCrewOpen = false;
}, },

1441
src/views/processManagement/bathRefine/accumulateClass.vue
View File

File diff suppressed because it is too large Load Diff

1100
src/views/processManagement/bathRefine/addQuantity.vue
View File

File diff suppressed because it is too large Load Diff

1478
src/views/processManagement/bathRefine/bathRefineTask.vue
View File

File diff suppressed because it is too large Load Diff

1595
src/views/processManagement/bathRefine/periodicalClass.vue
View File

File diff suppressed because it is too large Load Diff

1086
src/views/processManagement/bathRefine/planClass.vue
View File

File diff suppressed because it is too large Load Diff

951
src/views/processManagement/bathRefine/workCenterDevice.vue
Unescape View File

@ -1,744 +1,229 @@
<template> <template>
<basic-container> <basic-container>
<!-- 确认人员配置 --> <!-- 确认人员配置 -->
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud
@row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset" :option="option"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" :table-loading="loading"
@refresh-change="refreshChange" @on-load="onLoad" @row-del="rowDel"> :data="data"
</avue-crud> v-model="form"
</basic-container> v-model:page="page"
ref="crud"
@row-update="rowUpdate"
@row-save="rowSave"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
@row-del="rowDel"
@rowSave="rowSave"
@rowUpdate="rowUpdate"
>
</avue-crud>
</basic-container>
</template> </template>
<script> <script>
export default { import { getList, add, remove, update } from '@/api/processManagement/workCenterDevice.js';
data() {
return {
loading: false,
data: [],
form: {},
page: {
pageSize: 10,
currentPage: 1,
total: 0,
},
option: {
height: 'auto',
calcHeight: 32,
rowKey: 'twlId',
tip: false,
size: 'medium',
simplePage: true,
searchShow: true,
searchMenuSpan: 18,
searchIcon: true,
searchIndex: 3,
tree: false,
border: true,
index: true,
selection: false,
viewBtn: false,
delBtn: true,
addBtn: true,
editBtn: true,
editBtnText: '修改',
addBtnIcon:' ',
viewBtnIcon:' ',
delBtnIcon:' ',
editBtnIcon:' ',
viewBtnText: '详情',
labelWidth: 120,
searchLabelWidth: 120,
menu: true,
menuWidth: 140,
dialogWidth: 1200,
dialogClickModal: false,
searchEnter: true,
excelBtn: false,
filterBtn: true,
searchShowBtn: false,
columnSort: true,
excelBtn: true,
columnSort: true,
showOverflowTooltip: true,
menuAlign: 'left',
gridBtn:false,
searchLabelPosition: 'left',
searchGutter: 24,
searchSpan: 6,
searchMenuPosition:'right',
align: 'center',
column: [ export default {
{ data() {
label: '作业中心', return {
prop: 'wcName', loading: false,
type: 'select', data: [],
bind: 'bsWorkCenter.wcId', form: {},
search: true, page: {
sortable: true, pageSize: 10,
overHidden: true, currentPage: 1,
headerAlign: 'center', total: 0,
align: 'left', },
searchLabelWidth: 80, option: {
rules: [ height: 'auto',
{ calcHeight: 32,
required: true, rowKey: 'twlId',
message: '请输入作业中心', tip: false,
trigger: 'blur', size: 'medium',
}, simplePage: true,
], searchShow: true,
props: { searchMenuSpan: 18,
label: 'wcName', searchIcon: true,
value: 'wcId' searchIndex: 3,
}, tree: false,
dicData: [ border: true,
{ index: true,
"area": 13000.0, selection: false,
"batchNo": null, viewBtn: false,
"bigBatch": false, delBtn: true,
"bsJfCenter": { addBtn: true,
"createMan": { editBtn: true,
"accountId": null, editBtnText: '修改',
"card": null, addBtnIcon: ' ',
"createTime": "2022-08-31", viewBtnIcon: ' ',
"curStatus": 1, delBtnIcon: ' ',
"deleted": false, editBtnIcon: ' ',
"deptName": null, viewBtnText: '详情',
"dimissionTime": null, labelWidth: 120,
"factoryId": 41, searchLabelWidth: 120,
"head": 0, menu: true,
"jobName": "总工", menuWidth: 140,
"keyValue": 1, dialogWidth: 1200,
"ldapName": "admin", dialogClickModal: false,
"mail": "13699999999@136.com", searchEnter: true,
"mobile": "13699999999", excelBtn: false,
"pfDepartment": { filterBtn: true,
"appLink": null, searchShowBtn: false,
"createTime": "2022-08-31", columnSort: true,
"deleted": false, excelBtn: true,
"deptCode": "001", columnSort: true,
"deptId": 1, showOverflowTooltip: true,
"deptName": "MES开发部", menuAlign: 'left',
"deptType": 1, gridBtn: false,
"deptTypeTitle": "厂", searchLabelPosition: 'left',
"keyValue": 1, searchGutter: 24,
"memo": null, searchSpan: 6,
"orders": "00", searchMenuPosition: 'right',
"parentDeptId": null, align: 'center',
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2024-12-09 00:00:00",
"deleted": false,
"jcCode": "RBZX",
"jcId": 1,
"jcName": "热表中心",
"keyValue": 1,
"updateTime": "2024-12-09 00:00:00"
},
"checkout": false,
"craftAbility": "化学镀镍",
"createMan": {
"accountId": null,
"card": null,
"createTime": "2022-08-31",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 41,
"head": 0,
"jobName": "总工",
"keyValue": 1,
"ldapName": "admin",
"mail": "13699999999@136.com",
"mobile": "13699999999",
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2023-02-06 12:31:36",
"deleted": false,
"describe": null,
"endPoint": null,
"keyValue": 81,
"leaderUser": {
"accountId": 541,
"card": null,
"createTime": "2023-05-04",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 102,
"head": 0,
"jobName": "MES开发",
"keyValue": 541,
"ldapName": "cdl",
"mail": null,
"mobile": null,
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "CUIDIANLONG,CDL",
"ucUserId": null,
"updateTime": "2023-05-04 09:16:54",
"userCode": "cdl",
"userId": 541,
"userName": "崔殿龙",
"userSex": 1,
"userSources": "崔殿龙",
"userString": "541:A:崔殿龙",
"userType": "A"
},
"limitType": 0,
"processes": "上挂、下挂、交检、化学镀镍、喷砂",
"quantity": null,
"roundCycle": null,
"saturation": 85.0,
"sign": "4",
"startPoint": null,
"team": "化学镀镍一班崔胜伟、化学镀镍一班郭家梁",
"updateTime": "2023-03-06 18:42:47",
"wcCode": "001",
"wcId": 81,
"wcName": "化学镀镍作业中心",
"whetherPlate": false
},
{
"area": 0.0,
"batchNo": null,
"bigBatch": false,
"bsJfCenter": {
"createMan": {
"accountId": null,
"card": null,
"createTime": "2022-08-31",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 41,
"head": 0,
"jobName": "总工",
"keyValue": 1,
"ldapName": "admin",
"mail": "13699999999@136.com",
"mobile": "13699999999",
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2024-12-09 00:00:00",
"deleted": false,
"jcCode": "RBZX",
"jcId": 1,
"jcName": "热表中心",
"keyValue": 1,
"updateTime": "2024-12-09 00:00:00"
},
"checkout": false,
"craftAbility": "镀后接收",
"createMan": {
"accountId": null,
"card": null,
"createTime": "2022-08-31",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 41,
"head": 0,
"jobName": "总工",
"keyValue": 1,
"ldapName": "admin",
"mail": "13699999999@136.com",
"mobile": "13699999999",
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2023-02-06 12:48:41",
"deleted": false,
"describe": null,
"endPoint": null,
"keyValue": 85,
"leaderUser": {
"accountId": 541,
"card": null,
"createTime": "2023-05-04",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 102,
"head": 0,
"jobName": "MES开发",
"keyValue": 541,
"ldapName": "cdl",
"mail": null,
"mobile": null,
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "CUIDIANLONG,CDL",
"ucUserId": null,
"updateTime": "2023-05-04 09:16:54",
"userCode": "cdl",
"userId": 541,
"userName": "崔殿龙",
"userSex": 1,
"userSources": "崔殿龙",
"userString": "541:A:崔殿龙",
"userType": "A"
},
"limitType": 0,
"processes": "镀后接收",
"quantity": null,
"roundCycle": null,
"saturation": null,
"sign": "4",
"startPoint": null,
"team": "零件管理班",
"updateTime": "2023-03-06 18:23:20",
"wcCode": "004",
"wcId": 85,
"wcName": "镀后库作业中心",
"whetherPlate": true
},
{
"area": 0.0,
"batchNo": null,
"bigBatch": false,
"bsJfCenter": {
"createMan": {
"accountId": null,
"card": null,
"createTime": "2022-08-31",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 41,
"head": 0,
"jobName": "总工",
"keyValue": 1,
"ldapName": "admin",
"mail": "13699999999@136.com",
"mobile": "13699999999",
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2024-12-09 00:00:00",
"deleted": false,
"jcCode": "RBZX",
"jcId": 1,
"jcName": "热表中心",
"keyValue": 1,
"updateTime": "2024-12-09 00:00:00"
},
"checkout": true,
"craftAbility": "镀后检验",
"createMan": {
"accountId": null,
"card": null,
"createTime": "2022-08-31",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 41,
"head": 0,
"jobName": "总工",
"keyValue": 1,
"ldapName": "admin",
"mail": "13699999999@136.com",
"mobile": "13699999999",
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "ADMIN,ADMIN",
"ucUserId": null,
"updateTime": "2022-08-31 16:32:46",
"userCode": "00",
"userId": 1,
"userName": "admin",
"userSex": 1,
"userSources": "admin",
"userString": "1:A:admin",
"userType": "A"
},
"createTime": "2023-02-06 12:49:33",
"deleted": false,
"describe": null,
"endPoint": null,
"keyValue": 86,
"leaderUser": {
"accountId": 541,
"card": null,
"createTime": "2023-05-04",
"curStatus": 1,
"deleted": false,
"deptName": null,
"dimissionTime": null,
"factoryId": 102,
"head": 0,
"jobName": "MES开发",
"keyValue": 541,
"ldapName": "cdl",
"mail": null,
"mobile": null,
"pfDepartment": {
"appLink": null,
"createTime": "2022-08-31",
"deleted": false,
"deptCode": "001",
"deptId": 1,
"deptName": "MES开发部",
"deptType": 1,
"deptTypeTitle": "厂",
"keyValue": 1,
"memo": null,
"orders": "00",
"parentDeptId": null,
"parentPath": null,
"ucDeptId": null,
"updateTime": "2022-08-31 16:32:46"
},
"pinyinIndex": "CUIDIANLONG,CDL",
"ucUserId": null,
"updateTime": "2023-05-04 09:16:54",
"userCode": "cdl",
"userId": 541,
"userName": "崔殿龙",
"userSex": 1,
"userSources": "崔殿龙",
"userString": "541:A:崔殿龙",
"userType": "A"
},
"limitType": 0,
"processes": "镀后检验、性能检测、镀后自检外观检验、镀后自检尺寸检验",
"quantity": null,
"roundCycle": null,
"saturation": null,
"sign": "4",
"startPoint": null,
"team": "检验班",
"updateTime": "2023-06-06 15:07:27",
"wcCode": "005",
"wcId": 86,
"wcName": "检验作业中心",
"whetherPlate": false
},
]
},
{ column: [
label: '工艺员', {
prop: 'craftName', label: '作业中心',
type: 'select', prop: 'wcId',
multiple: true, type: 'select',
search: false, search: true,
sortable: true, sortable: true,
overHidden: true, overHidden: true,
headerAlign: 'center', headerAlign: 'center',
align: 'center', align: 'left',
rules: [ searchLabelWidth: 80,
{ rules: [
required: true, {
message: '请输入工艺员', required: true,
trigger: 'blur', message: '请输入作业中心',
}, trigger: 'blur',
], },
props:{ ],
label:'userName', props: {
value:'userId' label: 'wcName',
}, value: 'wcId',
dicData: [ },
{ },
"jobName": "生产调度员",
"deptName": "外协业务交付管理室",
"ldapName": "00188",
"userSex": 0,
"deptId": 65,
"mobile": null,
"userName": "00188",
"userId": 441,
"userCode": "00188"
}, {
"jobName": "表面处理工",
"deptName": "复合镍班",
"ldapName": "00460",
"userSex": 1,
"deptId": 69,
"mobile": null,
"userName": "00460",
"userId": 224,
"userCode": "00460"
}, {
"jobName": "保管员",
"deptName": "零件管理班",
"ldapName": "00660",
"userSex": 0,
"deptId": 46,
"mobile": null,
"userName": "00660",
"userId": 322,
"userCode": "00660"
},
]
},
{
label: '维护人',
prop: 'craftName',
search: false,
sortable: true,
headerAlign: 'center',
align: 'center',
display:false,
},
{
label: '维护时间',
prop: 'craftName',
search: false,
sortable: true,
headerAlign: 'center',
align: 'center',
display:false,
}
]
}
}
},
mounted() {
{
label: '工艺员',
prop: 'craftManName',
type: 'select',
multiple: true,
search: false,
sortable: true,
overHidden: true,
headerAlign: 'center',
align: 'center',
rules: [
{
required: true,
message: '请输入工艺员',
trigger: 'blur',
},
],
props: {
label: 'userName',
value: 'userId',
},
},
{
label: '维护人',
prop: 'keepMan',
search: false,
sortable: true,
headerAlign: 'center',
align: 'center',
display: false,
},
{
label: '维护时间',
prop: 'craftkeepTimeName',
search: false,
sortable: true,
headerAlign: 'center',
align: 'center',
display: false,
},
],
},
};
},
mounted() {},
methods: {
rowDel(row) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(res => {
return remove(row.id);
});
}, },
methods: { rowSave(row, done, loading) {
rowDel(row) { add(row).then(
this.$confirm('确定将选择数据删除?', { () => {
confirmButtonText: '确定', this.onLoad(this.page);
cancelButtonText: '取消', this.$message({
type: 'warning', type: 'success',
}).then(res =>{ message: '操作成功!',
});
}) done();
},
rowSave(row, done, loading) {
done()
},
rowUpdate(row, index, done, loading) {
done()
},
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
// this.query = params;
// this.page.currentPage = 1;
// this.onLoad(this.page, params);
done();
}, },
currentChange(currentPage) { error => {
this.page.currentPage = currentPage; window.console.log(error);
}, loading();
sizeChange(pageSize) { }
this.page.pageSize = pageSize; );
}, },
refreshChange() { rowUpdate(row, index, done, loading) {
this.onLoad(this.page, this.query); update(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: 'success',
message: '操作成功!',
});
done();
}, },
onLoad() { error => {
this.data = [ window.console.log(error);
{ loading();
"bsWorkCenter": {
"wcId": 81,
"wcName": "化学镀镍作业中心"
},
"bscsId": 4,
"craftManId": "[1,541]",
"craftManName": "[\"admin\",\"崔殿龙\"]",
"craftName": "admin,崔殿龙",
"deEquipmentCard": {
"bindQty": 4,
"categorys": "产线设备",
"deviceCode": "9652247",
"deviceIp": null,
"deviceName": "化学镀镍",
"docking": true,
"ecId": 1,
"keyValue": 1,
"macCode": "9652247",
"macSpec": null,
"memo": null,
"rfId": "SYM-HCP-L4",
"status": true,
"typeName": "9652247",
"updateTime": null,
"used": 1,
"usedText": "正常服役",
"virtualMac": false
},
"keepMan": {
"userId": 541,
"userName": "崔殿龙"
},
"keepTime": "2024-04-08 17:00:37",
"keyValue": 4
}
]
this.page.total = this.data.length
} }
} );
} },
searchReset() {
this.query = {};
this.onLoad(this.page);
},
searchChange(params, done) {
// this.query = params;
// this.page.currentPage = 1;
// this.onLoad(this.page, params);
done();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
},
sizeChange(pageSize) {
this.page.pageSize = pageSize;
},
refreshChange() {
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
this.loading = true;
getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
this.data = res.data.data.records;
this.loading = false;
this.page.total = res.data.data.total;
this.selectionClear();
});
},
},
};
</script> </script>

37
src/views/processManagement/components/setCrew.vue
Unescape View File

@ -13,12 +13,16 @@
:filter-method="filterMethod" :filter-method="filterMethod"
filter-placeholder="输入关键字进行确认" filter-placeholder="输入关键字进行确认"
:titles="['未选择', '已选择']" :titles="['未选择', '已选择']"
:data="data" :data="dataList"
:props="{
key: 'id',
label: 'tsName'
}"
/> />
<template #footer> <template #footer>
<div class="dialog-footer"> <div class="dialog-footer">
<el-button @click="submit()">取消</el-button> <el-button @click="cancel()">取消</el-button>
<el-button type="primary" @click="cancel()"> 确认 </el-button> <el-button type="primary" @click="submit()"> 确认 </el-button>
</div> </div>
</template> </template>
</el-dialog> </el-dialog>
@ -46,28 +50,24 @@ export default {
return { return {
url: "", url: "",
setCrewShow: false, setCrewShow: false,
data: [], dataList: [],
value: [],
}; };
}, },
mounted() { mounted() {
this.setCrewShow = this.setCrewOpen; this.setCrewShow = this.setCrewOpen;
console.log(9999, this.pId);
this.getTeams(); this.getTeams();
}, },
methods: { methods: {
getTeams() { getTeams() {
getProcessesTeams(this.pId).then((res) => { getProcessesTeams(this.pId).then((res) => {
console.log(9999999, res); this.dataList = res.data.data.teamSetEntityList
if(res.data.data.processTeamVOList.length > 0){
this.value = res.data.data.processTeamVOList.map(item => item.id)
}
}); });
}, },
open() { open() {
// if (this.type === 'teamSet') {
// this.url = 'teamSet/findUserByTeam/' + this.id;
// } else if (this.type === 'platingAssort') {
// this.url = 'bsPlatingAssort/findUserByPlatingAssort/' + this.id;
// } else if (this.type === 'abnormalConfig') {
// this.url = 'bsBasicClass/findUserByAbnormalConfig/' + this.id;
// }
}, },
submit() { submit() {
// const keyIds = this.$refs["tree-transfer"].getChecked(); // const keyIds = this.$refs["tree-transfer"].getChecked();
@ -94,6 +94,17 @@ export default {
// this.$message.success(this.$t("videaVueLib.publics.message.success")); // this.$message.success(this.$t("videaVueLib.publics.message.success"));
// this.cancel(true); // this.cancel(true);
// }); // });
let ids = this.value;
let query = {
// BsTeamSetDTO:{
pid: this.pId,
tsIdList: ids,
// }
};
setTeams(query).then(() => {
this.$message.success("设置班组成功");
this.cancel(true);
});
}, },
opened() { opened() {
// this.$refs["tree-transfer"].axios(); // this.$refs["tree-transfer"].axios();

440
src/views/processManagement/inPlantProcess.vue
Unescape View File

@ -1,230 +1,226 @@
<template> <template>
<basic-container> <basic-container>
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" :option="option"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" :table-loading="loading"
@refresh-change="refreshChange" @on-load="onLoad"> :data="data"
<template #menu-left> v-model="form"
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleDelete">申报 v-model:page="page"
ref="crud"
@row-del="rowDel"
@search-change="searchChange"
@search-reset="searchReset"
@selection-change="selectionChange"
@current-change="currentChange"
@size-change="sizeChange"
@refresh-change="refreshChange"
@on-load="onLoad"
>
<template #menu-left>
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleDelete">申报
</el-button> --> </el-button> -->
</template> </template>
<template #menu-right> <template #menu-right> </template>
<template #menu="scope">
<el-button type="primary" @click="handleImport">处理 </el-button>
</template>
</template> </avue-crud>
<template #menu="scope"> </basic-container>
<el-button type="primary" @click="handleImport">处理
</el-button>
</template>
</avue-crud>
</basic-container>
</template> </template>
<script> <script>
import { getList } from '@/api/processManagement/planClass.js';
export default { export default {
data() { data() {
return { return {
selectionList: [], selectionList: [],
option: { loading: false,
height: 'auto', option: {
calcHeight: 32, height: 'auto',
tip: false, calcHeight: 32,
size: 'medium', tip: false,
simplePage: true, size: 'medium',
searchShow: true, simplePage: true,
searchMenuSpan: 6, searchShow: true,
searchIcon: true, searchMenuSpan: 6,
searchIndex: 3, searchIcon: true,
tree: false, searchIndex: 3,
border: true, tree: false,
index: true, border: true,
selection: false, index: true,
viewBtn: false, selection: false,
delBtn: true, viewBtn: false,
addBtn: false, delBtn: true,
editBtnText: '修改', addBtn: false,
addBtnIcon: ' ', editBtnText: '修改',
viewBtnIcon: ' ', addBtnIcon: ' ',
delBtnIcon: ' ', viewBtnIcon: ' ',
editBtnIcon: ' ', delBtnIcon: ' ',
viewBtnText: '详情', editBtnIcon: ' ',
labelWidth: 120, viewBtnText: '详情',
menuWidth: 180, labelWidth: 120,
dialogWidth: 1040, menuWidth: 180,
dialogClickModal: false, dialogWidth: 1040,
searchEnter: true, dialogClickModal: false,
excelBtn: false, searchEnter: true,
filterBtn: true, excelBtn: false,
searchShowBtn: false, filterBtn: true,
columnSort: true, searchShowBtn: false,
excelBtn: true, columnSort: true,
columnSort: true, excelBtn: true,
showOverflowTooltip: true, columnSort: true,
menuAlign: 'left', showOverflowTooltip: true,
gridBtn:false, menuAlign: 'left',
searchLabelPosition: 'left', gridBtn: false,
searchGutter: 24, searchLabelPosition: 'left',
searchSpan: 6, searchGutter: 24,
searchMenuPosition:'right', searchSpan: 6,
align: 'center', searchMenuPosition: 'right',
column: [ align: 'center',
{ column: [
label: '作业中心', {
prop: 'tbCode', label: '作业中心',
sortable: true, prop: 'tbCode',
filter: true, sortable: true,
span: 12, filter: true,
search: true, span: 12,
display: false, search: true,
headerAlign: 'center', display: false,
align: 'left', headerAlign: 'center',
type:'select', align: 'left',
hide:true, type: 'select',
dicData:[ hide: true,
{ dicData: [
label:'作业中心1', {
value:1 label: '作业中心1',
}, value: 1,
{ },
label:'作业中心2', {
value:2 label: '作业中心2',
}, value: 2,
] },
}, ],
{ },
label: '任务号', {
prop: 'tbCode', label: '任务号',
sortable: true, prop: 'tbCode',
filter: true, sortable: true,
span: 12, filter: true,
search: false, span: 12,
display: false, search: false,
headerAlign: 'center', display: false,
align: 'left', headerAlign: 'center',
searchLabelWidth: 60, align: 'left',
}, searchLabelWidth: 60,
{ },
label: '产线', {
prop: 'bsWorkCenter.wcName', label: '产线',
search: true, prop: 'bsWorkCenter.wcName',
sortable: true, search: true,
filter: true, sortable: true,
span: 12, filter: true,
headerAlign: 'center', span: 12,
align: 'left', headerAlign: 'center',
searchLabelWidth: 45, align: 'left',
searchLabelWidth: 45,
}, },
{ {
label: '确认编号', label: '确认编号',
prop: 'condition', prop: 'condition',
search: false, search: false,
sortable: true, sortable: true,
filter: true, filter: true,
span: 12, span: 12,
headerAlign: 'center', headerAlign: 'center',
align: 'left', align: 'left',
},
}, {
{ label: '确认到期日期',
label: '确认到期日期', prop: 'lastTime',
prop: 'lastTime', search: false,
search: false, sortable: true,
sortable: true, filter: true,
filter: true, span: 12,
span: 12, headerAlign: 'center',
headerAlign: 'center', align: 'center',
align: 'center', },
{
}, label: '提醒天数',
{ prop: 'remDays',
label: '提醒天数', search: false,
prop: 'remDays', sortable: true,
search: false, filter: true,
sortable: true, span: 12,
filter: true, headerAlign: 'center',
span: 12, align: 'center',
headerAlign: 'center', },
align: 'center', {
}, label: '工艺员',
{ prop: 'proMan.userName',
label: '工艺员', bind: 'proMan.userName',
prop: 'proMan.userName', search: false,
bind: 'proMan.userName', sortable: true,
search: false, filter: true,
sortable: true, span: 12,
filter: true, headerAlign: 'center',
span: 12, align: 'center',
headerAlign: 'center', searchLabelWidth: 60,
align: 'center', },
searchLabelWidth: 60, {
label: '备注',
}, prop: 'memo',
{ search: false,
label: '备注', sortable: true,
prop: 'memo', filter: true,
search: false, span: 12,
sortable: true, headerAlign: 'center',
filter: true, align: 'left',
span: 12, },
headerAlign: 'center', {
align: 'left', label: '状态',
prop: 'tbStatusTitle',
}, search: true,
{ sortable: true,
label: '状态', filter: true,
prop: 'tbStatusTitle', span: 12,
search: true, headerAlign: 'center',
sortable: true, align: 'center',
filter: true, },
span: 12, ],
headerAlign: 'center', },
align: 'center', form: {},
} page: {
pageSize: 10,
] currentPage: 1,
}, total: 0,
form: { },
};
}, },
page: { methods: {
pageSize: 10, handleDelete() {
currentPage: 1, if (this.selectionList.length === 0) {
total: 0, this.$message.warning('请选择至少一条数据');
}, return;
} }
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}).then(() => {});
}, },
methods: { // 多选
handleDelete() { selectionChange(list) {
if (this.selectionList.length === 0) { this.selectionList = list;
this.$message.warning('请选择至少一条数据'); },
return; onLoad(page, params = {}) {
} this.loading = true;
this.$confirm('确定将选择数据删除?', { getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
confirmButtonText: '确定', this.data = res.data.data.records;
cancelButtonText: '取消', this.loading = false;
type: 'warning', this.page.total = res.data.data.total;
}).then(() => { this.selectionClear();
}) });
}, },
// 多选 },
selectionChange(list) { };
this.selectionList = list;
},
onLoad() {
this.loading = true
this.data = [
]
this.page.total = this.data.length
this.loading = false
setTimeout(() => {
this.selectionClear()
}, 500)
}
}
}
</script> </script>
<style lang="scss" scoped></style> <style lang="scss" scoped></style>

81
src/views/qualityManagement/similarParts/index.vue
Unescape View File

@ -7,7 +7,7 @@
<avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud" <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
@row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
@selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
@refresh-change="refreshChange" @on-load="onLoad"> @refresh-change="refreshChange" @on-load="onLoad" @rowSave="rowSave" @rowUpdate="rowUpdate">
<template #menu-left> <template #menu-left>
<!-- <el-button type="danger" @click="batchDel()">删除</el-button> --> <!-- <el-button type="danger" @click="batchDel()">删除</el-button> -->
</template> </template>
@ -32,15 +32,15 @@
<script> <script>
import { import {
getList,
add, add,
getRole,
getRoleAlias,
getRoleTreeById,
grant,
grantTree,
remove, remove,
update, update,
} from '@/api/processManagement/similarParts';
import {
} from '@/api/system/role'; } from '@/api/system/role';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import { validatenull } from '@/utils/validate'; import { validatenull } from '@/utils/validate';
@ -94,7 +94,7 @@ export default {
addBtn: true, addBtn: true,
editBtn: true, editBtn: true,
viewBtn: false, viewBtn: false,
delBtn: false, delBtn: true,
editBtnText: '修改', editBtnText: '修改',
labelWidth: 120, labelWidth: 120,
menuWidth: 120, menuWidth: 120,
@ -121,11 +121,21 @@ export default {
{ {
label: '零件名称', label: '零件名称',
prop: 'partName', prop: 'partOne',
bind: 'dsPart.partName',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 24,
type:'select',
dicData:[
{
label:'零件A',
value:1
},
{
label:'零件B',
value:2
}
],
rules: [ rules: [
{ {
required: true, required: true,
@ -136,11 +146,21 @@ export default {
}, },
{ {
label: '相似零件', label: '相似零件',
prop: 'partName', prop: 'partTwo',
bind: 'dsPart.partName',
search: true, search: true,
sortable: true, sortable: true,
span: 24, span: 24,
type:'select',
dicData:[
{
label:'零件A',
value:1
},
{
label:'零件B',
value:2
}
],
rules: [ rules: [
{ {
required: true, required: true,
@ -159,25 +179,8 @@ export default {
}; };
}, },
methods: { methods: {
// 批量接收
batchReceiving() { // 批量删除
this.$confirm('确定将选择数据批量接收?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
// return remove(row.id);
})
.then(() => {
// this.onLoad(this.page);
// this.$message({
// type: 'success',
// message: '操作成功!',
// });
});
},
// 批量关闭
batchDel() { batchDel() {
this.$confirm('确定将选择数据批量删除?', { this.$confirm('确定将选择数据批量删除?', {
confirmButtonText: '确定', confirmButtonText: '确定',
@ -195,10 +198,7 @@ export default {
// }); // });
}); });
}, },
// 加急
rushFn() {
this.isRushOpen = true
},
closeDialog() { closeDialog() {
this.isRushOpen = false this.isRushOpen = false
this.isBatchOpen = false this.isBatchOpen = false
@ -405,16 +405,13 @@ export default {
onLoad(page, params = {}) { onLoad(page, params = {}) {
this.loading = true; this.loading = true;
this.data = [
]
this.page.total = this.data.length this.page.total = this.data.length
// getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
// this.data = res.data.data.records; this.data = res.data.data.records;
this.loading = false; this.loading = false;
// this.page.total = res.data.data.total this.page.total = res.data.data.total
// this.selectionClear(); this.selectionClear();
// }); });
}, },
}, },
mounted() { mounted() {

Write Preview
Loading…
Cancel
Save