diff --git a/.env.dev b/.env.dev index 90b1efeb..d331d5a0 100644 --- a/.env.dev +++ b/.env.dev @@ -1,8 +1,8 @@ ### # @Author: Do not edit # @Date: 2023-08-29 09:40:39 - # @LastEditTime: 2023-10-30 10:49:39 - # @LastEditors: zhp + # @LastEditTime: 2023-11-11 20:50:30 + # @LastEditors: DY # @Description: ### # 开发环境配置 @@ -13,14 +13,14 @@ VUE_APP_TITLE = MES系统 # 芋道管理系统/开发环境 # VUE_APP_BASE_API = 'http://100.64.0.26:48082' -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.4.173:48080' # 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.0.33:48082' # VUE_APP_BASE_API = 'http://192.168.1.56:48080' -# VUE_APP_BASE_API = 'http://192.168.1.188:48080' - - +# VUE_APP_BASE_API = 'http://192.168.4.159:48080' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true @@ -35,3 +35,4 @@ VUE_APP_DOC_ENABLE = true # 百度统计 # VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/.env.front b/.env.front index 34f878c2..743152e3 100644 --- a/.env.front +++ b/.env.front @@ -1,3 +1,4 @@ + # 开发环境配置 ENV = 'development' diff --git a/.env.prod b/.env.prod index 7ac2b7f1..43504e8f 100644 --- a/.env.prod +++ b/.env.prod @@ -2,14 +2,14 @@ ENV = 'production' # 页面标题 -VUE_APP_TITLE = 产线监控系统 +VUE_APP_TITLE = MES系统 # 芋道管理系统/生产环境 VUE_APP_BASE_API = '/prod-api' # 根据服务器或域名修改 # PUBLIC_PATH = 'http://my-pi.com:8888/yudao-admin/' -PUBLIC_PATH = 'http://192.168.0.33:8888/' +PUBLIC_PATH = 'http://192.168.0.33:8889/' # 二级部署路径 VUE_APP_APP_NAME ='yudao-admin' diff --git a/.env.production b/.env.production new file mode 100644 index 00000000..a64ca0bb --- /dev/null +++ b/.env.production @@ -0,0 +1,12 @@ +### + # @Author: zhp + # @Date: 2023-10-30 14:18:30 + # @LastEditTime: 2023-11-02 16:16:09 + # @LastEditors: zhp + # @Description: +### +# just a flag +ENV = 'production' + +# base api +# VUE_APP_BASE_API = '/api' diff --git a/.env.stage b/.env.stage index 3602a9b9..b25d7a96 100644 --- a/.env.stage +++ b/.env.stage @@ -23,3 +23,4 @@ VUE_APP_DOC_ENABLE = false # 百度统计 VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab + diff --git a/src/api/base/coreAlarmLog.js b/src/api/base/coreAlarmLog.js new file mode 100644 index 00000000..c92b30c5 --- /dev/null +++ b/src/api/base/coreAlarmLog.js @@ -0,0 +1,60 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-03 15:25:55 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建异常警告 +export function createcoreAlarmLog(data) { + return request({ + url: '/base/core-alarm-log/create', + method: 'post', + data: data + }) +} + +// 更新异常警告 +export function updatecoreAlarmLog(data) { + return request({ + url: '/base/core-alarm-log/update', + method: 'put', + data: data + }) +} + +// 删除异常警告 +export function deletecoreAlarmLog(id) { + return request({ + url: '/base/core-alarm-log/delete?id=' + id, + method: 'delete' + }) +} + +// 获得异常警告 +export function getcoreAlarmLog(id) { + return request({ + url: '/base/core-alarm-log/get?id=' + id, + method: 'get' + }) +} + +// 获得警告分页 +export function getcoreAlarmLogPage(query) { + return request({ + url: '/base/core-alarm-log/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getcoreAlarmLogList(query) { + return request({ + url: '/base/core-alarm-log/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreCustomer.js b/src/api/base/coreCustomer.js new file mode 100644 index 00000000..b27ffdf0 --- /dev/null +++ b/src/api/base/coreCustomer.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-02 20:25:36 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建客户 +export function createCustomer(data) { + return request({ + url: '/base/core-customer/create', + method: 'post', + data: data + }) +} + +// 更新客户 +export function updateCustomer(data) { + return request({ + url: '/base/core-customer/update', + method: 'put', + data: data + }) +} + +// 删除客户 +export function deleteCustomer(id) { + return request({ + url: '/base/core-customer/delete?id=' + id, + method: 'delete' + }) +} + +// 获得客户 +export function getCustomer(id) { + return request({ + url: '/base/core-customer/get?id=' + id, + method: 'get' + }) +} + +// 获得客户code +export function getCode() { + return request({ + url: '/base/core-customer/getCode', + method: 'get' + }) +} + +// 获得客户分页 +export function getCustomerPage(query) { + return request({ + url: '/base/core-customer/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCustomerList(query) { + return request({ + url: '/base/core-customer/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreDepartment.js b/src/api/base/coreDepartment.js new file mode 100644 index 00000000..5e452bc2 --- /dev/null +++ b/src/api/base/coreDepartment.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-30 14:37:28 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建部门 +export function createCoreDepartment(data) { + return request({ + url: '/base/core-department/create', + method: 'post', + data: data + }) +} + +// 更新部门 +export function updateCoreDepartment(data) { + return request({ + url: '/base/core-department/update', + method: 'put', + data: data + }) +} + +// 删除部门 +export function deleteCoreDepartment(id) { + return request({ + url: '/base/core-department/delete?id=' + id, + method: 'delete' + }) +} + +// 获得部门 +export function getCoreDepartment(id) { + return request({ + url: '/base/core-department/get?id=' + id, + method: 'get' + }) +} + +// 获得部门code +export function getCode() { + return request({ + url: '/base/core-department/getCode', + method: 'get' + }) +} + +// 获得部门分页 +export function getCoreDepartmentPage(query) { + return request({ + url: '/base/core-department/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreDepartmentList(query) { + return request({ + url: '/base/core-department/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreMajor.js b/src/api/base/coreMajor.js new file mode 100644 index 00000000..3ffad226 --- /dev/null +++ b/src/api/base/coreMajor.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-10-31 15:11:25 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建专业 +export function createCoreMajor(data) { + return request({ + url: '/base/core-major/create', + method: 'post', + data: data + }) +} + +// 更新专业 +export function updateCoreMajor(data) { + return request({ + url: '/base/core-major/update', + method: 'put', + data: data + }) +} + +// 删除专业 +export function deleteCoreMajor(id) { + return request({ + url: '/base/core-major/delete?id=' + id, + method: 'delete' + }) +} + +// 获得专业 +export function getCoreMajor(id) { + return request({ + url: '/base/core-major/get?id=' + id, + method: 'get' + }) +} + +// 获得专业code +export function getCode() { + return request({ + url: '/base/core-major/getCode', + method: 'get' + }) +} + +// 获得专业分页 +export function getCoreMajorPage(query) { + return request({ + url: '/base/core-major/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreMajorList(query) { + return request({ + url: '/base/core-major/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreProduct.js b/src/api/base/coreProduct.js new file mode 100644 index 00000000..476a60b5 --- /dev/null +++ b/src/api/base/coreProduct.js @@ -0,0 +1,111 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-04 10:42:50 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建产品 +export function createCoreProduct(data) { + return request({ + url: '/base/core-product/create', + method: 'post', + data: data + }) +} + +// 更新产品 +export function updateCoreProduct(data) { + return request({ + url: '/base/core-product/update', + method: 'put', + data: data + }) +} + +// 删除产品 +export function deleteCoreProduct(id) { + return request({ + url: '/base/core-product/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品 +export function getCoreProduct(id) { + return request({ + url: '/base/core-product/get?id=' + id, + method: 'get' + }) +} + +// 获得产品code +export function getCode() { + return request({ + url: '/base/core-product/getCode', + method: 'get' + }) +} + +// 获得产品分页 +export function getCoreProductPage(query) { + return request({ + url: '/base/core-product/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreProductList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query + }) +} + +// 创建产品属性 +export function createCoreProductAttr(data) { + return request({ + url: '/base/core-product-attr/create', + method: 'post', + data: data + }) +} + +// 更新产品属性 +export function updateCoreProductAttr(data) { + return request({ + url: '/base/core-product-attr/update', + method: 'put', + data: data + }) +} + +// 删除产品属性 +export function deleteCoreProductAttr(id) { + return request({ + url: '/base/core-product-attr/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产品属性 +export function getCoreProductAttr(id) { + return request({ + url: '/base/core-product-attr/get?id=' + id, + method: 'get' + }) +} + +// 获得产品属性分页 +export function getCoreProductAttrPage(query) { + return request({ + url: '/base/core-product-attr/page', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreProductionLine.js b/src/api/base/coreProductionLine.js new file mode 100644 index 00000000..f3e76b7d --- /dev/null +++ b/src/api/base/coreProductionLine.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-03 19:06:15 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建产线 +export function createCorePL(data) { + return request({ + url: '/base/core-production-line/create', + method: 'post', + data: data + }) +} + +// 更新产线 +export function updateCorePL(data) { + return request({ + url: '/base/core-production-line/update', + method: 'put', + data: data + }) +} + +// 删除产线 +export function deleteCorePL(id) { + return request({ + url: '/base/core-production-line/delete?id=' + id, + method: 'delete' + }) +} + +// 获得产线 +export function getCorePL(id) { + return request({ + url: '/base/core-production-line/get?id=' + id, + method: 'get' + }) +} + +// 获得产线code +export function getCode() { + return request({ + url: '/base/core-production-line/getCode', + method: 'get' + }) +} + +// 获得产线分页 +export function getCorePLPage(query) { + return request({ + url: '/base/core-production-line/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCorePLList(query) { + return request({ + url: '/base/core-production-line/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreSupplier.js b/src/api/base/coreSupplier.js new file mode 100644 index 00000000..390b2d59 --- /dev/null +++ b/src/api/base/coreSupplier.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-03 10:39:44 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建供应商 +export function createCoreSupplier(data) { + return request({ + url: '/base/core-supplier/create', + method: 'post', + data: data + }) +} + +// 更新供应商 +export function updateCoreSupplier(data) { + return request({ + url: '/base/core-supplier/update', + method: 'put', + data: data + }) +} + +// 删除供应商 +export function deleteCoreSupplier(id) { + return request({ + url: '/base/core-supplier/delete?id=' + id, + method: 'delete' + }) +} + +// 获得供应商 +export function getCoreSupplier(id) { + return request({ + url: '/base/core-supplier/get?id=' + id, + method: 'get' + }) +} + +// 获得供应商code +export function getCode() { + return request({ + url: '/base/core-supplier/getCode', + method: 'get' + }) +} + +// 获得供应商分页 +export function getCoreSupplierPage(query) { + return request({ + url: '/base/core-supplier/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreSupplierList(query) { + return request({ + url: '/base/core-supplier/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorkOrder.js b/src/api/base/coreWorkOrder.js new file mode 100644 index 00000000..8f250b23 --- /dev/null +++ b/src/api/base/coreWorkOrder.js @@ -0,0 +1,138 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-06 17:49:42 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建工单 +export function createCoreWO(data) { + return request({ + url: '/base/core-work-order/create', + method: 'post', + data: data + }) +} + +// 更新工单 +export function updateCoreWO(data) { + return request({ + url: '/base/core-work-order/update', + method: 'put', + data: data + }) +} + +// 删除工单 +export function deleteCoreWO(id) { + return request({ + url: '/base/core-work-order/delete?id=' + id, + method: 'delete' + }) +} + +// 获得工单 +export function getCoreWO(id) { + return request({ + url: '/base/core-work-order/get?id=' + id, + method: 'get' + }) +} + +// 获得工单code +export function getCode() { + return request({ + url: '/base/core-work-order/getCode', + method: 'get' + }) +} + +// 获得工单分页 +export function getCoreWOPage(query) { + return request({ + url: '/base/core-work-order/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreWOList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query + }) +} + +// 创建工单预使用原料 +export function createCoreWOMa(data) { + return request({ + url: '/base/core-work-order-material/create', + method: 'post', + data: data + }) +} + +// 更新工单预使用原料 +export function updateCoreWOMa(data) { + return request({ + url: '/base/core-work-order-material/update', + method: 'put', + data: data + }) +} + +// 删除工单预使用原料 +export function deleteCoreWOMa(id) { + return request({ + url: '/base/core-work-order-material/delete?id=' + id, + method: 'delete' + }) +} + +// 获得工单预使用原料 +export function getCoreWOMa(id) { + return request({ + url: '/base/core-work-order-material/get?id=' + id, + method: 'get' + }) +} + +// 获得工单预使用原料分页 +export function getCoreWOMaPage(query) { + return request({ + url: '/base/core-work-order-material/page', + method: 'get', + params: query + }) +} + +// 获得预计用料信息分页 +export function getMaterialBomPage(query) { + return request({ + url: '/base/material-product-bom/bomUseNum', + method: 'get', + params: query + }) +} + +// 获得订单分页 +export function getConOrderList(query) { + return request({ + url: '/base/order/listConOrder', + method: 'get', + params: query + }) +} + +// 改变工单状态 激活暂停完成作废 +export function statusChange(data) { + return request({ + url: '/base/core-work-order/statusChange', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorker.js b/src/api/base/coreWorker.js new file mode 100644 index 00000000..823302bc --- /dev/null +++ b/src/api/base/coreWorker.js @@ -0,0 +1,103 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-02 19:49:52 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建员工 +export function createCoreWorker(data) { + return request({ + url: '/base/core-worker/create', + method: 'post', + data: data + }) +} + +// 更新员工 +export function updateCoreWorker(data) { + return request({ + url: '/base/core-worker/update', + method: 'put', + data: data + }) +} + +// 删除员工 +export function deleteCoreWorker(id) { + return request({ + url: '/base/core-worker/delete?id=' + id, + method: 'delete' + }) +} + +// 获得员工 +export function getCoreWorker(id) { + return request({ + url: '/base/core-worker/get?id=' + id, + method: 'get' + }) +} + +// 获得员工code +export function getCode() { + return request({ + url: '/base/core-worker/getCode', + method: 'get' + }) +} + +// 获得员工分页 +export function getCoreWorkerPage(query) { + return request({ + url: '/base/core-worker/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCoreWorkerList(query) { + return request({ + url: '/base/core-worker/listAll', + method: 'get', + params: query + }) +} + +// 创建员工--专业 +export function createWoBindMa(data) { + return request({ + url: '/base/core-worker-bind-major/create', + method: 'post', + data: data + }) +} + +// 更新员工--专业 +export function updateWoBindMa(data) { + return request({ + url: '/base/core-worker-bind-major/update', + method: 'put', + data: data + }) +} + +// 删除员工--专业 +export function deleteWoBindMa(id) { + return request({ + url: '/base/core-worker-bind-major/delete?id=' + id, + method: 'delete' + }) +} + +// 获得员工--专业分页 +export function getWoBindMaPage(query) { + return request({ + url: '/base/core-worker-bind-major/page', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/coreWorkshopSection.js b/src/api/base/coreWorkshopSection.js new file mode 100644 index 00000000..9ae8e3ea --- /dev/null +++ b/src/api/base/coreWorkshopSection.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 11:50:46 + * @LastEditTime: 2023-11-03 19:18:00 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建工段 +export function createCWSection(data) { + return request({ + url: '/base/core-workshop-section/create', + method: 'post', + data: data + }) +} + +// 更新工段 +export function updateCWSection(data) { + return request({ + url: '/base/core-workshop-section/update', + method: 'put', + data: data + }) +} + +// 删除工段 +export function deleteCWSection(id) { + return request({ + url: '/base/core-workshop-section/delete?id=' + id, + method: 'delete' + }) +} + +// 获得工段 +export function getCWSection(id) { + return request({ + url: '/base/core-workshop-section/get?id=' + id, + method: 'get' + }) +} + +// 获得工段code +export function getCode() { + return request({ + url: '/base/core-workshop-section/getCode', + method: 'get' + }) +} + +// 获得工段分页 +export function getCWSectionPage(query) { + return request({ + url: '/base/core-workshop-section/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getCWSectionList(query) { + return request({ + url: '/base/core-workshop-section/listAll', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/delivery.js b/src/api/base/delivery.js new file mode 100644 index 00000000..82c371c3 --- /dev/null +++ b/src/api/base/delivery.js @@ -0,0 +1,91 @@ +// 成品发货 +import request from '@/utils/request' +// 获得成品发货清单分页 +export function deliveryLogPage(data) { + return request({ + url: '/extend/delivery-log/page', + method: 'post', + data: data + }) +} + +// 获取发货进度分页 +export function deliveryProgressPage(data) { + return request({ + url: '/extend/delivery-progress/page', + method: 'post', + data: data + }) +} + +// 获取发货进度分页 +export function deliveryLogDetPage(data) { + return request({ + url: '/extend/delivery-log-det/page', + method: 'post', + data: data + }) +} + +// 创建成品发货清单 +export function deliveryLogCreate(data) { + return request({ + url: '/extend/delivery-log/create', + method: 'post', + data: data + }) +} + +// 更新成品发货清单 +export function deliveryLogUpdate(data) { + return request({ + url: '/extend/delivery-log/update', + method: 'put', + data: data + }) +} + +// 获得成品发货清单 +export function getDeliveryLog(query) { + return request({ + url: '/extend/delivery-log/get', + method: 'get', + params: query + }) +} + +// 删除成品发货清单 +export function deliveryLogDelete(query) { + return request({ + url: '/extend/delivery-log/delete', + method: 'delete', + params: query + }) +} + +// 装车 +export function deliveryLogDetCreate(data) { + return request({ + url: '/extend/delivery-log-det/create', + method: 'post', + data: data + }) +} + +// 获得一条发货详细 +export function deliveryLogDetGet(query) { + return request({ + url: '/extend/delivery-log-det/get', + method: 'get', + params: query + }) +} + +// 编辑发货详情 +export function deliveryLogDetUpdate(data) { + return request({ + url: '/extend/delivery-log-det/update', + method: 'put', + data: data + }) +} diff --git a/src/api/base/orderManage.js b/src/api/base/orderManage.js index 9114d63c..38085d6a 100644 --- a/src/api/base/orderManage.js +++ b/src/api/base/orderManage.js @@ -94,3 +94,56 @@ export function orderIssue(data) { data: data }) } + +// 获得工单 +export function getWorkOrderById(query) { + return request({ + url: '/base/core-work-order/get', + method: 'get', + params: query + }) +} + +// 订单监控 +export function orderMonitor(query) { + return request({ + url: '/base/order/orderMonitor', + method: 'get', + params: query + }) +} + +// 获得所有客户列表 +export function customerList() { + return request({ + url: '/base/core-customer/listAll', + method: 'get' + }) +} + +// 获得订单详情 +export function orderDetail(query) { + return request({ + url: '/base/order/getDetail', + method: 'get', + params: query + }) +} + +// 产品bom消耗信息 +export function bomUseNum(query) { + return request({ + url: '/base/material-product-bom/bomUseNum', + method: 'get', + params: query + }) +} + +// 完成订单 +export function orderFinish(query) { + return request({ + url: '/base/order/finish', + method: 'post', + params: query + }) +} \ No newline at end of file diff --git a/src/api/base/qualityScrapDet.js b/src/api/base/qualityScrapDet.js new file mode 100644 index 00000000..1cf724ac --- /dev/null +++ b/src/api/base/qualityScrapDet.js @@ -0,0 +1,69 @@ +/* + * @Author: zhp + * @Date: 2023-11-06 15:38:12 + * @LastEditTime: 2023-11-06 15:39:39 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapDet(data) { + return request({ + url: '/base/quality-scrap-det/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapDet(data) { + return request({ + url: '/base/quality-scrap-det/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapDet(id) { + return request({ + url: '/base/quality-scrap-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapDet(id) { + return request({ + url: '/base/quality-scrap-det/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapDetPage(query) { + return request({ + url: '/base/quality-scrap-det/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-det/getCode', + method: 'get', + params: query + }) +} diff --git a/src/api/base/qualityScrapLog.js b/src/api/base/qualityScrapLog.js new file mode 100644 index 00000000..f0bdaa69 --- /dev/null +++ b/src/api/base/qualityScrapLog.js @@ -0,0 +1,100 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 15:02:37 + * @LastEditTime: 2023-11-07 18:32:07 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapLog(data) { + return request({ + url: '/base/quality-scrap-log/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapLog(data) { + return request({ + url: '/base/quality-scrap-log/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapLog(id) { + return request({ + url: '/base/quality-scrap-log/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapLog(id) { + return request({ + url: '/base/quality-scrap-log/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapLogPage(query) { + return request({ + url: '/base/quality-scrap-log/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-log/getCode', + method: 'get', + params: query + }) +} +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} + +export function getTeamList(query) { + return request({ + url: '/base/group-team/listAll', + method: 'get', + params: query, + }) +} + +export function getLineList(query) { + return request({ + url: '/base/core-production-line/listAll', + method: 'get', + params: query, + }) +} + +export function getDetList(query) { + return request({ + url: '/base/quality-scrap-det/listAll', + method: 'get', + params: query, + }) +} diff --git a/src/api/base/qualityScrapType.js b/src/api/base/qualityScrapType.js new file mode 100644 index 00000000..de7190ff --- /dev/null +++ b/src/api/base/qualityScrapType.js @@ -0,0 +1,76 @@ +/* + * @Author: zhp + * @Date: 2023-11-04 18:27:11 + * @LastEditTime: 2023-11-06 15:55:24 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 创建质量检测类型基础 +export function createQualityScrapType(data) { + return request({ + url: '/base/quality-scrap-type/create', + method: 'post', + data: data + }) +} + +// 更新质量检测类型基础 +export function updateQualityScrapType(data) { + return request({ + url: '/base/quality-scrap-type/update', + method: 'put', + data: data + }) +} + +// 删除质量检测类型基础 +export function deleteQualityScrapType(id) { + return request({ + url: '/base/quality-scrap-type/delete?id=' + id, + method: 'delete' + }) +} + +// 获得质量检测类型基础 +export function getQualityScrapType(id) { + return request({ + url: '/base/quality-scrap-type/get?id=' + id, + method: 'get' + }) +} + +// 获得质量检测类型基础分页 +export function getQualityScrapTypePage(query) { + return request({ + url: '/base/quality-scrap-type/page', + method: 'get', + params: query + }) +} + +// 导出质量检测类型基础 Excel +export function exportQualityScrapTypeExcel(query) { + return request({ + url: '/base/quality-scrap-type/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +export function getCode(query) { + return request({ + url: '/base/quality-scrap-type/getCode', + method: 'get', + params: query + }) +} +export function getList(query) { + return request({ + url: 'base/quality-scrap-type/listAll', + method: 'get', + params: query + }) +} diff --git a/src/api/base/worker.js b/src/api/base/worker.js index 2fcee54c..67ad7268 100644 --- a/src/api/base/worker.js +++ b/src/api/base/worker.js @@ -14,4 +14,13 @@ export function getWorker(query) { method: 'get', params: query }) +} + +// 获得该班组其他可选组员列表(除去现有组员) +export function otherWorkerList(query) { + return request({ + url: '/base/group-team-det/otherWorkerList', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/api/core/analysis/index.js b/src/api/core/analysis/index.js index af791ff5..e5f374e9 100644 --- a/src/api/core/analysis/index.js +++ b/src/api/core/analysis/index.js @@ -1,23 +1,24 @@ /* * @Author: zhp * @Date: 2023-09-12 14:07:04 - * @LastEditTime: 2023-09-13 09:53:45 - * @LastEditors: zhp + * @LastEditTime: 2023-11-10 10:23:43 + * @LastEditors: DY * @Description: */ import request from '@/utils/request' -export function getYieldAnalysisPageData(data) { +export function getYieldAnalysisPageData(query) { return request({ - url: '/analysis/production-analysis/getOutput', - method: 'post', - data: data + url: '/base/core-production-line-rec-day/monthList', + method: 'get', + params: query }) } +// 产线平衡分析 export function getCT(data) { return request({ - url: '/analysis/production-analysis/getCT', + url: '/analysis/equipment-analysis/getCT', method: 'post', data: data }) diff --git a/src/api/core/base/factory.js b/src/api/core/base/factory.js index 8731bb57..42189799 100644 --- a/src/api/core/base/factory.js +++ b/src/api/core/base/factory.js @@ -1,9 +1,16 @@ +/* + * @Author: Do not edit + * @Date: 2023-10-21 10:11:01 + * @LastEditTime: 2023-11-03 19:03:44 + * @LastEditors: DY + * @Description: + */ import request from '@/utils/request' // 创建工厂 export function createFactory(data) { return request({ - url: '/base/factory/create', + url: '/base/core-factory/create', method: 'post', data: data }) @@ -12,7 +19,7 @@ export function createFactory(data) { // 更新工厂 export function updateFactory(data) { return request({ - url: '/base/factory/update', + url: '/base/core-factory/update', method: 'put', data: data }) @@ -21,7 +28,7 @@ export function updateFactory(data) { // 删除工厂 export function deleteFactory(id) { return request({ - url: '/base/factory/delete?id=' + id, + url: '/base/core-factory/delete?id=' + id, method: 'delete' }) } @@ -29,21 +36,30 @@ export function deleteFactory(id) { // 获得工厂 export function getFactory(id) { return request({ - url: '/base/factory/get?id=' + id, + url: '/base/core-factory/get?id=' + id, method: 'get' }) } // 获得工厂code export function getCode() { return request({ - url: '/base/factory/getCode', + url: '/base/core-factory/getCode', method: 'get' }) } // 获得工厂分页 export function getFactoryPage(query) { return request({ - url: '/base/factory/page', + url: '/base/core-factory/page', + method: 'get', + params: query + }) +} + +// 获得所有列表 +export function getFactoryList(query) { + return request({ + url: '/base/core-factory/listAll', method: 'get', params: query }) @@ -52,7 +68,7 @@ export function getFactoryPage(query) { // 导出工厂 Excel export function exportFactoryExcel(query) { return request({ - url: '/base/factory/export-excel', + url: '/base/core-factory/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/core/monitoring/data24.js b/src/api/core/monitoring/data24.js index 86afe0d8..0c99f289 100644 --- a/src/api/core/monitoring/data24.js +++ b/src/api/core/monitoring/data24.js @@ -1,17 +1,17 @@ /* * @Author: Do not edit * @Date: 2023-09-12 09:44:53 - * @LastEditTime: 2023-09-15 14:12:26 + * @LastEditTime: 2023-11-06 18:57:05 * @LastEditors: DY * @Description: */ import request from '@/utils/request' // 获得近24小时产线生产数据 -export function getPdlDataOneDay(data) { +export function getPdlDataOneDay(query) { return request({ - url: '/monitoring/production-monitor/getPdlDataOneDay', - method: 'post', - data: data + url: '/base/core-production-line-rec-hour/list24h', + method: 'get', + params: query }) } diff --git a/src/api/equipment/analysis/statistics.js b/src/api/equipment/analysis/statistics.js new file mode 100644 index 00000000..ebd60e17 --- /dev/null +++ b/src/api/equipment/analysis/statistics.js @@ -0,0 +1,27 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 09:27:39 + * @LastEditTime: 2023-11-10 09:30:00 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备统计分析 +export function getEqAnalysis(query) { + return request({ + url: '/analysis/equipment-analysis/statistics', + method: 'get', + params: query + }) +} + +// 导出设备统计分析 +export function exportEqAnalysisExcel(query) { + return request({ + url: '/analysis/equipment-analysis/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/alarm/records.js b/src/api/equipment/base/alarm/records.js new file mode 100644 index 00000000..8a4104ca --- /dev/null +++ b/src/api/equipment/base/alarm/records.js @@ -0,0 +1,60 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-09 17:42:27 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 创建设备报警处理 +export function createAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/create', + method: 'post', + data: data + }) +} + +// 更新设备报警处理 +export function updateAlarmHand(data) { + return request({ + url: '/base/equipment-alarm-hand/update', + method: 'put', + data: data + }) +} + +// 删除设备报警处理 +export function deleteAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/delete?id=' + id, + method: 'delete' + }) +} + +//获得设备报警处理 +export function getAlarmHand(id) { + return request({ + url: '/base/equipment-alarm-hand/get?id=' + id, + method: 'get' + }) +} + +// 获得设备报警处理分页 +export function getAlarmHandPage(query) { + return request({ + url: '/base/equipment-alarm-hand/page', + method: 'get', + params: query + }) +} + + +//获得设备报警记录 +export function getAlarmLog(id) { + return request({ + url: '/base/equipment-alarm-log/get?id=' + id, + method: 'get' + }) +} diff --git a/src/api/equipment/base/inspection/record.js b/src/api/equipment/base/inspection/record.js new file mode 100644 index 00000000..5c0e2cb2 --- /dev/null +++ b/src/api/equipment/base/inspection/record.js @@ -0,0 +1,62 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-11 19:52:54 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 根据设备获得所有巡检内容列表 +export function getcheckAllList(query) { + return request({ + url: '/base/equipment-check/listAll', + method: 'get', + params: query + }) +} + +// 创建设备巡检计划记录 +export function createCheckLog(data) { + return request({ + url: '/base/equipment-check-log/create', + method: 'post', + data: data + }) +} + +// 更新设备巡检计划记录 +export function updateCheckLog(data) { + return request({ + url: '/base/equipment-check-log/update', + method: 'put', + data: data + }) +} + +// 获得设备巡检计划记录 +export function getEqCheckLog(id) { + return request({ + url: '/base/equipment-check-log/get?id=' + id, + method: 'get' + }) +} + +// 导出设备巡检计划记录 +export function exportCheckLogExcel(query) { + return request({ + url: '/base/equipment-check-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} + +// 根据设备获得所有巡检配置列表 +export function getcheckConfigByEqList(query) { + return request({ + url: '/base/equipment-check-config/list', + method: 'get', + params: query + }) +} diff --git a/src/api/equipment/base/inspection/settings.js b/src/api/equipment/base/inspection/settings.js new file mode 100644 index 00000000..8d2ad8c9 --- /dev/null +++ b/src/api/equipment/base/inspection/settings.js @@ -0,0 +1,68 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-08 15:56:52 + * @LastEditTime: 2023-11-10 09:04:50 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得设备巡检设置 +export function getEqCheck(id) { + return request({ + url: '/base/equipment-check-config/get?id=' + id, + method: 'get' + }) +} + +// 创建巡检项目 +export function createCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/create', + method: 'post', + data: data + }) +} + +// 更新巡检项目 +export function updateCheckDet(data) { + return request({ + url: '/base/equipment-check-config-det/update', + method: 'put', + data: data + }) +} + +// 删除巡检项目 +export function deleteCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/delete?id=' + id, + method: 'delete' + }) +} + +//巡检项目 +export function getCheckDet(id) { + return request({ + url: '/base/equipment-check-config-det/get?id=' + id, + method: 'get' + }) +} + +// 获得巡检项目分页 +export function getCheckDetPage(query) { + return request({ + url: '/base/equipment-check-config-det/page', + method: 'get', + params: query + }) +} + +// 获得x巡检所有列表 +export function getcheckList(query) { + return request({ + url: '/base/equipment-check/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/repair.js b/src/api/equipment/base/repair.js new file mode 100644 index 00000000..a93e4a9f --- /dev/null +++ b/src/api/equipment/base/repair.js @@ -0,0 +1,25 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-10 16:09:33 + * @LastEditTime: 2023-11-10 16:50:08 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得设备维修 +export function getEqRepair(id) { + return request({ + url: '/base/equipment-repair-log/get?id=' + id, + method: 'get' + }) +} + +// 更新设备维修记录 +export function updateEqRepair(data) { + return request({ + url: '/base/equipment-repair-log/update', + method: 'put', + data: data + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/spare-parts/config.js b/src/api/equipment/base/spare-parts/config.js new file mode 100644 index 00000000..b2201cad --- /dev/null +++ b/src/api/equipment/base/spare-parts/config.js @@ -0,0 +1,51 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 17:28:54 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +//获得备品备件配置 +export function getSparePartConfig(id) { + return request({ + url: '/base/equipment-spare-part-config/get?id=' + id, + method: 'get' + }) +} + +// 创建设备备品备件配置--抽屉 +export function createConfigDet(data) { + return request({ + url: '/base/equipment-spare-part-config-det/create', + method: 'post', + data: data + }) +} + +// 删除设备备品备件配置--抽屉 +export function deleteConfigDet(id) { + return request({ + url: '/base/equipment-spare-part-config-det/delete?id=' + id, + method: 'delete' + }) +} + +// 获得抽屉表格分页 +export function getConfigDetPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/page', + method: 'get', + params: query + }) +} + +// 获得备品备件列表 +export function getSparePartList(query) { + return request({ + url: '/base/equipment-spare-part/list', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/api/equipment/base/spare-parts/monitor.js b/src/api/equipment/base/spare-parts/monitor.js new file mode 100644 index 00000000..af4f2a42 --- /dev/null +++ b/src/api/equipment/base/spare-parts/monitor.js @@ -0,0 +1,45 @@ +/* + * @Author: Do not edit + * @Date: 2023-11-11 16:18:57 + * @LastEditTime: 2023-11-11 18:44:51 + * @LastEditors: DY + * @Description: + */ +import request from '@/utils/request' + +// 获得抽屉表格分页 +export function getConfigDetMonitorPage(query) { + return request({ + url: '/base/equipment-spare-part-config-det/monitor', + method: 'get', + params: query + }) +} + +// 创建设备备品备件更换log +export function createSparePartLog(data) { + return request({ + url: '/base/equipment-spare-part-log/create', + method: 'post', + data: data + }) +} + +// 获得设备备品备件更换log分页 +export function getSparePartLogPage(query) { + return request({ + url: '/base/equipment-spare-part-log/page', + method: 'get', + params: query + }) +} + +// 导出设备备品备件更换log +export function exportSparePartLogExcel(query) { + return request({ + url: '/base/equipment-spare-part-log/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/extend/processEquMaterialBom.js b/src/api/extend/processEquMaterialBom.js new file mode 100644 index 00000000..5be7bfb0 --- /dev/null +++ b/src/api/extend/processEquMaterialBom.js @@ -0,0 +1,106 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 19:47:48 + * @LastEditTime: 2023-11-08 16:59:32 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得能耗统计查询分页 +export function processEquMaterialBomPage(data) { + return request({ + url: '/extend/process-equ-material-bom/page', + method: 'get', + data: data + }) +} + +export function updateProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/update', + method: 'put', + data: data + }) +} + +export function createProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/create', + method: 'post', + data: data + }) +} + + +export function getProcessEquMaterialBom(data) { + return request({ + url: '/extend/process-equ-material-bom/get', + method: 'get', + params: data + }) +} + +export function deleteProcessEquMaterialBom(id) { + return request({ + url: '/extend/process-equ-material-bom/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function getEquipmentList(data) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + data: data + }) +} + +export function deleteProcessEquMaterialBomDet(id) { + return request({ + url: '/extend/process-equ-material-bom-det/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function processEquMaterialBomDetPage(data) { + return request({ + url: '/extend/process-equ-material-bom-det/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/update', + method: 'put', + data: data + }) +} + +export function createProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/create', + method: 'post', + data: data + }) +} + +export function getProcessEquMaterialBomDet(data) { + return request({ + url: '/extend/process-equ-material-bom-det/get', + method: 'get', + params: data + }) +} + +export function getMaterialList(data) { + return request({ + url: '/base/material/listbyfilter', + method: 'get', + data: data + }) +} diff --git a/src/api/extend/processEquValueBom.js b/src/api/extend/processEquValueBom.js new file mode 100644 index 00000000..8048c56b --- /dev/null +++ b/src/api/extend/processEquValueBom.js @@ -0,0 +1,106 @@ +/* + * @Author: zhp + * @Date: 2023-11-09 09:37:14 + * @LastEditTime: 2023-11-09 14:20:02 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得能耗统计查询分页 +export function processEquValueBomPage(data) { + return request({ + url: '/extend/process-equ-value-bom/page', + method: 'get', + data: data + }) +} + +export function updateProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/update', + method: 'put', + data: data + }) +} + +export function createProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/create', + method: 'post', + data: data + }) +} + + +export function getProcessEquValueBom(data) { + return request({ + url: '/extend/process-equ-value-bom/get', + method: 'get', + params: data + }) +} + +export function deleteProcessEquValueBom(id) { + return request({ + url: '/extend/process-equ-value-bom/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function getEquipmentList(data) { + return request({ + url: '/base/core-equipment/listAll', + method: 'get', + data: data + }) +} + +export function deleteProcessEquValueBomDet(id) { + return request({ + url: '/extend/process-equ-value-bom-det/delete?id=' + id, + method: 'delete', + // data: data + }) +} + +export function processEquValueBomDetPage(data) { + return request({ + url: '/extend/process-equ-value-bom-det/page', + method: 'get', + params: data + }) +} + +export function updateProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/update', + method: 'put', + data: data + }) +} + +export function createProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/create', + method: 'post', + data: data + }) +} + +export function getProcessEquValueBomDet(data) { + return request({ + url: '/extend/process-equ-value-bom-det/get', + method: 'get', + params: data + }) +} + +export function getValueList(data) { + return request({ + url: '/extend/process-equ-value-bom-det/getEnableValuesByEquId', + method: 'get', + params: data + }) +} diff --git a/src/api/monitoring/qualityInspectionRecord.js b/src/api/monitoring/qualityInspectionRecord.js index 81454cc5..acd532c8 100644 --- a/src/api/monitoring/qualityInspectionRecord.js +++ b/src/api/monitoring/qualityInspectionRecord.js @@ -1,9 +1,16 @@ +/* + * @Author: zhp + * @Date: 2023-10-17 09:26:38 + * @LastEditTime: 2023-11-02 17:00:17 + * @LastEditors: zhp + * @Description: + */ import request from '@/utils/request' // 创建质量检查信息记录表 export function createQualityInspectionRecord(data) { return request({ - url: '/monitoring/quality-inspection-record/create', + url: '/base/quality-inspection-record/create', method: 'post', data: data }) @@ -12,7 +19,7 @@ export function createQualityInspectionRecord(data) { // 更新质量检查信息记录表 export function updateQualityInspectionRecord(data) { return request({ - url: '/monitoring/quality-inspection-record/update', + url: '/base/quality-inspection-record/update', method: 'put', data: data }) @@ -21,7 +28,7 @@ export function updateQualityInspectionRecord(data) { // 删除质量检查信息记录表 export function deleteQualityInspectionRecord(id) { return request({ - url: '/monitoring/quality-inspection-record/delete?id=' + id, + url: '/base/quality-inspection-record/delete?id=' + id, method: 'delete' }) } @@ -29,7 +36,7 @@ export function deleteQualityInspectionRecord(id) { // 获得质量检查信息记录表 export function getQualityInspectionRecord(id) { return request({ - url: '/monitoring/quality-inspection-record/get?id=' + id, + url: '/base/quality-inspection-record/get?id=' + id, method: 'get' }) } @@ -37,7 +44,7 @@ export function getQualityInspectionRecord(id) { // 获得质量检查信息记录表分页 export function getQualityInspectionRecordPage(query) { return request({ - url: '/monitoring/quality-inspection-record/page', + url: '/base/quality-inspection-record/page', method: 'get', params: query }) @@ -46,7 +53,7 @@ export function getQualityInspectionRecordPage(query) { // 导出质量检查信息记录表 Excel export function exportQualityInspectionRecordExcel(query) { return request({ - url: '/monitoring/quality-inspection-record/export-excel', + url: '/base/quality-inspection-record/export-excel', method: 'get', params: query, responseType: 'blob' diff --git a/src/api/monitoring/statisticalData.js b/src/api/monitoring/statisticalData.js new file mode 100644 index 00000000..4f19d699 --- /dev/null +++ b/src/api/monitoring/statisticalData.js @@ -0,0 +1,40 @@ +/* + * @Author: zhp + * @Date: 2023-11-07 14:10:18 + * @LastEditTime: 2023-11-07 16:29:55 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + +// 获得质量检查信息记录表分页 +export function getStatisticalDataPage(query) { + return request({ + url: '/base/statistical-data/getStatisticData', + method: 'get', + data: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +export function getProductList(query) { + return request({ + url: '/base/core-product/listAll', + method: 'get', + params: query, + }) +} + +export function getInspectionData(query) { + return request({ + url: '/base/statistical-data/getInspectionData', + method: 'get', + params: query, + }) +} diff --git a/src/api/monitoring/teamProduction.js b/src/api/monitoring/teamProduction.js index 5c257193..792d694b 100644 --- a/src/api/monitoring/teamProduction.js +++ b/src/api/monitoring/teamProduction.js @@ -16,4 +16,13 @@ export function getSchedulingMonitoringRecord(query) { method: 'get', params: query }) +} + +// 获得所有列表 +export function groupClassesListAll(query) { + return request({ + url: '/base/group-classes/listAll', + method: 'get', + params: query + }) } \ No newline at end of file diff --git a/src/api/quality/deviceParameters.js b/src/api/quality/deviceParameters.js new file mode 100644 index 00000000..ae1c87fb --- /dev/null +++ b/src/api/quality/deviceParameters.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-11-03 09:31:17 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getTreeData(query) { + return request({ + url: '/base/core-factory/getTreeByWorkOrder', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/quality/materialTraceability.js b/src/api/quality/materialTraceability.js new file mode 100644 index 00000000..d8eea07f --- /dev/null +++ b/src/api/quality/materialTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-10-31 10:28:51 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getMaterialUseLogPage(query) { + return request({ + url: '/base/material-use-log/materialTrace', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/quality/processTraceability.js b/src/api/quality/processTraceability.js new file mode 100644 index 00000000..d2152584 --- /dev/null +++ b/src/api/quality/processTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-31 15:05:06 + * @LastEditTime: 2023-11-03 09:05:50 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得工艺信息追溯page +export function getProcessTraceabilityPage(query) { + return request({ + url: '/extend/process-retrospect/get', + method: 'post', + data: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +// export function exportEnergyPlcExcel(query) { +// return request({ +// url: '/base/material-use-log/materialTraceExport', +// method: 'get', +// params: query, +// responseType: 'blob' +// }) +// } diff --git a/src/api/quality/processTraceabilityDetail.js b/src/api/quality/processTraceabilityDetail.js new file mode 100644 index 00000000..55da6791 --- /dev/null +++ b/src/api/quality/processTraceabilityDetail.js @@ -0,0 +1,43 @@ +/* + * @Author: zhp + * @Date: 2023-10-18 09:33:57 + * @LastEditTime: 2023-11-09 15:33:20 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得物料信息追溯page +export function getDetMaterial(query) { + return request({ + url: '/extend/process-retrospect/getDetMaterial', + method: 'post', + data: query + }) +} + +export function getDetValue(query) { + return request({ + url: '/extend/process-retrospect/getDetValue', + method: 'post', + data: query + }) +} + +// export function getWorkOrderList(query) { +// return request({ +// url: '/base/core-work-order/listbyfilter', +// method: 'get', +// params: query, +// }) +// } +// // 导出物料信息 +// export function exportEnergyPlcExcel(query) { +// return request({ +// url: '/base/material-use-log/materialTraceExport', +// method: 'get', +// params: query, +// responseType: 'blob' +// }) +// } diff --git a/src/api/quality/rawMaterialTraceability.js b/src/api/quality/rawMaterialTraceability.js new file mode 100644 index 00000000..aba01790 --- /dev/null +++ b/src/api/quality/rawMaterialTraceability.js @@ -0,0 +1,35 @@ +/* + * @Author: zhp + * @Date: 2023-10-31 10:55:20 + * @LastEditTime: 2023-10-31 15:05:30 + * @LastEditors: zhp + * @Description: + */ +import request from '@/utils/request' + + +// 获得原料信息追溯page +export function getRawMaterialPage(query) { + return request({ + url: '/base/core-work-order-material/page', + method: 'get', + params: query + }) +} + +export function getWorkOrderList(query) { + return request({ + url: '/base/core-work-order/listbyfilter', + method: 'get', + params: query, + }) +} +// 导出物料信息 +export function exportEnergyPlcExcel(query) { + return request({ + url: '/base/material-use-log/materialTraceExport', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouse-info.js b/src/api/warehouse/warehouse-info.js new file mode 100644 index 00000000..8ac37edf --- /dev/null +++ b/src/api/warehouse/warehouse-info.js @@ -0,0 +1,75 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 14:21:18 + * @LastEditors: zwq + * @LastEditTime: 2023-11-02 14:34:29 + * @Description: + */ +import request from '@/utils/request' + +// 创建仓库 +export function createWarehouse(data) { + return request({ + url: '/extend/warehouse/create', + method: 'post', + data: data + }) +} + +// 更新仓库 +export function updateWarehouse(data) { + return request({ + url: '/extend/warehouse/update', + method: 'put', + data: data + }) +} + +// 删除仓库 +export function deleteWarehouse(id) { + return request({ + url: '/extend/warehouse/delete?id=' + id, + method: 'delete' + }) +} + +// 获得仓库 +export function getWarehouse(id) { + return request({ + url: '/extend/warehouse/get?id=' + id, + method: 'get' + }) +} + +// 获得仓库列表 +export function getWarehouseList() { + return request({ + url: '/extend/warehouse/listAll', + method: 'get' + }) +} +// 获得仓库code +export function getCode() { + return request({ + url: '/extend/warehouse/getCode', + method: 'get' + }) +} +// 获得仓库分页 +export function getWarehousePage(query) { + return request({ + url: '/extend/warehouse/page', + method: 'get', + params: query + }) +} + +// 导出仓库 Excel +export function exportWarehouseExcel(query) { + return request({ + url: '/extend/warehouse/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseGoods.js b/src/api/warehouse/warehouseGoods.js new file mode 100644 index 00000000..1eaae6a7 --- /dev/null +++ b/src/api/warehouse/warehouseGoods.js @@ -0,0 +1,76 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 16:20:15 + * @LastEditors: zwq + * @LastEditTime: 2023-11-03 15:26:05 + * @Description: + */ +import request from '@/utils/request' + +// 创建物品 +export function createWarehouseGoods(data) { + return request({ + url: '/extend/warehouse-goods/create', + method: 'post', + data: data + }) +} + +// 更新物品 +export function updateWarehouseGoods(data) { + return request({ + url: '/extend/warehouse-goods/update', + method: 'put', + data: data + }) +} + +// 删除物品 +export function deleteWarehouseGoods(id) { + return request({ + url: '/extend/warehouse-goods/delete?id=' + id, + method: 'delete' + }) +} + +// 获得物品 +export function getWarehouseGoods(id) { + return request({ + url: '/extend/warehouse-goods/get?id=' + id, + method: 'get' + }) +} + +// 获得物品列表 +export function getListByType(id) { + return request({ + url: '/extend/warehouse-goods/getListByType?type=' + id, + method: 'get' + }) +} + +// 获得物品分页 +export function getWarehouseGoodsPage(data) { + return request({ + url: '/extend/warehouse-goods/page', + method: 'POST', + data: data + }) +} + +// 获得code +export function getCode() { + return request({ + url: '/extend/warehouse-goods/getCode', + method: 'get' + }) +} +// 导出物品 Excel +export function exportWarehouseGoodsExcel(query) { + return request({ + url: '/extend/warehouse-goods/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseLocation.js b/src/api/warehouse/warehouseLocation.js new file mode 100644 index 00000000..f1b41f6c --- /dev/null +++ b/src/api/warehouse/warehouseLocation.js @@ -0,0 +1,97 @@ +/* + * @Author: zwq + * @Date: 2023-11-02 14:31:42 + * @LastEditors: zwq + * @LastEditTime: 2023-11-04 14:56:10 + * @Description: + */ +import request from '@/utils/request' + +// 创建库位 +export function createWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/create', + method: 'post', + data: data + }) +} + +// 更新库位 +export function updateWarehouseLocation(data) { + return request({ + url: '/extend/warehouse-location/update', + method: 'put', + data: data + }) +} + +// 删除库位 +export function deleteWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/delete?id=' + id, + method: 'delete' + }) +} + +// 获得库位 +export function getWarehouseLocation(id) { + return request({ + url: '/extend/warehouse-location/get?id=' + id, + method: 'get' + }) +} +// 获得库位列表(通过仓库id) +export function listByWarehouse(id) { + return request({ + url: '/extend/warehouse-location/listByWarehouse?warehouseId=' + id, + method: 'get' + }) +} +// 获得库位列表(All) +export function listAll() { + return request({ + url: '/extend/warehouse-location/listAll', + method: 'get' + }) +} +// 获得库位code +export function getCode() { + return request({ + url: '/extend/warehouse-location/getCode', + method: 'get' + }) +} +// 获得库位分页 +export function getWarehouseLocationPage(data) { + return request({ + url: '/extend/warehouse-location/page', + method: 'POST', + data: data + }) +} +// 获得库存总览数据 +export function getOverview(data) { + return request({ + url: '/extend/warehouse-monitoring/getOverview', + method: 'POST', + data: data + }) +} +// 获得库位占用率数据 +export function getRate(data) { + return request({ + url: '/extend/warehouse-monitoring/getRate', + method: 'POST', + data: data + }) +} + +// 导出库位 Excel +export function exportWarehouseLocationExcel(query) { + return request({ + url: '/extend/warehouse-location/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseRealtime.js b/src/api/warehouse/warehouseRealtime.js new file mode 100644 index 00000000..4ce73e64 --- /dev/null +++ b/src/api/warehouse/warehouseRealtime.js @@ -0,0 +1,83 @@ +import request from '@/utils/request' + +// 创建出入库-无库位-入库 +export function createWarehouseRealtime(data) { + return request({ + url: '/extend/warehouse-realtime/create', + method: 'post', + data: data + }) +} +// 创建出入库-无库位-出库 +export function outWarehouseRealtime(data) { + return request({ + url: '/extend/warehouse-realtime/out', + method: 'post', + data: data + }) +} +// 更新出入库-无库位 +export function updateWarehouseRealtime(data) { + return request({ + url: '/extend/warehouse-realtime/update', + method: 'put', + data: data + }) +} + +// 删除出入库-无库位 +export function deleteWarehouseRealtime(id) { + return request({ + url: '/extend/warehouse-realtime/delete?id=' + id, + method: 'delete' + }) +} + +// 获得出入库-无库位 +export function getWarehouseRealtime(id) { + return request({ + url: '/extend/warehouse-realtime/get?id=' + id, + method: 'get' + }) +} +// 获得出入库-无库位-展开详情 +export function getWarehouseRealtimeDet(id) { + return request({ + url: '/extend/warehouse-realtime/getDet?id=' + id, + method: 'get' + }) +} +// 获得出入库-无库位-批次列表 +export function getBatchList(id) { + return request({ + url: '/extend/warehouse-realtime/getBatchList?id=' + id, + method: 'get' + }) +} +// 获得出入库-无库位分页 +export function getWarehouseRealtimePage(data) { + return request({ + url: '/extend/warehouse-realtime/page', + method: 'post', + data: data + }) +} + +// 获得出入库-无库位-历史分页 +export function getWarehouseRealtimeHisPage(data) { + return request({ + url: '/extend/warehouse-his/page', + method: 'post', + data: data + }) +} + +// 导出出入库-无库位 Excel +export function exportWarehouseRealtimeExcel(query) { + return request({ + url: '/extend/warehouse-realtime/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/api/warehouse/warehouseRealtimeLocation.js b/src/api/warehouse/warehouseRealtimeLocation.js new file mode 100644 index 00000000..af525c30 --- /dev/null +++ b/src/api/warehouse/warehouseRealtimeLocation.js @@ -0,0 +1,85 @@ +import request from '@/utils/request' + +// 创建出入库-有库位 +export function createWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/create', + method: 'post', + data: data + }) +} + +// 更新出入库-有库位 +export function updateWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/update', + method: 'put', + data: data + }) +} +// 出入库-有库位 > 出库操作 +export function outWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/out', + method: 'post', + data: data + }) +} + +// 出入库-有库位 > 入库操作 +export function inWarehouseRealtimeLocation(data) { + return request({ + url: '/extend/warehouse-realtime-location/in', + method: 'post', + data: data + }) +} + +// 删除出入库-有库位 +export function deleteWarehouseRealtimeLocation(id) { + return request({ + url: '/extend/warehouse-realtime-location/delete?id=' + id, + method: 'delete' + }) +} + +// 获得出入库-有库位 +export function getWarehouseRealtimeLocation(id) { + return request({ + url: '/extend/warehouse-realtime-location/get?id=' + id, + method: 'get' + }) +} +// 获得出入库历史-有库位详情列表 +export function getWarehouseLocationHisDet(id) { + return request({ + url: '/extend/warehouse-location-his-det/list?hisId=' + id, + method: 'get' + }) +} +// 获得出入库-有库位分页 +export function getWarehouseRealtimeLocationPage(data) { + return request({ + url: '/extend/warehouse-realtime-location/page', + method: 'post', + data: data + }) +} +// 获得出入库历史-有库位分页 +export function getWarehouseLocationHisPage(data) { + return request({ + url: '/extend/warehouse-location-his/page', + method: 'post', + data: data + }) +} + +// 导出出入库-有库位 Excel +export function exportWarehouseRealtimeLocationExcel(query) { + return request({ + url: '/extend/warehouse-realtime-location/export-excel', + method: 'get', + params: query, + responseType: 'blob' + }) +} diff --git a/src/assets/icons/svg/table_add.svg b/src/assets/icons/svg/table_add.svg new file mode 100644 index 00000000..812dde4b --- /dev/null +++ b/src/assets/icons/svg/table_add.svg @@ -0,0 +1,19 @@ + + + + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/components/DialogForm/index.vue b/src/components/DialogForm/index.vue index f0c324ea..4449dab1 100644 --- a/src/components/DialogForm/index.vue +++ b/src/components/DialogForm/index.vue @@ -66,7 +66,10 @@ :key="col.key" :disabled="disabled" :is="col.subcomponent" - :inlineStyle="col.style"> + v-model="form[col.prop]" + :inlineStyle="col.style" + @on-change="$emit('update', form)" + v-bind="col.bind">
- 选取文件 + 选取文件
请上传 @@ -66,6 +66,11 @@ export default { isShowTip: { type: Boolean, default: true + }, + // 是否禁用 + disabled: { + type: Boolean, + default: false } }, data() { @@ -179,6 +184,7 @@ export default { }, // 获取文件名称 getFileName(name) { + console.log('你好', name) if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { diff --git a/src/styles/index.scss b/src/styles/index.scss index f77398f4..93916ac0 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -180,6 +180,7 @@ input, textarea{ // 抽屉head区域---start .el-drawer__header { padding-bottom: 20px; + padding-left: 30px; margin-bottom: 23px; font-size: 20px; font-weight: 500; diff --git a/src/views/base/coreAlarmLog/index.vue b/src/views/base/coreAlarmLog/index.vue new file mode 100644 index 00000000..731bb4ab --- /dev/null +++ b/src/views/base/coreAlarmLog/index.vue @@ -0,0 +1,182 @@ + + + diff --git a/src/views/base/coreCustomer/add-or-updata.vue b/src/views/base/coreCustomer/add-or-updata.vue new file mode 100644 index 00000000..8dd236e5 --- /dev/null +++ b/src/views/base/coreCustomer/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue new file mode 100644 index 00000000..20a89f74 --- /dev/null +++ b/src/views/base/coreCustomer/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreDepartment/add-or-updata.vue b/src/views/base/coreDepartment/add-or-updata.vue new file mode 100644 index 00000000..cbf4c943 --- /dev/null +++ b/src/views/base/coreDepartment/add-or-updata.vue @@ -0,0 +1,107 @@ + + + + diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue new file mode 100644 index 00000000..97b6e59e --- /dev/null +++ b/src/views/base/coreDepartment/index.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/base/coreMajor/add-or-updata.vue b/src/views/base/coreMajor/add-or-updata.vue new file mode 100644 index 00000000..b02ea231 --- /dev/null +++ b/src/views/base/coreMajor/add-or-updata.vue @@ -0,0 +1,77 @@ + + + + diff --git a/src/views/base/coreMajor/index.vue b/src/views/base/coreMajor/index.vue new file mode 100644 index 00000000..052af981 --- /dev/null +++ b/src/views/base/coreMajor/index.vue @@ -0,0 +1,168 @@ + + + diff --git a/src/views/base/coreProduct/SmallTitle.vue b/src/views/base/coreProduct/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/coreProduct/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/coreProduct/add-or-updata.vue b/src/views/base/coreProduct/add-or-updata.vue new file mode 100644 index 00000000..d95df6d0 --- /dev/null +++ b/src/views/base/coreProduct/add-or-updata.vue @@ -0,0 +1,417 @@ + + + + + diff --git a/src/views/base/coreProduct/attr-add.vue b/src/views/base/coreProduct/attr-add.vue new file mode 100644 index 00000000..87285750 --- /dev/null +++ b/src/views/base/coreProduct/attr-add.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/src/views/base/coreProduct/index.vue b/src/views/base/coreProduct/index.vue new file mode 100644 index 00000000..97f1a642 --- /dev/null +++ b/src/views/base/coreProduct/index.vue @@ -0,0 +1,186 @@ + + + diff --git a/src/views/base/coreProductionLine/add-or-updata.vue b/src/views/base/coreProductionLine/add-or-updata.vue new file mode 100644 index 00000000..6b59fdc2 --- /dev/null +++ b/src/views/base/coreProductionLine/add-or-updata.vue @@ -0,0 +1,114 @@ + + + + diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue new file mode 100644 index 00000000..21b441cf --- /dev/null +++ b/src/views/base/coreProductionLine/index.vue @@ -0,0 +1,177 @@ + + + diff --git a/src/views/base/coreSupplier/add-or-updata.vue b/src/views/base/coreSupplier/add-or-updata.vue new file mode 100644 index 00000000..f718363c --- /dev/null +++ b/src/views/base/coreSupplier/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue new file mode 100644 index 00000000..3da6699f --- /dev/null +++ b/src/views/base/coreSupplier/index.vue @@ -0,0 +1,176 @@ + + + diff --git a/src/views/base/coreWorkOrder/SmallTitle.vue b/src/views/base/coreWorkOrder/SmallTitle.vue new file mode 100644 index 00000000..93b4a18f --- /dev/null +++ b/src/views/base/coreWorkOrder/SmallTitle.vue @@ -0,0 +1,65 @@ + + + + + + diff --git a/src/views/base/coreWorkOrder/add-or-updata.vue b/src/views/base/coreWorkOrder/add-or-updata.vue new file mode 100644 index 00000000..cf52a675 --- /dev/null +++ b/src/views/base/coreWorkOrder/add-or-updata.vue @@ -0,0 +1,306 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/addWorkOrder.vue b/src/views/base/coreWorkOrder/addWorkOrder.vue new file mode 100644 index 00000000..ce76ebc9 --- /dev/null +++ b/src/views/base/coreWorkOrder/addWorkOrder.vue @@ -0,0 +1,301 @@ + + \ No newline at end of file diff --git a/src/views/base/coreWorkOrder/attr-add.vue b/src/views/base/coreWorkOrder/attr-add.vue new file mode 100644 index 00000000..e12787e0 --- /dev/null +++ b/src/views/base/coreWorkOrder/attr-add.vue @@ -0,0 +1,211 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue new file mode 100644 index 00000000..e201d561 --- /dev/null +++ b/src/views/base/coreWorkOrder/detail.vue @@ -0,0 +1,413 @@ + + + + + diff --git a/src/views/base/coreWorkOrder/index.vue b/src/views/base/coreWorkOrder/index.vue new file mode 100644 index 00000000..0bfd8b96 --- /dev/null +++ b/src/views/base/coreWorkOrder/index.vue @@ -0,0 +1,401 @@ + + + diff --git a/src/views/base/coreWorker/add-or-updata.vue b/src/views/base/coreWorker/add-or-updata.vue new file mode 100644 index 00000000..78e959f4 --- /dev/null +++ b/src/views/base/coreWorker/add-or-updata.vue @@ -0,0 +1,339 @@ + + + + diff --git a/src/views/base/coreWorker/index.vue b/src/views/base/coreWorker/index.vue new file mode 100644 index 00000000..c5a6ccdf --- /dev/null +++ b/src/views/base/coreWorker/index.vue @@ -0,0 +1,204 @@ + + + diff --git a/src/views/base/coreWorkshopSection/add-or-updata.vue b/src/views/base/coreWorkshopSection/add-or-updata.vue new file mode 100644 index 00000000..271400e8 --- /dev/null +++ b/src/views/base/coreWorkshopSection/add-or-updata.vue @@ -0,0 +1,103 @@ + + + + diff --git a/src/views/base/coreWorkshopSection/index.vue b/src/views/base/coreWorkshopSection/index.vue new file mode 100644 index 00000000..493cf42e --- /dev/null +++ b/src/views/base/coreWorkshopSection/index.vue @@ -0,0 +1,172 @@ + + + diff --git a/src/views/base/custom/index.vue b/src/views/base/custom/index.vue index 873693a1..ab412ea9 100644 --- a/src/views/base/custom/index.vue +++ b/src/views/base/custom/index.vue @@ -134,7 +134,7 @@ import printPreview from './preview' import { MessageBox } from 'element-ui' import { hiprint } from 'vue-plugin-hiprint' import providers from './providers' -import printData from './print-data' +// import printData from './print-data' import $ from 'jquery' import SmallTitle from './SmallTitle.vue' let hiprintTemplate = null @@ -160,6 +160,7 @@ export default { // width: 220, // height: 80 }, + printData:{}, drawer: false, // 纸张类型 paperTypes: { @@ -355,13 +356,13 @@ export default { }, preView() { const { width } = this.curPaper - this.$refs.preView.show(hiprintTemplate, printData, width) + this.$refs.preView.show(hiprintTemplate, this.printData, width) }, print() { // if (window.hiwebSocket.opened) { const printerList = hiprintTemplate.getPrinterList() console.log(printerList) - hiprintTemplate.print2(printData, { printer: '', title: '预览打印' }) + hiprintTemplate.print2(this.printData, { printer: '', title: '预览打印' }) // return // } // this.$message.error('客户端未连接,无法直接打印') diff --git a/src/views/base/material/add-or-updata.vue b/src/views/base/material/add-or-updata.vue index 43874659..c4480fb3 100644 --- a/src/views/base/material/add-or-updata.vue +++ b/src/views/base/material/add-or-updata.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2023-10-27 15:11:02 + * @LastEditTime: 2023-11-06 19:44:24 * @Description: -->