From ee7ea361f34ca5bc6c3e8bc7231f6c1994d74457 Mon Sep 17 00:00:00 2001 From: chenshuichuan <1154693969@qq.com> Date: Tue, 28 May 2024 15:28:34 +0800 Subject: [PATCH] fix task --- src/api/erp/product/product/index.ts | 7 +- src/utils/dict.ts | 215 +++++++++--------- src/views/erp/mold/components/MoldForm.vue | 13 +- src/views/mes/bom/BomForm.vue | 11 +- .../mes/bom/components/BomDetailForm.vue | 27 +-- .../mes/bom/components/BomDetailList.vue | 2 +- .../itemrequisition/ItemRequisitionForm.vue | 23 +- src/views/mes/itemrequisition/index.vue | 35 +-- src/views/mes/plan/PlanForm.vue | 15 +- src/views/mes/plan/index.vue | 45 ++-- .../mes/task/components/TaskDetailForm.vue | 55 ++++- .../mes/task/components/TaskDetailList.vue | 6 +- 12 files changed, 235 insertions(+), 219 deletions(-) diff --git a/src/api/erp/product/product/index.ts b/src/api/erp/product/product/index.ts index 1136282f..8048687e 100644 --- a/src/api/erp/product/product/index.ts +++ b/src/api/erp/product/product/index.ts @@ -27,8 +27,13 @@ export const ProductApi = { // 查询产品精简列表 getProductSimpleList: async () => { - return await request.get({ url: `/erp/product/simple-list` }) + return await request.get({ url: `/erp/product/simple-list-product` }) }, + // 查询原料精简列表 + getItemSimpleList: async () => { + return await request.get({ url: `/erp/product/simple-list-item` }) + }, + // 查询产品详情 getProduct: async (id: number) => { diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 580ff1d2..e5f21789 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -101,150 +101,141 @@ export const getDictLabel = (dictType: string, value: any): string => { } - - - - - - export enum DICT_TYPE { -USER_TYPE = 'user_type', -COMMON_STATUS = 'common_status', -TERMINAL = 'terminal',// 终端 -DATE_INTERVAL = 'date_interval',// 数据间隔 - - + USER_TYPE = 'user_type', + COMMON_STATUS = 'common_status', + TERMINAL = 'terminal',// 终端 + DATE_INTERVAL = 'date_interval',// 数据间隔 // ========== SYSTEM 模块 ========== -SYSTEM_USER_SEX = 'system_user_sex', -SYSTEM_MENU_TYPE = 'system_menu_type', -SYSTEM_ROLE_TYPE = 'system_role_type', -SYSTEM_DATA_SCOPE = 'system_data_scope', -SYSTEM_NOTICE_TYPE = 'system_notice_type', -SYSTEM_LOGIN_TYPE = 'system_login_type', -SYSTEM_LOGIN_RESULT = 'system_login_result', -SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code', -SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type', -SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status', -SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status', -SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type', -SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type', -SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status', -SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type', -SYSTEM_SOCIAL_TYPE = 'system_social_type', + SYSTEM_USER_SEX = 'system_user_sex', + SYSTEM_MENU_TYPE = 'system_menu_type', + SYSTEM_ROLE_TYPE = 'system_role_type', + SYSTEM_DATA_SCOPE = 'system_data_scope', + SYSTEM_NOTICE_TYPE = 'system_notice_type', + SYSTEM_LOGIN_TYPE = 'system_login_type', + SYSTEM_LOGIN_RESULT = 'system_login_result', + SYSTEM_SMS_CHANNEL_CODE = 'system_sms_channel_code', + SYSTEM_SMS_TEMPLATE_TYPE = 'system_sms_template_type', + SYSTEM_SMS_SEND_STATUS = 'system_sms_send_status', + SYSTEM_SMS_RECEIVE_STATUS = 'system_sms_receive_status', + SYSTEM_ERROR_CODE_TYPE = 'system_error_code_type', + SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type', + SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status', + SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type', + SYSTEM_SOCIAL_TYPE = 'system_social_type', // ========== INFRA 模块 ========== -INFRA_BOOLEAN_STRING = 'infra_boolean_string', -INFRA_JOB_STATUS = 'infra_job_status', -INFRA_JOB_LOG_STATUS = 'infra_job_log_status', -INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status', -INFRA_CONFIG_TYPE = 'infra_config_type', -INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type', -INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type', -INFRA_CODEGEN_SCENE = 'infra_codegen_scene', -INFRA_FILE_STORAGE = 'infra_file_storage', -INFRA_OPERATE_TYPE = 'infra_operate_type', + INFRA_BOOLEAN_STRING = 'infra_boolean_string', + INFRA_JOB_STATUS = 'infra_job_status', + INFRA_JOB_LOG_STATUS = 'infra_job_log_status', + INFRA_API_ERROR_LOG_PROCESS_STATUS = 'infra_api_error_log_process_status', + INFRA_CONFIG_TYPE = 'infra_config_type', + INFRA_CODEGEN_TEMPLATE_TYPE = 'infra_codegen_template_type', + INFRA_CODEGEN_FRONT_TYPE = 'infra_codegen_front_type', + INFRA_CODEGEN_SCENE = 'infra_codegen_scene', + INFRA_FILE_STORAGE = 'infra_file_storage', + INFRA_OPERATE_TYPE = 'infra_operate_type', // ========== BPM 模块 ========== -BPM_MODEL_FORM_TYPE = 'bpm_model_form_type', -BPM_TASK_CANDIDATE_STRATEGY = 'bpm_task_candidate_strategy', -BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status', -BPM_TASK_STATUS = 'bpm_task_status', -BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type', -BPM_PROCESS_LISTENER_TYPE = 'bpm_process_listener_type', -BPM_PROCESS_LISTENER_VALUE_TYPE = 'bpm_process_listener_value_type', + BPM_MODEL_FORM_TYPE = 'bpm_model_form_type', + BPM_TASK_CANDIDATE_STRATEGY = 'bpm_task_candidate_strategy', + BPM_PROCESS_INSTANCE_STATUS = 'bpm_process_instance_status', + BPM_TASK_STATUS = 'bpm_task_status', + BPM_OA_LEAVE_TYPE = 'bpm_oa_leave_type', + BPM_PROCESS_LISTENER_TYPE = 'bpm_process_listener_type', + BPM_PROCESS_LISTENER_VALUE_TYPE = 'bpm_process_listener_value_type', // ========== PAY 模块 ========== -PAY_CHANNEL_CODE = 'pay_channel_code',// 支付渠道编码类型 -PAY_ORDER_STATUS = 'pay_order_status',// 商户支付订单状态 -PAY_REFUND_STATUS = 'pay_refund_status',// 退款订单状态 -PAY_NOTIFY_STATUS = 'pay_notify_status',// 商户支付回调状态 -PAY_NOTIFY_TYPE = 'pay_notify_type',// 商户支付回调状态 -PAY_TRANSFER_STATUS = 'pay_transfer_status',// 转账订单状态 -PAY_TRANSFER_TYPE = 'pay_transfer_type',// 转账订单状态 - - + PAY_CHANNEL_CODE = 'pay_channel_code',// 支付渠道编码类型 + PAY_ORDER_STATUS = 'pay_order_status',// 商户支付订单状态 + PAY_REFUND_STATUS = 'pay_refund_status',// 退款订单状态 + PAY_NOTIFY_STATUS = 'pay_notify_status',// 商户支付回调状态 + PAY_NOTIFY_TYPE = 'pay_notify_type',// 商户支付回调状态 + PAY_TRANSFER_STATUS = 'pay_transfer_status',// 转账订单状态 + PAY_TRANSFER_TYPE = 'pay_transfer_type',// 转账订单状态 // ========== MP 模块 ========== -MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match',// 自动回复请求匹配类型 -MP_MESSAGE_TYPE = 'mp_message_type',// 消息类型 + MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match',// 自动回复请求匹配类型 + MP_MESSAGE_TYPE = 'mp_message_type',// 消息类型 // ========== Member 会员模块 ========== -MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type',// 积分的业务类型 -MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type',// 会员经验业务类型 + MEMBER_POINT_BIZ_TYPE = 'member_point_biz_type',// 积分的业务类型 + MEMBER_EXPERIENCE_BIZ_TYPE = 'member_experience_biz_type',// 会员经验业务类型 // ========== MALL - 商品模块 ========== -PRODUCT_SPU_STATUS = 'product_spu_status',//商品状态 + PRODUCT_SPU_STATUS = 'product_spu_status',//商品状态 // ========== MALL - 交易模块 ========== -EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode',//快递的计费方式 -TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status',// 售后 - 状态 -TRADE_AFTER_SALE_WAY = 'trade_after_sale_way',// 售后 - 方式 -TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type',// 售后 - 类型 -TRADE_ORDER_TYPE = 'trade_order_type',// 订单 - 类型 -TRADE_ORDER_STATUS = 'trade_order_status',// 订单 - 状态 -TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status',// 订单项 - 售后状态 -TRADE_DELIVERY_TYPE = 'trade_delivery_type',// 配送方式 -BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition',// 分佣模式 -BROKERAGE_BIND_MODE = 'brokerage_bind_mode',// 分销关系绑定模式 -BROKERAGE_BANK_NAME = 'brokerage_bank_name',// 佣金提现银行 -BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type',// 佣金提现类型 -BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type',// 佣金业务类型 -BROKERAGE_RECORD_STATUS = 'brokerage_record_status',// 佣金状态 -BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status',// 佣金提现状态 + EXPRESS_CHARGE_MODE = 'trade_delivery_express_charge_mode',//快递的计费方式 + TRADE_AFTER_SALE_STATUS = 'trade_after_sale_status',// 售后 - 状态 + TRADE_AFTER_SALE_WAY = 'trade_after_sale_way',// 售后 - 方式 + TRADE_AFTER_SALE_TYPE = 'trade_after_sale_type',// 售后 - 类型 + TRADE_ORDER_TYPE = 'trade_order_type',// 订单 - 类型 + TRADE_ORDER_STATUS = 'trade_order_status',// 订单 - 状态 + TRADE_ORDER_ITEM_AFTER_SALE_STATUS = 'trade_order_item_after_sale_status',// 订单项 - 售后状态 + TRADE_DELIVERY_TYPE = 'trade_delivery_type',// 配送方式 + BROKERAGE_ENABLED_CONDITION = 'brokerage_enabled_condition',// 分佣模式 + BROKERAGE_BIND_MODE = 'brokerage_bind_mode',// 分销关系绑定模式 + BROKERAGE_BANK_NAME = 'brokerage_bank_name',// 佣金提现银行 + BROKERAGE_WITHDRAW_TYPE = 'brokerage_withdraw_type',// 佣金提现类型 + BROKERAGE_RECORD_BIZ_TYPE = 'brokerage_record_biz_type',// 佣金业务类型 + BROKERAGE_RECORD_STATUS = 'brokerage_record_status',// 佣金状态 + BROKERAGE_WITHDRAW_STATUS = 'brokerage_withdraw_status',// 佣金提现状态 // ========== MALL - 营销模块 ========== -PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type',// 优惠类型 -PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope',// 营销的商品范围 -PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type',// 优惠劵模板的有限期类型 -PROMOTION_COUPON_STATUS = 'promotion_coupon_status',// 优惠劵的状态 -PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type',// 优惠劵的领取方式 -PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status',// 优惠活动的状态 -PROMOTION_CONDITION_TYPE = 'promotion_condition_type',// 营销的条件类型枚举 -PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status',// 砍价记录的状态 -PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status',// 拼团记录的状态 -PROMOTION_BANNER_POSITION = 'promotion_banner_position',// banner 定位 + PROMOTION_DISCOUNT_TYPE = 'promotion_discount_type',// 优惠类型 + PROMOTION_PRODUCT_SCOPE = 'promotion_product_scope',// 营销的商品范围 + PROMOTION_COUPON_TEMPLATE_VALIDITY_TYPE = 'promotion_coupon_template_validity_type',// 优惠劵模板的有限期类型 + PROMOTION_COUPON_STATUS = 'promotion_coupon_status',// 优惠劵的状态 + PROMOTION_COUPON_TAKE_TYPE = 'promotion_coupon_take_type',// 优惠劵的领取方式 + PROMOTION_ACTIVITY_STATUS = 'promotion_activity_status',// 优惠活动的状态 + PROMOTION_CONDITION_TYPE = 'promotion_condition_type',// 营销的条件类型枚举 + PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status',// 砍价记录的状态 + PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status',// 拼团记录的状态 + PROMOTION_BANNER_POSITION = 'promotion_banner_position',// banner 定位 // ========== CRM - 客户管理模块 ========== -CRM_AUDIT_STATUS = 'crm_audit_status',// CRM 审批状态 -CRM_BIZ_TYPE = 'crm_biz_type',// CRM 业务类型 -CRM_BUSINESS_END_STATUS_TYPE = 'crm_business_end_status_type',// CRM 商机结束状态类型 -CRM_RECEIVABLE_RETURN_TYPE = 'crm_receivable_return_type',// CRM 回款的还款方式 -CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',// CRM 客户所属行业 -CRM_CUSTOMER_LEVEL = 'crm_customer_level',// CRM 客户级别 -CRM_CUSTOMER_SOURCE = 'crm_customer_source',// CRM 客户来源 -CRM_PRODUCT_STATUS = 'crm_product_status',// CRM 商品状态 -CRM_PERMISSION_LEVEL = 'crm_permission_level',// CRM 数据权限的级别 -CRM_PRODUCT_UNIT = 'crm_product_unit',// CRM 产品单位 -CRM_FOLLOW_UP_TYPE = 'crm_follow_up_type',// CRM 跟进方式 + CRM_AUDIT_STATUS = 'crm_audit_status',// CRM 审批状态 + CRM_BIZ_TYPE = 'crm_biz_type',// CRM 业务类型 + CRM_BUSINESS_END_STATUS_TYPE = 'crm_business_end_status_type',// CRM 商机结束状态类型 + CRM_RECEIVABLE_RETURN_TYPE = 'crm_receivable_return_type',// CRM 回款的还款方式 + CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',// CRM 客户所属行业 + CRM_CUSTOMER_LEVEL = 'crm_customer_level',// CRM 客户级别 + CRM_CUSTOMER_SOURCE = 'crm_customer_source',// CRM 客户来源 + CRM_PRODUCT_STATUS = 'crm_product_status',// CRM 商品状态 + CRM_PERMISSION_LEVEL = 'crm_permission_level',// CRM 数据权限的级别 + CRM_PRODUCT_UNIT = 'crm_product_unit',// CRM 产品单位 + CRM_FOLLOW_UP_TYPE = 'crm_follow_up_type',// CRM 跟进方式 // ========== ERP - 企业资源计划模块 ========== -ERP_AUDIT_STATUS = 'erp_audit_status',// ERP 审批状态 -ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type',// 库存明细的业务类型 -ERP_MOLD_STATUS = 'erp_mold_status',// ERP 模具状态 -ERP_MAINTAIN_TYPE = 'maintain_type',// ERP 保养类型 + ERP_AUDIT_STATUS = 'erp_audit_status',// ERP 审批状态 + ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type',// 库存明细的业务类型 + ERP_MOLD_STATUS = 'erp_mold_status',// ERP 模具状态 + ERP_MAINTAIN_TYPE = 'maintain_type',// ERP 保养类型 -ERP_AUTOCODE_IS_PADDING = "erp_autocode_is_padding", -ERP_AUTOCODE_PADDING_TYPE = "erp_autocode_padding_type", -ERP_AUTOCODE_CYCLEMETHOD = "erp_autocode_cyclemethod", -ERP_AUTOCODE_PARTTYPE = "erp_autocode_parttype", + ERP_AUTOCODE_IS_PADDING = "erp_autocode_is_padding", + ERP_AUTOCODE_PADDING_TYPE = "erp_autocode_padding_type", + ERP_AUTOCODE_CYCLEMETHOD = "erp_autocode_cyclemethod", + ERP_AUTOCODE_PARTTYPE = "erp_autocode_parttype", // ========== MES - 生产管理模块 ========== -MES_ORG_TYPE = "mes_org_type", -MES_ORG_CLASS = "mes_org_class", -MES_ORG_STATUS = "mes_org_status", - -MES_TASK_STATUS = "mes_task_status", -MES_PLAN_STATUS = "mes_plan_status", -MES_RECORD_STATUS = "mes_record_status", -MES_GROUP_TYPE = "mes_group_type", -MES_WORK_TEAM_USER_ROLE = "mes_work_team_user_role" + MES_ORG_TYPE = "mes_org_type", + MES_ORG_CLASS = "mes_org_class", + MES_ORG_STATUS = "mes_org_status", + + MES_TASK_STATUS = "mes_task_status", + MES_PLAN_STATUS = "mes_plan_status", + MES_RECORD_STATUS = "mes_record_status", + MES_GROUP_TYPE = "mes_group_type", + MES_WORK_TEAM_USER_ROLE = "mes_work_team_user_role", + MES_PRODUCE_ITEM_REQUISITION = "mes_produce_item_requisition" } diff --git a/src/views/erp/mold/components/MoldForm.vue b/src/views/erp/mold/components/MoldForm.vue index cbf15ae5..cb637117 100644 --- a/src/views/erp/mold/components/MoldForm.vue +++ b/src/views/erp/mold/components/MoldForm.vue @@ -27,11 +27,12 @@ - @@ -168,7 +169,7 @@ const resetForm = () => { name: undefined, unitId: undefined, machineId: undefined, - useTime: undefined, + useTime: 0, inTime: undefined, status: undefined, images: undefined, @@ -178,4 +179,4 @@ const resetForm = () => { } formRef.value?.resetFields() } - \ No newline at end of file + diff --git a/src/views/mes/bom/BomForm.vue b/src/views/mes/bom/BomForm.vue index ee883cbc..e6cb70f2 100644 --- a/src/views/mes/bom/BomForm.vue +++ b/src/views/mes/bom/BomForm.vue @@ -40,7 +40,14 @@ - + @@ -175,7 +182,7 @@ const resetForm = () => { version: undefined, productId: undefined, unitId: undefined, - yieldRate: undefined, + yieldRate: 100, remark: undefined, isEnable: undefined } diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue index 93e1f363..93ffffd9 100644 --- a/src/views/mes/bom/components/BomDetailForm.vue +++ b/src/views/mes/bom/components/BomDetailForm.vue @@ -9,15 +9,14 @@ > - + \ No newline at end of file + diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue index 6629dd24..9096511b 100644 --- a/src/views/mes/task/components/TaskDetailList.vue +++ b/src/views/mes/task/components/TaskDetailList.vue @@ -11,8 +11,8 @@ - - + + @@ -130,4 +130,4 @@ const handleDelete = async (id: number) => { await getList() } catch {} } - \ No newline at end of file +