Merge branch 'master' of http://120.26.64.82:10880/BFFE/SZYGM1.0

public/config.js

@@ -5,7 +5,7 @@ var LOOP_INTERVAL = {
   waybill: 15 * 1000,
   goods: 15 * 1000,
   dashboard: 15 * 1000,
-};
+}
 
 var NEW_DATACONTENT_ID = [
   51000,
@@ -79,14 +79,37 @@ var NEW_DATACONTENT_ID = [
   52006,
   52016,
   51062,
-  100000,
   9, //航站查询
   10, //航司查询
   11, //节点查询
   12, //位置查询
   13, //预警报警场景维护
   15, //预警报警策略维护
-];
+  54001,
+  54002,
+  54003,
+  54004,
+  54005,
+  54006,
+  54007,
+  54008,
+  54009,
+  54010,
+  54011,
+  54012,
+  54013,
+  54014,
+  54015,
+  54016,
+  54017,
+  54018,
+  54019,
+  54020,
+  54021,
+  54023,
+  54024,
+  54025
+]
 
 var DATACONTENT_ID = {
   /***-----登录------***/
@@ -132,7 +155,7 @@ var DATACONTENT_ID = {
 
   /***-----权限管理------***/
   authTreeId: 40, //权限管理-权限树
-  authTreeNewId: 92, //权限管理-权限树
+  authTreeNewId: 54001, //权限管理-权限树
 
   /***-----应用管理------***/
   appTableId: 39, //应用管理
@@ -150,39 +173,39 @@ var DATACONTENT_ID = {
   advancedQueryNew: 93, //高级查询-数据查询-id
 
   /***-----账号管理------***/
-  accountTableId: 78, //账号管理-首页-列表
+  accountTableId: 54004, //账号管理-首页-列表
   accountRoleId: 43, //账号管理-根据id查角色
   accountDetailsId: 45, //账号管理-根据id查详情
 
   /***-----账号组管理------***/
-  accountGroupTableId: 18034, //账号组管理-首页-列表
-  accountGroupSelId: 18035, //账号组管理-下拉
-  accountGroupDetailsId: 18036, //账号组管理-根据id查详情
+  accountGroupTableId: 54005, //账号组管理-首页-列表
+  accountGroupSelId: 54006, //账号组管理-下拉
+  accountGroupDetailsId: 54007, //账号组管理-根据id查详情
 
   /***-----角色管理------***/
   roleTableId: 59, //角色管理-首页-列表
-  roleTableNId: 63, //角色管理-首页-列表
+  roleTableNId: 54002, //角色管理-首页-列表
   roleTableNewId: 91, //角色管理-根据id查权限
   roleDetailsId: 62, //角色管理-根据id查详情
-  roleAuthId: 42, //角色管理-根据id查权限
+  roleAuthId: 54003, //角色管理-根据id查权限
 
   /***-----基础数据------***/
-  airlineTableId: 80, //基础数据-航司信息维护-表格-id
-  airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
-  airportTableId: 79, //基础数据-机场信息维护-表格-id
-  terminalTableId: 1803432, //基础数据-机场信息维护-区域-表格-id
-  airpositTableId: 1803433, //基础数据-机场信息维护-区域位置-表格-id
-  deployNodeId: 54, //基础数据-节点信息维护-id
-  modelMainNodeId: 1803434, //基础数据-机型维护-id
-  shippingNodeId: 1803435, //基础数据-舱位-id
-  containerNodeId: 1803436, //基础数据-容器-id
-  bagTableId: 55, //基础数据-特殊行李维护-表格-id
-  equipmentNodeId: 1803437, //基础数据-设备维护-表格-id
-  forwarderNodeId: 1803438, //基础数据-货代-表格-id
-  hiddenCompany: 56, // 基础数据-屏蔽航司维护
+  airlineTableId: 54009, //基础数据-航司信息维护-表格-id
+  airportTreeId: 54011, //基础数据-机场信息维护-公司列表-id
+  airportTableId: 54013, //基础数据-机场信息维护-表格-id
+  terminalTableId: 54014, //基础数据-机场信息维护-区域-表格-id
+  airpositTableId: 54024, //基础数据-机场信息维护-区域位置-表格-id
+  deployNodeId: 54015, //基础数据-节点信息维护-id
+  modelMainNodeId: 54016, //基础数据-机型维护-id
+  shippingNodeId: 54017, //基础数据-舱位-id
+  containerNodeId: 54018, //基础数据-容器-id
+  bagTableId: 54020, //基础数据-特殊行李维护-表格-id
+  equipmentNodeId: 54021, //基础数据-设备维护-表格-id
+  forwarderNodeId: 54019, //基础数据-货代-表格-id
+  hiddenCompany: 54010, // 基础数据-屏蔽航司维护
 
   /***-----应用管理------***/
-  appTableId: 39, //应用管理-列表
+  appTableId: 54008, //应用管理-列表
 
   /***-----系统设置------***/
   sysProtoTabId: 1, //系统设置-协议管理-表格-id
@@ -205,7 +228,6 @@ var DATACONTENT_ID = {
   sysQueryChildTabId: 25, //系统设置-查询模板-列设置-表格-id
   sysQueryChildEditTabId: 26, //系统设置-查询模板-列设置-表格-编辑-id
   messageQueryTabId: 1803442, //系统设置-消息查询-表格-id
-  securityPolicy: 100000, // 系统配置-基础配置
 
   dataSourceOptions: 13, //系统设置-数据源下拉
   serviceOptions: 14, //系统设置-服务下拉
@@ -404,7 +426,7 @@ var DATACONTENT_ID = {
   modeAgentbased: 51047, //基于代理人
   modeSpecialList: 51049, //特货明细
   modedeliverydetails: 51050, //拉货明细
-};
+}
 
 var SERVICE_ID = {
   /***-----账号管理------***/
@@ -427,7 +449,6 @@ var SERVICE_ID = {
   sysQueryTabId: 5, //系统设置-查询模板-表格-增删改
   sysDataTabId: 9, //系统设置-数据结构-数据项-表格-增删改
   sysServiceAddXyId: 10, //系统设置-服务管理-新增服务-新增数据源-提交
-  securityPolicy: 111000, // 系统配置-基础配置
 
   /***-----应用管理------***/
   appScId: 12, //应用管理-增删改
@@ -440,6 +461,5 @@ var SERVICE_ID = {
 
   /***-----离港管理------***/
   departureScId: 8011, //发送报警预警日志信息
-};
-
-var NEW_SERVICE_ID = [];
+}
+var NEW_SERVICE_ID = [55001, 65024];

src/api/webApi.ts

@@ -1,39 +1,39 @@
-import request from "@/utils/axiosReq";
-import { CommonQueryResult } from "~/common";
+import request from '@/utils/axiosReq'
+import { CommonQueryResult } from '~/common'
 
 export function Query<T = any>(params): Promise<CommonQueryResult<T>> {
   if (NEW_DATACONTENT_ID.includes(params.id)) {
-    return NewQuery<T>(params);
+    return NewQuery<T>(params)
   }
   return request({
-    url: "/openApi/query",
-    method: "post",
+    url: '/openApi/query',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 function NewQuery<T = any>(params): Promise<CommonQueryResult<T>> {
   return request({
-    url: "/newOpenApi/search",
-    method: "post",
+    url: '/newOpenApi/search',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 export async function myQuery(id, ...dataContent) {
   const params = {
     id,
     dataContent,
-  };
+  }
   try {
-    const result = await Query(params);
+    const result = await Query(params)
     if (Number(result.code) === 0) {
-      return result.returnData.listValues;
+      return result.returnData.listValues
     } else {
-      return Promise.reject(result.message);
+      return Promise.reject(result.message)
     }
   } catch (error) {
-    return Promise.reject(error);
+    return Promise.reject(error)
   }
 }
 
@@ -41,50 +41,50 @@ export async function htQuery(id, ...dataContent) {
   const params = {
     id,
     dataContent,
-  };
+  }
   try {
-    const result = await Query(params);
+    const result = await Query(params)
     if (Number(result.code) === 0) {
-      return result.returnData;
+      return result.returnData
     } else {
-      return [];
+      return []
     }
   } catch (error) {
-    return [];
+    return []
   }
 }
 
 function NewGeneralDataReception(func: any) {
-  return func;
+  return func
 }
 
 export function GeneralDataReception(params): Promise<CommonQueryResult> {
-  const { serviceId, dataContent } = params;
+  const { serviceId, dataContent } = params
   if (NEW_SERVICE_ID.includes(serviceId)) {
-    const newData = JSON.parse(dataContent);
-    const { event } = newData;
-    const eventType = event;
-    let key: any = null;
+    const newData = JSON.parse(dataContent)
+    const { event } = newData
+    const eventType = event
+    let key: any = null
     if (newData?.event) {
-      delete newData.event;
+      delete newData.event
     }
     if (eventType == 2) {
       for (const item in newData) {
-        if (item.includes("id") || item.includes("Id") || item.includes("ID")) {
-          key = item;
+        if (item.includes('id') || item.includes('Id') || item.includes('ID')) {
+          key = item
         }
       }
       return NewGeneralDataReception(
         dataToChange(serviceId, newData, eventType, key)
-      );
+      )
     }
-    return NewGeneralDataReception(dataToChange(serviceId, newData, eventType));
+    return NewGeneralDataReception(dataToChange(serviceId, newData, eventType))
   }
   return request({
-    url: "/openApi/generalDataReception",
-    method: "post",
+    url: '/openApi/generalDataReception',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 //增/删/改
@@ -100,115 +100,115 @@ export async function dataToChange(
       dataContent: formatChange(data, event, key),
       event: `${event}`,
       // authId: this.AauthId
-    };
-    const { code, message } = await sendData(params);
-    return { code, message };
+    }
+    const { code, message } = await sendData(params)
+    return { code, message }
   } catch (error) {
-    return { code: 1, message: error };
+    return { code: 1, message: error }
   }
 }
 
 function sendData(params) {
   return request({
-    url: "/externalApi/openApi/sendData",
-    method: "post",
+    url: '/externalApi/openApi/sendData',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 //新增
 export function newData(params) {
   return request({
-    url: "/externalApi/openApi/sendData",
-    method: "post",
+    url: '/externalApi/openApi/sendData',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 //修改
 export function modifyData(params) {
   return request({
-    url: "/externalApi/openApi/sendData",
-    method: "post",
+    url: '/externalApi/openApi/sendData',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 //删除movedata
 export function moveData(params) {
   return request({
-    url: "/externalApi/openApi/sendData",
-    method: "post",
+    url: '/externalApi/openApi/sendData',
+    method: 'post',
     data: params,
-  });
+  })
 }
 
 function formatChange(data, event, key) {
-  const datas: any = [];
-  const flag = Array.isArray(data);
+  const datas: any = []
+  const flag = Array.isArray(data)
   if (flag) {
     for (let i = 0; i < data.length; i++) {
-      let obj: any = {};
+      let obj: any = {}
       if (event == 1) {
-        obj.Value = data[i];
+        obj.Value = data[i]
       } else if (event == 2) {
-        obj.Value = data[i];
-        obj.filter = {};
+        obj.Value = data[i]
+        obj.filter = {}
         if (Array.isArray(key)) {
-          const keys = <any>[];
-          const vals = <any>[];
-          obj.filter = [];
+          const keys = <any>[]
+          const vals = <any>[]
+          obj.filter = []
           for (let j = 0; j < key.length; j++) {
-            const dep = key[i];
-            keys.push(Object.keys(dep));
-            vals.push(Object.values(dep));
+            const dep = key[i]
+            keys.push(Object.keys(dep))
+            vals.push(Object.values(dep))
           }
           const nobj = {
-            left: "(",
+            left: '(',
             column: `${keys[i]}`,
-            comparator: "=",
+            comparator: '=',
             value: `${vals[i]}`,
-            right: ")",
-            connector: "and",
-          };
-          obj.filter.push(nobj);
+            right: ')',
+            connector: 'and',
+          }
+          obj.filter.push(nobj)
           if (obj.Value.hasOwnProperty(keys[i])) {
-            delete obj.Value[keys[i]];
+            delete obj.Value[keys[i]]
           }
         } else {
-          obj.filter[key] = data[i][key];
+          obj.filter[key] = data[i][key]
           if (obj.Value[key]) {
-            delete obj.Value[key];
+            delete obj.Value[key]
           }
         }
       } else {
-        obj = data[i];
+        obj = data[i]
       }
-      datas.push(obj);
+      datas.push(obj)
     }
   } else {
-    let obj: any = {};
+    let obj: any = {}
     if (event == 1) {
-      obj.Value = data;
+      obj.Value = data
     } else if (event == 2) {
-      obj.Value = data;
+      obj.Value = data
       obj.filter = [
         {
-          left: "(",
+          left: '(',
           column: `${key}`,
-          comparator: "=",
+          comparator: '=',
           value: `${data[key]}`,
-          right: ")",
-          connector: "and",
+          right: ')',
+          connector: 'and',
         },
-      ];
+      ]
       if (obj.Value[key]) {
-        delete obj.Value[key];
+        delete obj.Value[key]
       }
     } else {
-      obj = data;
+      obj = data
     }
-    datas.push(obj);
+    datas.push(obj)
   }
-  return datas;
+  return datas
 }

src/components/minheader/index.vue

@@ -1,8 +1,5 @@
 <template>
-  <div
-    :class="isStatus || isStatuser ? 'flex' : 'flex-end'"
-    class="data-table-btn"
-  >
+  <div :class="isStatus || isStatuser ? 'flex' : 'flex-end'" class="data-table-btn">
     <div v-if="isStatus || isStatuser" class="vStatus flex-act">
       <slot name="header" />
       <!-- <el-date-picker
@@ -15,27 +12,9 @@
         size="default"
       >
       </el-date-picker> -->
-      <el-date-picker
-        v-if="isTime"
-        format="YYYY-MM-DD"
-        value-format="YYYY-MM-DD"
-        v-model="startTime"
-        :rows="1"
-        size="default"
-        type="date"
-        placeholder="开始日期"
-      >
+      <el-date-picker v-if="isTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="startTime" :rows="1" size="default" type="date" placeholder="开始日期">
       </el-date-picker>
-      <el-date-picker
-        v-if="isTime"
-        format="YYYY-MM-DD"
-        value-format="YYYY-MM-DD"
-        class="L12"
-        size="default"
-        v-model="endTime"
-        type="date"
-        placeholder="结束日期"
-      >
+      <el-date-picker v-if="isTime" format="YYYY-MM-DD" value-format="YYYY-MM-DD" class="L12" size="default" v-model="endTime" type="date" placeholder="结束日期">
       </el-date-picker>
     </div>
     <!-- <div class="">
@@ -59,53 +38,22 @@
         <!-- <el-button type="danger" size="default" class="br L12">搜索</el-button> -->
       </template>
       <template v-if="isSlot">
-        <el-button v-permission="slotPermission ? [slotPermission] : []" type="danger" size="default" class="br L12" @click="addslot"
-          >1个插槽</el-button
-        >
+        <el-button v-permission="slotPermission ? [slotPermission] : []" type="danger" size="default" class="br L12" @click="addslot">1个插槽</el-button>
       </template>
       <template v-if="isJournal">
-        <el-button
-          v-permission="logPermission ? [logPermission] : []"
-          size="default"
-          plain
-          class="btn-white P12"
-          @click="addJournal"
-          >查看日志</el-button
-        >
+        <el-button v-permission="logPermission ? [logPermission] : []" size="default" plain class="btn-white P12" @click="addJournal">查看日志</el-button>
       </template>
       <template v-if="isMeasure">
-        <el-button size="default" plain class="btn-white br" @click="addBbut"
-          >测试</el-button
-        >
+        <el-button size="default" plain class="btn-white br" @click="addBbut">测试</el-button>
       </template>
       <template v-if="isPreser">
-        <el-button
-          v-permission="savePermission ? [savePermission] : []"
-          type="danger"
-          size="default"
-          class="br L12"
-          @click="preserBtn"
-          >保存</el-button
-        >
+        <el-button v-permission="savePermission ? [savePermission] : []" type="danger" size="default" class="br L12" @click="preserBtn">保存</el-button>
       </template>
       <template v-if="isAuth">
-        <el-button
-          size="default"
-          plain
-          class="btn-white br"
-          @click="addBbut"
-          v-permission="powerData ? [powerData] : []"
-          >新增</el-button
-        >
+        <el-button size="default" plain class="btn-white br" @click="addBbut" v-permission="powerData ? [powerData] : []">新增</el-button>
       </template>
       <template v-if="isShow">
-        <img
-          v-permission="columnSetPermission ? [columnSetPermission] : []"
-          class="btn-img"
-          src="@/assets/baggage/ic_setting.png"
-          title="列设置"
-          @click="show"
-        />
+        <img v-permission="columnSetPermission ? [columnSetPermission] : []" class="btn-img" src="@/assets/baggage/ic_setting.png" title="列设置" @click="show" />
       </template>
     </div>
   </div>
@@ -177,24 +125,24 @@ const props = defineProps({
   },
   searchPermission: {
     type: String,
-    default: ''
+    default: "",
   },
   columnSetPermission: {
     type: String,
-    default: ''
+    default: "",
   },
   logPermission: {
     type: String,
-    default: ''
+    default: "",
   },
   savePermission: {
     type: String,
-    default: ''
+    default: "",
   },
   slotPermission: {
     type: String,
-    default: ''
-  }
+    default: "",
+  },
 });
 // console.log(props.power);
 //搜索内容
@@ -216,14 +164,14 @@ const emits = defineEmits([
 const addBbut = () => {
   emits("addForm");
 };
-const search = (val) => {
+const search = (val?) => {
   emits("searchForm", [startTime.value, endTime.value, val]);
   emits("searchForms", val);
   // ElMessage.success(`搜索成功：${val}`);
 };
 const clear = () => {
   emits("clearForm");
-  ElMessage.success(`清除`);
+  // ElMessage.success(`清除`);
 };
 //保存
 const preserBtn = () => {
@@ -244,7 +192,7 @@ const show = () => {
 // console.log(power);
 startTime.value = momentMini(new Date()).format("YYYY-MM-DD");
 endTime.value = momentMini(new Date()).format("YYYY-MM-DD");
-search();
+// search();
 </script>
 <style lang="scss" scoped>
 .data-table-btn {

src/utils/axiosReq.ts

@@ -68,7 +68,7 @@ service.interceptors.response.use(
     // if the custom code is not 20000, it is judged as an error.
     if (res.code != '0') {
       ElMessage({
-        message: '执行失败',
+        message: res.message ?? '执行失败',
         type: 'error',
         duration: 5 * 1000,
       })

src/views/BasicsData/airlineCompany/index.vue

@@ -1,12 +1,7 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_airlines_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="new_airlines_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">航司信息维护</div>
@@ -14,106 +9,50 @@
         </template>
       </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.fullName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.fullName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="airlineCompanyForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="airlineCompanyForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="中文名称"
-                  size="default"
-                  prop="fullName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.fullName"
-                    placeholder="请输入中文名称"
-                  />
+                <el-form-item label="航司ID" size="default" prop="airlineCompanyID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.airlineCompanyID" placeholder="请输入航司ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="中文简称"
-                  size="default"
-                  prop="abbreviation"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.abbreviation"
-                    placeholder="请输入中文简称"
-                  />
+                <el-form-item label="中文名称" size="default" prop="fullName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.fullName" placeholder="请输入中文名称" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="中文简称" size="default" prop="abbreviation" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.abbreviation" placeholder="请输入中文简称" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="英文全称" size="default">
-                  <el-input
-                    v-model="tableForm.englishFullName"
-                    placeholder="请输入英文全称"
-                  />
+                  <el-input v-model="tableForm.englishFullName" placeholder="请输入英文全称" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="英文简称" size="default">
-                  <el-input
-                    v-model="tableForm.englishAbbreviation"
-                    placeholder="请输入英文简称"
-                  />
+                  <el-input v-model="tableForm.englishAbbreviation" placeholder="请输入英文简称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="航司二字码"
-                  size="default"
-                  prop="ITATCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.ITATCode"
-                    placeholder="请输入航司二字码"
-                  />
+                <el-form-item label="航司二字码" size="default" prop="ITATCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.ITATCode" placeholder="请输入航司二字码" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="航司三字码"
-                  size="default"
-                  prop="ICAOCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.ICAOCode"
-                    placeholder="请输入航司三字码"
-                  />
+                <el-form-item label="航司三字码" size="default" prop="ICAOCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.ICAOCode" placeholder="请输入航司三字码" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.remarks"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -124,61 +63,61 @@
   </div>
 </template>
 <script setup lang="ts">
-import DataTable from '@/components/tableTemp/index.vue'
-import Minheader from '@/components/minheader/index.vue'
-import Dialog from '@/components/dialog/index.vue'
-import { Query, GeneralDataReception } from '@/api/webApi'
-import { ElMessage } from 'element-plus'
+import DataTable from "@/components/tableTemp/index.vue";
+import Minheader from "@/components/minheader/index.vue";
+import Dialog from "@/components/dialog/index.vue";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
 
-const formRules = useElement().formRules
-const page = ref(0) //分页参数
-const dataContent = ref({})
-const noMore = ref(false)
-const rowTitle = ref('')
-const tableCols = ref<any[]>([]) //表头数据
-const serviceId = ref<number | null>(null)
-const tableObj = ref({}) //增删改数据缓存
-const flag = ref(false) //弹窗开关
-const type = ref('') //判断是否删除
-const msgTitle = ref('新增航司信息维护') //弹窗标题
+const formRules = useElement().formRules;
+const page = ref(0); //分页参数
+const dataContent = ref({});
+const noMore = ref(false);
+const rowTitle = ref("");
+const tableCols = ref<any[]>([]); //表头数据
+const serviceId = ref<number | null>(null);
+const tableObj = ref({}); //增删改数据缓存
+const flag = ref(false); //弹窗开关
+const type = ref(""); //判断是否删除
+const msgTitle = ref("新增航司信息维护"); //弹窗标题
 const tableForm = reactive({
-  fullName: '',
-  abbreviation: '',
-  englishAbbreviation: '',
-  ITATCode: '',
-  ICAOCode: '',
-  remarks: '',
-  event: <number | string>'',
-  airlineCompanyID: '',
-  englishFullName: '',
-}) //弹窗内容
+  fullName: "",
+  abbreviation: "",
+  englishAbbreviation: "",
+  ITATCode: "",
+  ICAOCode: "",
+  remarks: "",
+  event: <number | string>"",
+  airlineCompanyID: "",
+  englishFullName: "",
+}); //弹窗内容
 //列表
-const tableData = ref<any[]>([])
+const tableData = ref<any[]>([]);
 const tableBtnGroup = ref([
   {
-    name: '编辑',
-    className: 'editBtn',
+    name: "编辑",
+    className: "editBtn",
     param: 2,
-    is: 'airline_editor_button',
+    is: "airline_editor_button",
   },
   {
-    name: '删除',
-    className: 'delBtn',
+    name: "删除",
+    className: "delBtn",
     param: 3,
-    is: 'airlines_delete_button',
+    is: "airlines_delete_button",
   },
-])
+]);
 //新增
 const addForm = () => {
-  msgTitle.value = '新增航司信息维护'
-  tableForm.event = 1
-  flag.value = true
-  type.value = ''
-}
+  msgTitle.value = "新增航司信息维护";
+  tableForm.event = 1;
+  flag.value = true;
+  type.value = "";
+};
 //取消
 const resetForm = () => {
-  airlineCompanyForm.value?.resetFields()
-  flag.value = false
+  airlineCompanyForm.value?.resetFields();
+  flag.value = false;
   // tableForm.fullName = "";
   // tableForm.abbreviation = "";
   // tableForm.englishAbbreviation = "";
@@ -187,51 +126,51 @@ const resetForm = () => {
   // tableForm.remarks = "";
   // tableForm.airlineCompanyID = "";
   // tableForm.englishFullName = "";
-}
+};
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    msgTitle.value = '编辑航司信息维护'
-    flag.value = true
-    type.value = ''
-    tableForm.event = 2
-    tableForm.fullName = index.fullName
-    tableForm.abbreviation = index.abbreviation
-    tableForm.englishAbbreviation = index.englishAbbreviation
-    tableForm.ITATCode = index.ITATCode
-    tableForm.ICAOCode = index.ICAOCode
-    tableForm.remarks = index.remarks
-    tableForm.airlineCompanyID = index.airlineCompanyID
-    tableForm.englishFullName = index.englishFullName
+    msgTitle.value = "编辑航司信息维护";
+    flag.value = true;
+    type.value = "";
+    tableForm.event = 2;
+    tableForm.fullName = index.fullName;
+    tableForm.abbreviation = index.abbreviation;
+    tableForm.englishAbbreviation = index.englishAbbreviation;
+    tableForm.ITATCode = index.ITATCode;
+    tableForm.ICAOCode = index.ICAOCode;
+    tableForm.remarks = index.remarks;
+    tableForm.airlineCompanyID = index.airlineCompanyID;
+    tableForm.englishFullName = index.englishFullName;
   } else if (param === 3) {
-    msgTitle.value = '删除航司信息维护'
-    flag.value = true
-    type.value = 'del'
-    tableForm.event = 3
-    tableForm.fullName = index.fullName
-    tableForm.abbreviation = index.abbreviation
-    tableForm.englishAbbreviation = index.englishAbbreviation
-    tableForm.ITATCode = index.ITATCode
-    tableForm.ICAOCode = index.ICAOCode
-    tableForm.remarks = index.remarks
-    tableForm.airlineCompanyID = index.airlineCompanyID
+    msgTitle.value = "删除航司信息维护";
+    flag.value = true;
+    type.value = "del";
+    tableForm.event = 3;
+    tableForm.fullName = index.fullName;
+    tableForm.abbreviation = index.abbreviation;
+    tableForm.englishAbbreviation = index.englishAbbreviation;
+    tableForm.ITATCode = index.ITATCode;
+    tableForm.ICAOCode = index.ICAOCode;
+    tableForm.remarks = index.remarks;
+    tableForm.airlineCompanyID = index.airlineCompanyID;
   } else if (param === 4) {
   }
-}
+};
 //删除
 const eleDialog = () => {
-  msgTitle.value = '删除航司信息维护'
-  flag.value = true
-  type.value = 'del'
-}
+  msgTitle.value = "删除航司信息维护";
+  flag.value = true;
+  type.value = "del";
+};
 const delRemove = () => {
-  tableForm.event = 3
-  generalDataReception(tableForm)
-}
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
-  flag.value = false
-}
+  flag.value = false;
+};
 //获取表格数据
 const getQuery = async () => {
   try {
@@ -239,44 +178,46 @@ const getQuery = async () => {
       id: DATACONTENT_ID.airlineTableId,
       needPage: ++page.value,
       dataContent: Object.values(dataContent.value),
-    })
-    if (code === '0') {
+    });
+    if (code === "0") {
       if (returnData.listValues.length === 0) {
-        page.value--
-        noMore.value = true
+        page.value--;
+        noMore.value = true;
       }
-      const titleColumn = returnData.columnSet.find(item => item.needShow === 1)
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
       if (titleColumn) {
-        rowTitle.value = titleColumn.columnName
+        rowTitle.value = titleColumn.columnName;
       }
-      tableData.value.push(...returnData.listValues)
-      tableCols.value = returnData.columnSet
-      tableCols.value.forEach(element => {
-        element.label = element.columnLabel
-        element.key = element.columnName
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
         // if (element.columnName === "queryTemplate") {
         //   element.width = "300px";
         // }
-      })
-      serviceId.value = returnData.submitID!
+      });
+      serviceId.value = returnData.submitID!;
     } else {
-      page.value--
+      page.value--;
     }
   } catch (error) {
-    page.value--
+    page.value--;
   }
-}
+};
 //确认提交
-const airlineCompanyForm: any = ref(null)
+const airlineCompanyForm: any = ref(null);
 const submitForm = () => {
   airlineCompanyForm.value.validate((valid: any) => {
     if (valid) {
-      generalDataReception(tableForm)
+      generalDataReception(tableForm);
     } else {
-      return false
+      return false;
     }
-  })
-}
+  });
+};
 const resetTable = () => {
   page.value = 0
   noMore.value = false
@@ -285,44 +226,44 @@ const resetTable = () => {
 
 const btnAuthMap = [, 'new_airlines_button', 'airline_editor_button', 'airlines_delete_button']
 //新增-编辑-删除
-const generalDataReception = async data => {
+const generalDataReception = async (data) => {
   try {
     data = {
       ...data,
-    }
+    };
     const { code } = await GeneralDataReception({
       serviceId: serviceId.value,
       dataContent: JSON.stringify(data),
       btnAuth: btnAuthMap[data.event],
     })
     if (code == 0) {
-      ElMessage.success(`操作成功`)
+      ElMessage.success(`操作成功`);
       // this.$message.success("操作成功");
-      resetTable()
-      getQuery()
-      resetForm()
-      flag.value = false
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
       // rmFlag.value = false;
-      tableObj.value = {}
+      tableObj.value = {};
       // this.$router.go(0);
     } else {
-      ElMessage.error(`操作失败`)
+      ElMessage.error(`操作失败`);
       // this.$message.error("操作失败");
       // this.flag = false;
       // this.rmFlag = false;
-      tableObj.value = {}
-      resetForm()
+      tableObj.value = {};
+      resetForm();
     }
   } catch (error) {
-    flag.value = false
+    flag.value = false;
     //  rmFlag.value = false;
-    tableObj.value = {}
-    resetForm()
+    tableObj.value = {};
+    resetForm();
   }
-}
+};
 onMounted(() => {
-  getQuery()
-})
+  getQuery();
+});
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/airportCompany/index.vue

@@ -1,85 +1,46 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_airport_companies_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" :is-btn="true" :is-search="true" powerData="new_airport_companies_button" @searchForms="searchForms" @addForm="addForm" @clearForm="clearForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">机场公司维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.companyName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.companyName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="airportCompanyForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="airportCompanyForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="公司名称"
-                  size="default"
-                  :rules="formRules.isNotNull"
-                  prop="companyName"
-                >
-                  <el-input
-                    v-model="tableForm.companyName"
-                    placeholder="请输入公司名称"
-                  />
+                <el-form-item label="公司ID" size="default" :rules="formRules.isNotNull" prop="companyID">
+                  <el-input v-model="tableForm.companyID" placeholder="请输入公司ID" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="公司名称" size="default" :rules="formRules.isNotNull" prop="companyName">
+                  <el-input v-model="tableForm.companyName" placeholder="请输入公司名称" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="上级公司" size="default">
-                  <el-select
-                    style="width: 100%"
-                    v-model="tableForm.parentID"
-                    class="input-shadow"
-                    filterable
-                    default-first-option
-                    clearable
-                    placeholder="请选择"
-                  >
-                    <el-option
-                      v-for="item in tableOptionser"
-                      :key="item.v"
-                      :label="item.k"
-                      :value="item.v"
-                    >
+                  <el-select style="width: 100%" v-model="tableForm.parentID" class="input-shadow" filterable default-first-option clearable placeholder="请选择">
+                    <el-option v-for="item in tableOptionser" :key="item.v" :label="item.k" :value="item.v">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col>
+                <el-form-item label="上级公司ID" size="default" prop="parentID">
+                  <el-input v-model="tableForm.parentID" placeholder="请输入上级公司ID" />
+                </el-form-item>
+              </el-col>
               <el-col>
                 <el-form-item label="公司描述" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.companyDesc"
-                    placeholder="请输入公司描述"
-                  />
+                  <el-input type="textarea" v-model="tableForm.companyDesc" placeholder="请输入公司描述" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -96,23 +57,23 @@ import Dialog from "@/components/dialog/index.vue";
 import { Query, GeneralDataReception } from "@/api/webApi";
 import * as _ from "lodash";
 import { ElMessage } from "element-plus";
-const power = ref<String>("new_airlines_button"); //权限
+const power = ref<string>("new_airlines_button"); //权限
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const asShow = ref<Boolean>(false);
+const noMore = ref<boolean>(false);
+const asShow = ref<boolean>(false);
 const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增机场公司维护"); //弹窗标题
-const tableOptionser = ref([]); //弹窗下拉
-const tableOptionCopys = ref([]); //弹窗下拉
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增机场公司维护"); //弹窗标题
+const tableOptionser = ref<any>([]); //弹窗下拉
+const tableOptionCopys = ref<any>([]); //弹窗下拉
 const tableColsCopys = reactive([]); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   companyName: "",
   parentID: "",
   companyDesc: "",
@@ -134,7 +95,7 @@ const tableBtnGroup = ref([
   },
 ]);
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -144,6 +105,13 @@ const state = reactive({
   ],
   listLoading: true,
 });
+const searchForms = (val) => {
+  getQuery(val);
+};
+
+const clearForm = () => {
+  getQuery();
+};
 //新增
 const addForm = () => {
   msgTitle.value = "新增机场公司维护";
@@ -155,7 +123,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  airportCompanyForm.value?.resetFields()
+  airportCompanyForm.value?.resetFields();
   flag.value = false;
   // tableForm.companyName = "";
   // tableForm.parentID = "";
@@ -196,7 +164,7 @@ const delRest = () => {
   flag.value = false;
 };
 //获取弹框-下拉数据
-const getSelectData = async (id, name) => {
+const getSelectData = async (id?, name?) => {
   const { code, returnData } = await Query({
     id,
     dataContent: name ? [name] : name === null ? [null] : [],
@@ -209,12 +177,12 @@ const getSelectData = async (id, name) => {
   }
 };
 //获取表格数据
-const getQuery = async () => {
+const getQuery = async (val = "") => {
   try {
     const { code, returnData } = await Query({
       id: DATACONTENT_ID.airportTreeId,
       needPage: ++page.value,
-      dataContent: Object.values(dataContent.value),
+      dataContent: [val],
     });
     if (code === "0") {
       if (returnData.listValues.length === 0) {
@@ -227,7 +195,7 @@ const getQuery = async () => {
       if (titleColumn) {
         rowTitle.value = titleColumn.columnName;
       }
-      tableData.value.push(...returnData.listValues);
+      tableData.value = [...returnData.listValues];
       tableCols.value = returnData.columnSet;
       returnData.columnSet.forEach((item) => {
         if (item.listqueryTemplateID && item.columnName === "parentID") {

src/views/BasicsData/airportInfo/airportInfoChild/index.vue

@@ -1,100 +1,53 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="newly_added_terminal_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="newly_added_terminal_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">区域设置</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.terminalName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.terminalName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="airportInfoChildForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="airportInfoChildForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="区域名称"
-                  size="default"
-                  prop="terminalName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.terminalName"
-                    placeholder="请输入区域名称"
-                  />
+                <el-form-item label="所属机场ID" size="default" prop="airportID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.airportID" placeholder="请输入所属机场ID" />
                 </el-form-item>
               </el-col>
-              <!-- <el-col>
-                <el-form-item
-                  label="区域编码"
-                  size="default"
-                  prop="terminalID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.terminalID"
-                    placeholder="请输入区域编码"
-                  />
+              <el-col>
+                <el-form-item label="航站楼ID" size="default" prop="airportTerminalID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.airportTerminalID" placeholder="请输入航站楼ID" />
                 </el-form-item>
-              </el-col> -->
-              <!-- <el-col>
-                <el-form-item
-                  label="机场三字码"
-                  size="default"
-                  prop="airportCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    disabled
-                    v-model="tableForm.airportCode"
-                    placeholder="请输入机场三字码"
-                  />
+              </el-col>
+              <el-col>
+                <el-form-item label="区域名称" size="default" prop="terminalName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.terminalName" placeholder="请输入区域名称" />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
+              <el-col>
+                <el-form-item label="航站楼名称" size="default" prop="airportTerminalName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.airportTerminalName" placeholder="请输入航站楼名称" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="机场三字码" size="default" prop="airportCode" :rules="formRules.isNotNull">
+                  <el-input disabled v-model="tableForm.airportCode" placeholder="请输入机场三字码" />
+                </el-form-item>
+              </el-col>
               <el-col>
                 <el-form-item label="机场名称" size="default">
-                  <el-input
-                    disabled
-                    v-model="tableForm.abbreviation"
-                    placeholder="请输入机场名称"
-                  />
+                  <el-input disabled v-model="tableForm.abbreviation" placeholder="请输入机场名称" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.remarks"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -116,16 +69,16 @@ const router = useRouter();
 const route = useRoute();
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增区域"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增区域"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableBtnGroup = ref<Array>([
+const tableBtnGroup = ref<any>([
   {
     name: "编辑",
     className: "editBtn",
@@ -145,16 +98,18 @@ const tableBtnGroup = ref<Array>([
     is: "terminal_deletion_button",
   },
 ]); //单独的编辑
-const tableForm = reactive({
+const tableForm = reactive<any>({
   terminalID: "",
   terminalName: "",
   airportCode: "",
   abbreviation: "",
   remarks: "",
   event: "",
+  airportID: "",
+  airportTerminalID: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -175,13 +130,20 @@ tableForm.abbreviation = route.query.abbreviation
 //新增
 const addForm = () => {
   msgTitle.value = "新增区域";
+  for (const key in tableForm) {
+    if (key == "airportCode" || key == "abbreviation") {
+      tableForm[key] = tableForm[key];
+    } else {
+      tableForm[key] = "";
+    }
+  }
   tableForm.event = 1;
   flag.value = true;
   type.value = "";
 };
 //取消
 const resetForm = () => {
-  airportInfoChildForm.value?.resetFields()
+  airportInfoChildForm.value?.resetFields();
   flag.value = false;
   // tableForm.terminalID = "";
   // tableForm.terminalName = "";
@@ -216,15 +178,15 @@ const aloneDialog = () => {
 };
 //编辑-删除
 const btnClick = (row, index, param) => {
+  console.log(index);
   if (param === 2) {
     msgTitle.value = "编辑区域";
     flag.value = true;
     type.value = "";
+    for (const key in index) {
+      tableForm[key] = index[key];
+    }
     tableForm.event = 2;
-    tableForm.terminalID = index.terminalID;
-    tableForm.terminalName = index.terminalName;
-    tableForm.airportCode = index.airportCode;
-    tableForm.remarks = index.remarks;
   } else if (param === 3) {
     msgTitle.value = "删除区域";
     flag.value = true;

src/views/BasicsData/airportInfo/index.vue

@@ -1,177 +1,81 @@
 <template>
   <div class="airportInfoDetails">
-    <Minheader
-      :is-auth="true"
-      :is-statuser="true"
-      powerData="new_airport_button"
-      @addForm="addForm"
-    >
+    <Minheader :is-auth="true" :is-statuser="true" powerData="new_airport_button" @addForm="addForm">
       <template #header>
         <div class="status flex-wrap">
           <div class="manageTitle">机场信息维护</div>
         </div>
-      </template></Minheader
-    >
+      </template>
+    </Minheader>
     <div class="airportInfo-content">
       <el-row :gutter="24">
         <el-col :span="6" style="background: #fff">
           <div class="tree_left">
             <el-scrollbar style="height: 100%">
               <div class="corporate">{{ company }}</div>
-              <el-tree
-                :data="data.value"
-                :props="defaultProps"
-                accordion
-                @node-click="handleNodeClick"
-              >
+              <el-tree :data="data" :props="defaultProps" accordion @node-click="handleNodeClick">
               </el-tree>
             </el-scrollbar>
           </div>
         </el-col>
         <el-col :span="18">
           <div class="app-containers">
-            <DataTable
-              :btnGroupWidth="btnGroupWidth"
-              :tableHeader="tableCols"
-              :tableData="tableData"
-              :tableBtnGroup="tableBtnGroup"
-              :tableProperty="{ rowKey: 'ID' }"
-              @btnClick="btnClick"
-            />
+            <DataTable :btnGroupWidth="btnGroupWidth" :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
           </div>
         </el-col>
       </el-row>
     </div>
-    <Dialog
-      width="600px"
-      :flag="flag"
-      :type="type"
-      :msgTitle="msgTitle"
-      :delName="tableForm.airportName"
-      @resetForm="resetForm"
-      @delRest="delRest"
-      @submitForm="submitForm"
-      @delRemove="delRemove"
-    >
+    <Dialog width="600px" :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.airportName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
       <div class="diacont">
         <el-form :model="tableForm" :rules="formRules" ref="airportInfoForm">
           <el-row :gutter="24">
             <el-col :span="12">
-              <el-form-item
-                label="中文全称"
-                size="default"
-                prop="airportName"
-                :rules="formRules.isNotNull"
-              >
-                <el-input
-                  v-model="tableForm.airportName"
-                  placeholder="请输入机场名称"
-                />
+              <el-form-item label="中文全称" size="default" prop="airportName" :rules="formRules.isNotNull">
+                <el-input v-model="tableForm.airportName" placeholder="请输入机场名称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="中文简称"
-                size="default"
-                prop="abbreviation"
-                :rules="formRules.isNotNull"
-              >
-                <el-input
-                  v-model="tableForm.abbreviation"
-                  placeholder="请输入中文简称"
-                />
+              <el-form-item label="中文简称" size="default" prop="abbreviation" :rules="formRules.isNotNull">
+                <el-input v-model="tableForm.abbreviation" placeholder="请输入中文简称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="英文简称" size="default">
-                <el-input
-                  v-model="tableForm.englishAbbreviation"
-                  placeholder="请输入英文简称"
-                />
+                <el-input v-model="tableForm.englishAbbreviation" placeholder="请输入英文简称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="英文全称" size="default">
-                <el-input
-                  v-model="tableForm.fullName"
-                  placeholder="请输入英文全称"
-                />
+                <el-input v-model="tableForm.fullName" placeholder="请输入英文全称" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="三字码"
-                size="default"
-                prop="IATACode"
-                :rules="formRules.isNotNull"
-              >
-                <el-input
-                  v-model="tableForm.IATACode"
-                  placeholder="请输入三字码"
-                />
+              <el-form-item label="三字码" size="default" prop="IATACode" :rules="formRules.isNotNull">
+                <el-input v-model="tableForm.IATACode" placeholder="请输入三字码" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="四字码"
-                size="default"
-                prop="ICAOCode"
-                :rules="formRules.isNotNull"
-              >
-                <el-input
-                  v-model="tableForm.ICAOCode"
-                  placeholder="请输入四字码"
-                />
+              <el-form-item label="四字码" size="default" prop="ICAOCode" :rules="formRules.isNotNull">
+                <el-input v-model="tableForm.ICAOCode" placeholder="请输入四字码" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="时区"
-                size="default"
-                prop="airportTimeZone"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="时区" size="default" prop="airportTimeZone" :rules="formRules.isNotNull">
                 <!-- <el-input v-model="tableForm.china" /> -->
-                <el-select
-                  style="width: 100%"
-                  v-model="tableForm.airportTimeZone"
-                  class="input-shadow"
-                  filterable
-                  default-first-option
-                  clearable
-                  placeholder="请选择时区"
-                >
-                  <el-option
-                    v-for="item in tableOptionser"
-                    :key="item.v ? item.v : item.planDepartureApt"
-                    :label="item.k ? item.k : item.planDepartureApt"
-                    :value="item.v ? item.v : item.planDepartureApt"
-                  >
+                <el-select style="width: 100%" v-model="tableForm.airportTimeZone" class="input-shadow" filterable default-first-option clearable placeholder="请选择时区">
+                  <el-option v-for="item in tableOptionser" :key="item.v ? item.v : item.planDepartureApt" :label="item.k ? item.k : item.planDepartureApt" :value="item.v ? item.v : item.planDepartureApt">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="公司名称"
-                size="default"
-                prop="companyName"
-                :rules="formRules.isNotNull"
-              >
-                <el-input
-                  disabled
-                  v-model="tableForm.companyName"
-                  placeholder="请输入公司名称"
-                />
+              <el-form-item label="公司名称" size="default" prop="companyName" :rules="formRules.isNotNull">
+                <el-input disabled v-model="tableForm.companyName" placeholder="请输入公司名称" />
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="备注" size="default">
-                <el-input
-                  type="textarea"
-                  v-model="tableForm.remarks"
-                  placeholder="请输入备注"
-                />
+                <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -189,7 +93,7 @@ import { ElMessage } from "element-plus";
 import Cookies from "js-cookie";
 const formRules = useElement().formRules;
 const router = useRouter();
-const tableBtnGroup = ref<Array>([
+const tableBtnGroup = ref<any>([
   {
     name: "编辑",
     className: "editBtn",
@@ -211,21 +115,21 @@ const tableBtnGroup = ref<Array>([
 ]); //单独的编辑
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
 const defaultProps = ref({
   children: "children",
   label: "companyName",
 });
 const companyID = ref(""); //机场id
-const btnGroupWidth = ref<String>("");
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增机场信息维护"); //弹窗标题
-const tableOptionser = ref<Array>([
+const btnGroupWidth = ref<string>("");
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增机场信息维护"); //弹窗标题
+const tableOptionser = ref<any>([
   {
     k: "UTC",
     v: "1",
@@ -320,7 +224,7 @@ const tableOptionser = ref<Array>([
   },
 ]); //弹窗下拉
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   airportID: "",
   airportName: "",
   IATACode: "",
@@ -343,7 +247,7 @@ const tableColumnProperty = reactive({
   headerAlign: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -359,7 +263,7 @@ const state = reactive({
   listLoading: true,
 });
 const company = ref("所属公司");
-const data = reactive([]);
+const data = ref([]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增机场信息维护";
@@ -370,7 +274,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  airportInfoForm.value?.resetFields()
+  airportInfoForm.value?.resetFields();
   flag.value = false;
   // tableForm.airportID = "";
   // tableForm.airportName = "";
@@ -518,7 +422,7 @@ const getAirlines = async () => {
       dataContent: [],
     });
     if (res.code === "0") {
-      let arr = [];
+      let arr: any = [];
       arr = translateDataToTreeAll(
         res.returnData.listValues,
         "parentID",

src/views/BasicsData/airportInfo/positionSetting/index.vue

@@ -1,118 +1,53 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="position_addition_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="position_addition_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">位置设置</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.positionDescribe"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.positionDescribe" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="positionSettingForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="positionSettingForm">
             <el-row :gutter="24">
-              <!-- <el-col>
-                <el-form-item
-                  label="区域ID"
-                  size="default"
-                  prop="terminalID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    disabled
-                    v-model="tableForm.terminalID"
-                    placeholder="请输入区域ID"
-                  />
+              <el-col>
+                <el-form-item label="位置ID" size="default" prop="positionID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.positionID" placeholder="位置ID" />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
               <el-col>
-                <el-form-item
-                  label="区域名称"
-                  size="default"
-                  prop="terminalName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    disabled
-                    v-model="tableForm.terminalName"
-                    placeholder="请输入区域名称"
-                  />
+                <el-form-item label="区域名称" size="default" prop="terminalName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.terminalName" placeholder="请输入区域名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="位置名称"
-                  size="default"
-                  prop="positionDescribe"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.positionDescribe"
-                    placeholder="请输入位置名称"
-                  />
+                <el-form-item label="位置名称" size="default" prop="positionName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.positionName" placeholder="请输入位置名称" />
                 </el-form-item>
               </el-col>
-              <!-- <el-col>
-                <el-form-item
-                  label="位置序号"
-                  size="default"
-                  prop="positionSN"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.positionSN"
-                    placeholder="请输入位置序号"
-                  />
+              <el-col>
+                <el-form-item label="位置标识" size="default" prop="locationCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.locationCode" placeholder="请输入位置标识" />
                 </el-form-item>
-              </el-col> -->
+              </el-col>
               <el-col>
-                <el-form-item
-                  label="位置编码"
-                  size="default"
-                  prop="locationCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.locationCode"
-                    placeholder="请输入位置编码"
-                  />
+                <el-form-item label="位置所属节点" size="default" prop="positionNode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.positionNode" placeholder="请输入位置所属节点" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="位置编码" size="default" prop="positionSN" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.positionSN" placeholder="请输入位置编码" />
                 </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.remarks"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
               <!-- <el-col>
@@ -140,16 +75,16 @@ const formRules = useElement().formRules;
 const route = useRoute();
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增位置设置"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增位置设置"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   positionID: "",
   positionSN: "",
   positionDescribe: "",
@@ -159,11 +94,13 @@ const tableForm = reactive({
   terminalName: "",
   remarks: "",
   event: "",
+  positionName: "",
+  positionNode: "",
 }); //弹窗内容
 //列表
 tableForm.terminalID = route.query.terminalID;
 tableForm.terminalName = route.query.terminalName;
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -198,7 +135,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  positionSettingForm.value?.resetFields()
+  positionSettingForm.value?.resetFields();
   flag.value = false;
   // tableForm.positionID = "";
   // tableForm.positionSN = "";
@@ -227,14 +164,10 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑位置";
     flag.value = true;
     type.value = "";
+    for (const key in index) {
+      tableForm[key] = index[key];
+    }
     tableForm.event = 2;
-    tableForm.positionID = index.positionID;
-    tableForm.positionSN = index.positionSN;
-    tableForm.positionDescribe = index.positionDescribe;
-    tableForm.englishDescribe = index.englishDescribe;
-    tableForm.locationCode = index.locationCode;
-    tableForm.terminalID = index.terminalID;
-    tableForm.remarks = index.remarks;
   } else if (param === 3) {
     msgTitle.value = "删除位置";
     flag.value = true;
@@ -313,12 +246,11 @@ const btnAuthMap = [, 'position_addition_button', 'position_edit_button', 'locat
 //新增-编辑-删除
 const generalDataReception = async (data) => {
   try {
-    let obj = {
-      terminalID: route.query.terminalID,
-    };
+    // let obj = {
+    //   terminalID: route.query.terminalID,
+    // };
     data = {
       ...data,
-      obj,
     };
     const { code } = await GeneralDataReception({
       serviceId: serviceId.value,

src/views/BasicsData/cargoInformation/index.vue

@@ -1,103 +1,43 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_freight_forwarder_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-btn="true" :is-search="true" :is-statuser="true" powerData="new_freight_forwarder_button" @searchForms="searchForms" @clearForm="clearForm" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">货代管理</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.agentName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.agentName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="cargoInformationForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="cargoInformationForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="货代ID"
-                  size="default"
-                  prop="agentID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.agentID"
-                    placeholder="请输入货代ID"
-                  />
+                <el-form-item label="货代ID" size="default" prop="agentID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.agentID" placeholder="请输入货代ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="货代名称"
-                  size="default"
-                  prop="agentName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.agentName"
-                    placeholder="请输入货代名称"
-                  />
+                <el-form-item label="货代名称" size="default" prop="agentName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.agentName" placeholder="请输入货代名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="货代编码"
-                  size="default"
-                  prop="agentCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.agentCode"
-                    placeholder="请输入货代编码"
-                  />
+                <el-form-item label="货代编码" size="default" prop="agentCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.agentCode" placeholder="请输入货代编码" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="货代等级"
-                  size="default"
-                  prop="level"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.level"
-                    placeholder="请输入货代等级"
-                  />
+                <el-form-item label="货代等级" size="default" prop="level" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.level" placeholder="请输入货代等级" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.agentDesc"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.agentDesc" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -116,16 +56,16 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增货代管理"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增货代管理"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   agentID: "",
   agentName: "",
   agentCode: "",
@@ -134,7 +74,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -159,6 +99,13 @@ const tableBtnGroup = ref([
     is: "freight_forwarder_deletion_button",
   },
 ]);
+const searchForms = (val) => {
+  console.log(val);
+};
+
+const clearForm = () => {
+  console.log("清除");
+};
 //新增
 const addForm = () => {
   msgTitle.value = "新增货代管理";
@@ -168,7 +115,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  cargoInformationForm.value?.resetFields()
+  cargoInformationForm.value?.resetFields();
   flag.value = false;
   // tableForm.agentID = "";
   // tableForm.agentName = "";

src/views/BasicsData/containerMaintenance/index.vue

@@ -1,103 +1,43 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="container_addition_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-btn="true" :is-search="true" :is-statuser="true" powerData="container_addition_button" @clearForm="clearForm" @searchForms="searchForms" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">容器类型维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.containerName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.containerName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="containerMaintenanceForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="containerMaintenanceForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="容器类型ID"
-                  size="default"
-                  prop="containerID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.containerID"
-                    placeholder="请输入容器类型ID"
-                  />
+                <el-form-item label="容器类型ID" size="default" prop="containerID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.containerID" placeholder="请输入容器类型ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="容器类型名称"
-                  size="default"
-                  prop="containerName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.containerName"
-                    placeholder="请输入容器类型名称"
-                  />
+                <el-form-item label="容器类型名称" size="default" prop="containerName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.containerName" placeholder="请输入容器类型名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="容器类型识别码"
-                  size="default"
-                  prop="containerCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.containerCode"
-                    placeholder="请输入容器类型识别码"
-                  />
+                <el-form-item label="容器类型识别码" size="default" prop="containerCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.containerCode" placeholder="请输入容器类型识别码" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="容器单位"
-                  size="default"
-                  prop="containerUnit"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.containerUnit"
-                    placeholder="请输入容器单位"
-                  />
+                <el-form-item label="容器单位" size="default" prop="containerUnit" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.containerUnit" placeholder="请输入容器单位" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.containerDesc"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.containerDesc" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -116,16 +56,16 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增容器维护"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增容器维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   containerID: "",
   containerName: "",
   containerCode: "",
@@ -134,7 +74,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -158,6 +98,13 @@ const tableBtnGroup = ref([
     is: "container_deletion_button",
   },
 ]);
+const searchForms = (val) => {
+  console.log(val);
+};
+
+const clearForm = () => {
+  console.log("清除");
+};
 //新增
 const addForm = () => {
   msgTitle.value = "新增类型维护";
@@ -167,7 +114,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  containerMaintenanceForm.value?.resetFields()
+  containerMaintenanceForm.value?.resetFields();
   flag.value = false;
   // tableForm.containerID = "";
   // tableForm.containerName = "";

src/views/BasicsData/deployNode/index.vue

@@ -1,73 +1,38 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_node_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="new_node_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">节点信息维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.nodeName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.nodeName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
           <el-form :model="tableForm" :rules="formRules" ref="deployNodeForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="节点名称"
-                  size="default"
-                  prop="nodeName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.nodeName"
-                    placeholder="请输入名称"
-                  />
+                <el-form-item label="节点ID" size="default" prop="nodeID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.nodeID" placeholder="请输入节点ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="节点编码"
-                  size="default"
-                  prop="nodeCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.nodeCode"
-                    placeholder="请输入航站名称"
-                  />
+                <el-form-item label="节点名称" size="default" prop="nodeName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.nodeName" placeholder="请输入名称" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="节点编码" size="default" prop="nodeCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.nodeCode" placeholder="请输入航站名称" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.nodeDescribe"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.nodeDescribe" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -86,16 +51,16 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增节点信息维护"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增节点信息维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   nodeID: "",
   nodeName: "",
   nodeCode: "",
@@ -103,7 +68,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -137,7 +102,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  deployNodeForm.value?.resetFields()
+  deployNodeForm.value?.resetFields();
   flag.value = false;
   // tableForm.nodeID = "";
   // tableForm.nodeName = "";

src/views/BasicsData/equipmentMaintenance/index.vue

@@ -1,55 +1,28 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="equipment_addition_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="equipment_addition_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">设备维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.deviceName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.deviceName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="equipmentMaintenanceForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="equipmentMaintenanceForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="设备名称"
-                  size="default"
-                  prop="deviceName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.deviceName"
-                    placeholder="请输入设备名称"
-                  />
+                <el-form-item label="设备ID" size="default" prop="deviceID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.deviceID" placeholder="请输入设备ID" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="设备名称" size="default" prop="deviceName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.deviceName" placeholder="请输入设备名称" />
                 </el-form-item>
               </el-col>
               <!-- <el-col>
@@ -66,39 +39,18 @@
                 </el-form-item>
               </el-col> -->
               <el-col>
-                <el-form-item
-                  label="设备编码"
-                  size="default"
-                  prop="deviceCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.deviceCode"
-                    placeholder="请输入设备编码"
-                  />
+                <el-form-item label="设备编码" size="default" prop="deviceCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.deviceCode" placeholder="请输入设备编码" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="IP"
-                  size="default"
-                  prop="deviceIP"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.deviceIP"
-                    placeholder="请输入IP"
-                  />
+                <el-form-item label="IP" size="default" prop="deviceIP" :rules="formRules.isNotNull">
+                  <el-input type="textarea" v-model="tableForm.deviceIP" placeholder="请输入IP" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.remarks"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.remarks" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -117,16 +69,16 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增设备维护"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增设备维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   deviceID: "",
   deviceName: "",
   deviceType: "",
@@ -136,7 +88,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -172,7 +124,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  equipmentMaintenanceForm.value?.resetFields()
+  equipmentMaintenanceForm.value?.resetFields();
   flag.value = false;
   // tableForm.deviceID = "";
   // tableForm.deviceName = "";

src/views/BasicsData/modelMaintenance/index.vue

@@ -1,90 +1,43 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_model_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="new_model_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">机型维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.modelName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.modelName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="modelMaintenanceForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="modelMaintenanceForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="机型名称"
-                  size="default"
-                  prop="modelName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.modelName"
-                    placeholder="请输入机型名称"
-                  />
+                <el-form-item label="机型ID" size="default" prop="modelID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.modelID" placeholder="请输入机型ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="机型类型"
-                  size="default"
-                  prop="modelType"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.modelType"
-                    placeholder="请输入机型类型"
-                  />
+                <el-form-item label="机型名称" size="default" prop="modelName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.modelName" placeholder="请输入机型名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="机型编码"
-                  size="default"
-                  prop="modelCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.modelCode"
-                    placeholder="请输入机型编码"
-                  />
+                <el-form-item label="机型类型" size="default" prop="modelType" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.modelType" placeholder="请输入机型类型" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="机型编码" size="default" prop="modelCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.modelCode" placeholder="请输入机型编码" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.modelDesc"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.modelDesc" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -103,17 +56,17 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
 const router = useRouter();
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增机型维护"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增机型维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableBtnGroup = ref<Array>([
+const tableBtnGroup = ref<any>([
   {
     name: "编辑",
     className: "editBtn",
@@ -133,7 +86,7 @@ const tableBtnGroup = ref<Array>([
     is: "model_deletion_button",
   },
 ]); //单独的编辑
-const tableForm = reactive({
+const tableForm = reactive<any>({
   modelID: "",
   modelName: "",
   modelType: "",
@@ -142,7 +95,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -161,7 +114,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  modelMaintenanceForm.value?.resetFields()
+  modelMaintenanceForm.value?.resetFields();
   flag.value = false;
   // tableForm.modelID = "";
   // tableForm.modelName = "";
@@ -284,6 +237,7 @@ const resetTable = () => {
 const btnAuthMap = [, 'new_model_button', 'airline_editor_button', 'model_deletion_button']
 //新增-编辑-删除
 const generalDataReception = async (data) => {
+  console.log(data);
   try {
     data = {
       ...data,

src/views/BasicsData/shippingSpace/index.vue

@@ -1,85 +1,48 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_cabin_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-statuser="true" powerData="new_cabin_button" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">舱位管理</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.storingName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.storingName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="shippingSpaceForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="shippingSpaceForm">
             <el-row :gutter="24">
+              <el-col>
+                <el-form-item label="机型ID" prop="binNo" :rules="formRules.isNotNull" size="default">
+                  <el-input v-model="tableForm.binNo" placeholder="请输入机型ID" />
+                </el-form-item>
+              </el-col>
+              <el-col>
+                <el-form-item label="舱位ID" prop="storingID" :rules="formRules.isNotNull" size="default">
+                  <el-input v-model="tableForm.storingID" placeholder="请输入舱位ID" />
+                </el-form-item>
+              </el-col>
               <el-col>
                 <el-form-item label="机型名称" size="default">
-                  <el-input
-                    disabled
-                    v-model="tableForm.modelName"
-                    placeholder="请输入机型名称"
-                  />
+                  <el-input disabled v-model="tableForm.modelName" placeholder="请输入机型名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="舱位名称"
-                  size="default"
-                  prop="storingName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.storingName"
-                    placeholder="请输入舱位名称"
-                  />
+                <el-form-item label="舱位名称" size="default" prop="storingName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.storingName" placeholder="请输入舱位名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="舱位编码"
-                  size="default"
-                  prop="storingCode"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.storingCode"
-                    placeholder="请输入舱位编码"
-                  />
+                <el-form-item label="舱位编码" size="default" prop="storingCode" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.storingCode" placeholder="请输入舱位编码" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    v-model="tableForm.storingDesc"
-                    placeholder="请输入备注"
-                  />
+                  <el-input v-model="tableForm.storingDesc" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -99,16 +62,16 @@ const formRules = useElement().formRules;
 const route = useRoute();
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增舱位管理"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增舱位管理"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   storingID: "",
   storingName: "",
   storingCode: "",
@@ -120,7 +83,7 @@ const tableForm = reactive({
 tableForm.binNo = route.query.modelID;
 tableForm.modelName = route.query.modelName;
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -153,7 +116,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  shippingSpaceForm.value?.resetFields()
+  shippingSpaceForm.value?.resetFields();
   flag.value = false;
   // tableForm.storingID = "";
   // tableForm.storingName = "";

src/views/BasicsData/specialCargoMaintenance/index.vue

@@ -1,103 +1,43 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader
-        :is-auth="true"
-        :is-statuser="true"
-        powerData="new_special_goods_type_button"
-        @addForm="addForm"
-      >
+      <Minheader :is-auth="true" :is-btn="true" :is-search="true" :is-statuser="true" powerData="new_special_goods_type_button" @searchForms="searchForms" @clearForm="clearForm" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">特殊货物类型维护</div>
           </div>
-        </template></Minheader
-      >
+        </template>
+      </Minheader>
       <div class="app-containers">
-        <DataTable
-          :tableHeader="tableCols"
-          :tableData="tableData"
-          :tableBtnGroup="tableBtnGroup"
-          :tableProperty="{ rowKey: 'ID' }"
-          @btnClick="btnClick"
-        />
+        <DataTable :tableHeader="tableCols" :tableData="tableData" :tableBtnGroup="tableBtnGroup" :tableProperty="{ rowKey: 'ID' }" @btnClick="btnClick" />
       </div>
-      <Dialog
-        :flag="flag"
-        :type="type"
-        :msgTitle="msgTitle"
-        :delName="tableForm.specialTypeName"
-        @resetForm="resetForm"
-        @delRest="delRest"
-        @submitForm="submitForm"
-        @delRemove="delRemove"
-      >
+      <Dialog :flag="flag" :type="type" :msgTitle="msgTitle" :delName="tableForm.specialTypeName" @resetForm="resetForm" @delRest="delRest" @submitForm="submitForm" @delRemove="delRemove">
         <div class="diacont">
-          <el-form
-            :model="tableForm"
-            :rules="formRules"
-            ref="specialCargoMaintenanceForm"
-          >
+          <el-form :model="tableForm" :rules="formRules" ref="specialCargoMaintenanceForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item
-                  label="特殊货物类型ID"
-                  size="default"
-                  prop="specialTypeID"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.specialTypeID"
-                    placeholder="请输入特殊货物类型ID"
-                  />
+                <el-form-item label="特殊货物类型ID" size="default" prop="specialTypeID" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.specialTypeID" placeholder="请输入特殊货物类型ID" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="特殊货物类型名称"
-                  size="default"
-                  prop="specialTypeName"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.specialTypeName"
-                    placeholder="请输入特殊货物类型名称"
-                  />
+                <el-form-item label="特殊货物类型名称" size="default" prop="specialTypeName" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.specialTypeName" placeholder="请输入特殊货物类型名称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="特殊货物类型编码"
-                  size="default"
-                  prop="specialType"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.specialType"
-                    placeholder="请输入特殊货物类型编码"
-                  />
+                <el-form-item label="特殊货物类型编码" size="default" prop="specialType" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.specialType" placeholder="请输入特殊货物类型编码" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="特殊货物类型简称"
-                  size="default"
-                  prop="abbspecialType"
-                  :rules="formRules.isNotNull"
-                >
-                  <el-input
-                    v-model="tableForm.abbspecialType"
-                    placeholder="请输入特殊货物类型简称"
-                  />
+                <el-form-item label="特殊货物类型简称" size="default" prop="abbspecialType" :rules="formRules.isNotNull">
+                  <el-input v-model="tableForm.abbspecialType" placeholder="请输入特殊货物类型简称" />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="备注" size="default">
-                  <el-input
-                    type="textarea"
-                    v-model="tableForm.specialTypeDescribe"
-                    placeholder="请输入备注"
-                  />
+                  <el-input type="textarea" v-model="tableForm.specialTypeDescribe" placeholder="请输入备注" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -116,16 +56,16 @@ import { ElMessage } from "element-plus";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
-const noMore = ref<Boolean>(false);
-const rowTitle = ref<String>("");
-const tableCols = ref([]); //表头数据
-const serviceId = ref<String>("");
+const noMore = ref<boolean>(false);
+const rowTitle = ref<string>("");
+const tableCols = ref<any>([]); //表头数据
+const serviceId = ref<any>("");
 const tableObj = ref({}); //增删改数据缓存
-const flag = ref<Boolean>(false); //弹窗开关
-const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增特殊货物类型维护"); //弹窗标题
+const flag = ref<boolean>(false); //弹窗开关
+const type = ref<string>(""); //判断是否删除
+const msgTitle = ref<string>("新增特殊货物类型维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
-const tableForm = reactive({
+const tableForm = reactive<any>({
   specialTypeID: "",
   specialType: "",
   specialTypeName: "",
@@ -134,7 +74,7 @@ const tableForm = reactive({
   event: "",
 }); //弹窗内容
 //列表
-const tableData = ref([]);
+const tableData = ref<any>([]);
 //表头
 const state = reactive({
   list: [
@@ -158,6 +98,13 @@ const tableBtnGroup = ref([
     is: "special_cargo_type_deletion_button",
   },
 ]);
+const searchForms = (val) => {
+  console.log(val);
+};
+
+const clearForm = () => {
+  console.log("清除");
+};
 //新增
 const addForm = () => {
   msgTitle.value = "新增特殊货物类型维护";
@@ -167,7 +114,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  specialCargoMaintenanceForm.value?.resetFields()
+  specialCargoMaintenanceForm.value?.resetFields();
   flag.value = false;
   // tableForm.specialTypeID = "";
   // tableForm.specialType = "";

src/views/systemSettings/warningSet/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="airportInfo scroll-y">
     <div class="wrap">
-      <Minheader :is-auth="true" :is-statuser="true" powerData="alert_alarm_settings_add_button" @addForm="addForm" @searchForms="searchForms">
+      <Minheader :is-auth="true" :is-btn="true" :is-search="true" :is-statuser="true" powerData="alert_alarm_settings_add_button" @addForm="addForm" @searchForms="searchForms" @clearForm="clearForm">
         <template #header>
           <div class="status flex-wrap">
             <div class="manageTitle">预警告警维护</div>
@@ -118,14 +118,7 @@
           </el-form>
         </div>
       </Dialog>
-      <el-popover
-        ref="popoverRef"
-        :virtual-ref="inputRef"
-        virtual-triggering
-        placement="right"
-        trigger="click"
-        content="多个停机位用逗号分隔，例如 51,52"
-      />
+      <el-popover ref="popoverRef" :virtual-ref="inputRef" virtual-triggering placement="right" trigger="click" content="多个停机位用逗号分隔，例如 51,52" />
     </div>
   </div>
 </template>
@@ -141,6 +134,7 @@ import {
 } from "@/api/webApi";
 import { ElMessage } from "element-plus";
 import { onMounted } from "vue";
+import { da } from "element-plus/es/locale";
 const formRules = useElement().formRules;
 const page = ref<number>(0); //分页参数
 const dataContent = ref<object>({});
@@ -159,7 +153,7 @@ const tableOptionser = ref<any>([]); //弹窗下拉
 const submitID = ref<string | any>("");
 const delName = ref<string>("");
 const listqueryTemplateID = ref<string | any>("");
-const inputRef = ref(null)
+const inputRef = ref(null);
 const tableForm = reactive<any>({
   IATACode: null,
   departmentAirport: null,
@@ -239,7 +233,7 @@ const addForm = () => {
 };
 //取消
 const resetForm = () => {
-  warningSetForm.value?.resetFields()
+  warningSetForm.value?.resetFields();
   flag.value = false;
   // tableForm.IATACode = "";
   // tableForm.departmentAirport = "";
@@ -585,8 +579,8 @@ const generalDataReception = async (data, event) => {
   try {
     if (event === 3) {
       data = {
-        alarmSceneId: data.alarmSceneId
-      }
+        alarmSceneId: data.alarmSceneId,
+      };
     } else {
       data = {
         ...data,
@@ -618,11 +612,12 @@ const generalDataReception = async (data, event) => {
     resetForm();
   }
 };
-//清除
-const searchForms = (data) => {
-  page.value = 0;
-  tableData.value = [];
-  getQuery(data);
+const searchForms = (val) => {
+  console.log(val);
+};
+
+const clearForm = () => {
+  console.log("清除");
 };
 //获取航司二字码
 const getIaCode = async () => {
@@ -635,6 +630,7 @@ const getAirpot = async () => {
   tableOptionser.value = result;
 };
 onMounted(() => {
+  getQuery();
   getIaCode();
   getAirpot();
 });

src/views/userManagement/role/index.vue

@@ -17,6 +17,9 @@
     <!--新增/编辑-->
     <Dialog :flag="editDialogVisible" :msgTitle="editDialogTitle" @submitForm="submitForm(ruleFormRef)" @resetForm="resetForm(ruleFormRef)" :show-flag="true">
       <el-form ref="ruleFormRef" :model="ruleForm" label-width="110px" class="demo-ruleForm">
+        <el-form-item label="角色ID" :rules="[{required: true,message: '请输入角色ID',trigger: 'blur',}]" prop="role_id">
+          <el-input v-model="ruleForm.role_id" size="default" placeholder="请输入角色名称" />
+        </el-form-item>
         <el-form-item label="角色名称" :rules="[{required: true,message: '请输入角色名称',trigger: 'blur',}]" prop="role_name">
           <el-input v-model="ruleForm.role_name" size="default" placeholder="请输入角色名称" />
         </el-form-item>
@@ -29,6 +32,12 @@
             <el-radio :label="2"> 禁用</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否存在互斥" prop="repel">
+          <el-radio-group v-model="ruleForm.repel">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0"> 否</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
     </Dialog>
   </div>
@@ -45,7 +54,7 @@ const router = useRouter();
 const ruleFormRef = ref<FormInstance>();
 const tableHeader = ref([]);
 const tableData = ref([]);
-const tableBtnGroup = [
+const tableBtnGroup = <any>[
   {
     name: "编辑",
     className: "editBtn",
@@ -71,9 +80,11 @@ const dT = ref("add");
 const editDialogVisible = ref(false);
 const editDialogTitle = ref("新增角色");
 const ruleForm = ref<any>({
+  role_id: "",
   role_name: "",
   role_comment: "",
   role_status: "",
+  repel: "",
 });
 const searchInfo = ref("");
 const rowIndex = ref<any>({});