From e961bf6cfa43663b3f40e20ef2005c2a0257d2a7 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Fri, 27 Oct 2023 16:16:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 5 +- src/api/base/material.js | 121 +++++ src/api/base/materialDate.js | 68 +++ src/api/base/materialProductBom.js | 112 +++++ src/api/base/materialUseLog.js | 69 +++ src/assets/icons/svg/table_delete.svg | 15 + src/views/base/material/SmallTitle.vue | 65 +++ src/views/base/material/add-or-updata.vue | 421 ++++++++++++++++ src/views/base/material/attr-add.vue | 141 ++++++ src/views/base/material/index.vue | 233 +++++++++ src/views/base/materialDate/add-or-updata.vue | 107 ++++ src/views/base/materialDate/index.vue | 169 +++++++ .../base/materialProductBom/add-or-updata.vue | 469 ++++++++++++++++++ src/views/base/materialProductBom/index.vue | 187 +++++++ .../base/materialUseLog/add-or-updata.vue | 258 ++++++++++ src/views/base/materialUseLog/index.vue | 212 ++++++++ 16 files changed, 2650 insertions(+), 2 deletions(-) create mode 100644 src/api/base/material.js create mode 100644 src/api/base/materialDate.js create mode 100644 src/api/base/materialProductBom.js create mode 100644 src/api/base/materialUseLog.js create mode 100644 src/assets/icons/svg/table_delete.svg create mode 100644 src/views/base/material/SmallTitle.vue create mode 100644 src/views/base/material/add-or-updata.vue create mode 100644 src/views/base/material/attr-add.vue create mode 100644 src/views/base/material/index.vue create mode 100644 src/views/base/materialDate/add-or-updata.vue create mode 100644 src/views/base/materialDate/index.vue create mode 100644 src/views/base/materialProductBom/add-or-updata.vue create mode 100644 src/views/base/materialProductBom/index.vue create mode 100644 src/views/base/materialUseLog/add-or-updata.vue create mode 100644 src/views/base/materialUseLog/index.vue diff --git a/.env.dev b/.env.dev index 2f15db72..a89429ee 100644 --- a/.env.dev +++ b/.env.dev @@ -1,7 +1,7 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-16 09:22:52 + # @LastEditTime: 2023-10-23 10:50:02 # @LastEditors: DY # @Description: ### @@ -14,7 +14,8 @@ VUE_APP_TITLE = 产线监控系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' -VUE_APP_BASE_API = 'http://192.168.0.33:48080' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' +VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080' # 路由懒加载 diff --git a/src/api/base/material.js b/src/api/base/material.js new file mode 100644 index 00000000..26e495a0 --- /dev/null +++ b/src/api/base/material.js @@ -0,0 +1,121 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-24 11:22:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料 +export function createMaterial(data) { + return request({ + url: '/base/material/create', + method: 'post', + data: data + }) +} + +// 更新物料 +export function updateMaterial(data) { + return request({ + url: '/base/material/update', + method: 'put', + data: data + }) +} + +// 删除物料 +export function deleteMaterial(id) { + return request({ + url: '/base/material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料 +export function getMaterial(id) { + return request({ + url: '/base/material/get?id=' + id, + method: 'get' + }) +} + +// 获得物料code +export function getCode() { + return request({ + url: '/base/material/getMaterialCode', + method: 'get' + }) +} + +// 获得物料分页 +export function getMaterialPage(query) { + return request({ + url: '/base/material/page', + method: 'get', + params: query + }) +} + +// 获得物料列表 +export function getMaterialList(query) { + return request({ + url: '/base/material/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得供应商所有列表 +export function getSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} + +// 获得物料属性列表 +export function getMaterialAttrList(query) { + return request({ + url: '/base/material-attr/page', + method: 'get', + params: query + }) +} + +// 创建物料属性 +export function createMaterialAttr(data) { + return request({ + url: '/base/material-attr/create', + method: 'post', + data: data + }) +} + +// 更新物料属性 +export function updateMaterialAttr(data) { + return request({ + url: '/base/material-attr/update', + method: 'put', + data: data + }) +} + +// 删除物料属性 +export function deleteMaterialAttr(id) { + return request({ + url: '/base/material-attr/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料属性 +export function getMaterialAttr(query) { + return request({ + url: '/base/material-attr/get', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/materialDate.js b/src/api/base/materialDate.js new file mode 100644 index 00000000..9c2782cb --- /dev/null +++ b/src/api/base/materialDate.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-24 17:09:59 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料批次 +export function createMaterialDate(data) { + return request({ + url: '/base/material-date/create', + method: 'post', + data: data + }) +} + +// 更新物料批次 +export function updateMaterialDate(data) { + return request({ + url: '/base/material-date/update', + method: 'put', + data: data + }) +} + +// 删除物料批次 +export function deleteMaterialDate(id) { + return request({ + url: '/base/material-date/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物料批次 +export function getMaterialDate(id) { + return request({ + url: '/base/material-date/getDetail?id=' + id, + method: 'get' + }) +} + +// 获得物料批次code +export function getCode() { + return request({ + url: '/base/material-date/getMaterialDateCode', + method: 'get' + }) +} + +// 获得物料批次分页 +export function getMaterDatePage(query) { + return request({ + url: '/base/material-date/page', + method: 'get', + params: query + }) +} + +// 获得物料批次列表 +export function getMaterDateList(query) { + return request({ + url: '/base/material-date/listbyfilter', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/materialProductBom.js b/src/api/base/materialProductBom.js new file mode 100644 index 00000000..2b0474aa --- /dev/null +++ b/src/api/base/materialProductBom.js @@ -0,0 +1,112 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-26 20:06:29 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建产品Bom +export function createMaterialPB(data) { + return request({ + url: '/base/material-product-bom/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom +export function updateMaterialPB(data) { + return request({ + url: '/base/material-product-bom/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom +export function deleteMaterialPB(id) { + return request({ + url: '/base/material-product-bom/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品Bom +export function getMaterialPB(id) { + return request({ + url: '/base/material-product-bom/get?id=' + id, + method: 'get' + }) +} + +// 获得产品Bomcode +export function getCode() { + return request({ + url: '/base/material-product-bom/getMaterialProductBomCode', + method: 'get' + }) +} + +// 获得产品Bom分页 +export function getMaterialPBPage(query) { + return request({ + url: '/base/material-product-bom/page', + method: 'get', + params: query + }) +} + +// 获得产品Bom列表 +export function getMaterialPBList(query) { + return request({ + url: '/base/material-product-bom/listbyfilter', + method: 'get', + params: query + }) +} + +// 获得产品列表 +export function getProList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query + }) +} + +// 获得产品Bom详细分页 +export function getProBomList(query) { + return request({ + url: '/base/material-product-bom-det/page', + method: 'get', + params: query + }) +} + +// 创建产品Bom详细 +export function createMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/create', + method: 'post', + data: data + }) +} + +// 更新产品Bom详细 +export function updateMaterialPBDet(data) { + return request({ + url: '/base/material-product-bom-det/update', + method: 'put', + data: data + }) +} + +// 删除产品Bom详细 +export function deleteMaterialPBDet(id) { + return request({ + url: '/base/material-product-bom-det/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/api/base/materialUseLog.js b/src/api/base/materialUseLog.js new file mode 100644 index 00000000..3497c071 --- /dev/null +++ b/src/api/base/materialUseLog.js @@ -0,0 +1,69 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-26 09:32:21 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建物料使用记录 +export function createMaterialLog(data) { + return request({ + url: '/base/material-use-log/create', + method: 'post', + data: data + }) +} + +// 更新物料使用记录 +export function updateMaterialLog(data) { + return request({ + url: '/base/material-use-log/update', + method: 'put', + data: data + }) +} + +// 获得物料使用记录 +export function getMaterialLog(id) { + return request({ + url: '/base/material-use-log/getDetail?id=' + id, + method: 'get' + }) +} + +// 获得物料使用记录分页 +export function getMaterialLogPage(query) { + return request({ + url: '/base/material-use-log/page', + method: 'get', + params: query + }) +} + +// 获得所有设备列表 +export function getEqListAll(query) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + params: query + }) +} + +// 获得所有员工列表 +export function getworkerAll(query) { + return request({ + url: '/base/core-worker/listAll', + method: 'get', + params: query + }) +} + +// 删除物料使用记录 +export function deleteMaterialLog(id) { + return request({ + url: '/base/material-use-log/delete?id=' + id, + method: 'delete' + }) +} diff --git a/src/assets/icons/svg/table_delete.svg b/src/assets/icons/svg/table_delete.svg new file mode 100644 index 00000000..518fd2c8 --- /dev/null +++ b/src/assets/icons/svg/table_delete.svg @@ -0,0 +1,15 @@ + + + + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/base/material/SmallTitle.vue b/src/views/base/material/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/material/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue new file mode 100644 index 00000000..43874659 --- /dev/null +++ b/src/views/base/material/add-or-updata.vue @@ -0,0 +1,421 @@ + + + + + diff --git a/src/views/base/material/attr-add.vue b/src/views/base/material/attr-add.vue new file mode 100644 index 00000000..2106320e --- /dev/null +++ b/src/views/base/material/attr-add.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/base/material/index.vue b/src/views/base/material/index.vue new file mode 100644 index 00000000..08ecf314 --- /dev/null +++ b/src/views/base/material/index.vue @@ -0,0 +1,233 @@ + + + diff --git a/src/views/base/materialDate/add-or-updata.vue b/src/views/base/materialDate/add-or-updata.vue new file mode 100644 index 00000000..110a01f1 --- /dev/null +++ b/src/views/base/materialDate/add-or-updata.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/base/materialDate/index.vue b/src/views/base/materialDate/index.vue new file mode 100644 index 00000000..7ea838ea --- /dev/null +++ b/src/views/base/materialDate/index.vue @@ -0,0 +1,169 @@ + + + diff --git a/src/views/base/materialProductBom/add-or-updata.vue b/src/views/base/materialProductBom/add-or-updata.vue new file mode 100644 index 00000000..a30323a8 --- /dev/null +++ b/src/views/base/materialProductBom/add-or-updata.vue @@ -0,0 +1,469 @@ + + + + + diff --git a/src/views/base/materialProductBom/index.vue b/src/views/base/materialProductBom/index.vue new file mode 100644 index 00000000..5e4b5331 --- /dev/null +++ b/src/views/base/materialProductBom/index.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/base/materialUseLog/add-or-updata.vue b/src/views/base/materialUseLog/add-or-updata.vue new file mode 100644 index 00000000..7d7ff568 --- /dev/null +++ b/src/views/base/materialUseLog/add-or-updata.vue @@ -0,0 +1,258 @@ + + + + diff --git a/src/views/base/materialUseLog/index.vue b/src/views/base/materialUseLog/index.vue new file mode 100644 index 00000000..4a1f4b79 --- /dev/null +++ b/src/views/base/materialUseLog/index.vue @@ -0,0 +1,212 @@ + + + From 00fba0a83babad538df503c298967b88c340d86d Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Mon, 30 Oct 2023 10:26:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2023.10.30=E6=8F=90=E6=B5=8B=E8=83=BD?= =?UTF-8?q?=E6=BA=90&=E7=8F=AD=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 4 +- src/api/base/equipment.js | 2 +- src/api/base/groupTeamScheduling.js | 9 - src/api/base/orderManage.js | 54 +++- src/api/monitoring/teamProduction.js | 19 ++ src/utils/dict.js | 7 +- .../energy/monitoring/orderEnergy/index.vue | 76 ++--- .../components/schedulingMonitoringDetail.vue | 46 --- .../components/groupTeamViewDetail.vue | 2 - .../group/monitoring/groupTeamView/index.vue | 33 +- .../components/teamProductionDetail.vue | 162 ++++++++++ .../index.vue | 13 +- .../orderManage/components/addWorkOrder.vue | 289 ++++++++++++++++++ .../orderManage/components/bindWorkOrder.vue | 11 + .../base/orderManage/components/orderAdd.vue | 96 ++++-- src/views/order/base/orderManage/index.vue | 163 ++++++++-- 16 files changed, 821 insertions(+), 165 deletions(-) create mode 100644 src/api/monitoring/teamProduction.js delete mode 100644 src/views/group/monitoring/groupTeamScheduling/components/schedulingMonitoringDetail.vue create mode 100644 src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue rename src/views/group/monitoring/{groupTeamScheduling => teamProduction}/index.vue (89%) create mode 100644 src/views/order/base/orderManage/components/addWorkOrder.vue create mode 100644 src/views/order/base/orderManage/components/bindWorkOrder.vue diff --git a/.env.dev b/.env.dev index 93e957d9..abd002b5 100644 --- a/.env.dev +++ b/.env.dev @@ -13,11 +13,11 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 -VUE_APP_BASE_API = 'http://192.168.0.33:48082' +# VUE_APP_BASE_API = 'http://192.168.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.2.173:48080' # VUE_APP_BASE_API = 'http://192.168.1.49:48080' # VUE_APP_BASE_API = 'http://192.168.1.8:48080' -# VUE_APP_BASE_API = 'http://192.168.1.56:48080' +VUE_APP_BASE_API = 'http://192.168.1.56:48080' # VUE_APP_BASE_API = 'http://192.168.1.188:48080' diff --git a/src/api/base/equipment.js b/src/api/base/equipment.js index 8c1b4246..0a4fd0ab 100644 --- a/src/api/base/equipment.js +++ b/src/api/base/equipment.js @@ -55,7 +55,7 @@ export function exportEquipmentExcel(query) { // 获得所有设备列表 export function getEquipmentAll() { return request({ - url: '/base/equipment/listAll', + url: '/base/core-equipment/listAll', method: 'get' }) } diff --git a/src/api/base/groupTeamScheduling.js b/src/api/base/groupTeamScheduling.js index 35f754bf..be88f707 100644 --- a/src/api/base/groupTeamScheduling.js +++ b/src/api/base/groupTeamScheduling.js @@ -26,12 +26,3 @@ export function autoSet(query) { params: query }) } - -// 获得排班信息分页 建议size 150 -export function groupTeamSchedulingPage(query) { - return request({ - url: '/base/group-team-scheduling/page', - method: 'get', - params: query - }) -} \ No newline at end of file diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 8f8d1cf5..9114d63c 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -34,6 +34,14 @@ export function getOrderCode() { }) } +// 获取工单code +export function getWorkOrderCode() { + return request({ + url: '/base/order/getWorkOrderCode', + method: 'get' + }) +} + // 获得订单 export function getOrderById(query) { return request({ @@ -41,4 +49,48 @@ export function getOrderById(query) { method: 'get', params: query }) -} \ No newline at end of file +} + +// 获得工艺流程列表 +export function getProcessFlowList() { + return request({ + url: '/extend/process-flow/listAll', + method: 'get' + }) +} + +// 创建订单 +export function orderCreate(data) { + return request({ + url: '/base/order/create', + method: 'post', + data: data + }) +} + +// 更新订单 +export function orderUpdate(data) { + return request({ + url: '/base/order/update', + method: 'put', + data: data + }) +} + +// 删除订单 +export function orderDelete(query) { + return request({ + url: '/base/order/delete', + method: 'delete', + params: query + }) +} + +// 下发订单，绑定的穿工单id，新建不传 +export function orderIssue(data) { + return request({ + url: '/base/order/issue', + method: 'post', + data: data + }) +} diff --git a/src/api/monitoring/teamProduction.js b/src/api/monitoring/teamProduction.js new file mode 100644 index 00000000..5c257193 --- /dev/null +++ b/src/api/monitoring/teamProduction.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 获得排班信息分页 建议size 150 +export function groupTeamSchedulingPage(query) { + return request({ + url: '/base/group-team-scheduling/page', + method: 'get', + params: query + }) +} + +// 获得不同产线每小时报废数据，用于班组检测 班组生产情况详情（动态结构） +export function getSchedulingMonitoringRecord(query) { + return request({ + url: '/base/quality-inspection-record/getSchedulingMonitoringRecord', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/utils/dict.js b/src/utils/dict.js index a7621c32..f90ec7c2 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -89,8 +89,6 @@ export const DICT_TYPE = { // ============== ENERGY - 能源模块 ============= ENERGY_UNIT: 'energy_unit', - - // ============== ENERGY - 能源模块 ============= EQU_ALARM_LEVEL: 'equ_alarm_level', MONITOR_INDEX_TYPE: 'monitor_index_type', OBJECT_TYPE: 'object_type', @@ -99,8 +97,9 @@ export const DICT_TYPE = { // ============== ORDER - 订单模块 ============= ORDER_STATUS: 'order_status', - ORDER_ORIGIN: 'order_origin', - ORDER_PRIORITY: 'order_priority' + ORDER_ORIGIN: 'order_Origin', + ORDER_PRIORITY: 'order_priority', + PACK_SPEC: 'pack_spec' } /** diff --git a/src/views/energy/monitoring/orderEnergy/index.vue b/src/views/energy/monitoring/orderEnergy/index.vue index 9918fe5b..847d7003 100644 --- a/src/views/energy/monitoring/orderEnergy/index.vue +++ b/src/views/energy/monitoring/orderEnergy/index.vue @@ -96,7 +96,7 @@ const tableProps = [ } ] import { getEnergyTypeListAll } from '@/api/base/energyType' -import { orderList, workOrderList } from '@/api/base/orderManage' +import { workOrderList } from '@/api/base/orderManage' import { getWorkOrderMsg, getOrderEnergyData } from '@/api/monitoring/orderEnergy' import BarChart from "./components/barChart" export default { @@ -104,25 +104,21 @@ export default { data() { return { formConfig: [ - { - type: 'select', - label: '订单', - selectOptions: [], - param: 'energyTypeId' - }, { type: 'select', label: '工单', selectOptions: [], - param: 'energyTypeId1' + param: 'workOrderId', + clearable: false }, { type: 'select', label: '能源类型', selectOptions: [], - param: 'energyTypeId2', + param: 'objType', filterable: true, - width: 120 + width: 120, + clearable: false }, { type: 'select', @@ -130,8 +126,9 @@ export default { selectOptions: this.getDictDatas(this.DICT_TYPE.OBJECT_TYPE), labelField: 'label', valueField: 'value', - param: 'energyTypeId3', - width: 100 + param: 'energyTypeId', + width: 100, + clearable: false }, { type: 'button', @@ -145,8 +142,9 @@ export default { tableH: this.tableHeight(400), // 查询参数 queryParams: { - pageNo: 1, - pageSize: 10000 + workOrderId: '', + objType: '', + energyTypeId: '' }, orderMsg: {}, chartData: [], @@ -162,34 +160,38 @@ export default { }, methods: { getListArr() { - getEnergyTypeListAll().then(res => { - this.formConfig[2].selectOptions = res.data || [] - }) - orderList().then(res => { - console.log(res) - }) workOrderList().then(res => { - console.log(res) + this.formConfig[0].selectOptions = res.data || [] + }) + getEnergyTypeListAll().then(res => { + this.formConfig[1].selectOptions = res.data || [] }) }, - buttonClick() { - getWorkOrderMsg({ - "workOrderId": 1, - "objType": "3", - "energyTypeId": '1681183397517406210' - }).then(res => { - console.log(res) + buttonClick(val) { + if (!val.workOrderId) { + this.$modal.msgWarning('工单不能为空') + return false + } + if (!val.objType) { + this.$modal.msgWarning('能源类型不能为空') + return false + } + if (!val.energyTypeId) { + this.$modal.msgWarning('对象维度不能为空') + return false + } + this.queryParams.workOrderId = val.workOrderId + this.queryParams.objType = val.objType + this.queryParams.energyTypeId = val.energyTypeId + getWorkOrderMsg({ ...this.queryParams }).then(res => { this.orderMsg = res.data || {} getOrderEnergyData({ - "workOrderId": 1, - "objType": "3", - "energyTypeId": '1681183397517406210', - "startProduceTime": "1694239523000", - "finishProduceTime": "1694498723000" - }).then(res => { - console.log(res) - this.tableData = res.data || [] - this.chartData = res.data || [] + ...this.queryParams, + startProduceTime: res.data.startProduceTime || '', + finishProduceTime: res.data.finishProduceTime || '' + }).then(result => { + this.tableData = result.data || [] + this.chartData = result.data || [] }) }) }, diff --git a/src/views/group/monitoring/groupTeamScheduling/components/schedulingMonitoringDetail.vue b/src/views/group/monitoring/groupTeamScheduling/components/schedulingMonitoringDetail.vue deleted file mode 100644 index 99934d85..00000000 --- a/src/views/group/monitoring/groupTeamScheduling/components/schedulingMonitoringDetail.vue +++ /dev/null @@ -1,46 +0,0 @@ - - - \ No newline at end of file diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue index 702ab09f..bdf1eba9 100644 --- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue +++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue @@ -64,14 +64,12 @@ export default { }, methods: { init(params) { - console.log(params) this.visible = true this.queryParams = params getByTeam({ teamId: this.queryParams.teamId, workOrderId: this.queryParams.workOrderId }).then(res => { - console.log(res) this.tableData = res.data || [] }) } diff --git a/src/views/group/monitoring/groupTeamView/index.vue b/src/views/group/monitoring/groupTeamView/index.vue index 63e0f837..7a5a6e1f 100644 --- a/src/views/group/monitoring/groupTeamView/index.vue +++ b/src/views/group/monitoring/groupTeamView/index.vue @@ -61,10 +61,11 @@ export default { return { formConfig: [ { - type: 'input', - label: '工单名称', - placeholder: '工单名称', - param: 'cnName' + type: 'select', + label: '工单', + selectOptions: [], + param: 'workOrderId', + clearable: false }, { type: 'button', @@ -79,7 +80,8 @@ export default { pageSize: 1000, workOrderId: '' }, - workOrderName: '工单名称ddd', + workOrderList: [], + workOrderName: '', tableBtn, tableProps, tableH: this.tableHeight(220), @@ -92,33 +94,42 @@ export default { window.addEventListener('resize', () => { this.tableH = this.tableHeight(220) }) + this.getOrderList() }, methods: { // 获取工单list getOrderList() { workOrderList().then(res => { - + console.log(res) + this.formConfig[0].selectOptions = res.data || [] + this.workOrderList = res.data || [] }) }, // 查询 buttonClick(val) { - // this.queryParams.workOrderId = val.id - this.queryParams.workOrderId = 1 + if (!val.workOrderId) { + this.$modal.msgWarning('工单不能为空') + return false + } + this.queryParams.workOrderId = val.workOrderId this.getList() }, // 获取table数据 getList() { getByWorkOrder({ id: this.queryParams.workOrderId }).then(res => { - console.log(res) - this.list = res.data + this.list = res.data || [] }) }, handleClick(val) { - console.log(val) this.paramVisible = true let params = {} params.teamId = val.data.id params.teamName = val.data.name + this.workOrderList.map(item => { + if (this.queryParams.workOrderId === item.id) { + this.workOrderName = item.name + } + }) params.workOrderId = this.queryParams.workOrderId params.workOrderName = this.workOrderName this.$nextTick(() => { diff --git a/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue new file mode 100644 index 00000000..a681e8c0 --- /dev/null +++ b/src/views/group/monitoring/teamProduction/components/teamProductionDetail.vue @@ -0,0 +1,162 @@ + + + \ No newline at end of file diff --git a/src/views/group/monitoring/groupTeamScheduling/index.vue b/src/views/group/monitoring/teamProduction/index.vue similarity index 89% rename from src/views/group/monitoring/groupTeamScheduling/index.vue rename to src/views/group/monitoring/teamProduction/index.vue index 3e3c6e09..c5fce23c 100644 --- a/src/views/group/monitoring/groupTeamScheduling/index.vue +++ b/src/views/group/monitoring/teamProduction/index.vue @@ -30,13 +30,13 @@ @pagination="getList" /> - + \ No newline at end of file diff --git a/src/views/order/base/orderManage/components/bindWorkOrder.vue b/src/views/order/base/orderManage/components/bindWorkOrder.vue new file mode 100644 index 00000000..48d07d70 --- /dev/null +++ b/src/views/order/base/orderManage/components/bindWorkOrder.vue @@ -0,0 +1,11 @@ + + \ No newline at end of file diff --git a/src/views/order/base/orderManage/components/orderAdd.vue b/src/views/order/base/orderManage/components/orderAdd.vue index 9462cff6..4a5317b5 100644 --- a/src/views/order/base/orderManage/components/orderAdd.vue +++ b/src/views/order/base/orderManage/components/orderAdd.vue @@ -20,7 +20,7 @@ - + + :key="item.id" + :label="item.name" + :value="item.id"> @@ -72,7 +72,14 @@ - + + + + @@ -86,7 +93,7 @@ @@ -105,20 +112,24 @@ - + - + @@ -142,9 +153,10 @@ \ No newline at end of file