修改bug

src/views/BasicsData/airlineCompany/index.vue

@@ -31,12 +31,12 @@
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="英文全称" size="default">
+                <el-form-item label="英文全称" size="default" prop="englishFullName" :rules="formRules.isNotNull">
                   <el-input v-model="tableForm.englishFullName" placeholder="请输入英文全称" />
                 </el-form-item>
               </el-col>
               <el-col>
-                <el-form-item label="英文简称" size="default">
+                <el-form-item label="英文简称" prop="englishAbbreviation" size="default" :rules="formRules.isNotNull">
                   <el-input v-model="tableForm.englishAbbreviation" placeholder="请输入英文简称" />
                 </el-form-item>
               </el-col>
@@ -219,12 +219,17 @@ const submitForm = () => {
   });
 };
 const resetTable = () => {
-  page.value = 0
-  noMore.value = false
-  tableData.value = []
-}
+  page.value = 0;
+  noMore.value = false;
+  tableData.value = [];
+};
 
-const btnAuthMap = [, 'new_airlines_button', 'airline_editor_button', 'airlines_delete_button']
+const btnAuthMap = [
+  ,
+  "new_airlines_button",
+  "airline_editor_button",
+  "airlines_delete_button",
+];
 //新增-编辑-删除
 const generalDataReception = async (data) => {
   try {
@@ -235,7 +240,7 @@ const generalDataReception = async (data) => {
       serviceId: serviceId.value,
       dataContent: JSON.stringify(data),
       btnAuth: btnAuthMap[data.event],
-    })
+    });
     if (code == 0) {
       ElMessage.success(`操作成功`);
       // this.$message.success("操作成功");

src/views/BasicsData/cargoInformation/index.vue

@@ -190,7 +190,11 @@ const getQuery = async (val = "") => {
       if (titleColumn) {
         rowTitle.value = titleColumn.columnName;
       }
-      tableData.value.push(...returnData.listValues);
+      if (val) {
+        tableData.value = [...returnData.listValues];
+      } else {
+        tableData.value.push(...returnData.listValues);
+      }
       tableCols.value = returnData.columnSet;
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;

src/views/BasicsData/specialCargoMaintenance/index.vue

@@ -191,7 +191,11 @@ const getQuery = async (val = "") => {
       if (titleColumn) {
         rowTitle.value = titleColumn.columnName;
       }
-      tableData.value.push(...returnData.listValues);
+      if (val) {
+        tableData.value = [...returnData.listValues];
+      } else {
+        tableData.value.push(...returnData.listValues);
+      }
       tableCols.value = returnData.columnSet;
       tableCols.value.forEach((element) => {
         element.label = element.columnLabel;

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

@@ -60,7 +60,7 @@
           <el-form-item v-if="name === 'flight'" prop="company" style="width: 180px">
             <el-input v-model.trim="formData.company" size="default" placeholder="请输入航司进行搜索" :prefix-icon="Search" clearable @keyup.enter.prevent="dataQuery" />
           </el-form-item>
-          <el-form-item prop="flightNO" style="width: 180px">
+          <el-form-item v-if="name === 'waybill'" prop="flightNO" style="width: 180px">
             <el-input v-model.trim="formData.flightNO" size="default" placeholder="请输入航班号" clearable />
           </el-form-item>
           <el-form-item prop="keyWords" :style="name === 'flight' ? { width: '190px' } : {}">
@@ -186,6 +186,7 @@ const getAirports = async () => {
 onMounted(() => {
   if (props.name === 'flight') {
     getAirports()
+    dataQuery()
   }
 })
 

src/views/dataQuery/components/DataQueryView/useTable.ts

@@ -166,7 +166,6 @@ export function useTable(
           ? [startDate, endDate, flightNO, keyWords]
           : [startDate, endDate, keyWords]
       dataContent = dataContent.map((v) => (v === '' ? null : v))
-      console.log(defaultDataContent)
       const {
         code,
         returnData: { columnSet, listValues },

src/views/userManagement/account/index.vue

@@ -129,7 +129,7 @@ const getGroup = async () => {
 };
 
 //获取table
-const accountList = async () => {
+const accountList = async (type?: string) => {
   let result: any = null;
   if (msgType.value == "all") {
     result = await Query({
@@ -139,8 +139,11 @@ const accountList = async () => {
     });
   } else {
     result = await Query({
-      id: DATACONTENT_ID.accountGroupDetailsId,
-      dataContent: [msgId.value],
+      id:
+        type == "tree"
+          ? DATACONTENT_ID.accountGroupDetailsId
+          : DATACONTENT_ID.accountTableId,
+      dataContent: type == "tree" ? [msgId.value] : [searchInfo.value],
       needPage: PageIndex.value,
     });
   }
@@ -223,7 +226,7 @@ const handleNodeClick = (data) => {
     PageIndex.value = 1;
     msgType.value = "cld";
     msgId.value = data.user_group_id;
-    accountList();
+    accountList("tree");
   } else {
     msgType.value = "all";
     clear();