From cd891c15a64a5c6cad95e74960514971cef3412f Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Fri, 31 May 2024 14:14:02 +0800 Subject: [PATCH] fix show --- src/api/erp/product/product/index.ts | 4 + src/api/erp/sale/order/index.ts | 14 +- src/api/mes/task/index.ts | 12 +- src/components/Editor/src/Editor.vue | 2 +- src/components/UploadFile/src/UploadFile.vue | 2 +- src/config/axios/service.ts | 4 +- src/views/bpm/model/ModelImportForm.vue | 2 +- .../components/PurchaseOrderItemForm.vue | 2 +- .../mes/bom/components/BomDetailList.vue | 18 +- src/views/mes/bom/index.vue | 10 +- src/views/mes/record/DabaoIndex.vue | 6 +- src/views/mes/task/TaskAddSaleForm.vue | 190 +++++++++++++ .../task/components/SaleOrderItemsList.vue | 116 ++++++++ .../task/components/TaskAddSaleDetailForm.vue | 255 ++++++++++++++++++ .../mes/task/components/TaskDetailForm.vue | 47 +++- .../mes/task/components/TaskDetailList.vue | 6 +- src/views/mes/task/index.vue | 40 +-- src/views/mp/draft/editor-config.ts | 2 +- src/views/system/user/UserImportForm.vue | 2 +- 19 files changed, 680 insertions(+), 54 deletions(-) create mode 100644 src/views/mes/task/TaskAddSaleForm.vue create mode 100644 src/views/mes/task/components/SaleOrderItemsList.vue create mode 100644 src/views/mes/task/components/TaskAddSaleDetailForm.vue diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts index 8048687e..82c9b689 100644 --- a/src/api/erp/product/product/index.ts +++ b/src/api/erp/product/product/index.ts @@ -33,6 +33,10 @@ export const ProductApi = { getItemSimpleList: async () => { return await request.get({ url: `/erp/product/simple-list-item` }) }, + // 查询采购商品精简列表 + getOrderSimpleList: async () => { + return await request.get({ url: `/erp/product/simple-list-order` }) + }, // 查询产品详情 diff --git a/src/api/erp/sale/order/index.ts b/src/api/erp/sale/order/index.ts index 2d2ac53e..44fe559e 100644 --- a/src/api/erp/sale/order/index.ts +++ b/src/api/erp/sale/order/index.ts @@ -13,7 +13,19 @@ export interface SaleOrderVO { outCount: number // 销售出库数量 returnCount: number // 销售退货数量 } - +// ERP 销售订单项 VO +export interface SaleOrderItemsVO { + id: number // 编号 + orderId: number // 销售订单编号 + productId: number // 产品编号 + productUnitId: number // 产品单位单位 + productPrice: number // 产品单价 + count: number // 数量 + totalPrice: number // 总价 + remark: string // 备注 + outCount: number // 销售出库数量 + returnCount: number // 销售退货数量 +} // ERP 销售订单 API export const SaleOrderApi = { // 查询销售订单分页 diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts index 36178e52..5f9050d5 100644 --- a/src/api/mes/task/index.ts +++ b/src/api/mes/task/index.ts @@ -68,5 +68,13 @@ export const TaskApi = { // 获得生产任务单明细 getTaskDetail: async (id: number) => { return await request.get({ url: `/mes/task/task-detail/get?id=` + id }) - } -} \ No newline at end of file + }, + + // ==================== 子表（生产任务单明细） ==================== + + // 获得生产任务单明细列表 + getTaskDetailListByTaskId: async (taskId) => { + return await request.get({ url: `/mes/task/task-detail/list-by-task-id?taskId=` + taskId }) + }, + +} diff --git a/src/components/Editor/src/Editor.vue b/src/components/Editor/src/Editor.vue index eff82745..f493d9fd 100644 --- a/src/components/Editor/src/Editor.vue +++ b/src/components/Editor/src/Editor.vue @@ -105,7 +105,7 @@ const editorConfig = computed((): IEditorConfig => { headers: { Accept: '*', Authorization: 'Bearer ' + getAccessToken(), - 'tenant-id': getTenantId() + 'tenantId': getTenantId() }, // 跨域是否传递 cookie ，默认为 false diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index 4459e69e..545eff2d 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -68,7 +68,7 @@ const emit = defineEmits(['update:modelValue']) const props = defineProps({ modelValue: propTypes.oneOfType([String, Array]).isRequired, - fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg'] + fileType: propTypes.array.def(['png', 'jpg', 'jpeg', 'doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg'] fileSize: propTypes.number.def(5), // 大小限制(MB) limit: propTypes.number.def(5), // 数量限制 autoUpload: propTypes.bool.def(true), // 自动上传 diff --git a/src/config/axios/service.ts b/src/config/axios/service.ts index 25936068..f3073b1f 100644 --- a/src/config/axios/service.ts +++ b/src/config/axios/service.ts @@ -57,7 +57,7 @@ service.interceptors.request.use( // 设置租户 if (tenantEnable && tenantEnable === 'true') { const tenantId = getTenantId() - if (tenantId) (config as Recordable).headers['tenant-id'] = tenantId + if (tenantId) (config as Recordable).headers['tenantId'] = tenantId } const params = config.params || {} const data = config.data || false @@ -199,7 +199,7 @@ service.interceptors.response.use( ) const refreshToken = async () => { - axios.defaults.headers.common['tenant-id'] = getTenantId() + axios.defaults.headers.common['tenantId'] = getTenantId() return await axios.post(base_url + '/system/auth/refresh-token?refreshToken=' + getRefreshToken()) } const handleAuthorized = () => { diff --git a/src/views/bpm/model/ModelImportForm.vue b/src/views/bpm/model/ModelImportForm.vue index 9a91e1d5..854a0b8c 100644 --- a/src/views/bpm/model/ModelImportForm.vue +++ b/src/views/bpm/model/ModelImportForm.vue @@ -93,7 +93,7 @@ const submitForm = async () => { // 提交请求 uploadHeaders.value = { Authorization: 'Bearer ' + getAccessToken(), - 'tenant-id': getTenantId() + 'tenantId': getTenantId() } formLoading.value = true uploadRef.value!.submit() diff --git a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue index 265193e9..94bd0e45 100644 --- a/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue +++ b/src/views/erp/purchase/order/components/PurchaseOrderItemForm.vue @@ -262,7 +262,7 @@ defineExpose({ validate }) /** 初始化 */ onMounted(async () => { - productList.value = await ProductApi.getProductSimpleList() + productList.value = await ProductApi.getOrderSimpleList() // 默认添加一个 if (formData.value.length === 0) { handleAdd() diff --git a/src/views/mes/bom/components/BomDetailList.vue b/src/views/mes/bom/components/BomDetailList.vue index ad05cb36..345ce3a7 100644 --- a/src/views/mes/bom/components/BomDetailList.vue +++ b/src/views/mes/bom/components/BomDetailList.vue @@ -2,30 +2,18 @@ - + - - - - + \ No newline at end of file + diff --git a/src/views/mes/task/TaskAddSaleForm.vue b/src/views/mes/task/TaskAddSaleForm.vue new file mode 100644 index 00000000..17c82819 --- /dev/null +++ b/src/views/mes/task/TaskAddSaleForm.vue @@ -0,0 +1,190 @@ + + diff --git a/src/views/mes/task/components/SaleOrderItemsList.vue b/src/views/mes/task/components/SaleOrderItemsList.vue new file mode 100644 index 00000000..6f5c9f5b --- /dev/null +++ b/src/views/mes/task/components/SaleOrderItemsList.vue @@ -0,0 +1,116 @@ + + + diff --git a/src/views/mes/task/components/TaskAddSaleDetailForm.vue b/src/views/mes/task/components/TaskAddSaleDetailForm.vue new file mode 100644 index 00000000..8888137e --- /dev/null +++ b/src/views/mes/task/components/TaskAddSaleDetailForm.vue @@ -0,0 +1,255 @@ + + diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue index ee46153e..f1c27f80 100644 --- a/src/views/mes/task/components/TaskDetailForm.vue +++ b/src/views/mes/task/components/TaskDetailForm.vue @@ -45,7 +45,7 @@ placeholder="请输入数量" /> - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file + diff --git a/src/views/mp/draft/editor-config.ts b/src/views/mp/draft/editor-config.ts index ee3b95ec..f109d954 100644 --- a/src/views/mp/draft/editor-config.ts +++ b/src/views/mp/draft/editor-config.ts @@ -32,7 +32,7 @@ export const createEditorConfig = ( headers: { Accept: '*', Authorization: 'Bearer ' + getAccessToken(), - 'tenant-id': getTenantId() + 'tenantId': getTenantId() }, // 跨域是否传递 cookie ，默认为 false diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue index 8447b286..edff90e9 100644 --- a/src/views/system/user/UserImportForm.vue +++ b/src/views/system/user/UserImportForm.vue @@ -76,7 +76,7 @@ const submitForm = async () => { // 提交请求 uploadHeaders.value = { Authorization: 'Bearer ' + getAccessToken(), - 'tenant-id': getTenantId() + 'tenantId': getTenantId() } formLoading.value = true uploadRef.value!.submit()