|
|
@@ -35,7 +35,7 @@
|
|
|
</template>
|
|
|
<template #extra>
|
|
|
<div class="w-60">
|
|
|
- <el-select v-model="searchForm.partId" block clearable placeholder="片段查询" @change="searchClick">
|
|
|
+ <el-select v-model="searchForm.partId" clearable block placeholder="片段查询" @change="searchClick">
|
|
|
<el-option v-for="item in partData" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</div>
|
|
|
@@ -117,7 +117,7 @@
|
|
|
<el-input v-model="partForm.name" placeholder="请输入名称" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="桩号前缀" prop="prefix">
|
|
|
- <el-input v-model="partForm.prefix" placeholder="只允许输入大写的英文字母" />
|
|
|
+ <el-input v-model="partForm.prefix" placeholder="只允许输入大写的英文字母及数字" />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<template #footer>
|
|
|
@@ -165,12 +165,12 @@
|
|
|
<template #suffix>度</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="flex-1 ml-4" no-label>
|
|
|
+ <el-form-item class="ml-4 flex-1" no-label>
|
|
|
<el-input v-model="formLineEleValue.fen" placeholder="输入分">
|
|
|
<template #suffix>分</template>
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item class="flex-1 ml-4" no-label>
|
|
|
+ <el-form-item class="ml-4 flex-1" no-label>
|
|
|
<el-input v-model="formLineEleValue.miao" placeholder="输入秒">
|
|
|
<template #suffix>秒</template>
|
|
|
</el-input>
|
|
|
@@ -652,9 +652,10 @@ const partRules = {
|
|
|
prefix: {
|
|
|
required: true,
|
|
|
validator: (rule, value, callback) => {
|
|
|
- const reg = /^[A-Z]+$/
|
|
|
+ // 修改验证规则，使其匹配大写英文字母和数字
|
|
|
+ const reg = /^[A-Z0-9]+$/
|
|
|
if (value && !reg.test(value)) {
|
|
|
- callback(new Error('只允许输入大写的英文字母'))
|
|
|
+ callback(new Error('只允许输入大写的英文字母和数字'))
|
|
|
} else {
|
|
|
callback()
|
|
|
}
|
|
|
@@ -721,7 +722,7 @@ const handleAdminPartSave = async (row) => {
|
|
|
//没有前缀，且片段名称中不包含‘主线’
|
|
|
window?.$message?.warning('请输入桩号前缀')
|
|
|
} else if (!reg.test(row.prefix) && row.name.indexOf('主线') < 0) {
|
|
|
- window?.$message?.warning('桩号前缀,只允许输入大写的英文字母')
|
|
|
+ window?.$message?.warning('桩号前缀,只允许输入大写的英文字母及数字')
|
|
|
} else if (row.id) {
|
|
|
const { error, code, msg } = await bezierApi.savePartUpdate({
|
|
|
...row,
|
