linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style：模具管理-点检记录-字段名调整

Browse Source
main
黄伟杰 1 day ago
parent 152838e14b
commit f7ee7787d2
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File

1
src/locales/en.ts
Unescape Escape View File

@ -1497,6 +1497,7 @@ export default {
projectForm: 'Project Form',
startDate: 'Start Date',
endDate: 'End Date',
planEndDate: 'Plan End Date',
cronExpression: 'Cron Expression',
enabled: 'Enabled',
creatorName: 'Creator',

1
src/locales/zh-CN.ts
Unescape Escape View File

@ -1494,6 +1494,7 @@ export default {
projectForm: '项目表单',
startDate: '开始日期',
endDate: '结束日期',
planEndDate: '计划结束时间',
cronExpression: 'cron 表达式',
enabled: '启用',
creatorName: '创建人',

25
src/views/mold/taskConfiguration/TaskConfigurationForm.vue
Unescape Escape View File

@ -34,17 +34,16 @@
<el-option v-for="item in planOptions" :key="String(item.id)" :label="item.planName" :value="String(item.id)" />
</el-select>
</el-form-item>
<el-form-item :label="t('EquipmentManagement.TaskManagement.dateRange')" prop="dateRange">
<el-form-item :label="t('EquipmentManagement.TaskManagement.planEndDate')" prop="endDate">
<el-date-picker
v-model="formData.dateRange"
v-model="formData.endDate"
value-format="YYYY-MM-DD"
type="daterange"
:start-placeholder="t('EquipmentManagement.TaskManagement.placeholderStartDate')"
:end-placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
type="date"
:placeholder="t('EquipmentManagement.TaskManagement.placeholderEndDate')"
class="!w-320px"
/>
</el-form-item>
<el-form-item :label="t('EquipmentManagement.TaskManagement.cronExpression')" prop="cronExpression">
<!-- <el-form-item :label="t('EquipmentManagement.TaskManagement.cronExpression')" prop="cronExpression">
<template #label>
<Tooltip
title="Cron 表达式"
@ -52,7 +51,7 @@
/>
</template>
<crontab v-model="formData.cronExpression" />
</el-form-item>
</el-form-item> -->
<el-form-item :label="t('EquipmentManagement.TaskManagement.operableUsers')" prop="operableUsers">
<el-select
v-model="formData.operableUsers"
@ -145,7 +144,7 @@ const formData = ref({
taskType: undefined as number | undefined,
moldList: [] as string[],
projectForm: [] as string[],
dateRange: [] as string[],
endDate: undefined as string | undefined,
cronExpression: undefined as string | undefined,
operableUsers: [] as string[],
enabled: true as boolean
@ -157,7 +156,7 @@ const formRules = reactive({
enabled: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEnabled'), trigger: 'change' }],
moldList: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDeviceList'), trigger: 'change' }],
projectForm: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderProjectForm'), trigger: 'change' }],
dateRange: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderDateRange'), trigger: 'change' }]
endDate: [{ required: true, message: t('EquipmentManagement.TaskManagement.placeholderEndDate'), trigger: 'change' }]
})
const resetForm = () => {
@ -167,7 +166,7 @@ const resetForm = () => {
taskType: undefined,
moldList: [],
projectForm: [],
dateRange: [],
endDate: undefined,
cronExpression: undefined,
operableUsers: [],
enabled: true
@ -198,7 +197,7 @@ const open = async (type: string, row?: TaskManagementVO) => {
.map((id) => String(id))
formData.value.projectForm = mappedIds
}
formData.value.dateRange = [row.startDate, row.endDate].filter(Boolean) as string[]
formData.value.endDate = row.endDate || undefined
formData.value.cronExpression = row.cronExpression
formData.value.operableUsers = parseIdsValue((row as any).operableUsers)
if (typeof row.enabled === 'boolean') {
@ -219,15 +218,13 @@ const submitForm = async () => {
await formRef.value.validate()
formLoading.value = true
try {
const [startDate, endDate] = Array.isArray(formData.value.dateRange) ? formData.value.dateRange : []
const payload: TaskManagementVO = {
id: formData.value.id,
name: formData.value.name,
taskType: formData.value.taskType,
moldList: toCommaSeparatedIds((formData.value as any).moldList),
projectForm: toCommaSeparatedIds((formData.value as any).projectForm),
startDate: startDate || undefined,
endDate: endDate || undefined,
endDate: formData.value.endDate || undefined,
cronExpression: formData.value.cronExpression,
operableUsers: toCommaSeparatedIds((formData.value as any).operableUsers),
enabled: formData.value.enabled

6
src/views/mold/taskConfiguration/index.vue
Unescape Escape View File

@ -84,9 +84,9 @@
</template>
</el-table-column>
<el-table-column :label="t('EquipmentManagement.TaskManagement.projectForm')" align="center" prop="projectFormName" min-width="140" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.endDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="120" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.cronExpression')" align="center" prop="cronExpression" min-width="180" />
<!-- <el-table-column :label="t('EquipmentManagement.TaskManagement.startDate')" align="center" prop="startDate" :formatter="dateFormatter2" width="120" sortable /> -->
<el-table-column :label="t('EquipmentManagement.TaskManagement.planEndDate')" align="center" prop="endDate" :formatter="dateFormatter2" width="150" sortable />
<!-- <el-table-column :label="t('EquipmentManagement.TaskManagement.cronExpression')" align="center" prop="cronExpression" min-width="180" /> -->
<el-table-column :label="t('EquipmentManagement.TaskManagement.enabled')" align="center" prop="enabled" width="90">
<template #default="scope">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.enabled" />

Write Preview
Loading…
Cancel
Save