From 7af2d33d8fda6af451b0873a8f642c3cf7686136 Mon Sep 17 00:00:00 2001
From: 邱宇豪 <qyh123230312>
Date: 星期三, 29 十一月 2023 16:21:49 +0800
Subject: [PATCH] 20231129_qiuyh_解决钢筋笼生产查询问题、新加钢筋笼材料标示牌、调整区域打卡

---
 web/src/views/Basics/MouldIndex.vue |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/web/src/views/Basics/MouldIndex.vue b/web/src/views/Basics/MouldIndex.vue
index 8044b32..546346f 100644
--- a/web/src/views/Basics/MouldIndex.vue
+++ b/web/src/views/Basics/MouldIndex.vue
@@ -67,6 +67,7 @@
         <el-table-column prop="proName" label="项目名称" align="center"></el-table-column>
         <el-table-column prop="mouldCode" label="模具型号" align="center"></el-table-column>
         <el-table-column prop="mouldNum" label="模具编号" align="center"></el-table-column>
+        <el-table-column prop="mouldMn" label="模具MN号" align="center"></el-table-column>
         <el-table-column prop="groutingHolesName" label="注浆孔" align="center"></el-table-column>
         <el-table-column prop="mouldTypeName" label="管片块号" align="center"></el-table-column>
         <el-table-column prop="mouldSizeName" label="尺寸" align="center"></el-table-column>
@@ -74,8 +75,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>
@@ -125,12 +126,12 @@
         <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="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>
+        <!-- <el-form-item label="模具编号:" prop="mouldNum">
+          <el-input v-model="formMould.mouldNum"  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>
+        </el-form-item>
         <el-form-item label="注浆孔:" prop="groutingHoles">
         <el-select v-model="formMould.groutingHoles" :size="size" clearable placeholder="请选择注浆孔">
           <el-option
@@ -304,7 +305,7 @@
           }],
           mouldNum: [{
             required: true,
-            message: '请输入模具编码',
+            message: '请输入模具编号',
             trigger: 'blur'
           }],
           mouldMn: [{
@@ -362,7 +363,7 @@
             message: '请输入预警次数',
             trigger: 'blur'
           }],
-          waningDay: [{
+          warningDay: [{
             required: true,
             message: '请输入预警天数',
             trigger: 'blur'
@@ -459,6 +460,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