Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/tradePavilion/BuildingManager.vue

@@ -16,7 +16,8 @@
     <div class="head-title">
       {{isCarrier?'载体管理':'楼宇管理'}}
       <div>
-        <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small" type="primary">
+        <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
+          type="primary">
           批量导出
         </el-button>
       </div>
@@ -153,8 +154,8 @@
         <el-table-column label="操作" width="100">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="修改" placement="top">
-              <img @click="CommonJump('editVehicle', { ID: scope.row.ID,isCarrier:isCarrier?1:0 })" src="../../assets/img/userman/edit.png"
-                alt="" />
+              <img @click="CommonJump('editVehicle', { ID: scope.row.ID,isCarrier:isCarrier?1:0 })"
+                src="../../assets/img/userman/edit.png" alt="" />
             </el-tooltip>
             <el-tooltip v-if="scope.row.IsChengDu==0" class="item" effect="dark" content="删除" placement="top">
               <img @click="delManage(scope.row)" src="../../assets/img/userman/del.png" alt="" />
@@ -217,11 +218,11 @@
           QEndDate: "", //	开业截止时间
           ExcelEnumIds: [],
           UserId: 0,
-          RandomNum:0,//随机数
-          CategoryId: 0,//分类Id
-          BuildingCarrierType: null,//(1-载体，2-楼宇)
-          OpeningStatus: -1,// 0-即将开业，1-已开业
-          QShopType: 0,//1-成都首店,2-宜宾商载通
+          RandomNum: 0, //随机数
+          CategoryId: 0, //分类Id
+          BuildingCarrierType: null, //(1-载体，2-楼宇)
+          OpeningStatus: -1, // 0-即将开业，1-已开业
+          QShopType: 0, //1-成都首店,2-宜宾商载通
         },
         usermsg: {
           pageIndex: 1,
@@ -249,21 +250,34 @@
         download_timer: null, //下载文件timer
         loadingText: "", //下载文件提示名称
         isCarrier: true,
-        CategoryList:[],
-        ShopTypeList:[
-          {Name: '成都首店',Id:1},
-          {Name: '宜宾商载通',Id:2},
+        CategoryList: [],
+        ShopTypeList: [{
+            Name: '成都首店',
+            Id: 1
+          },
+          {
+            Name: '宜宾商载通',
+            Id: 2
+          },
         ],
-        OpeningList: [
-          {Name: '不限',Id:-1},
-          {Name: '即将开业',Id:0},
-          {Name: '已开业',Id:1},
+        OpeningList: [{
+            Name: '不限',
+            Id: -1
+          },
+          {
+            Name: '即将开业',
+            Id: 0
+          },
+          {
+            Name: '已开业',
+            Id: 1
+          },
         ]
       };
     },
     created() {
-      this.isCarrier = this.$route.name=='BuildingServiceManager'
-      this.msg.BuildingCarrierType = this.isCarrier?1:2
+      this.isCarrier = this.$route.name == 'BuildingServiceManager'
+      this.msg.BuildingCarrierType = this.isCarrier ? 1 : 2
       this.getList();
       this.getTypeEnumList();
       this.getDown();
@@ -272,7 +286,7 @@
     watch: {
       $route: {
         handler(val, oldVal) {
-          this.isCarrier = val.name=='BuildingServiceManager'
+          this.isCarrier = val.name == 'BuildingServiceManager'
           this.msg = {
             MetroName: "", //地铁站名称
             pageIndex: 1,
@@ -284,11 +298,11 @@
             QEndDate: "", //	开业截止时间
             ExcelEnumIds: [],
             UserId: 0,
-            RandomNum:0,//随机数
-            CategoryId: 0,//分类Id
-            BuildingCarrierType: this.isCarrier?1:2,//(1-载体，2-楼宇)
-            OpeningStatus: -1,// 0-即将开业，1-已开业
-            QShopType: 0,//1-成都首店,2-宜宾商载通
+            RandomNum: 0, //随机数
+            CategoryId: 0, //分类Id
+            BuildingCarrierType: this.isCarrier ? 1 : 2, //(1-载体，2-楼宇)
+            OpeningStatus: -1, // 0-即将开业，1-已开业
+            QShopType: 0, //1-成都首店,2-宜宾商载通
           }
           this.getList();
           this.getTypeEnumList();
@@ -345,12 +359,16 @@
       downLoadCarrier() {
         this.msg.ExcelEnumIds = this.checkedCities;
         let msg = JSON.parse(JSON.stringify(this.msg));
-        msg.RandomNum=Math.random();
+        msg.RandomNum = Math.random();
         if (!msg.Id || msg.Id == "") {
           msg.Id = 0;
         }
-         this.downLoadLoading = true;
-        this.loadingText = "正在生成楼宇文件,请勿关闭或刷新页面...";
+        this.downLoadLoading = true;
+        if (this.isCarrier) {
+          this.loadingText = "正在生成商业载体文件,请勿关闭或刷新页面...";
+        } else {
+          this.loadingText = "正在生成楼宇文件,请勿关闭或刷新页面...";
+        }
         var that = this;
         this.download_timer = setInterval(function () {
           that.checkCarrierFile(msg)
@@ -358,15 +376,22 @@
       },
       checkCarrierFile(msg) {
         var fileName = "楼宇信息.xls";
+        if (this.isCarrier) {
+          fileName = "商业载体信息.xls";
+        }
         var that = this;
         this.apipost(
-          "/api/Trade/CheckCarrierFile",
+          "/api/Trade/CheckBuildingCarrierFile",
           msg,
           (res) => {
             if (res.data.resultCode == 1) {
               clearInterval(this.download_timer);
               this.checkedCities = [];
-              this.loadingText = "正在下载楼宇文件,请勿关闭或刷新页面...";
+              if (this.isCarrier) {
+                this.loadingText = "正在下载商业载体文件,请勿关闭或刷新页面...";
+              } else {
+                this.loadingText = "正在下载楼宇文件,请勿关闭或刷新页面...";
+              }
               var fileUrl = res.data.data.fileUrl;
               var filepath = res.data.data.filePath;
               var key = res.data.message;
@@ -385,7 +410,8 @@
                 responseType: 'arraybuffer',
                 onDownloadProgress: (progressEvent) => {
                   const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100);
-                  that.loadingText = `正在下载楼宇文件` + progress + `%,请勿关闭或刷新页面...`;
+                  that.loadingText = `正在下载【` + (that.isCarrier ? '商业载体' : "楼宇") + `】文件` + progress +
+                    `%,请勿关闭或刷新页面...`;
                   // 在这里处理下载进度, 如更新界面上的进度条
                 }
               }).then((res) => {
@@ -412,7 +438,7 @@
 
       getDown() {
         this.cityOptions = [];
-        this.apipost("/api/Trade/GetCarrierExportEnumList", {}, (res) => {
+        this.apipost("/api/Trade/GetBuildingCarrierExportEnumList", {}, (res) => {
           this.cities = res.data.data;
           let data = res.data.data;
           data.forEach((item) => {
@@ -453,7 +479,7 @@
           }
         });
         this.apipost("/api/Trade/GetBrandClassList", {
-          BrandCategory: this.isCarrier?1:2
+          BrandCategory: this.isCarrier ? 1 : 2
         }, (res) => {
           if (res.data.resultCode == 1) {
             this.CategoryList = res.data.data;