111

package-lock.json

@@ -11,10 +11,12 @@
       "dependencies": {
         "@element-plus/icons-vue": "^2.0.9",
         "axios": "0.21.3",
+        "blueimp-md5": "^2.19.0",
         "echarts": "5.3.2",
         "el-table-infinite-scroll": "^3.0.1",
         "element-plus": "^2.2.9",
         "file-saver": "^2.0.5",
+        "js-cookie": "^3.0.1",
         "js-error-collection": "^1.0.7",
         "mitt": "^3.0.0",
         "moment-mini": "2.22.1",
@@ -3853,6 +3855,11 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
+    "node_modules/blueimp-md5": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
+      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="
+    },
     "node_modules/bn.js": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
@@ -10790,6 +10797,14 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
+    "node_modules/js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/js-error-collection": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/js-error-collection/-/js-error-collection-1.0.8.tgz",
@@ -23961,6 +23976,11 @@
       "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
       "dev": true
     },
+    "blueimp-md5": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
+      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w=="
+    },
     "bn.js": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz",
@@ -29304,6 +29324,11 @@
       "integrity": "sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==",
       "dev": true
     },
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
+    },
     "js-error-collection": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/js-error-collection/-/js-error-collection-1.0.8.tgz",

public/demo.js

@@ -22,4 +22,9 @@ const LOOP_INTERVAL = {
 const DATACONTENT_ID = {
   /***-----登录------***/
   loginId: 36, //登录-获取权限-id
-}
+
+  /***-----基础数据------***/
+  airlineTableId: 80, //基础数据-航司信息维护-表格-id
+  airportTreeId: 58, //基础数据-机场信息维护-公司列表-id
+  airportTableId: 79, //基础数据-机场信息维护-表格-id
+};

src/api/webApi.ts

@@ -25,3 +25,11 @@ export async function myQuery(id, ...dataContent) {
     return Promise.reject(error);
   }
 }
+
+export function GeneralDataReception(params) {
+  return request({
+    url: "/openApi/generalDataReception",
+    method: "post",
+    data: params,
+  });
+}

src/utils/axiosReq2.ts

@@ -1,113 +1,113 @@
-import axios from 'axios'
-import router from '@/router'
-import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
-import { getToken, setToken } from '@/utils/auth'
-import { AxiosConfigTy, AxiosReqTy, ObjTy } from '~/common'
-import { useUserStore } from '@/store/user'
-let reqConfig: any
-let loadingE: any
+import axios from "axios";
+import router from "@/router";
+import { ElLoading, ElMessage, ElMessageBox } from "element-plus";
+import { getToken, setToken } from "@/utils/auth";
+import { AxiosConfigTy, AxiosReqTy, ObjTy } from "~/common";
+import { useUserStore } from "@/store/user";
+let reqConfig: any;
+let loadingE: any;
 
-const service: any = axios.create()
+const service: any = axios.create();
 
 // 请求拦截
 service.interceptors.request.use(
   (request: AxiosReqTy) => {
     // token setting
-    request.headers['AUTHORIZE_TOKEN'] = getToken()
-    request.headers['token'] = "4cdc82f3d9374abc9cd2c940170a770b"
-    request.data["OperatorId"] ="1656481036138";
+    request.headers["AUTHORIZE_TOKEN"] = getToken();
+    request.headers["token"] = "ba729239f8b04ee682ada8fe08dbd7ab";
+    request.data["OperatorId"] = "1656481036138";
     /* download file*/
     if (request.isDownLoadFile) {
-      request.responseType = 'blob'
+      request.responseType = "blob";
     }
     /* upload file*/
     if (request.isUploadFile) {
-      request.headers['Content-Type'] = 'application/json'
+      request.headers["Content-Type"] = "application/json";
     }
-    reqConfig = request
+    reqConfig = request;
     if (request.bfLoading) {
       loadingE = ElLoading.service({
         lock: true,
-        text: '数据载入中',
+        text: "数据载入中",
         // spinner: 'el-icon-ElLoading',
-        background: 'rgba(0, 0, 0, 0.1)'
-      })
+        background: "rgba(0, 0, 0, 0.1)",
+      });
     }
     /*
      *params会拼接到url上
      * */
     if (request.isParams) {
-      request.params = request.data
-      request.data = {}
+      request.params = request.data;
+      request.data = {};
     }
-    return request
+    return request;
   },
   (err: any) => {
-    Promise.reject(err)
+    Promise.reject(err);
   }
-)
+);
 // 响应拦截
 service.interceptors.response.use(
   (res: any) => {
     if (reqConfig.afHLoading && loadingE) {
-      loadingE.close()
+      loadingE.close();
     }
     // 如果是下载文件直接返回
     if (reqConfig.isDownLoadFile) {
-      return res
+      return res;
     }
-    const { flag, msg, isNeedUpdateToken, updateToken, code } = res.data
+    const { flag, msg, isNeedUpdateToken, updateToken, code } = res.data;
     //更新token保持登录状态
     if (isNeedUpdateToken) {
-      setToken(updateToken)
+      setToken(updateToken);
     }
-    const successCode = '0,200,20000'
+    const successCode = "0,200,20000";
     if (successCode.includes(code)) {
-      return res.data
+      return res.data;
     } else {
       if (code === 403) {
-        ElMessageBox.confirm('请重新登录', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
+        ElMessageBox.confirm("请重新登录", {
+          confirmButtonText: "重新登录",
+          cancelButtonText: "取消",
+          type: "warning",
         }).then(() => {
-          const userStore = useUserStore()
+          const userStore = useUserStore();
           userStore.resetState().then(() => {
-            router.push({ path: '/login' })
-          })
-        })
+            router.push({ path: "/login" });
+          });
+        });
       }
       if (reqConfig.isAlertErrorMsg) {
         ElMessage({
           message: msg,
-          type: 'error',
-          duration: 2 * 1000
-        })
+          type: "error",
+          duration: 2 * 1000,
+        });
       }
       //返回错误信息
       //如果未catch 走unhandledrejection进行收集
       //注：如果没有return 则，会放回到请求方法中.then ,返回的res为 undefined
-      return Promise.reject(res.data)
+      return Promise.reject(res.data);
     }
   },
   (err: any) => {
     /*http错误处理，处理跨域，404，401，500*/
-    if (loadingE) loadingE.close()
+    if (loadingE) loadingE.close();
     ElMessage({
       message: err,
-      type: 'error',
-      duration: 2 * 1000
-    })
+      type: "error",
+      duration: 2 * 1000,
+    });
     //如果是跨域
     //Network Error,cross origin
     const errObj: ObjTy = {
       msg: err.toString(),
       reqUrl: reqConfig.baseURL + reqConfig.url,
-      params: reqConfig.isParams ? reqConfig.params : reqConfig.data
-    }
-    return Promise.reject(JSON.stringify(errObj))
+      params: reqConfig.isParams ? reqConfig.params : reqConfig.data,
+    };
+    return Promise.reject(JSON.stringify(errObj));
   }
-)
+);
 
 export function axiosReq({
   url,
@@ -120,11 +120,11 @@ export function axiosReq({
   isDownLoadFile,
   baseURL,
   timeout,
-  isAlertErrorMsg = true
+  isAlertErrorMsg = true,
 }: AxiosConfigTy): any {
   return service({
     url: url,
-    method: method ?? 'get',
+    method: method ?? "get",
     data: data ?? {},
     isParams: isParams ?? false,
     bfLoading: bfLoading ?? false,
@@ -133,8 +133,8 @@ export function axiosReq({
     isDownLoadFile: isDownLoadFile ?? false,
     isAlertErrorMsg: isAlertErrorMsg,
     baseURL: baseURL ?? import.meta.env.VITE_WEB_BASE_URL,
-    timeout: timeout ?? 15000
-  })
+    timeout: timeout ?? 15000,
+  });
 }
 
-export default axiosReq
+export default axiosReq;

src/utils/validate.ts

@@ -129,3 +129,36 @@ export function parseTime(time: any, cFormat: string) {
   });
   return time_str;
 }
+
+export function translateDataToTreeAll(arr, parentKey, key) {
+  const map = {};
+  const result = [];
+  arr.forEach((element) => {
+    const id = element[key];
+    const pid = element[parentKey];
+    if (map[id]) {
+      map[id] = {
+        ...element,
+        children: map[id].children,
+      };
+    } else {
+      map[id] = {
+        ...element,
+        children: [],
+      };
+    }
+    const item = map[id];
+    if (pid <= 0) {
+      result.push(item);
+    } else {
+      if (map[pid]) {
+        map[pid].children.push(item);
+      } else {
+        map[pid] = {
+          children: [item],
+        };
+      }
+    }
+  });
+  return result;
+}

src/views/BasicsData/airlineCompany/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -23,6 +23,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -30,7 +32,7 @@
               <el-col>
                 <el-form-item label="航司名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.fullName"
                     placeholder="请输入航司名称"
                   />
                 </el-form-item>
@@ -38,7 +40,7 @@
               <el-col>
                 <el-form-item label="中文简称" size="default">
                   <el-input
-                    v-model="tableForm.china"
+                    v-model="tableForm.abbreviation"
                     placeholder="请输入中文简称"
                   />
                 </el-form-item>
@@ -46,7 +48,7 @@
               <el-col>
                 <el-form-item label="英文简称" size="default">
                   <el-input
-                    v-model="tableForm.englin"
+                    v-model="tableForm.englishAbbreviation"
                     placeholder="请输入英文简称"
                   />
                 </el-form-item>
@@ -54,7 +56,7 @@
               <el-col>
                 <el-form-item label="航司二字码" size="default">
                   <el-input
-                    v-model="tableForm.two"
+                    v-model="tableForm.ITATCode"
                     placeholder="请输入航司二字码"
                   />
                 </el-form-item>
@@ -62,7 +64,7 @@
               <el-col>
                 <el-form-item label="航司三字码" size="default">
                   <el-input
-                    v-model="tableForm.three"
+                    v-model="tableForm.ICAOCode"
                     placeholder="请输入航司三字码"
                   />
                 </el-form-item>
@@ -71,7 +73,7 @@
                 <el-form-item label="备注" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.text"
+                    v-model="tableForm.remarks"
                     placeholder="请输入备注"
                   />
                 </el-form-item>
@@ -87,45 +89,31 @@
 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 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 tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增航司信息维护"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  fullName: "",
+  abbreviation: "",
+  englishAbbreviation: "",
+  ITATCode: "",
+  ICAOCode: "",
+  remarks: "",
+  event: "",
+  airlineCompanyID: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-  {
-    name: "中国国际航空",
-    china: "国航",
-    englin: "AIRCHINA",
-    two: "CA",
-    three: "CCA",
-    text: "CA国航",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -153,47 +141,47 @@ const tableBtnGroup = ref([
 //新增
 const addForm = () => {
   msgTitle.value = "新增航司信息维护";
+  tableForm.event = 1;
   flag.value = true;
   type.value = "";
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
-  tableForm.text = "";
+  tableForm.fullName = "";
+  tableForm.abbreviation = "";
+  tableForm.englishAbbreviation = "";
+  tableForm.ITATCode = "";
+  tableForm.ICAOCode = "";
+  tableForm.remarks = "";
+  tableForm.airlineCompanyID = "";
 };
-//编辑
-// const editDialog = (data) => {
-//   msgTitle.value = "编辑航司信息维护";
-//   flag.value = true;
-//   type.value = "";
-//   tableForm.name = data.name;
-//   tableForm.china = data.china;
-//   tableForm.englin = data.englin;
-//   tableForm.two = data.two;
-//   tableForm.three = data.three;
-//   tableForm.text = data.text;
-// };
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
     msgTitle.value = "编辑航司信息维护";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
+    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;
   } 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;
   } else if (param === 4) {
   }
 };
@@ -203,10 +191,98 @@ const eleDialog = () => {
   flag.value = true;
   type.value = "del";
 };
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
 //删除
 const delRest = () => {
   flag.value = false;
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.airlineTableId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        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;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+      ...dataContent,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+onMounted(() => {
+  getQuery();
+});
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/airportCompany/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -23,6 +23,8 @@
         :msgTitle="msgTitle"
         @resetForm="resetForm"
         @delRest="delRest"
+        @submitForm="submitForm"
+        @delRemove="delRemove"
       >
         <div class="diacont">
           <el-form :model="tableForm">
@@ -30,7 +32,7 @@
               <el-col>
                 <el-form-item label="公司名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.companyName"
                     placeholder="请输入公司名称"
                   />
                 </el-form-item>
@@ -39,7 +41,7 @@
                 <el-form-item label="上级公司" size="default">
                   <el-select
                     style="width: 100%"
-                    v-model="tableForm.china"
+                    v-model="tableForm.parentID"
                     class="input-shadow"
                     filterable
                     default-first-option
@@ -48,9 +50,9 @@
                   >
                     <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"
+                      :key="item.v"
+                      :label="item.k"
+                      :value="item.v"
                     >
                     </el-option>
                   </el-select>
@@ -60,7 +62,7 @@
                 <el-form-item label="公司描述" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.englin"
+                    v-model="tableForm.companyDesc"
                     placeholder="请输入公司描述"
                   />
                 </el-form-item>
@@ -76,15 +78,27 @@
 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 page = ref<number>(0); //分页参数
+const dataContent = ref<object>({});
+const noMore = ref<Boolean>(false);
+const asShow = ref<Boolean>(false);
+const rowTitle = ref<String>("");
+const tableCols = ref([]); //表头数据
+const serviceId = ref<String>("");
+const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增机场公司维护"); //弹窗标题
-const tableOptionser = ref<Array>([]); //弹窗下拉
-const tableColsCopys = reactive<Object>({}); //弹窗
+const tableOptionser = ref([]); //弹窗下拉
+const tableColsCopys = reactive([]); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
+  companyName: "",
+  parentID: "",
+  companyDesc: "",
+  companyID: "",
+  event: "",
 }); //弹窗内容
 const tableBtnGroup = ref([
   {
@@ -99,23 +113,7 @@ const tableBtnGroup = ref([
   },
 ]);
 //列表
-const tableData = ref([
-  {
-    name: "中国国际航空",
-    china: "中国国际航空",
-    englin: "",
-  },
-  {
-    name: "中国国际航空",
-    china: "中国国际航空",
-    englin: "",
-  },
-  {
-    name: "中国国际航空",
-    china: "中国国际航空",
-    englin: "",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -130,13 +128,17 @@ const addForm = () => {
   msgTitle.value = "新增机场公司维护";
   flag.value = true;
   type.value = "";
+  tableForm.event = 1;
+  asShow.value = false;
+  asShow.value = true;
 };
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
+  tableForm.companyName = "";
+  tableForm.parentID = "";
+  tableForm.companyDesc = "";
+  tableForm.companyID = "";
 };
 //编辑-删除
 const btnClick = (row, index, param) => {
@@ -144,13 +146,20 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑机场公司维护";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
+    tableForm.event = 2;
+    tableForm.companyName = index.companyName;
+    tableForm.parentID = index.parentID;
+    tableForm.companyDesc = index.companyDesc;
+    tableForm.companyID = index.companyID;
   } else if (param === 3) {
     msgTitle.value = "删除机场公司维护";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.companyName = index.companyName;
+    tableForm.parentID = index.parentID;
+    tableForm.companyDesc = index.companyDesc;
+    tableForm.companyID = index.companyID;
   } else if (param === 4) {
   }
 };
@@ -158,6 +167,111 @@ const btnClick = (row, index, param) => {
 const delRest = () => {
   flag.value = false;
 };
+//获取弹框-下拉数据
+const getSelectData = async (id, name) => {
+  const { code, returnData } = await Query({
+    id,
+    dataContent: name ? [name] : name === null ? [null] : [],
+  });
+  if (code == 0) {
+    tableOptionser.value = returnData.listValues;
+  } else {
+    tableOptionser.value = [];
+  }
+};
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.airportTreeId,
+      needPage: ++page.value,
+      dataContent: Object.values(dataContent.value),
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        rowTitle.value = titleColumn.columnName;
+      }
+      tableData.value.push(...returnData.listValues);
+      tableCols.value = returnData.columnSet;
+      returnData.columnSet.forEach((item) => {
+        if (item.listqueryTemplateID && item.columnName === "parentID") {
+          getSelectData(item.listqueryTemplateID);
+        }
+      });
+      tableCols.value.forEach((element) => {
+        element.label = element.columnLabel;
+        element.key = element.columnName;
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+const changeSelect = (data, name) => {
+  if (tableForm[data].value === "") {
+    tableForm[data].value = null;
+  }
+};
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+      ...dataContent,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
+};
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {

src/views/BasicsData/airportInfo/index.vue

@@ -13,7 +13,12 @@
           <div class="tree_left">
             <el-scrollbar style="height: 100%">
               <div class="corporate">{{ company }}</div>
-              <el-tree :data="data2" accordion @node-click="handleNodeClick">
+              <el-tree
+                :data="data.value"
+                :props="defaultProps"
+                accordion
+                @node-click="handleNodeClick"
+              >
               </el-tree>
             </el-scrollbar>
           </div>
@@ -22,7 +27,7 @@
           <div class="app-containers">
             <DataTable
               BtnGroupWidth="300px"
-              :tableHeader="state.list"
+              :tableHeader="tableCols"
               :tableData="tableData"
               :tableBtnGroup="tableBtnGroup"
               :tableProperty="{ rowKey: 'ID' }"
@@ -39,6 +44,8 @@
       :msgTitle="msgTitle"
       @resetForm="resetForm"
       @delRest="delRest"
+      @submitForm="submitForm"
+      @delRemove="delRemove"
     >
       <div class="diacont">
         <el-form :model="tableForm">
@@ -46,7 +53,7 @@
             <el-col :span="12">
               <el-form-item label="机场名称" size="default">
                 <el-input
-                  v-model="tableForm.name"
+                  v-model="tableForm.airportName"
                   placeholder="请输入机场名称"
                 />
               </el-form-item>
@@ -54,7 +61,7 @@
             <el-col :span="12">
               <el-form-item label="三字码" size="default">
                 <el-input
-                  v-model="tableForm.china"
+                  v-model="tableForm.IATACode"
                   placeholder="请输入三字码"
                 />
               </el-form-item>
@@ -62,7 +69,7 @@
             <el-col :span="12">
               <el-form-item label="四字码" size="default">
                 <el-input
-                  v-model="tableForm.englin"
+                  v-model="tableForm.ICAOCode"
                   placeholder="请输入四字码"
                 />
               </el-form-item>
@@ -70,7 +77,7 @@
             <el-col :span="12">
               <el-form-item label="中文简称" size="default">
                 <el-input
-                  v-model="tableForm.two"
+                  v-model="tableForm.abbreviation"
                   placeholder="请输入中文简称"
                 />
               </el-form-item>
@@ -78,14 +85,17 @@
             <el-col :span="12">
               <el-form-item label="英文简称" size="default">
                 <el-input
-                  v-model="tableForm.three"
+                  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.text" placeholder="请输入全称" />
+                <el-input
+                  v-model="tableForm.fullName"
+                  placeholder="请输入全称"
+                />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -93,7 +103,7 @@
                 <!-- <el-input v-model="tableForm.china" /> -->
                 <el-select
                   style="width: 100%"
-                  v-model="tableForm.text1"
+                  v-model="tableForm.airportTimeZone"
                   class="input-shadow"
                   filterable
                   default-first-option
@@ -111,10 +121,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="描述" size="default">
+              <el-form-item label="公司名称" size="default">
                 <el-input
-                  v-model="tableForm.text2"
-                  placeholder="请输入机场三字码"
+                  v-model="tableForm.companyName"
+                  placeholder="请输入公司名称"
                 />
               </el-form-item>
             </el-col>
@@ -127,6 +137,9 @@
 <script setup lang="ts">
 import DataTable from "@/components/tableTemp/index.vue";
 import Dialog from "@/components/dialog/index.vue";
+import { translateDataToTreeAll } from "@/utils/validate";
+import { Query, GeneralDataReception } from "@/api/webApi";
+import { ElMessage } from "element-plus";
 const router = useRouter();
 const tableBtnGroup = ref<Array>([
   {
@@ -145,20 +158,35 @@ const tableBtnGroup = ref<Array>([
     param: 3,
   },
 ]); //单独的编辑
+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 tableObj = ref({}); //增删改数据缓存
+const defaultProps = ref({
+  children: "children",
+  label: "companyName",
+});
+const companyID = ref(""); //机场id
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增机场信息维护"); //弹窗标题
 const tableOptionser = ref<Array>([]); //弹窗下拉
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
-  text1: "",
-  text2: "",
+  airportID: "",
+  airportName: "",
+  IATACode: "",
+  ICAOCode: "",
+  abbreviation: "",
+  englishAbbreviation: "",
+  fullName: "",
+  companyID: "",
+  airportTimeZone: "",
+  companyName: "",
+  event: "",
 }); //弹窗内容
 const tableColumnProperty = reactive({
   width: "120px",
@@ -169,38 +197,7 @@ const tableColumnProperty = reactive({
   headerAlign: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "成都双流机场",
-    china: "CTU",
-    englin: "ZUUU",
-    two: "",
-    three: "CHENGDU",
-    text: "成都双流机场",
-    text1: "",
-    text2: "西南分公司",
-  },
-  {
-    name: "成都双流机场",
-    china: "CTU",
-    englin: "ZUUU",
-    two: "",
-    three: "CHENGDU",
-    text: "成都双流机场",
-    text1: "",
-    text2: "西南分公司",
-  },
-  {
-    name: "成都双流机场",
-    china: "CTU",
-    englin: "ZUUU",
-    two: "",
-    three: "CHENGDU",
-    text: "成都双流机场",
-    text1: "",
-    text2: "西南分公司",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -216,39 +213,14 @@ const state = reactive({
   listLoading: true,
 });
 const company = ref("所属公司");
-const data2 = reactive([
-  {
-    id: 1,
-    label: "中国国际航空",
-    children: [
-      {
-        id: 2,
-        label: "西南分公司",
-      },
-      {
-        id: 3,
-        label: "浙江分公司",
-      },
-      {
-        id: 4,
-        label: "重庆分公司",
-      },
-      {
-        id: 5,
-        label: "天津分公司",
-      },
-      {
-        id: 6,
-        label: "上海分公司",
-      },
-    ],
-  },
-]);
+const data = reactive([]);
 //新增
 const addForm = () => {
   msgTitle.value = "新增机场信息维护";
   flag.value = true;
   type.value = "";
+  tableForm.event = 1;
+  tableForm.companyID = companyID;
 };
 //取消
 const resetForm = () => {
@@ -288,26 +260,158 @@ const btnClick = (row, index, param) => {
     msgTitle.value = "编辑机场信息维护";
     flag.value = true;
     type.value = "";
-    tableForm.name = index.name;
-    tableForm.china = index.china;
-    tableForm.englin = index.englin;
-    tableForm.two = index.two;
-    tableForm.three = index.three;
-    tableForm.text = index.text;
-    tableForm.text1 = index.text1;
-    tableForm.text2 = index.text2;
+    tableForm.airportID = index.airportID;
+    tableForm.airportName = index.airportName;
+    tableForm.IATACode = index.IATACode;
+    tableForm.ICAOCode = index.ICAOCode;
+    tableForm.abbreviation = index.abbreviation;
+    tableForm.englishAbbreviation = index.englishAbbreviation;
+    tableForm.fullName = index.fullName;
+    tableForm.companyID = index.companyID;
+    tableForm.airportTimeZone = index.airportTimeZone;
+    tableForm.companyName = index.companyName;
+    tableForm.event = index.event;
   } else if (param === 3) {
     msgTitle.value = "删除机场信息维护";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.airportID = index.airportID;
+    tableForm.airportName = index.airportName;
+    tableForm.IATACode = index.IATACode;
+    tableForm.ICAOCode = index.ICAOCode;
+    tableForm.abbreviation = index.abbreviation;
+    tableForm.englishAbbreviation = index.englishAbbreviation;
+    tableForm.fullName = index.fullName;
+    tableForm.companyID = index.companyID;
+    tableForm.airportTimeZone = index.airportTimeZone;
+    tableForm.companyName = index.companyName;
+    tableForm.event = index.event;
   } else if (param === 4) {
     router.push({ path: "/BasicsData/airportInfoChild" });
   }
 };
 //点击树事件
 const handleNodeClick = (data) => {
-  company.value = data.label;
+  // console.log(data);
+  company.value = data.companyName;
+  companyID.value = data.companyID;
+  tableData.value = [];
+  getQuery();
+};
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.airportTableId,
+      needPage: ++page.value,
+      dataContent: [JSON.stringify(companyID.value)],
+    });
+    if (code === "0") {
+      if (returnData.listValues.length === 0) {
+        page.value--;
+        noMore.value = true;
+      }
+      const titleColumn = returnData.columnSet.find(
+        (item) => item.needShow === 1
+      );
+      if (titleColumn) {
+        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;
+        // if (element.columnName === "queryTemplate") {
+        //   element.width = "300px";
+        // }
+      });
+      serviceId.value = returnData.submitID;
+    } else {
+      page.value--;
+    }
+  } catch (error) {
+    page.value--;
+  }
+};
+//公司列表
+const getAirlines = async () => {
+  try {
+    const res = await Query({
+      id: DATACONTENT_ID.airportTreeId,
+      dataContent: [],
+    });
+    if (res.code === "0") {
+      let arr = [];
+      arr = translateDataToTreeAll(
+        res.returnData.listValues,
+        "parentID",
+        "companyID"
+      );
+      data.value = arr;
+      // if (!company.length) {
+      //   company.value = arr[0].companyID;
+      //   company.value = arr[0].companyName;
+      // }
+    } else {
+      // this.$message.error(res.message ?? "失败");
+    }
+  } catch (error) {
+    // this.$message.error("失败");
+  }
+};
+//确认提交
+const submitForm = () => {
+  generalDataReception(tableForm);
 };
+const resetTable = () => {
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
+//新增-编辑-删除
+const generalDataReception = async (data) => {
+  try {
+    data = {
+      ...data,
+      ...dataContent,
+    };
+    const { code } = await GeneralDataReception({
+      serviceId: serviceId.value,
+      dataContent: JSON.stringify(data),
+    });
+    if (code == 0) {
+      ElMessage.success(`操作成功`);
+      // this.$message.success("操作成功");
+      resetTable();
+      getQuery();
+      resetForm();
+      flag.value = false;
+      // rmFlag.value = false;
+      tableObj.value = {};
+      // this.$router.go(0);
+    } else {
+      ElMessage.error(`操作失败`);
+      // this.$message.error("操作失败");
+      // this.flag = false;
+      // this.rmFlag = false;
+      tableObj.value = {};
+      resetForm();
+    }
+  } catch (error) {
+    flag.value = false;
+    //  rmFlag.value = false;
+    tableObj.value = {};
+    resetForm();
+  }
+};
+const delRemove = () => {
+  tableForm.event = 3;
+  generalDataReception(tableForm);
+};
+
+getAirlines();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {