bug修复代码更新

@@ -169,7 +169,7 @@
 
 
 <script>
 <script>
 import { findCagroPreData } from "@/api/cargoSelect";
 import { findCagroPreData } from "@/api/cargoSelect";
-import { cargoXlsxPre } from "@/utils/zipdownload";
+import { downLoadXlsx } from "@/utils/zipdownload";
 export default {
 export default {
   name: "CAPreQualificationExport",
   name: "CAPreQualificationExport",
   data() {
   data() {
@@ -222,7 +222,7 @@ export default {
       );
       );
       cargoXlse.cargoExportPreQueryDto.limitStart = 0;
       cargoXlse.cargoExportPreQueryDto.limitStart = 0;
       cargoXlse.cargoExportPreQueryDto.limitSize = -1;
       cargoXlse.cargoExportPreQueryDto.limitSize = -1;
-      cargoXlsxPre("/cargo/excelPre", cargoXlse)
+      downLoadXlsx("/cargo/excelPre", cargoXlse,'航班预审表')
         .then(() => {
         .then(() => {
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.downloading = false;
           this.downLoadingTip.tip = "";
           this.downLoadingTip.tip = "";

@@ -30,7 +30,13 @@
         :width="item.width"
         :width="item.width"
         :formatter="formatter"
         :formatter="formatter"
       >
       >
+       <template slot-scope="scope">
+          <el-tag v-if="item.value === 'menuType'" :type="scope.row.menuType === 'B'?'':'success'"
+            disable-transitions>{{scope.row.menuType === 'B'?'按钮':'菜单'}}</el-tag>
+            <span v-else>{{scope.row.title}}</span>
+        </template>
       </el-table-column>
       </el-table-column>
+       
       <el-table-column
       <el-table-column
         header-align="center"
         header-align="center"
         align="center"
         align="center"

@@ -41,7 +41,7 @@
         icon="el-icon-search"
         icon="el-icon-search"
         size="mini"
         size="mini"
         :loading="tableLoading"
         :loading="tableLoading"
-        @click="selectRoleList"
+        @click="selectRoleList(0)"
         >搜索</el-button
         >搜索</el-button
       >
       >
       <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']"
       <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']"
@@ -205,7 +205,10 @@ export default {
   },
   },
   methods: {
   methods: {
     //角色列表
     //角色列表
-    selectRoleList() {
+    selectRoleList(val) {
+      if(val == 0){
+        this.formData.page = 1
+      }
       this.tableLoading = true;
       this.tableLoading = true;
       if (this.createTime.length > 0) {
       if (this.createTime.length > 0) {
         this.formData.createStart = this.createTime[0];
         this.formData.createStart = this.createTime[0];

@@ -36,7 +36,7 @@
         icon="el-icon-search"
         icon="el-icon-search"
         size="mini"
         size="mini"
         :loading="loading"
         :loading="loading"
-        @click="selectUser"
+        @click="selectUser(0)"
         >搜索</el-button
         >搜索</el-button
       >
       >
       <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']"
       <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']"
@@ -251,7 +251,10 @@ export default {
   },
   },
   methods: {
   methods: {
     //用户列表
     //用户列表
-    selectUser() {
+    selectUser(val) {
+      if(val == 0){
+        this.formData.page = 1
+      }
       this.loading = true;
       this.loading = true;
       listUser(this.formData)
       listUser(this.formData)
         .then((res) => {
         .then((res) => {