From 9a12866758b1749953e1330c2e64d25d7a6a05b5 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 09 十一月 2023 14:11:48 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/Basics/MouldIndex.vue | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/web/src/views/Basics/MouldIndex.vue b/web/src/views/Basics/MouldIndex.vue
index 661dd28..8044b32 100644
--- a/web/src/views/Basics/MouldIndex.vue
+++ b/web/src/views/Basics/MouldIndex.vue
@@ -125,8 +125,8 @@
<el-form-item label="模具型号：" prop="mouldCode">
<el-input v-model="formMould.mouldCode" :size="size" clearable placeholder="请输入模具型号"></el-input>
</el-form-item>
- <el-form-item label="模具编号：" prop="mouldNum" v-if="!asyncTitle">
- <el-input v-model="formMould.mouldNum" :disabled="true" clearable placeholder="请输入模具编号"></el-input>
+ <el-form-item label="模具编号：" prop="mouldMn">
+ <el-input v-model="formMould.mouldMn" clearable placeholder="请输入模具编号"></el-input>
</el-form-item>
<!-- <el-form-item label="模具MN号：" prop="mouldMn">
<el-input v-model="formMould.mouldMn" :size="size" clearable placeholder="请输入模具MN号"></el-input>
@@ -191,13 +191,23 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="模具检查预警值：" prop="supplierId">
- <el-input placeholder="请输入次数" v-model="input2" style="margin-right:15px">
- <template slot="append">次数</template>
- </el-input>
- <el-input placeholder="请输入天数" v-model="input2">
- <template slot="append">天数</template>
- </el-input>
+ <el-form-item label="模具检查预警值：" required>
+ <el-row :gutter="10" type="flex">
+ <el-col :span="12">
+ <el-form-item prop="warningValue">
+ <el-input placeholder="请输入次数" v-model="formMould.warningValue" clearable>
+ <template slot="append">次数</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item prop="warningDay">
+ <el-input placeholder="请输入天数" v-model="formMould.warningDay" clearable>
+ <template slot="append">天数</template>
+ </el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
</el-form-item>
<el-form-item label="使用状态：" prop="status">
<el-select v-model="formMould.status" :size="size" clearable placeholder="请选择使用状态">
@@ -212,7 +222,7 @@
<el-form-item label="最大循环次数：" prop="maxCycleTime">
<el-input v-model="formMould.maxCycleTime" :size="size" clearable placeholder="请输入最大循环次数"></el-input>
</el-form-item>
- <el-form-item label="生产日期：">
+ <el-form-item label="生产日期：" prop="productDate">
<el-date-picker
v-model="formMould.productDate"
type="date"
@@ -222,7 +232,7 @@
placeholder="请选择生产日期">
</el-date-picker>
</el-form-item>
- <el-form-item label="进厂日期：">
+ <el-form-item label="进厂日期：" prop="comeFactoryTime">
<el-date-picker
v-model="formMould.comeFactoryTime"
type="date"
@@ -336,6 +346,26 @@
required: true,
message: '请输入最大循环次数',
trigger: 'blur'
+ }],
+ productDate: [{
+ required: true,
+ message: '请选择生产日期',
+ trigger: ['blur', 'change']
+ }],
+ comeFactoryTime: [{
+ required: true,
+ message: '请选择进厂日期',
+ trigger: ['blur', 'change']
+ }],
+ warningValue: [{
+ required: true,
+ message: '请输入预警次数',
+ trigger: 'blur'
+ }],
+ waningDay: [{
+ required: true,
+ message: '请输入预警天数',
+ trigger: 'blur'
}]
}, // 表单校验规则
mouldTypeDatas: [], // 块号
@@ -354,7 +384,7 @@
},{
value: 4,
label: '报废'
- }]
+ }],
}
},
mounted() {
--
Gitblit v1.9.3