diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js index f2e1e1a..535fa21 100644 --- a/src/api/orderManagement/planYieIdOrder.js +++ b/src/api/orderManagement/planYieIdOrder.js @@ -10,6 +10,22 @@ export const getList = (current, size, params) => { size, }, }); +}; +// 获取热表生产订单 +export const getHotOrderList = params => { + return request({ + url: '/api/blade-desk/order/yieldOrder/pageElectroplate', + method: 'get', + params, + }); +}; +// 获取烧结生产订单 +export const getSinterOrderList = params => { + return request({ + url: '/api/blade-desk/order/yieldPlan/pageSintering', + method: 'get', + params, + }); }; // 修改 export const update = row => { diff --git a/src/api/orderManagement/sinTerPlanOrder.js b/src/api/orderManagement/sinTerPlanOrder.js index fa502bc..b72dc94 100644 --- a/src/api/orderManagement/sinTerPlanOrder.js +++ b/src/api/orderManagement/sinTerPlanOrder.js @@ -10,6 +10,22 @@ export const getList = (current, size, params) => { size, }, }); +}; +// 获取热表计划列表接口 +export const getHotList = params => { + return request({ + url: '/api/blade-desk/order/yieldPlan/pageElectroplate', + method: 'get', + params:params + }); +}; +// 获取烧结计划列表接口 +export const getShootList = params => { + return request({ + url: '/api/blade-desk/order/yieldPlan/pageSintering', + method: 'get', + params:params + }); }; // 修改 export const update = row => { diff --git a/src/api/qualityManagement/productionTesting/productionQuality.js b/src/api/qualityManagement/productionTesting/productionQuality.js index 63db06c..7caea03 100644 --- a/src/api/qualityManagement/productionTesting/productionQuality.js +++ b/src/api/qualityManagement/productionTesting/productionQuality.js @@ -1,3 +1,4 @@ +// 生产质量检验 import request from '@/axios'; // 获取主加工单位-供应商下拉列表 @@ -7,4 +8,13 @@ export const getSupplierList = (params) => { method: 'get', params }); +}; + +// 获取生产质量检验 +export const getInspectionList = (data) => { + return request({ + url: '/api/blade-desk/QA/InspectionTask/listSearch', + method: 'post', + data + }); }; \ No newline at end of file diff --git a/src/api/qualityManagement/remindRedeem/remindRedeem.js b/src/api/qualityManagement/remindRedeem/remindRedeem.js index f25637b..7c408e1 100644 --- a/src/api/qualityManagement/remindRedeem/remindRedeem.js +++ b/src/api/qualityManagement/remindRedeem/remindRedeem.js @@ -42,4 +42,12 @@ export const deleteRemind = (params) =>{ method:'post', params }) +} + +// 零件下拉 +export const getPartList = () =>{ + return request({ + url:'/api/blade-desk/dsPart/getPartList', + method:'get' + }) } \ No newline at end of file diff --git a/src/api/storeManagement/workwearPlan.js b/src/api/storeManagement/workwearPlan.js new file mode 100644 index 0000000..fdea1c4 --- /dev/null +++ b/src/api/storeManagement/workwearPlan.js @@ -0,0 +1,38 @@ +// 工装计划申报 +import request from '@/axios'; + +// 工装计划列表 +export const getList = params => { + return request({ + url: '/api/blade-wms/stMoldApplyFor/list', + method: 'get', + params + }); +}; + +// 工装计划单条新增 +export const save = data => { + return request({ + url: '/api/blade-wms/stMoldApplyFor/save', + method: 'post', + data + }); +}; + +// 工装计划修改 +export const update = data => { + return request({ + url: '/api/blade-wms/stMoldApplyFor/update', + method: 'post', + data + }); +}; + +// 工装计划删除 +export const del = params => { + return request({ + url: '/api/blade-wms/stMoldApplyFor/remove', + method: 'post', + params + }); +}; \ No newline at end of file diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue index 6674edc..5d87c3d 100644 --- a/src/views/orderManagement/planYieIdOrder.vue +++ b/src/views/orderManagement/planYieIdOrder.vue @@ -101,7 +101,7 @@ import { remove, update, } from '@/api/system/role'; -import { getList, updatePreference, closeBatchs } from '@/api/orderManagement/planYieIdOrder'; +import { getList, updatePreference, closeBatchs,getHotOrderList } from '@/api/orderManagement/planYieIdOrder'; import { mapGetters } from 'vuex'; import { validatenull } from '@/utils/validate'; import lookProcess from './components/lookProcess.vue'; @@ -988,1128 +988,30 @@ export default { }, async onLoad(page, params = {}) { this.loading = true; - - // 如果没有传入参数，使用默认查询条件 - if (Object.keys(params).length === 0 && Object.keys(this.query).length > 0) { - params = this.query; - } - this.data = [ - { - id: 1, - alreadyBranchQty: 5.0, - bsPlatingmedium: { - bpsId: 4, - bpsName: '小类04', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 4, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '已派工', - custodian: null, - deliveryQty: 0.0, - demandDate: '2023-03-07 00:00:00', - dominantDept: '1000', - dsPart: null, - keyValue: 41417, - memo: '同一批次,可提前交件', - partCode: '21E100-001-3900-E34', - partName: 'LRMT振动机架底板', - planType: 1, - planUser: '0300092', - poArea: 18.3376140803, - poCode: 'WO-2212149345', - str0: '12212149345', - str1: '22212149345', - str2: '49345', - poCode1: '22121249345', - poCode2: '2212149322245', - poId: 41417, - poQty: 5, - primaryCraft: '库1-2（机加）-4（表）-库2', - priority: 1, - prodIdent: 'JII', - orderPriority: 1, - plate: 'Ct.Ocd', - prodLine: 'test', - productType: 'LRMT', - releaseDate: '2022-12-28 09:07:31', - originalProductionOrderNo: '22212149345', - returnWorkOrderNo: '22212149345', - productName: 'LRMT', - roamNo: 'B1269880', - routeNo: 'LX01-03-001', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 5.0, - useDept: '3505', - wcName: null, - }, - { - id: 2, - alreadyBranchQty: 5.0, - bsPlatingmedium: { - bpsId: 6, - bpsName: '小类06', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 6, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '加工中', - custodian: null, - deliveryQty: 0.0, - demandDate: '2022-11-20 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41419, - memo: '可提前交件', - partCode: '21E2-505-134-B1', - partName: '左柜柜体喷漆部件', - planType: 1, - planUser: '0300009', - plate: null, - poArea: 0.0, - poCode: 'WO-221047370', - str0: '12212149345', - str1: '22212149345', - str2: '49345', - poCode1: '22121249345', - poCode2: '2212149322245', - poId: 41419, - poQty: 5, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - orderPriority: 1, - plate: 'Ct.Ocd', - prodLine: null, - productType: 'Y/QAZ', - releaseDate: '2022-10-12 09:02:31', - originalProductionOrderNo: '22212149345', - returnWorkOrderNo: '22212149345', - productName: 'LRMT', - roamNo: null, - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 5.0, - useDept: '4302', - wcName: null, - }, - { - id: 3, - orderType: 2, // 石墨模订单 - glassPlateIssuedStatus: null, // 非烧结订单，玻璃饼下发状态为空 - alreadyBranchQty: 3.0, - bsPlatingmedium: { - bpsId: 5, - bpsName: '小类05', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 5, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '已退回', - custodian: null, - deliveryQty: 0.0, - demandDate: '2023-07-17 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41420, - memo: null, - partCode: '21E2-505-523-B1', - partName: '客货舱设备架', - planType: 1, - planUser: '0300007', - plate: null, - poArea: 0.0, - poCode: 'WO-221279741', - str0: '12212149345', - str1: '22212149345', - str2: '49345', - poCode1: '22121249345', - poCode2: '2212149322245', - poId: 41420, - poQty: 3, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - orderPriority: 1, - plate: 'Ct.Ocd', - prodLine: null, - productType: 'Y/QAZ', - releaseDate: '2022-12-14 11:05:47', - originalProductionOrderNo: '22212149345', - returnWorkOrderNo: '22212149345', - productName: 'LRMT', - roamNo: 'B1964845', - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 3.0, - useDept: '4302', - wcName: null, - }, - { - id: 4, - orderType: 0, // 烧结订单 - glassPlateIssuedStatus: 0, // 烧结订单，玻璃饼下发状态为未下发 - alreadyBranchQty: 1.0, - bsPlatingSmall: { - bpsId: 6, - bpsName: '小类06', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 6, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: { - 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', - }, - closeTime: '2025-08-25 15:57:35', - curStatus: 15, - curStatusText: '已完工', - custodian: null, - deliveryQty: 0.0, - demandDate: '2022-12-06 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41418, - memo: 'SWSXJ017-00000075 0159,可提前交件', - partCode: '21E2-505-134-B1', - partName: '左柜柜体喷漆部件', - planType: 1, - planUser: '0300009', - plate: null, - poArea: 0.0, - poCode: 'WO-221194871', - str0: '12212149345', - str1: '22212149345', - str2: '49345', - poCode1: '22121249345', - poCode2: '2212149322245', - poId: 41418, - poQty: 1, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - orderPriority: 1, - plate: 'Ct.Ocd', - prodLine: null, - productType: 'Y/QAZ', - releaseDate: '2022-11-15 18:44:12', - originalProductionOrderNo: '22212149345', - returnWorkOrderNo: '22212149345', - productName: 'LRMT', - roamNo: 'B2284606', - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 1.0, - useDept: '4302', - wcName: null, - }, - ]; - this.page.total = this.data.length; - this.query.sureType = ''; try { - const res = await getList( - page.currentPage, - page.pageSize, + const res = await getHotOrderList({ + current:this.page.currentPage, + size:this.page.pageSize, + ...this.query, + }); + this.data = res.data.data.records; + this.page.total = res.data.data.total; + this.loading = false; + // const res = await getList( + // page.currentPage, + // page.pageSize, - Object.assign(params, this.query) - ); - if (res.code) { - this.data = res.data.data.records; - this.page.total = res.data.data.total; - this.selectionClear(); - } + // Object.assign(params, this.query) + // ); + // if (res.code) { + // this.data = res.data.data.records; + // this.page.total = res.data.data.total; + // this.selectionClear(); + // } } catch (err) { console.log(err); } - this.loading = false; + }, }, mounted() { diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index e9e85bf..94ae327 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -105,7 +105,7 @@ import { update, } from '@/api/system/role'; -import { getList,closeBatchs } from '@/api/orderManagement/sinTerPlanOrder'; +import { closeBatchs,getHotList } from '@/api/orderManagement/sinTerPlanOrder'; import { mapGetters } from 'vuex'; import { validatenull } from '@/utils/validate'; @@ -286,7 +286,7 @@ export default { }, { label: '镀种小类', - prop: 'plate1', + prop: 'bpsId', search: false, sortable: true, width: 120, @@ -304,7 +304,7 @@ export default { }, { label: '生产标识', - prop: 'prodIdent', + prop: 'productIdent', search: false, sortable: true, width: 120, @@ -865,1077 +865,25 @@ export default { async onLoad(page, params = {}) { this.loading = true; - this.data = [ - { - id: 1, - alreadyBranchQty: 5.0, - bsPlatingmedium: { - bpsId: 4, - bpsName: '小类04', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 4, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '已派工', - custodian: null, - deliveryQty: 0.0, - demandDate: '2023-03-07 00:00:00', - dominantDept: '1000', - dsPart: null, - keyValue: 41417, - memo: '同一批次,可提前交件', - plannedOrderNo2: '21E100-001-3900-E34', - partName: 'LRMT振动机架底板', - planType: 1, - planUser: '0300092', - plate: 'Ct.Ocd', - plate1: 'Ocd', - poArea: 18.3376140803, - plannedOrderNo1: 'WO-2212149345', - poId: 41417, - poQty: 5, - primaryCraft: '库1-2（机加）-4（表）-库2', - priority: 1, - prodIdent: 'JII', - prodLine: 'test', - plannedOrderNo3: 'LRMT', - releaseDate: '2022-12-28 09:07:31', - roamNo: 'B1269880', - routeNo: 'LX01-03-001', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 5.0, - useDept: '3505', - wcName: null, - }, - { - id: 2, - alreadyBranchQty: 5.0, - bsPlatingmedium: { - bpsId: 6, - bpsName: '小类06', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 6, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '加工中', - custodian: null, - deliveryQty: 0.0, - demandDate: '2022-11-20 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41419, - memo: '可提前交件', - plannedOrderNo2: '21E2-505-134-B1', - partName: '左柜柜体喷漆部件', - planType: 1, - planUser: '0300009', - plate: null, - poArea: 0.0, - plannedOrderNo1: 'WO-221047370', - poId: 41419, - poQty: 5, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - prodLine: null, - plannedOrderNo3: 'Y/QAZ', - releaseDate: '2022-10-12 09:02:31', - roamNo: null, - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 5.0, - useDept: '4302', - wcName: null, - }, - { - id: 3, - alreadyBranchQty: 3.0, - bsPlatingmedium: { - bpsId: 5, - bpsName: '小类05', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 5, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: null, - closeTime: null, - curStatus: 4, - curStatusText: '已退回', - custodian: null, - deliveryQty: 0.0, - demandDate: '2023-07-17 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41420, - memo: null, - plannedOrderNo2: '21E2-505-523-B1', - partName: '客货舱设备架', - planType: 1, - planUser: '0300007', - plate: null, - poArea: 0.0, - plannedOrderNo1: 'WO-221279741', - poId: 41420, - poQty: 3, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - prodLine: null, - plannedOrderNo3: 'Y/QAZ', - releaseDate: '2022-12-14 11:05:47', - roamNo: 'B1964845', - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 3.0, - useDept: '4302', - wcName: null, - }, - { - id: 4, - alreadyBranchQty: 1.0, - bsPlatingSmall: { - bpsId: 6, - bpsName: '小类06', - bsWorkCenter: { - 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: 90, - card: null, - createTime: '2023-02-08', - curStatus: 1, - deleted: false, - deptName: null, - dimissionTime: null, - factoryId: 41, - head: 1, - jobName: '生产调度员', - keyValue: 90, - ldapName: '03891', - mail: null, - mobile: null, - pfDepartment: { - appLink: null, - createTime: '2023-02-08', - deleted: false, - deptCode: '06', - deptId: 47, - deptName: '经营管理室', - deptType: 1, - deptTypeTitle: '厂', - keyValue: 47, - memo: null, - orders: '6', - parentDeptId: 41, - parentPath: null, - ucDeptId: null, - updateTime: '2023-02-08 13:23:30', - }, - pinyinIndex: '03891,03891', - ucUserId: null, - updateTime: '2023-02-08 13:20:39', - userCode: '03891', - userId: 90, - userName: '03891', - userSex: 1, - userSources: '03891', - userString: '90:A:03891', - userType: 'A', - }, - createTime: '2023-04-08 18:35:43', - deleted: false, - describe: null, - endPoint: null, - keyValue: 142, - 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: 0, - roundCycle: null, - saturation: 0.0, - sign: '4', - startPoint: null, - team: '热处理班', - updateTime: '2023-04-08 18:35:43', - wcCode: '003', - wcId: 142, - wcName: '热处理作业中心', - whetherPlate: false, - }, - capacity: 1.0, - keyValue: 6, - updateMan: { - 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', - }, - updateTime: '2024-04-10 16:22:22', - }, - bsProcedureQua: null, - closeMan: { - 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', - }, - closeTime: '2025-08-25 15:57:35', - curStatus: 15, - curStatusText: '已完工', - custodian: null, - deliveryQty: 0.0, - demandDate: '2022-12-06 00:00:00', - dominantDept: '4302', - dsPart: null, - keyValue: 41418, - memo: 'SWSXJ017-00000075 0159,可提前交件', - plannedOrderNo2: '21E2-505-134-B1', - partName: '左柜柜体喷漆部件', - planType: 1, - planUser: '0300009', - plate: null, - poArea: 0.0, - plannedOrderNo1: 'WO-221194871', - poId: 41418, - poQty: 1, - primaryCraft: '库1、2-12（装配）-4（表）-12（装配）-库3', - priority: 1, - prodIdent: 'JIX', - prodLine: null, - plannedOrderNo3: 'Y/QAZ', - releaseDate: '2022-11-15 18:44:12', - roamNo: 'B2284606', - routeNo: 'LX12-02-007', - sureType: null, - sureTypeTitle: '未确认', - syncTime: '2023-02-08 13:26:47', - undeliveredQty: 1.0, - useDept: '4302', - wcName: null, - }, - ]; - this.page.total = this.data.length; - this.query.sureType=1; try { - const res = await getList( - page.currentPage, - page.pageSize, + const res = await getHotList({ + current:this.page.currentPage, + size:this.page.pageSize, + }) + this.data = res.data.data.records; + this.page.total = res.data.data.total; + console.log('res----------------',res) + // const res = await getList( + // page.currentPage, + // page.pageSize, - Object.assign(params, this.query) - ); - if (res.code) { - this.data = res.data.data.records; - this.page.total = res.data.data.total; - this.selectionClear(); - } + // Object.assign(params, this.query) + // ); + // if (res.code) { + // this.data = res.data.data.records; + // this.page.total = res.data.data.total; + // this.selectionClear(); + // } } catch (err) { console.log(err); } diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue index 68ed7d1..d59d060 100644 --- a/src/views/orderManagement/sinTerPlanOrder.vue +++ b/src/views/orderManagement/sinTerPlanOrder.vue @@ -82,7 +82,7 @@