From 34766731ba96d42b961079724f0264ef25eedbe7 Mon Sep 17 00:00:00 2001
From: hejianhao <15708179461@qq.com>
Date: 星期三, 14 五月 2025 17:22:56 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/components/DynamicComponent/addTableHeader.vue | 51 ++++++++++++++++++++++++++-------------------------
1 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/laboratory/src/components/DynamicComponent/addTableHeader.vue b/laboratory/src/components/DynamicComponent/addTableHeader.vue
index 5758d3f..0623b5d 100644
--- a/laboratory/src/components/DynamicComponent/addTableHeader.vue
+++ b/laboratory/src/components/DynamicComponent/addTableHeader.vue
@@ -12,7 +12,7 @@
<el-form ref="form" :model="form" :rules="rules" label-position="top">
<el-row :gutter="24">
<el-col :span="24">
- <el-form-item label="表头名称" prop="sampleCode">
+ <el-form-item label="表头名称" prop="name">
<el-input
v-model="form.name"
style="width: 100%"
@@ -21,7 +21,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="表头类型" prop="sampleCode">
+ <el-form-item label="表头类型" prop="type">
<el-radio-group v-model="form.type" style="width: 100%">
<el-radio-button label="text">文本框</el-radio-button>
<el-radio-button label="image">图片上传</el-radio-button>
@@ -31,7 +31,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="操作权限" prop="sampleCode">
+ <el-form-item label="操作权限" prop="role">
<el-select v-model="form.role" placeholder="请选择" style="width: 100%" multiple>
<el-option
v-for="item in options"
@@ -43,8 +43,8 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item label="提示文案" prop="sampleCode">
+ <el-col :span="24" v-if="['text', 'date', 'user'].includes(form.type)">
+ <el-form-item label="提示文案" prop="message">
<el-input
v-model="form.message"
style="width: 100%"
@@ -53,7 +53,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="是否必填" prop="testTypes">
+ <el-form-item label="是否必填" prop="required">
<el-radio-group v-model="form.required">
<el-radio label="true">是</el-radio>
<el-radio label="false">否</el-radio>
@@ -80,6 +80,10 @@
type: Boolean,
default: false,
},
+ participants: {
+ type: Array,
+ default: () => []
+ }
},
data() {
return {
@@ -102,13 +106,13 @@
{
type: "array",
required: true,
- message: "请至少选择一种检测类型",
+ message: "请至少选择一个操作人",
trigger: "change",
},
],
message: [
{
- required: true,
+ required: false,
message: "请输入提示文案",
trigger: "blur",
},
@@ -121,23 +125,7 @@
},
],
},
- options: [{
- value: '1',
- label: '黄金糕'
- }, {
- value: '2',
- label: '双皮奶'
- }, {
- value: '3',
- label: '蚵仔煎'
- }, {
- value: '4',
- label: '龙须面'
- }, {
- value: '5',
- label: '北京烤鸭'
- }],
- value: ''
+ value: ''
};
},
computed: {
@@ -149,6 +137,13 @@
this.$emit("update:visible", val);
},
},
+ options() {
+ // 将participants转换为select组件需要的格式
+ return this.participants.map(participant => ({
+ value: participant.userId ,
+ label: participant.nickName
+ }));
+ }
},
mounted() {
// 组件挂载时的初始化逻辑
@@ -179,6 +174,12 @@
};
},
handleSubmit() {
+ // 对于需要提示文案的类型，添加额外验证
+ if (['text', 'date', 'user'].includes(this.form.type) && !this.form.message) {
+ this.$message.error('请输入提示文案');
+ return;
+ }
+
this.$refs.form.validate((valid) => {
if (valid) {
const submitData = {
--
Gitblit v1.7.1