1

src/views/BasicsData/airlineCompany/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.fullName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -35,14 +36,14 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="航司名称"
+                  label="中文名称"
                   size="default"
                   prop="fullName"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.fullName"
-                    placeholder="请输入航司名称"
+                    placeholder="请输入中文名称"
                   />
                 </el-form-item>
               </el-col>
@@ -60,12 +61,15 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item
-                  label="英文简称"
-                  size="default"
-                  prop="englishAbbreviation"
-                  :rules="formRules.isNotNull"
-                >
+                <el-form-item label="英文全称" size="default">
+                  <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="请输入英文简称"
@@ -141,6 +145,7 @@ const tableForm = reactive({
   remarks: "",
   event: "",
   airlineCompanyID: "",
+  englishFullName: "",
 }); //弹窗内容
 //列表
 const tableData = ref([]);
@@ -185,6 +190,7 @@ const resetForm = () => {
   tableForm.ICAOCode = "";
   tableForm.remarks = "";
   tableForm.airlineCompanyID = "";
+  tableForm.englishFullName = "";
 };
 //编辑-删除
 const btnClick = (row, index, param) => {
@@ -200,6 +206,7 @@ const btnClick = (row, index, param) => {
     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;

src/views/BasicsData/airportCompany/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.companyName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"

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

@@ -4,7 +4,7 @@
       <Minheader :is-auth="true" :is-statuser="true" @addForm="addForm">
         <template #header>
           <div class="status flex-wrap">
-            <div class="manageTitle">航站楼设置</div>
+            <div class="manageTitle">区域设置</div>
           </div>
         </template></Minheader
       >
@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.terminalName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -35,26 +36,31 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="航站名称"
+                  label="区域名称"
                   size="default"
                   prop="terminalName"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.terminalName"
-                    placeholder="请输入航站名称"
+                    placeholder="请输入区域名称"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="航站楼编码" size="default">
+                <el-form-item
+                  label="区域编码"
+                  size="default"
+                  prop="terminalID"
+                  :rules="formRules.isNotNull"
+                >
                   <el-input
                     v-model="tableForm.terminalID"
-                    placeholder="请输入航站楼编码"
+                    placeholder="请输入区域编码"
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
+              <!-- <el-col>
                 <el-form-item
                   label="机场三字码"
                   size="default"
@@ -67,6 +73,24 @@
                     placeholder="请输入机场三字码"
                   />
                 </el-form-item>
+              </el-col> -->
+              <el-col>
+                <el-form-item label="机场名称" size="default">
+                  <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-form-item>
               </el-col>
             </el-row>
           </el-form>
@@ -93,7 +117,7 @@ const serviceId = ref<String>("");
 const tableObj = ref({}); //增删改数据缓存
 const flag = ref<Boolean>(false); //弹窗开关
 const type = ref<String>(""); //判断是否删除
-const msgTitle = ref<String>("新增航站楼"); //弹窗标题
+const msgTitle = ref<String>("新增区域"); //弹窗标题
 const tableColsCopys = reactive<Object>({}); //弹窗
 const tableBtnGroup = ref<Array>([
   {
@@ -116,6 +140,8 @@ const tableForm = reactive({
   terminalID: "",
   terminalName: "",
   airportCode: "",
+  abbreviation: "",
+  remarks: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -130,9 +156,10 @@ const state = reactive({
   listLoading: true,
 });
 tableForm.airportCode = route.query.IATACode;
+tableForm.abbreviation = route.query.abbreviation;
 //新增
 const addForm = () => {
-  msgTitle.value = "新增航站楼";
+  msgTitle.value = "新增区域";
   tableForm.event = 1;
   flag.value = true;
   type.value = "";
@@ -142,10 +169,11 @@ const resetForm = () => {
   flag.value = false;
   tableForm.terminalID = "";
   tableForm.terminalName = "";
+  tableForm.remarks = "";
 };
 //编辑
 const editDialog = (data) => {
-  msgTitle.value = "编辑航站楼";
+  msgTitle.value = "编辑区域";
   flag.value = true;
   type.value = "";
   tableForm.name = data.name;
@@ -154,7 +182,7 @@ const editDialog = (data) => {
 };
 //删除
 const eleDialog = () => {
-  msgTitle.value = "删除航站楼";
+  msgTitle.value = "删除区域";
   flag.value = true;
   type.value = "del";
 };
@@ -173,15 +201,16 @@ const aloneDialog = () => {
 //编辑-删除
 const btnClick = (row, index, param) => {
   if (param === 2) {
-    msgTitle.value = "编辑航站楼";
+    msgTitle.value = "编辑区域";
     flag.value = true;
     type.value = "";
     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 = "删除航站楼";
+    msgTitle.value = "删除区域";
     flag.value = true;
     type.value = "del";
     tableForm.event = 3;
@@ -193,6 +222,7 @@ const btnClick = (row, index, param) => {
       path: "/BasicsData/positionSetting",
       query: {
         terminalID: index.terminalID,
+        terminalName: index.terminalName,
       },
     });
   }
@@ -217,6 +247,9 @@ const getQuery = async () => {
         rowTitle.value = titleColumn.columnName;
       }
       tableData.value.push(...returnData.listValues);
+      tableData.value.forEach((element) => {
+        element.abbreviation = route.query.abbreviation;
+      });
       tableCols.value = returnData.columnSet;
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;

src/views/BasicsData/airportInfo/index.vue

@@ -42,6 +42,7 @@
       :flag="flag"
       :type="type"
       :msgTitle="msgTitle"
+      :delName="tableForm.airportName"
       @resetForm="resetForm"
       @delRest="delRest"
       @submitForm="submitForm"
@@ -52,7 +53,7 @@
           <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item
-                label="机场名称"
+                label="中文全称"
                 size="default"
                 prop="airportName"
                 :rules="formRules.isNotNull"
@@ -65,66 +66,56 @@
             </el-col>
             <el-col :span="12">
               <el-form-item
-                label="三字码"
+                label="中文简称"
                 size="default"
-                prop="IATACode"
+                prop="abbreviation"
                 :rules="formRules.isNotNull"
               >
                 <el-input
-                  v-model="tableForm.IATACode"
-                  placeholder="请输入三字码"
+                  v-model="tableForm.abbreviation"
+                  placeholder="请输入中文简称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="四字码"
-                size="default"
-                prop="ICAOCode"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="英文简称" size="default">
                 <el-input
-                  v-model="tableForm.ICAOCode"
-                  placeholder="请输入四字码"
+                  v-model="tableForm.englishAbbreviation"
+                  placeholder="请输入英文简称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item
-                label="中文简称"
-                size="default"
-                prop="abbreviation"
-                :rules="formRules.isNotNull"
-              >
+              <el-form-item label="英文全称" size="default">
                 <el-input
-                  v-model="tableForm.abbreviation"
-                  placeholder="请输入中文简称"
+                  v-model="tableForm.fullName"
+                  placeholder="请输入英文全称"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-                label="英文简称"
+                label="三字码"
                 size="default"
-                prop="englishAbbreviation"
+                prop="IATACode"
                 :rules="formRules.isNotNull"
               >
                 <el-input
-                  v-model="tableForm.englishAbbreviation"
-                  placeholder="请输入英文简称"
+                  v-model="tableForm.IATACode"
+                  placeholder="请输入三字码"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item
-                label="全称"
+                label="四字码"
                 size="default"
-                prop="fullName"
+                prop="ICAOCode"
                 :rules="formRules.isNotNull"
               >
                 <el-input
-                  v-model="tableForm.fullName"
-                  placeholder="请输入全称"
+                  v-model="tableForm.ICAOCode"
+                  placeholder="请输入四字码"
                 />
               </el-form-item>
             </el-col>
@@ -163,11 +154,21 @@
                 :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-form-item>
+            </el-col>
           </el-row>
         </el-form>
       </div>
@@ -189,7 +190,7 @@ const tableBtnGroup = ref<Array>([
     param: 2,
   },
   {
-    name: "航站楼设置",
+    name: "区域设置",
     className: "editBtn",
     param: 4,
   },
@@ -321,6 +322,7 @@ const tableForm = reactive({
   companyID: "",
   airportTimeZone: "",
   companyName: "",
+  remarks: "",
   event: "",
 }); //弹窗内容
 const tableColumnProperty = reactive({
@@ -371,6 +373,7 @@ const resetForm = () => {
   tableForm.airportTimeZone = "";
   tableForm.companyName = "";
   tableForm.event = "";
+  tableForm.remarks = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -417,6 +420,7 @@ const btnClick = (row, index, param) => {
     tableForm.airportTimeZone = index.airportTimeZone;
     tableForm.companyName = index.companyName;
     tableForm.event = index.event;
+    tableForm.remarks = index.remarks;
   } else if (param === 3) {
     msgTitle.value = "删除机场信息维护";
     flag.value = true;
@@ -438,6 +442,7 @@ const btnClick = (row, index, param) => {
       path: "/BasicsData/airportInfoChild",
       query: {
         IATACode: index.IATACode,
+        abbreviation: index.abbreviation,
       },
     });
   }
@@ -446,6 +451,7 @@ const btnClick = (row, index, param) => {
 const handleNodeClick = (data) => {
   // console.log(data);
   company.value = data.companyName;
+  tableForm.companyName = data.companyName;
   companyID.value = data.companyID;
   tableData.value = [];
   page.value = 0;
@@ -509,6 +515,7 @@ const getAirlines = async () => {
       data.value = arr;
       companyID.value = data.value[0].companyID;
       company.value = data.value[0].companyName;
+      tableForm.companyName = data.value[0].companyName;
       getQuery();
       // if (!company.length) {
       //   company.value = arr[0].companyID;

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

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.positionDescribe"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -33,9 +34,9 @@
             ref="positionSettingForm"
           >
             <el-row :gutter="24">
-              <el-col>
+              <!-- <el-col>
                 <el-form-item
-                  label="航站楼ID"
+                  label="区域ID"
                   size="default"
                   prop="terminalID"
                   :rules="formRules.isNotNull"
@@ -43,11 +44,28 @@
                   <el-input
                     disabled
                     v-model="tableForm.terminalID"
-                    placeholder="请输入航站楼ID"
+                    placeholder="请输入区域ID"
+                  />
+                </el-form-item>
+              </el-col> -->
+              <el-col>
+                <el-form-item label="区域名称" size="default">
+                  <el-input
+                    disabled
+                    v-model="tableForm.terminalName"
+                    placeholder="请输入区域名称"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
+                <el-form-item label="位置名称" size="default">
+                  <el-input
+                    v-model="tableForm.positionDescribe"
+                    placeholder="请输入位置名称"
+                  />
+                </el-form-item>
+              </el-col>
+              <!-- <el-col>
                 <el-form-item
                   label="位置序号"
                   size="default"
@@ -59,7 +77,7 @@
                     placeholder="请输入位置序号"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col>
                 <el-form-item
                   label="位置编码"
@@ -73,32 +91,23 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
-                <el-form-item
-                  label="位置描述"
-                  size="default"
-                  prop="positionDescribe"
-                  :rules="formRules.isNotNull"
-                >
+              <el-col :span="24">
+                <el-form-item label="备注" size="default">
                   <el-input
-                    v-model="tableForm.positionDescribe"
-                    placeholder="请输入位置描述"
+                    type="textarea"
+                    v-model="tableForm.remarks"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
-                <el-form-item
-                  label="位置英文描述"
-                  size="default"
-                  prop="englishDescribe"
-                  :rules="formRules.isNotNull"
-                >
+              <!-- <el-col>
+                <el-form-item label="位置英文描述" size="default">
                   <el-input
                     v-model="tableForm.englishDescribe"
                     placeholder="请输入位置英文描述"
                   />
                 </el-form-item>
-              </el-col>
+              </el-col> -->
             </el-row>
           </el-form>
         </div>
@@ -132,10 +141,13 @@ const tableForm = reactive({
   englishDescribe: "",
   locationCode: "",
   terminalID: "",
+  terminalName: "",
+  remarks: "",
   event: "",
 }); //弹窗内容
 //列表
 tableForm.terminalID = route.query.terminalID;
+tableForm.terminalName = route.query.terminalName;
 const tableData = ref([]);
 //表头
 const state = reactive({
@@ -175,17 +187,7 @@ const resetForm = () => {
   tableForm.positionDescribe = "";
   tableForm.englishDescribe = "";
   tableForm.locationCode = "";
-};
-//编辑
-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.remarks = "";
 };
 //删除
 const eleDialog = () => {
@@ -214,6 +216,7 @@ const btnClick = (row, index, param) => {
     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;
@@ -249,6 +252,9 @@ const getQuery = async () => {
       }
       tableData.value.push(...returnData.listValues);
       tableCols.value = returnData.columnSet;
+      tableData.value.forEach((element) => {
+        element.terminalName = route.query.terminalName;
+      });
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;
         element.key = element.columnName;

src/views/BasicsData/cargoInformation/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.agentName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -60,11 +61,11 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="货代描述" size="default">
+                <el-form-item label="备注" size="default">
                   <el-input
                     type="textarea"
                     v-model="tableForm.agentDesc"
-                    placeholder="请输入货代描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>

src/views/BasicsData/containerMaintenance/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.containerName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -35,36 +36,49 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="容器名称"
+                  label="容器类型名称"
                   size="default"
                   prop="containerName"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.containerName"
-                    placeholder="请输入容器名称"
+                    placeholder="请输入容器类型名称"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="容器编码"
+                  label="容器类型识别码"
                   size="default"
                   prop="containerCode"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.containerCode"
-                    placeholder="请输入容器编码"
+                    placeholder="请输入容器类型识别码"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="容器描述" size="default">
+                <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="请输入容器描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
@@ -98,6 +112,7 @@ const tableForm = reactive({
   containerName: "",
   containerCode: "",
   containerDesc: "",
+  containerUnit: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -137,6 +152,7 @@ const resetForm = () => {
   tableForm.containerName = "";
   tableForm.containerCode = "";
   tableForm.containerDesc = "";
+  tableForm.containerUnit = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -172,6 +188,7 @@ const btnClick = (row, index, param) => {
     tableForm.containerName = index.containerName;
     tableForm.containerCode = index.containerCode;
     tableForm.containerDesc = index.containerDesc;
+    tableForm.containerUnit = index.containerUnit;
   } else if (param === 3) {
     msgTitle.value = "删除容器维护";
     flag.value = true;
@@ -275,6 +292,6 @@ getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {
-  width: 80px;
+  width: 130px;
 }
 </style>

src/views/BasicsData/deployNode/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.nodeName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -31,7 +32,7 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="名称"
+                  label="节点名称"
                   size="default"
                   prop="nodeName"
                   :rules="formRules.isNotNull"
@@ -44,7 +45,7 @@
               </el-col>
               <el-col>
                 <el-form-item
-                  label="编码"
+                  label="节点编码"
                   size="default"
                   prop="nodeCode"
                   :rules="formRules.isNotNull"
@@ -56,11 +57,11 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="描述" size="default">
+                <el-form-item label="备注" size="default">
                   <el-input
                     type="textarea"
                     v-model="tableForm.nodeDescribe"
-                    placeholder="请输入描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
@@ -272,6 +273,6 @@ getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {
-  width: 70px;
+  width: 80px;
 }
 </style>

src/views/BasicsData/equipmentMaintenance/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.deviceName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -46,7 +47,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col>
+              <!-- <el-col>
                 <el-form-item
                   label="设备类型"
                   size="default"
@@ -58,10 +59,23 @@
                     placeholder="请输入设备类型"
                   />
                 </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>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="设备IP"
+                  label="IP"
                   size="default"
                   prop="deviceIP"
                   :rules="formRules.isNotNull"
@@ -69,7 +83,16 @@
                   <el-input
                     type="textarea"
                     v-model="tableForm.deviceIP"
-                    placeholder="请输入设备IP"
+                    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-form-item>
               </el-col>
@@ -103,6 +126,8 @@ const tableForm = reactive({
   deviceName: "",
   deviceType: "",
   deviceIP: "",
+  deviceCode: "",
+  remarks: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -145,6 +170,8 @@ const resetForm = () => {
   tableForm.deviceName = "";
   tableForm.deviceType = "";
   tableForm.deviceIP = "";
+  tableForm.deviceCode = "";
+  tableForm.remarks = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -180,6 +207,8 @@ const btnClick = (row, index, param) => {
     tableForm.deviceName = index.deviceName;
     tableForm.deviceType = index.deviceType;
     tableForm.deviceIP = index.deviceIP;
+    tableForm.deviceCode = index.deviceCode;
+    tableForm.remarks = index.remarks;
   } else if (param === 3) {
     msgTitle.value = "删除设备维护";
     flag.value = true;
@@ -189,6 +218,8 @@ const btnClick = (row, index, param) => {
     tableForm.deviceName = index.deviceName;
     tableForm.deviceType = index.deviceType;
     tableForm.deviceIP = index.deviceIP;
+    tableForm.deviceCode = index.deviceCode;
+    tableForm.deviceCode = index.deviceCode;
   } else if (param === 4) {
   }
 };

src/views/BasicsData/modelMaintenance/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.modelName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -73,11 +74,11 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="机型描述" size="default">
+                <el-form-item label="备注" size="default">
                   <el-input
                     type="textarea"
                     v-model="tableForm.modelDesc"
-                    placeholder="请输入机型描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
@@ -213,6 +214,7 @@ const btnClick = (row, index, param) => {
       path: "/BasicsData/modelMaintenance/shippingSpace",
       query: {
         modelID: index.modelID,
+        modelName: index.modelName,
       },
     });
   }

src/views/BasicsData/shippingSpace/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.storingName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -33,6 +34,15 @@
             ref="shippingSpaceForm"
           >
             <el-row :gutter="24">
+              <el-col>
+                <el-form-item label="机型名称" size="default">
+                  <el-input
+                    disabled
+                    v-model="tableForm.modelName"
+                    placeholder="请输入机型名称"
+                  />
+                </el-form-item>
+              </el-col>
               <el-col>
                 <el-form-item
                   label="舱位名称"
@@ -60,10 +70,10 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="舱位描述" size="default">
+                <el-form-item label="备注" size="default">
                   <el-input
                     v-model="tableForm.storingDesc"
-                    placeholder="请输入舱位描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
@@ -99,9 +109,11 @@ const tableForm = reactive({
   storingCode: "",
   storingDesc: "",
   binNo: "",
+  modelName: "",
   event: "",
 }); //弹窗内容
 tableForm.binNo = route.query.modelID;
+tableForm.modelName = route.query.modelName;
 //列表
 const tableData = ref([]);
 //表头
@@ -206,6 +218,9 @@ const getQuery = async () => {
         rowTitle.value = titleColumn.columnName;
       }
       tableData.value.push(...returnData.listValues);
+      tableData.value.forEach((element) => {
+        element.modelName = route.query.modelName;
+      });
       tableCols.value = returnData.columnSet;
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;

src/views/BasicsData/specialCargoMaintenance/index.vue

@@ -21,6 +21,7 @@
         :flag="flag"
         :type="type"
         :msgTitle="msgTitle"
+        :delName="tableForm.specialTypeName"
         @resetForm="resetForm"
         @delRest="delRest"
         @submitForm="submitForm"
@@ -35,36 +36,49 @@
             <el-row :gutter="24">
               <el-col>
                 <el-form-item
-                  label="类型名称"
+                  label="特殊货物类型名称"
                   size="default"
                   prop="specialTypeName"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.specialTypeName"
-                    placeholder="请输入类型名称"
+                    placeholder="请输入特殊货物类型名称"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
                 <el-form-item
-                  label="类型编码"
+                  label="特殊货物类型编码"
                   size="default"
                   prop="specialType"
                   :rules="formRules.isNotNull"
                 >
                   <el-input
                     v-model="tableForm.specialType"
-                    placeholder="请输入类型编码"
+                    placeholder="请输入特殊货物类型编码"
                   />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="描述" size="default">
+                <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="请输入描述"
+                    placeholder="请输入备注"
                   />
                 </el-form-item>
               </el-col>
@@ -98,6 +112,7 @@ const tableForm = reactive({
   specialType: "",
   specialTypeName: "",
   specialTypeDescribe: "",
+  abbspecialType: "",
   event: "",
 }); //弹窗内容
 //列表
@@ -137,6 +152,7 @@ const resetForm = () => {
   tableForm.specialType = "";
   tableForm.specialTypeName = "";
   tableForm.specialTypeDescribe = "";
+  tableForm.abbspecialType = "";
 };
 //编辑
 const editDialog = (data) => {
@@ -172,6 +188,7 @@ const btnClick = (row, index, param) => {
     tableForm.specialType = index.specialType;
     tableForm.specialTypeName = index.specialTypeName;
     tableForm.specialTypeDescribe = index.specialTypeDescribe;
+    tableForm.abbspecialType = index.abbspecialType;
   } else if (param === 3) {
     msgTitle.value = "删除特殊货物类型维护";
     flag.value = true;
@@ -181,6 +198,7 @@ const btnClick = (row, index, param) => {
     tableForm.specialType = index.specialType;
     tableForm.specialTypeName = index.specialTypeName;
     tableForm.specialTypeDescribe = index.specialTypeDescribe;
+    tableForm.abbspecialType = index.abbspecialType;
   } else if (param === 4) {
   }
 };
@@ -275,6 +293,6 @@ getQuery();
 </script>
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label {
-  width: 80px;
+  width: 140px;
 }
 </style>