diff --git a/src/api/mes/criticalComponent/index.ts b/src/api/mes/criticalComponent/index.ts index 9dd85ebe..662913fd 100644 --- a/src/api/mes/criticalComponent/index.ts +++ b/src/api/mes/criticalComponent/index.ts @@ -13,7 +13,9 @@ export const CriticalComponentApi = { getCriticalComponentPage: async (params: any) => { return await request.get({ url: `/mes/critical-component/page`, params }) }, - + getCriticalComponentList: async () => { + return await request.get({ url: `/mes/critical-component/list`, }) + }, createCriticalComponent: async (data: Partial) => { return await request.post({ url: `/mes/critical-component/create`, data }) }, diff --git a/src/api/mes/dvsubject/index.ts b/src/api/mes/dvsubject/index.ts index 02b9ac41..dfbfe8f3 100644 --- a/src/api/mes/dvsubject/index.ts +++ b/src/api/mes/dvsubject/index.ts @@ -14,6 +14,8 @@ export interface DvSubjectVO { judgmentCriteria: string // 判定基准 creator?: string // 创建人 createTime?: string | number | Date // 创建时间 + upperVal?: number + lowerVal?: number } // 维保项目 API @@ -22,6 +24,10 @@ export const DvSubjectApi = { getDvSubjectPage: async (params: any) => { return await request.get({ url: `/mes/dv-subject/page`, params }) }, + // 查询维保项目列表 + getDvSubjectList: async () => { + return await request.get({ url: `/mes/dv-subject/list` }) + }, // 查询维保项目详情 getDvSubject: async (id: number) => { diff --git a/src/layout/components/Setting/src/Setting.vue b/src/layout/components/Setting/src/Setting.vue index 3b84d9f5..04d0214b 100644 --- a/src/layout/components/Setting/src/Setting.vue +++ b/src/layout/components/Setting/src/Setting.vue @@ -81,7 +81,7 @@ const setMenuTheme = (color: string) => { // 左侧菜单选中字体颜色 leftMenuTextActiveColor: isDarkColor ? '#fff' : 'var(--el-color-primary)', // logo字体颜色 - logoTitleTextColor: isDarkColor ? '#fff' : 'inherit', + logoTitleTextColor: isDarkColor ? '#fff' : '#409EFF', // logo边框颜色 logoBorderColor: isDarkColor ? color : '#eee' } diff --git a/src/locales/en.ts b/src/locales/en.ts index 4a594b68..719b4ad1 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -55,7 +55,8 @@ export default { operate: 'Operation', copy: 'Copy', copySuccess: 'Copy Success', - copyError: 'Copy Error' + copyError: 'Copy Error', + code:'Auto-generate on Save' }, lock: { lockScreen: 'Lock screen', @@ -808,6 +809,8 @@ export default { inspectionMethod: 'Inspection Method', valueType: 'Value Type', judgmentCriteria: 'Judgment Criteria', + upperVal: 'Upper Value', + lowerVal: 'Lower Value', creatorName: 'Creator', createTime: 'Create Time', operate: 'Operate', @@ -823,7 +826,9 @@ export default { placeholderProjectCode: 'Please input project code', placeholderProjectName: 'Please input project name', placeholderInspectionMethod: 'Please select inspection method', - placeholderValueType: 'Please select value type' + placeholderValueType: 'Please select value type', + placeholderUpperVal: 'Please input upper value', + placeholderLowerVal: 'Please input lower value', }, // Plan Maintenance PlanMaintenance: { diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 9e88f36f..7e1bb935 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -801,6 +801,8 @@ export default { inspectionMethod: '检验方式', valueType: '值类型', judgmentCriteria: '判定基准', + upperVal: '上限值', + lowerVal: '下限值', creatorName: '创建人', createTime: '创建时间', operate: '操作', @@ -816,7 +818,9 @@ export default { placeholderProjectCode: '请输入项目编码', placeholderProjectName: '请输入项目名称', placeholderInspectionMethod: '请选择检验方式', - placeholderValueType: '请选择值类型' + placeholderValueType: '请选择值类型', + placeholderUpperVal: '请输入上限值', + placeholderLowerVal: '请输入下限值', }, // 方案维护 diff --git a/src/views/erp/stock/in/StockInForm.vue b/src/views/erp/stock/in/StockInForm.vue index 71b26cb3..7e57f3aa 100644 --- a/src/views/erp/stock/in/StockInForm.vue +++ b/src/views/erp/stock/in/StockInForm.vue @@ -66,7 +66,7 @@ /> - + - - + diff --git a/src/views/erp/stock/out/StockOutForm.vue b/src/views/erp/stock/out/StockOutForm.vue index ddea4f43..ba1c48fa 100644 --- a/src/views/erp/stock/out/StockOutForm.vue +++ b/src/views/erp/stock/out/StockOutForm.vue @@ -102,7 +102,6 @@ import { StockOutApi, StockOutVO } from '@/api/erp/stock/out' import StockOutItemForm from './components/StockOutItemForm.vue' import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer' -import {DICT_TYPE, getBoolDictOptions, getStrDictOptions} from "@/utils/dict"; /** ERP 其它出库单表单 */ defineOptions({ name: 'StockOutForm' }) @@ -140,14 +139,14 @@ const options = [ label: '备件出库', }, - { - value: '原料出库', - label: '原料出库', - }, - { - value: '产品出库', - label: '产品出库', - }, + // { + // value: '原料出库', + // label: '原料出库', + // }, + // { + // value: '产品出库', + // label: '产品出库', + // }, { value: '领料出库', label: '领料出库', diff --git a/src/views/formula/formulaType/index.vue b/src/views/formula/formulaType/index.vue index 4445bc3b..ee42c728 100644 --- a/src/views/formula/formulaType/index.vue +++ b/src/views/formula/formulaType/index.vue @@ -63,7 +63,7 @@ row-key="id" @selection-change="handleSelectionChange" > - + - { const [deviceTypeRes, userRes, criticalRes, beijianRes] = await Promise.all([ DeviceTypeApi.getDeviceTypeTree({ pageNo: 1, pageSize: 10 }), getSimpleUserList(), - CriticalComponentApi.getCriticalComponentPage({}), + CriticalComponentApi.getCriticalComponentList(), ProductApi.getComponentSimpleList() ]) deviceTypeTree.value = deviceTypeRes users.value = userRes ?? [] - criticalComponentOptions.value = (criticalRes?.list ?? []).map((item: any) => { + criticalComponentOptions.value = (criticalRes ?? []).map((item: any) => { const code = item.code ? String(item.code) : '' const name = item.name ? String(item.name) : '' const label = code && name ? `${code}-${name}` : name || code || String(item.id) diff --git a/src/views/mes/dvsubject/DvSubjectForm.vue b/src/views/mes/dvsubject/DvSubjectForm.vue index 3ee2676f..d65bc88e 100644 --- a/src/views/mes/dvsubject/DvSubjectForm.vue +++ b/src/views/mes/dvsubject/DvSubjectForm.vue @@ -42,6 +42,24 @@ + + + + + + { isEnable: formData.value.isEnable, inspectionMethod: formData.value.inspectionMethod, valueType: formData.value.valueType, - judgmentCriteria: formData.value.judgmentCriteria + judgmentCriteria: formData.value.judgmentCriteria, + upperVal: formData.value.upperVal, + lowerVal: formData.value.lowerVal } as unknown as DvSubjectVO if (formType.value === 'create') { await DvSubjectApi.createDvSubject(data) @@ -167,6 +189,8 @@ const resetForm = () => { inspectionMethod: undefined, valueType: undefined, judgmentCriteria: undefined, + upperVal: undefined, + lowerVal: undefined } formRef.value?.resetFields() } diff --git a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue index 8570de80..278d2548 100644 --- a/src/views/mes/planMaintenance/PlanMaintenanceForm.vue +++ b/src/views/mes/planMaintenance/PlanMaintenanceForm.vue @@ -66,9 +66,9 @@ const formType = ref<'create' | 'update'>('create') const subjectOptions = ref([]) const ensureSubjectOptionsLoaded = async () => { if (subjectOptions.value.length) return - const res = await DvSubjectApi.getDvSubjectPage({}) - const list = Array.isArray(res) ? res : res?.list - subjectOptions.value = (list ?? []) as DvSubjectVO[] + const res = await DvSubjectApi.getDvSubjectList() + console.log(res) + subjectOptions.value = (res ?? []) as DvSubjectVO[] } const parseIds = (value: any): Array => { diff --git a/src/views/mes/planMaintenance/index.vue b/src/views/mes/planMaintenance/index.vue index c2771800..297f1dfe 100644 --- a/src/views/mes/planMaintenance/index.vue +++ b/src/views/mes/planMaintenance/index.vue @@ -1,6 +1,6 @@