From b5518a0c0e740b570fab07dcf5fe3c3fe6fa743e Mon Sep 17 00:00:00 2001
From: DouDou <877258667@qq.com>
Date: Thu, 12 Sep 2024 15:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/com_tool_info_add_update.vue   | 51 ++++++++++++++++---
 .../com_tool_instance_add_update.vue          | 43 ++++++++++++++--
 .../com_tool_instance_date_add_update.vue     |  2 +-
 3 files changed, 85 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/tooling/components/com_tool_info_add_update.vue b/src/views/modules/tooling/components/com_tool_info_add_update.vue
index 819ba7a..8a14956 100644
--- a/src/views/modules/tooling/components/com_tool_info_add_update.vue
+++ b/src/views/modules/tooling/components/com_tool_info_add_update.vue
@@ -3,21 +3,21 @@
     <el-dialog :title="titleCon" v-drag  :visible.sync="visible" :close-on-click-modal="false"
                width="600px" style="height: 650px;" class="customer-dialog">
       <el-container style="height: 265px;">
-        <el-form :inline="true" label-position="top" label-width="80px">
+        <el-form :inline="true" :model="pageData"  :rules="rules" label-position="top" label-width="80px" >
           <!--  第一行   -->
           <el-row class="customer-row">
             <el-col :span="6">
-              <el-form-item :label=labels.toolId>
+              <el-form-item :label=labels.toolId prop="toolId">
                 <el-input  v-model="pageData.toolId"  :disabled="!this.addFlag"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label=labels.toolDesc>
+              <el-form-item :label=labels.toolDesc prop="toolDesc">
                 <el-input v-model="pageData.toolDesc" ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label=labels.site>
+              <el-form-item :label=labels.site prop="site">
                 <span slot="label" style="" @click="getBaseList(1017)"><a herf="#">域</a></span>
                 <el-input  v-model="pageData.site"  :disabled="!this.addFlag"></el-input>
               </el-form-item>
@@ -31,18 +31,18 @@
           <!--  第二行   -->
           <el-row class="customer-row">
             <el-col :span="6">
-              <el-form-item :label=labels.toolType>
+              <el-form-item :label=labels.toolType prop="toolType">
                 <span slot="label" style="" @click="getBaseList(1016)"><a herf="#">工具类型</a></span>
                 <el-input  v-model="pageData.toolType"  ></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item :label=labels.toolTypeDesc>
-                <el-input v-model="pageData.toolTypeDesc" ></el-input>
+                <el-input v-model="pageData.toolTypeDesc" disabled></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item :label=labels.calendarId>
+              <el-form-item :label=labels.calendarId prop="calendarId">
                 <span slot="label" style="" @click="getBaseList(1018)"><a herf="#">日历标识</a></span>
                 <el-input  v-model="pageData.calendarId"  ></el-input>
               </el-form-item>
@@ -270,6 +270,43 @@ export default {
         languageCode: this.$i18n.locale,
         objectType: 'label'
       },
+      rules: {
+        site: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolDesc: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        calendarId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+      },
     }
   },
   methods: {
diff --git a/src/views/modules/tooling/components/com_tool_instance_add_update.vue b/src/views/modules/tooling/components/com_tool_instance_add_update.vue
index 843eff6..605132d 100644
--- a/src/views/modules/tooling/components/com_tool_instance_add_update.vue
+++ b/src/views/modules/tooling/components/com_tool_instance_add_update.vue
@@ -3,16 +3,16 @@
     <el-dialog :title="titleCon" v-drag  :visible.sync="visible" :close-on-click-modal="false"
                width="750px" style="height: 650px;" class="customer-dialog">
       <el-container style="height: 265px;">
-        <el-form :inline="true" label-position="top" label-width="80px">
+        <el-form :inline="true" :model="pageData"  :rules="rules"  label-position="top" label-width="80px">
           <!--  第一行   -->
           <el-row class="customer-row">
             <el-col :span="4">
-              <el-form-item label="工具样品">
+              <el-form-item label="工具实例">
                 <el-input  v-model="pageData.toolInstance"  :disabled="!this.addFlag"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <el-form-item label="描述">
+              <el-form-item label="工具实例描述">
                 <el-input v-model="pageData.description" ></el-input>
               </el-form-item>
             </el-col>
@@ -290,6 +290,43 @@ export default {
         languageCode: this.$i18n.locale,
         objectType: 'label'
       },
+      rules: {
+        site: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolDesc: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        toolType: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+        calendarId: [
+          {
+            required: true,
+            message: ' ',
+            trigger: ['blur','change']
+          }
+        ],
+      },
     }
   },
   methods: {
diff --git a/src/views/modules/tooling/components/com_tool_instance_date_add_update.vue b/src/views/modules/tooling/components/com_tool_instance_date_add_update.vue
index c095cba..34d8178 100644
--- a/src/views/modules/tooling/components/com_tool_instance_date_add_update.vue
+++ b/src/views/modules/tooling/components/com_tool_instance_date_add_update.vue
@@ -3,7 +3,7 @@
     <el-dialog :title="titleCon" v-drag  :visible.sync="visible" :close-on-click-modal="false"
                width="490px" style="height: 650px;" class="customer-dialog">
       <el-container style="height: 325px;">
-        <el-form :inline="true" label-position="top" label-width="80px">
+        <el-form :inline="true" :model="pageData"  :rules="rules" label-position="top" label-width="80px">
           <!--  第一行   -->
           <el-row class="customer-row">
             <el-col :span="12">