修改

src/views/systemSettings/datastructure/datastructureTerm.vue

@@ -48,17 +48,12 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="数据项类型"
-                  size="default"
-                  prop="dataType"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
+                <el-form-item label="数据项类型" size="default">
+                  <!-- <el-input
                     v-model="tableForm.dataType"
                     placeholder="请输入数据项类型"
-                  />
-                  <!-- <el-select
+                  /> -->
+                  <el-select
                     style="width: 100%"
                     v-model="tableForm.dataType"
                     class="input-shadow"
@@ -74,7 +69,7 @@
                       :value="item.v ? item.v : item.planDepartureApt"
                     >
                     </el-option>
-                  </el-select> -->
+                  </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="12">

src/views/systemSettings/warningEdit/index.vue

@@ -9,14 +9,24 @@
         </template></Minheader
       >
       <div class="diacont">
-        <el-form :model="tableForm" class="w100 fw">
+        <el-form
+          :model="tableForm"
+          class="w100 fw"
+          :rules="formRules"
+          ref="warningEditsForm"
+        >
           <!-- <div class="outersurface pd30">
             <el-form-item label="策略名称" size="default">
               <el-input v-model="tableForm.name" placeholder="请输入策略名称" />
             </el-form-item>
           </div> -->
           <div class="outersurface pd30">
-            <el-form-item label="航司二字码" size="default">
+            <el-form-item
+              label="航司二字码"
+              size="default"
+              prop="IATACode"
+              :rules="formRules.isNotNull"
+            >
               <el-input
                 v-model="tableForm.IATACode"
                 placeholder="请输入航司二字码"
@@ -66,7 +76,12 @@
             </el-form-item>
           </div>
           <div class="outersurface">
-            <el-form-item label="航班号" size="default">
+            <el-form-item
+              label="航班号"
+              size="default"
+              prop="flightNo"
+              :rules="formRules.isNotNull"
+            >
               <el-input
                 v-model="tableForm.flightNo"
                 placeholder="请输入航班号"
@@ -74,7 +89,12 @@
             </el-form-item>
           </div>
           <div class="outersurface pd30">
-            <el-form-item label="生效时间" size="default">
+            <el-form-item
+              label="生效时间"
+              size="default"
+              prop="startDate"
+              :rules="formRules.isNotNull"
+            >
               <el-date-picker
                 v-model="tableForm.startDate"
                 :rows="1"
@@ -87,7 +107,12 @@
             </el-form-item>
           </div>
           <div class="outersurface pd30">
-            <el-form-item label="失效时间" size="default">
+            <el-form-item
+              label="失效时间"
+              size="default"
+              prop="endDate"
+              :rules="formRules.isNotNull"
+            >
               <el-date-picker
                 format="YYYY-MM-DD HH:mm:ss"
                 value-format="YYYY-MM-DD HH:mm:ss"
@@ -153,12 +178,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="计算依据"
-                size="default"
-                prop="calculationBasis"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="计算依据" size="default">
                 <el-select
                   style="width: 100%"
                   v-model="tableForms.calculationBasis"
@@ -205,12 +225,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="开始节点"
-                size="default"
-                prop="beginNode"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="开始节点" size="default">
                 <el-select
                   style="width: 100%"
                   v-model="tableForms.beginNode"
@@ -231,12 +246,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="开始位置"
-                size="default"
-                prop="beginPosition"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="开始位置" size="default">
                 <el-select
                   style="width: 100%"
                   v-model="tableForms.beginPosition"
@@ -257,12 +267,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="结束节点"
-                size="default"
-                prop="endNode"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="结束节点" size="default">
                 <el-select
                   style="width: 100%"
                   v-model="tableForms.endNode"
@@ -283,12 +288,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="结束位置"
-                size="default"
-                prop="endPosition"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="结束位置" size="default">
                 <el-select
                   style="width: 100%"
                   v-model="tableForms.endPosition"
@@ -526,7 +526,7 @@ const warningEditForm: any = ref(null);
 const submitForm = () => {
   warningEditForm.value.validate((valid: any) => {
     if (valid) {
-      generalDataReception(tableForm);
+      generalDataReception(tableForms);
     } else {
       return false;
     }
@@ -577,9 +577,16 @@ const generalDataReception = async (data) => {
   }
 };
 //编辑数据
+const warningEditsForm: any = ref(null);
 const preserForm = async () => {
   tableForm.event = 2;
-  generalDataReceptions(tableForm);
+  warningEditsForm.value.validate((valid: any) => {
+    if (valid) {
+      generalDataReception(tableForm);
+    } else {
+      return false;
+    }
+  });
 };
 //表格-增/删/改
 const generalDataReceptions = async (data) => {
@@ -643,6 +650,6 @@ getQuery();
   }
 }
 ::v-deep .el-form-item__label {
-  width: 90px;
+  width: 100px;
 }
 </style>

src/views/systemSettings/warningSet/index.vue

@@ -57,12 +57,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="起飞机场"
-                  size="default"
-                  prop="departmentAirport"
-                  :rules="formRules.isNotNull"
-                >
+                <el-form-item label="起飞机场" size="default">
                   <el-select
                     style="width: 100%"
                     v-model="tableForm.departmentAirport"
@@ -83,12 +78,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item
-                  label="降落机场"
-                  size="default"
-                  prop="landingAirport"
-                  :rules="formRules.isNotNull"
-                >
+                <el-form-item label="降落机场" size="default">
                   <el-select
                     style="width: 100%"
                     v-model="tableForm.landingAirport"