修改bug

public/config.js

@@ -116,7 +116,8 @@ var NEW_DATACONTENT_ID = [
   52221,
   52222,
   52223,
-  52224
+  52224,
+  51063
 ]
 
 var DATACONTENT_ID = {
@@ -169,7 +170,7 @@ var DATACONTENT_ID = {
   appTableId: 39, //应用管理
 
   /***-----数据查询------***/
-  airportCode: 100015, // 数据查询-航班-航站列表
+  airportCode: 51063, // 数据查询-航班-航站列表
   flightDataQuery: 51000, //数据查询-航班-表格
   waybillDataQuery: 51001, //数据查询-运单-表格
   freightDataQuery: 1803440, //数据查询-货物-表格
@@ -476,4 +477,4 @@ var SERVICE_ID = {
   /***-----离港管理------***/
   departureScId: 8011, //发送报警预警日志信息
 }
-var NEW_SERVICE_ID = [55001, 65015, 65024, 65002, 65026, 65060, 65061, 65001, 65005, 65008, 65004, 65009, 65010, 65011, 65013, 65014, 65024, 64015, 65016, 65017, 65018, 65019, 65020, 65021];
+var NEW_SERVICE_ID = [55001, 65015, 65024, 65002, 65026, 65060, 65061, 65001, 65005, 65008, 65004, 65007, 65009, 65010, 65011, 65013, 65014, 65024, 64015, 65016, 65017, 65018, 65019, 65020, 65021];

src/views/BasicsData/airportCompany/index.vue

@@ -34,12 +34,12 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="上级公司ID" :rules="tableForm.parentID?formRules.isNotNull:''" size="default" prop="parentID">
+                <el-form-item label="上级公司ID" :rules="formRules.isNotNull" size="default" prop="parentID">
                   <el-input :disabled="tableForm.parentID == 'null'" v-model="tableForm.parentID" placeholder="请输入上级公司ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="公司描述" size="default">
+                <el-form-item label="公司描述" :rules="formRules.isNotNull" size="default">
                   <el-input type="textarea" v-model="tableForm.companyDesc" placeholder="请输入公司描述" />
                 </el-form-item>
               </el-col>
@@ -136,9 +136,10 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑机场公司维护";
     flag.value = true;
     type.value = "";
+    console.log(index);
     tableForm.event = 2;
     tableForm.companyName = index.companyName;
-    tableForm.parentID = index.parentID;
+    tableForm.parentID = index.parentID == null ? "null" : index.parentID;
     tableForm.companyDesc = index.companyDesc;
     tableForm.companyID = index.companyID;
     tableOptionser.value = [];

src/views/BasicsData/airportInfo/index.vue

@@ -78,6 +78,11 @@
                 <el-input disabled v-model="tableForm.companyName" placeholder="请输入公司名称" />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="公司ID" size="default" prop="companyID" :rules="formRules.isNotNull">
+                <el-input disabled v-model="tableForm.companyID" placeholder="请输入公司ID" />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注" size="default">
                 <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />

src/views/BasicsData/equipmentMaintenance/index.vue

@@ -26,12 +26,12 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="设备类型" size="default" prop="deviceType">
+                <el-form-item label="设备类型" size="default" :rules="formRules.isNotNull" prop="deviceType">
                   <el-input v-model="tableForm.deviceType" placeholder="请输入设备类型" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="设备位置" size="default" prop="location">
+                <el-form-item label="设备位置" size="default" :rules="formRules.isNotNull" prop="location">
                   <el-input v-model="tableForm.location" placeholder="请输入设备位置" />
                 </el-form-item>
               </el-col>
@@ -46,7 +46,7 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="备注" size="default">
+                <el-form-item label="备注" :rules="formRules.isNotNull" size="default">
                   <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>

src/views/dataQuery/components/DataQueryView/index.vue

@@ -13,10 +13,10 @@
         </div>
         <div v-if="name === 'waybill'" class="form-left">
           <el-form-item>
-            <el-date-picker v-model="formData.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" size="default" type="date" placeholder="开始日期" :prefix-icon="datePreTitle('开始')" :clearable="false" class="pre-text" />
+            <el-date-picker v-model="formData.startDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" size="default" type="date" placeholder="开始日期" :prefix-icon="datePreTitle('开始')" class="pre-text" />
           </el-form-item>
           <el-form-item>
-            <el-date-picker v-model="formData.endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="disabledEndDate" size="default" type="date" placeholder="结束日期" :prefix-icon="datePreTitle('结束')" :clearable="false" class="pre-text" />
+            <el-date-picker v-model="formData.endDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD" :disabled-date="disabledEndDate" size="default" type="date" placeholder="结束日期" :prefix-icon="datePreTitle('结束')" class="pre-text" />
           </el-form-item>
         </div>
         <div v-if="name === 'flight'" class="form-left">