From 8bb7160c9c4fd7ce5893ee673647b13cc35410ae Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 03 三月 2025 17:27:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/data/arc/ArcSettingForm.vue | 119 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 72 insertions(+), 47 deletions(-)
diff --git a/src/views/data/arc/ArcSettingForm.vue b/src/views/data/arc/ArcSettingForm.vue
index 740e1f1..bd5293f 100644
--- a/src/views/data/arc/ArcSettingForm.vue
+++ b/src/views/data/arc/ArcSettingForm.vue
@@ -7,24 +7,55 @@
:rules="formRules"
label-width="120px"
>
- <el-form-item label="名称" prop="name">
- <el-input v-model="formData.name" placeholder="请输入归档名称" />
- </el-form-item>
- <el-form-item label="归档周期" prop="type">
- <el-select
- v-model="formData.type"
- clearable
- placeholder="请选择归档周期"
- >
- <el-option
- v-for="dict in getDictOptions(DICT_TYPE.ARC_TYPE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="归档点位" prop="point">
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="编码" prop="code">
+ <el-input v-model="formData.code" placeholder="请输入编码" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="名称" prop="name">
+ <el-input v-model="formData.name" placeholder="请输入名称" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="归档周期" prop="type">
+ <el-select
+ v-model="formData.type"
+ clearable
+ placeholder="请选择归档周期"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.ARC_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="计算方法" prop="calculate">
+ <el-select
+ v-model="formData.calculate"
+ clearable
+ placeholder="请选择计算方法"
+ >
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.ARC_CALCULATE_TYPE)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="归档点位" prop="point">
<el-select
v-model="formData.point"
filterable
@@ -35,35 +66,25 @@
:label="item.pointName"
:value="item.pointNo"/>
</el-select>
- </el-form-item>
- <el-form-item label="计算方法" prop="calculate">
- <el-select
- v-model="formData.calculate"
- clearable
- placeholder="请选择计算方法"
- >
- <el-option
- v-for="dict in getDictOptions(DICT_TYPE.ARC_CALCULATE_TYPE)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="是否启用" prop="isEnable">
- <el-select
- v-model="formData.isEnable"
- clearable
- placeholder="请选择是否启用"
- >
- <el-option
- v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="是否启用" prop="isEnable">
+ <el-select
+ v-model="formData.isEnable"
+ clearable
+ placeholder="请选择是否启用"
+ >
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COM_IS_INT)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form>
<template #footer>
<el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -87,13 +108,16 @@
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
id: undefined,
+ code: undefined,
name: undefined,
type: undefined,
point: undefined,
calculate: undefined,
+ sort: 1,
isEnable: 1
})
const formRules = reactive({
+ code: [{ required: true, message: '编码不能为空', trigger: 'blur' }],
name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
type: [{ required: true, message: '归档周期不能为空', trigger: 'blur' }],
point: [{ required: true, message: '归档点位不能为空', trigger: 'blur' }],
@@ -162,6 +186,7 @@
type: undefined,
point: undefined,
calculate: undefined,
+ sort: 1,
isEnable: 1
}
formRef.value?.resetFields()
--
Gitblit v1.9.3