位置设置

public/demo.js

@@ -31,6 +31,7 @@ const DATACONTENT_ID = {
   airpositTableId: 1803433, //基础数据-机场信息维护-航站楼位置-表格-id
   deployNodeId: 54, //基础数据-节点信息维护-id
   modelMainNodeId: 1803434, //基础数据-机型维护-id
+  shippingNodeId: 1803435, //基础数据-舱位-id
 
   /***-----系统设置------***/
   sysSourceId: 13, //系统设置-数据源-id

src/views/BasicsData/airportInfo/index.vue

@@ -319,6 +319,17 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
+  tableForm.airportID = "";
+  tableForm.airportName = "";
+  tableForm.IATACode = "";
+  tableForm.ICAOCode = "";
+  tableForm.abbreviation = "";
+  tableForm.englishAbbreviation = "";
+  tableForm.fullName = "";
+  tableForm.companyID = "";
+  tableForm.airportTimeZone = "";
+  tableForm.companyName = "";
+  tableForm.event = "";
 };
 //编辑
 const editDialog = (data) => {

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

@@ -30,43 +30,43 @@
           <el-form :model="tableForm">
             <el-row :gutter="24">
               <el-col>
-                <el-form-item label="位置名称" size="default">
+                <el-form-item label="位置序号" size="default">
                   <el-input
-                    v-model="tableForm.name"
-                    placeholder="请输入位置名称"
+                    v-model="tableForm.positionSN"
+                    placeholder="请输入位置序号"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="位置所属节点" size="default">
+                <el-form-item label="位置描述" size="default">
                   <el-input
-                    v-model="tableForm.china"
-                    placeholder="请输入位置所属节点"
+                    v-model="tableForm.positionDescribe"
+                    placeholder="请输入位置描述"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="位置标识" size="default">
+                <el-form-item label="位置英文描述" size="default">
                   <el-input
-                    v-model="tableForm.englin"
-                    placeholder="请输入位置标识"
+                    v-model="tableForm.englishDescribe"
+                    placeholder="请输入位置英文描述"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item label="位置编码" size="default">
                   <el-input
-                    v-model="tableForm.two"
+                    v-model="tableForm.locationCode"
                     placeholder="请输入位置编码"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="位置描述" size="default">
+                <el-form-item label="航站楼ID" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.three"
-                    placeholder="请输入位置描述"
+                    v-model="tableForm.terminalID"
+                    placeholder="请输入航站楼ID"
                   />
                 </el-form-item>
               </el-col>
@@ -96,14 +96,16 @@ const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增位置设置"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
+  positionID: "",
+  positionSN: "",
+  positionDescribe: "",
+  englishDescribe: "",
+  locationCode: "",
+  terminalID: "",
   event: "",
 }); //弹窗内容
 //列表
+tableForm.terminalID = route.query.terminalID;
 const tableData = ref([]);
 //表头
 const state = reactive({
@@ -138,11 +140,12 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
-  tableForm.two = "";
-  tableForm.three = "";
+  tableForm.positionID = "";
+  tableForm.positionSN = "";
+  tableForm.positionDescribe = "";
+  tableForm.englishDescribe = "";
+  tableForm.locationCode = "";
+  tableForm.terminalID = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -175,15 +178,24 @@ 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.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;
   } else if (param === 3) {
     msgTitle.value = "删除位置";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.positionID = index.positionID;
+    tableForm.positionSN = index.positionSN;
+    tableForm.positionDescribe = index.positionDescribe;
+    tableForm.englishDescribe = index.englishDescribe;
+    tableForm.locationCode = index.locationCode;
+    tableForm.terminalID = index.terminalID;
   } else if (param === 4) {
   }
 };

src/views/BasicsData/deployNode/index.vue

@@ -119,9 +119,10 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
+  tableForm.nodeID = "";
+  tableForm.nodeName = "";
+  tableForm.nodeCode = "";
+  tableForm.nodeDescribe = "";
 };
 //编辑
 const editDialog = (data) => {

src/views/BasicsData/modelMaintenance/index.vue

@@ -32,7 +32,7 @@
               <el-col>
                 <el-form-item label="机型名称" size="default">
                   <el-input
-                    v-model="tableForm.name"
+                    v-model="tableForm.modelName"
                     placeholder="请输入机型名称"
                   />
                 </el-form-item>
@@ -40,7 +40,7 @@
               <el-col>
                 <el-form-item label="标识符" size="default">
                   <el-input
-                    v-model="tableForm.china"
+                    v-model="tableForm.modelType"
                     placeholder="请输入标识符"
                   />
                 </el-form-item>
@@ -49,7 +49,7 @@
                 <el-form-item label="机型描述" size="default">
                   <el-input
                     type="textarea"
-                    v-model="tableForm.englin"
+                    v-model="tableForm.modelDesc"
                     placeholder="请输入机型描述"
                   />
                 </el-form-item>
@@ -97,12 +97,10 @@ const tableBtnGroup = ref<Array>([
   },
 ]); //单独的编辑
 const tableForm = reactive({
-  name: "",
-  china: "",
-  englin: "",
-  two: "",
-  three: "",
-  text: "",
+  modelID: "",
+  modelName: "",
+  modelType: "",
+  modelDesc: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -126,9 +124,10 @@ const addForm = () => {
 //取消
 const resetForm = () => {
   flag.value = false;
-  tableForm.name = "";
-  tableForm.china = "";
-  tableForm.englin = "";
+  tableForm.modelID = "";
+  tableForm.modelName = "";
+  tableForm.modelType = "";
+  tableForm.modelDesc = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -163,15 +162,27 @@ 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.modelID = index.modelID;
+    tableForm.modelName = index.modelName;
+    tableForm.modelType = index.modelType;
+    tableForm.modelDesc = index.modelDesc;
   } else if (param === 3) {
     msgTitle.value = "删除机型维护";
     flag.value = true;
     type.value = "del";
+    tableForm.event = 3;
+    tableForm.modelID = index.modelID;
+    tableForm.modelName = index.modelName;
+    tableForm.modelType = index.modelType;
+    tableForm.modelDesc = index.modelDesc;
   } else if (param === 4) {
-    router.push({ path: "/BasicsData/shippingSpace" });
+    router.push({
+      path: "/BasicsData/shippingSpace",
+      query: {
+        modelID: index.modelID,
+      },
+    });
   }
 };
 //获取表格数据

src/views/BasicsData/shippingSpace/index.vue

@@ -10,7 +10,7 @@
       >
       <div class="app-containers">
         <DataTable
-          :tableHeader="state.list"
+          :tableHeader="tableCols"
           :tableData="tableData"
           :tableBtnGroup="tableBtnGroup"
           :tableProperty="{ rowKey: 'ID' }"
@@ -60,6 +60,16 @@
 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 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 tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
 const msgTitle = ref<String>("新增舱位管理"); //弹窗标题
@@ -70,23 +80,7 @@ const tableForm = reactive({
   englin: "",
 }); //弹窗内容
 //列表
-const tableData = ref([
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-  {
-    name: "测试",
-    china: "测试",
-    englin: "测试",
-  },
-]);
+const tableData = ref([]);
 //表头
 const state = reactive({
   list: [
@@ -156,6 +150,43 @@ const btnClick = (row, index, param) => {
   } else if (param === 4) {
   }
 };
+//获取表格数据
+const getQuery = async () => {
+  try {
+    const { code, returnData } = await Query({
+      id: DATACONTENT_ID.shippingNodeId,
+      needPage: ++page.value,
+      dataContent: [route.query.modelID],
+    });
+    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--;
+  }
+};
+getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {