11

src/components/sallCenter/plugin/link.vue

@@ -224,7 +224,7 @@
         </el-form-item>
         <template v-if="data.picSwitch">
           <el-form-item label="图标">
-            <label slot="label">图标
+            <label slot="label">
               <el-tooltip class="item" effect="dark" content="最大宽度750px，最大高度36px，图标等比例缩放" placement="top">
                 <i class="el-icon-info"></i>
               </el-tooltip>

src/components/tradePavilion/BrandEnterpriseManager.vue

@@ -14,7 +14,7 @@
 <template>
   <div class="VehicleManagement">
     <div class="head-title">
-      {{isBrand?'品牌':'服务'}}管理
+      {{isBrand?'消费品牌':'企业服务'}}管理
       <div>
         <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
           type="primary">
@@ -23,14 +23,14 @@
       </div>
       <div>
         <el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small"
-          @click="CommonJump('BrandEnterEdit',{isBrand:isBrand?1:0})">新增{{isBrand?'品牌':'服务'}}</el-button>
+          @click="CommonJump('BrandEnterEdit',{isBrand:isBrand?1:0})">新增{{isBrand?'消费品牌':'企业服务'}}</el-button>
       </div>
     </div>
     <div class="content">
       <div>
         <div class="searchInput" style="width: 250px; margin-bottom: 10px">
           <el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
-            style="display: inline-block; width: 225px; height: 30px" :placeholder="`${isBrand?'品牌':'服务'}名称`" v-model="msg.BrandName"
+            style="display: inline-block; width: 225px; height: 30px" :placeholder="`${isBrand?'消费品牌':'企业服务'}名称`" v-model="msg.BrandName"
             size="small" clearable>
           </el-input>
           <span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
@@ -42,7 +42,7 @@
         </div>
         <div class="searchInput" style="width: 200px; margin-bottom: 10px">
           <el-select size="small" v-model="msg.CategoryId" filterable
-            @change="(msg.pageIndex = 1), getList()" :placeholder="`请选择${isBrand?'品牌':'服务'}分类`">
+            @change="(msg.pageIndex = 1), getList()" :placeholder="`${isBrand?'消费品牌':'企业服务'}分类`" clearable @clear="(msg.pageIndex = 1), getList()">
             <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
             </el-option>
           </el-select>
@@ -146,7 +146,7 @@
           ExcelEnumIds: [],
           UserId: 0,
           RandomNum: 0, //随机数
-          CategoryId: 0, //分类Id
+          CategoryId: "", //分类Id
           BrandEnterpriseType: null, //(1-品牌，2-服务)
           OpeningStatus: -1, // 0-即将开业，1-已开业
           QShopType: 0, //1-成都首店,2-宜宾商载通
@@ -192,7 +192,7 @@
             BrandName: "", //名称
             pageIndex: 1,
             pageSize: 15,
-            CategoryId: 0, //分类Id
+            CategoryId: "", //分类Id
             BrandEnterpriseType: this.isBrand ? 1 : 2, //(1-品牌，2-服务)
           }
           this.getList();
@@ -362,15 +362,9 @@
         }, (res) => {
           if (res.data.resultCode == 1) {
             this.CategoryList = res.data.data;
-            let obj = {
-              ClassName: "不限",
-              ID: 0,
-            };
-            this.CategoryList.unshift(obj);
           }
         });
       },
-
       //获取项目类型
       getProject(type) {
         let str = "";

src/components/tradePavilion/BuildingManager.vue

@@ -14,7 +14,7 @@
 <template>
   <div class="VehicleManagement">
     <div class="head-title">
-      {{isCarrier?'载体':'楼宇'}}管理
+      {{isCarrier?'商业载体':'楼宇'}}管理
       <div>
         <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
           type="primary">
@@ -23,7 +23,7 @@
       </div>
       <div>
         <el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small"
-          @click="CommonJump('BuildingVehicle',{isCarrier:isCarrier?1:0})">新增{{isCarrier?'载体':'楼宇'}}</el-button>
+          @click="CommonJump('BuildingVehicle',{isCarrier:isCarrier?1:0})">新增{{isCarrier?'商业载体':'楼宇'}}</el-button>
       </div>
     </div>
     <div class="content">
@@ -84,24 +84,24 @@
             </el-option>
           </el-select>
         </div> -->
-        <div class="searchInput" style="width: 200px; margin-bottom: 10px">
+        <!-- <div class="searchInput" style="width: 200px; margin-bottom: 10px">
           <el-select size="small" v-model="msg.QShopType" filterable
             @change="(msg.pageIndex = 1), getList()" placeholder="请选择首店类型">
             <el-option label="不限" :value="0"></el-option>
             <el-option v-for="item in ShopTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
-        </div>
+        </div> -->
         <div class="searchInput" style="width: 200px; margin-bottom: 10px">
-          <el-select size="small" v-model="msg.CategoryId" filterable
-            @change="(msg.pageIndex = 1), getList()" placeholder="请选择分类">
+          <el-select size="small" v-model="msg.CategoryId" filterable @change="(msg.pageIndex = 1), getList()" clearable
+            @clear="(msg.pageIndex = 1), getList()" :placeholder="(isCarrier?'商业载体':'楼宇')+`分类`">
             <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
             </el-option>
           </el-select>
         </div>
         <div class="searchInput" style="width: 200px; margin-bottom: 10px">
-          <el-select size="small" v-model="msg.OpeningStatus" filterable
-            @change="(msg.pageIndex = 1), getList()" placeholder="请选择开店状态">
+          <el-select size="small" v-model="msg.OpeningStatus" clearable @change="(msg.pageIndex = 1), getList()"
+            @clear="(msg.pageIndex = 1), getList()" placeholder="开业状态">
             <el-option v-for="item in OpeningList" :key="item.Id" :label="item.Name" :value="item.Id">
             </el-option>
           </el-select>
@@ -114,13 +114,13 @@
       <el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0">
         <el-table-column prop="CarrierName" width="200" label="项目名称">
         </el-table-column>
-        <!-- <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
+        <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
           <template slot-scope="scope">
             <div v-for="(item, index) in scope.row.CarrierMetroList" :key="index" class="CarrierList">
               <span>{{ item.MetroNum }}号线</span><span>{{ item.MetroName }}</span><span>{{ item.Distance }}</span>
             </div>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="Logo" width="100" label="logo">
           <template slot-scope="scope">
             <el-image :src="scope.row.Logo" style="width: 50px" :preview-src-list="scope.row.LogoList">
@@ -219,9 +219,9 @@
           ExcelEnumIds: [],
           UserId: 0,
           RandomNum: 0, //随机数
-          CategoryId: 0, //分类Id
+          CategoryId: "", //分类Id
           BuildingCarrierType: null, //(1-载体，2-楼宇)
-          OpeningStatus: -1, // 0-即将开业，1-已开业
+          OpeningStatus: "", // 0-即将开业，1-已开业
           QShopType: 0, //1-成都首店,2-宜宾商载通
         },
         usermsg: {
@@ -261,10 +261,6 @@
           },
         ],
         OpeningList: [{
-            Name: '不限',
-            Id: -1
-          },
-          {
             Name: '即将开业',
             Id: 0
           },
@@ -299,9 +295,9 @@
             ExcelEnumIds: [],
             UserId: 0,
             RandomNum: 0, //随机数
-            CategoryId: 0, //分类Id
+            CategoryId: "", //分类Id
             BuildingCarrierType: this.isCarrier ? 1 : 2, //(1-载体，2-楼宇)
-            OpeningStatus: -1, // 0-即将开业，1-已开业
+            OpeningStatus: "", // 0-即将开业，1-已开业
             QShopType: 0, //1-成都首店,2-宜宾商载通
           }
           this.getList();
@@ -483,15 +479,9 @@
         }, (res) => {
           if (res.data.resultCode == 1) {
             this.CategoryList = res.data.data;
-            let obj = {
-              ClassName: "不限",
-              ID: 0,
-            };
-            this.CategoryList.unshift(obj);
           }
         });
       },
-
       //获取项目类型
       getProject(type) {
         let str = "";

src/components/tradePavilion/BuildingVehicle.vue

@@ -2,8 +2,8 @@
   <div v-loading="pageloading" class="editVehicle">
     <div class="head-title">
       <span @click="CommonJump(isCarrier?'BuildingServiceManager':'BuildingManager')"
-        class="blue point">{{isCarrier?'载体':'楼宇'}}管理</span>
-      / <span>{{ID?'编辑':'新增'}}{{isCarrier?'载体':'楼宇'}}</span>
+        class="blue point">{{isCarrier?'商业载体':'楼宇'}}管理</span>
+      / <span>{{ID?'编辑':'新增'}}{{isCarrier?'商业载体':'楼宇'}}</span>
     </div>
     <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="180px">
       <el-card shadow="never" style="margin-top: 10px" class="box-card">
@@ -357,54 +357,54 @@
         </el-form-item>
         <!--prop="Ascription"-->
         <el-form-item label="资产权属" >
-          <el-input v-model="addMsg.Ascription" style="width: 690px" size="small" placeholder="请输入资产权属">
+          <el-input v-model="addMsg.Ascription" style="width: 690px" size="small" placeholder="请输入资产权属" maxlength="500">
           </el-input>
         </el-form-item>
         <!--prop="CarrierSize"-->
         <el-form-item label="项目面积" >
           <el-input v-model="addMsg.CarrierSize" @keyup.native="checkPrice(addMsg, 'CarrierSize')" style="width: 690px"
-            size="small" placeholder="请输入项目面积">
+            size="small" placeholder="请输入项目面积" maxlength="500">
             <template slot="append">㎡</template>
           </el-input>
         </el-form-item>
         <!--prop="PropertyComposition"-->
         <el-form-item label="物业构成" >
-          <el-input v-model="addMsg.PropertyComposition" style="width: 690px" size="small" placeholder="请输入物业构成">
+          <el-input v-model="addMsg.PropertyComposition" style="width: 690px" size="small" placeholder="请输入物业构成" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="Location"-->
         <el-form-item label="项目发展及定位" >
-          <el-input v-model="addMsg.Location" style="width: 690px" size="small" placeholder="请输入项目发展及定位">
+          <el-input v-model="addMsg.Location" style="width: 690px" size="small" placeholder="请输入项目发展及定位" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!-- prop="Crowd"-->
         <el-form-item label="周边人群结构特征">
-          <el-input v-model="addMsg.Crowd" style="width: 690px" size="small" placeholder="请输入周边人群结构特征">
+          <el-input v-model="addMsg.Crowd" style="width: 690px" size="small" placeholder="请输入周边人群结构特征" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="VisitorsFlowrate"-->
         <el-form-item label="人流量参数" >
-          <el-input v-model="addMsg.VisitorsFlowrate" style="width: 690px" size="small" placeholder="请输入人流量参数">
+          <el-input v-model="addMsg.VisitorsFlowrate" style="width: 690px" size="small" placeholder="请输入人流量参数" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="LayersNum"-->
         <el-form-item label="商业楼层" >
-          <el-input v-model="addMsg.LayersNum" style="width: 690px" size="small" placeholder="请输入商业楼层">
+          <el-input v-model="addMsg.LayersNum" style="width: 690px" size="small" placeholder="请输入商业楼层" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="SupportingFacilities"-->
         <el-form-item label="水电气及配套" >
-          <el-input v-model="addMsg.SupportingFacilities" style="width: 690px" size="small" placeholder="请输入水电气及配套">
+          <el-input v-model="addMsg.SupportingFacilities" style="width: 690px" size="small" placeholder="请输入水电气及配套" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="ManagementCompany"-->
         <el-form-item label="管理公司及管理费" >
-          <el-input v-model="addMsg.ManagementCompany" style="width: 690px" size="small" placeholder="请输入管理公司及管理费">
+          <el-input v-model="addMsg.ManagementCompany" style="width: 690px" size="small" placeholder="请输入管理公司及管理费" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <!--prop="BrandDemand"-->
         <el-form-item label="目标招商业态及品牌需求" >
-          <el-input v-model="addMsg.BrandDemand" style="width: 690px" size="small" placeholder="请输入目标招商业态及品牌需求">
+          <el-input v-model="addMsg.BrandDemand" style="width: 690px" size="small" placeholder="请输入目标招商业态及品牌需求" maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
       </el-card>
@@ -489,7 +489,7 @@
           BuiltUpArea: "", //经营面积
           AreaRequirement: "", //可租赁面积
           YeJi: "", //去年业绩
-          OpeningStatus: -1,
+          OpeningStatus: 0,
           BuildingCarrierType: 1, //(1-载体,2-楼宇)
           CategoryId: 0, //分类
           Ascription: '', //资产权属