From 83ea655f2d36ab319d2dfe885947957c550d4f64 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期一, 13 十一月 2023 14:17:26 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
web/src/views/Basics/MouldIndex.vue | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/web/src/views/Basics/MouldIndex.vue b/web/src/views/Basics/MouldIndex.vue
index 50a5987..7aafa57 100644
--- a/web/src/views/Basics/MouldIndex.vue
+++ b/web/src/views/Basics/MouldIndex.vue
@@ -74,8 +74,8 @@
<el-table-column prop="supplierName" label="供应商" align="center"></el-table-column>
<el-table-column prop="maxCycleTime" label="最大循环次数" align="center"></el-table-column>
<el-table-column prop="currentCycleTime" label="累计循环次数" align="center"></el-table-column>
- <el-table-column prop="" label="次数" align="center"></el-table-column>
- <el-table-column prop="" label="天数" align="center"></el-table-column>
+ <el-table-column prop="warningValue" label="次数" align="center"></el-table-column>
+ <el-table-column prop="warningDay" label="天数" align="center"></el-table-column>
<el-table-column label="使用状态" align="center">
<template #default="{ row }">
<div>
@@ -191,13 +191,23 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="模具检查预警值：" prop="supplierId">
- <el-input placeholder="请输入次数" v-model="formMould.alarmTimes" style="margin-right:15px">
- <template slot="append">次数</template>
- </el-input>
- <el-input placeholder="请输入天数" v-model="formMould.alarmDays">
- <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="请选择使用状态">
@@ -347,6 +357,16 @@
message: '请选择进厂日期',
trigger: ['blur', 'change']
}],
+ warningValue: [{
+ required: true,
+ message: '请输入预警次数',
+ trigger: 'blur'
+ }],
+ warningDay: [{
+ required: true,
+ message: '请输入预警天数',
+ trigger: 'blur'
+ }]
}, // 表单校验规则
mouldTypeDatas: [], // 块号
mouldSizeData: [], // 尺寸
@@ -364,7 +384,7 @@
},{
value: 4,
label: '报废'
- }]
+ }],
}
},
mounted() {
@@ -439,6 +459,8 @@
this.$set(this.formMould, 'maxCycleTime', row.maxCycleTime);
this.$set(this.formMould, 'productDate', row.productDate);
this.$set(this.formMould, 'comeFactoryTime', row.comeFactoryTime);
+ this.$set(this.formMould, 'warningValue', row.warningValue);
+ this.$set(this.formMould, 'warningDay', row.warningDay);
},
// 打印模具信息
propScanCode(item) {
--
Gitblit v1.9.3