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/BrandEnterEdit.vue

 <template>
   <div v-loading="pageloading" class="editBrandEnter">
     <div class="head-title">
-      <span @click="CommonJump(isBrand?'BrandManager':'EnterpriseManager')" class="blue point"
-        >{{isBrand?'品牌':'服务'}}管理</span
-      >
+      <span @click="CommonJump(isBrand?'BrandManager':'EnterpriseManager')"
+        class="blue point">{{isBrand?'品牌':'服务'}}管理</span>
       / <span>{{ID?'编辑':'新增'}}{{isBrand?'品牌':'服务'}}</span>
     </div>
     <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="180px">
       <el-card shadow="never" style="margin-top: 10px" class="box-card">
         <el-form-item :label="`${isBrand?'品牌':'服务'}分类`" class="is-required" prop="CategoryId">
-          <el-select
-            class="w300"
-            v-model="addMsg.CategoryId"
-            size="small"
-            placeholder="请选择"
-          >
-            <el-option
-              v-for="item in CategoryList"
-              :key="item.ID"
-              :label="item.ClassName"
-              :value="item.ID"
-            >
+          <el-select class="w300" v-model="addMsg.CategoryId" size="small" placeholder="请选择">
+            <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item
-          :label="`${isBrand?'品牌':'服务'}全名`"
-          prop="FullBrandName"
-          class="is-required"
-          size="small"
-        >
-          <el-input
-            v-model="addMsg.FullBrandName"
-            :placeholder="`请输入${isBrand?'品牌':'服务'}全名`"
-            maxlength="100"
-            style="width: 690px;"
-          />
+        <el-form-item :label="`${isBrand?'品牌':'服务'}全名`" prop="FullBrandName" class="is-required" size="small">
+          <el-input v-model="addMsg.FullBrandName" :placeholder="`请输入${isBrand?'品牌':'服务'}全名`" maxlength="100"
+            style="width: 690px;" />
         </el-form-item>
-        <el-form-item
-          :label="`${isBrand?'品牌':'服务'}名`"
-          prop="BrandName"
-          class="is-required"
-          size="small"
-        >
-          <el-input
-            v-model="addMsg.BrandName"
-            :placeholder="`请输入${isBrand?'品牌':'服务'}名`"
-            maxlength="100"
-            style="width: 690px;"
-          />
+        <el-form-item :label="`${isBrand?'品牌':'服务'}名`" prop="BrandName" class="is-required" size="small">
+          <el-input v-model="addMsg.BrandName" :placeholder="`请输入${isBrand?'品牌':'服务'}名`" maxlength="100"
+            style="width: 690px;" />
         </el-form-item>
         <el-form-item :label="`${isBrand?'品牌':'服务'}视频`">
-          <el-input
-            v-model="addMsg.VideoUrl"
-            size="small"
-            placeholder="请输入内容"
-            style="width: 690px;"
-          >
-            <el-button @click="changeState1 = true" slot="append"
-              >添加视频</el-button
-            >
+          <el-input v-model="addMsg.VideoUrl" size="small" placeholder="请输入内容" style="width: 690px;">
+            <el-button @click="changeState1 = true" slot="append">添加视频</el-button>
           </el-input>
-          <a
-            v-if="addMsg.VideoUrl != ''"
-            class="blue noline"
-            :href="addMsg.VideoUrl"
-            target="_blank"
-            >视频链接</a
-          >
+          <a v-if="addMsg.VideoUrl != ''" class="blue noline" :href="addMsg.VideoUrl" target="_blank">视频链接</a>
         </el-form-item>
         <el-form-item label="Logo" class="is-required" prop="Logo" size="small">
           <el-button @click="type=1,choicImg=true" size="small">选择文件</el-button>
-          <div
-            class="app-gallery-item"
-            style="position: relative; width: 100px; margin-top: 10px"
-          >
-            <img
-              v-if="!addMsg.Logo || addMsg.Logo == ''"
-              src="../../assets/img/default.png"
-              style="width: 80px; height: 80px"
-              alt=""
-            />
-            <el-image
-              v-else
-              style="width: 80px; height: 80px"
-              :src="addMsg.Logo"
-              :preview-src-list="LogoList"
-            >
+          <div class="app-gallery-item" style="position: relative; width: 100px; margin-top: 10px">
+            <img v-if="!addMsg.Logo || addMsg.Logo == ''" src="../../assets/img/default.png"
+              style="width: 80px; height: 80px" alt="" />
+            <el-image v-else style="width: 80px; height: 80px" :src="addMsg.Logo" :preview-src-list="LogoList">
             </el-image>
           </div>
         </el-form-item>
         <el-form-item :label="`${isBrand?'品牌':'服务'}介绍图`">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="第一张图片为封面图"
-            placement="top"
-            style="position: absolute; left: -5px; top: 12px"
-          >
+          <el-tooltip class="item" effect="dark" content="第一张图片为封面图" placement="top"
+            style="position: absolute; left: -5px; top: 12px">
             <i class="el-tooltip el-icon-info"></i>
           </el-tooltip>
           <p style="color: #c9c9c9; margin: 0 0 12px 20px">
@@ -106,105 +47,47 @@
           <div class="nav_Main">
             <div class="nav_IconContent">
               <draggable v-model="addMsg.BannerList">
-                <div
-                  style="
+                <div style="
                     position: relative;
                     margin-right: 20px;
                     display: inline-block;
-                  "
-                  v-for="(item, index) in addMsg.BannerList"
-                  :key="index + '2'"
-                >
-                  <el-image
-                    style="width: 100px; height: 100px"
-                    :src="item"
-                    :preview-src-list="addMsg.BannerList"
-                  >
+                  " v-for="(item, index) in addMsg.BannerList" :key="index + '2'">
+                  <el-image style="width: 100px; height: 100px" :src="item" :preview-src-list="addMsg.BannerList">
                   </el-image>
-                  <el-button
-                    @click="ClearCarouse(index)"
-                    class="delBtn"
-                    type="danger"
-                    icon="el-icon-close"
-                    circle
-                  >
+                  <el-button @click="ClearCarouse(index)" class="delBtn" type="danger" icon="el-icon-close" circle>
                   </el-button>
                 </div>
               </draggable>
             </div>
-            <div
-              @click="type=2,choicImg=true"
-              v-if="addMsg.BannerList.length < 9"
-              class="add-image-btn 2222"
-              style="cursor: pointer"
-            >
+            <div @click="type=2,choicImg=true" v-if="addMsg.BannerList.length < 9" class="add-image-btn 2222"
+              style="cursor: pointer">
               + 添加图片
             </div>
           </div>
         </el-form-item>
-        <el-form-item
-          label="店铺数量"
-          prop="ShopNum"
-          class="is-required"
-          size="small"
-        >
-          <el-input
-            v-model="addMsg.ShopNum"
-            placeholder="请输入店铺数量"
-            type="number"
-            maxlength="3"
-            style="width: 690px;"
-          />
+        <el-form-item label="店铺数量" prop="ShopNum" class="is-required" size="small">
+          <el-input v-model="addMsg.ShopNum" placeholder="请输入店铺数量" type="number" maxlength="3" style="width: 690px;" />
         </el-form-item>
-        <el-form-item label="建筑面积" size="small" >
-          <el-input
-            v-model="addMsg.BuiltUpArea"
-            placeholder="请输入建筑面积"
-            type="number"
-            style="width: 200px"
-            maxlength="7"
-          />
+        <el-form-item label="建筑面积" size="small">
+          <el-input v-model="addMsg.BuiltUpArea" placeholder="请输入建筑面积" type="number" style="width: 200px"
+            maxlength="7" />
           <span style="margin: 0 10px">~</span>
-          <el-input
-            v-model="addMsg.EndBuiltUpArea"
-            placeholder="请输入建筑面积"
-            type="number"
-            style="width: 200px"
-            maxlength="7"
-          />
+          <el-input v-model="addMsg.EndBuiltUpArea" placeholder="请输入建筑面积" type="number" style="width: 200px"
+            maxlength="7" />
         </el-form-item>
         <el-form-item label="需求面积" size="small">
-          <el-input
-            v-model="addMsg.AreaRequirement"
-            placeholder="请输入需求面积"
-            type="number"
-            style="width: 200px"
-            maxlength="7"
-          />
+          <el-input v-model="addMsg.AreaRequirement" placeholder="请输入需求面积" type="number" style="width: 200px"
+            maxlength="7" />
           <span style="margin: 0 10px">~</span>
-          <el-input
-            v-model="addMsg.EndAreaRequirement"
-            placeholder="请输入需求面积"
-            type="number"
-            style="width: 200px"
-            maxlength="7"
-          />
+          <el-input v-model="addMsg.EndAreaRequirement" placeholder="请输入需求面积" type="number" style="width: 200px"
+            maxlength="7" />
         </el-form-item>
         <el-form-item label="客群定位" size="small">
-          <el-input
-            v-model="addMsg.CustomerType"
-            placeholder="请输入客群定位"
-            maxlength="200"
-            style="width: 690px;"
-          />
+          <el-input v-model="addMsg.CustomerType" placeholder="请输入客群定位" maxlength="200" style="width: 690px;" />
         </el-form-item>
         <el-form-item :label="`${isBrand?'品牌':'服务'}定位`" size="small">
-          <el-input
-            v-model="addMsg.BrandType"
-            :placeholder="`请输入${isBrand?'品牌':'服务'}定位`"
-            maxlength="100"
-            style="width: 690px;"
-          />
+          <el-input v-model="addMsg.BrandType" :placeholder="`请输入${isBrand?'品牌':'服务'}定位`" maxlength="100"
+            style="width: 690px;" />
         </el-form-item>
 
         <!-- <el-form-item label="拓店区域" size="small">
@@ -392,59 +275,30 @@
         </el-form-item> -->
 
         <el-form-item label="发展意向" prop="">
-          <el-input
-            v-model="addMsg.DevIntention"
-            style="width: 690px"
-            size="small"
-            placeholder="请输入发展意向"
-          >
+          <el-input v-model="addMsg.DevIntention" style="width: 690px" size="small" placeholder="请输入发展意向"  maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <el-form-item label="合作条件" prop="">
-          <el-input
-            v-model="addMsg.Cooperation"
-            style="width: 690px"
-            size="small"
-            placeholder="请输入合作条件"
-          >
+          <el-input v-model="addMsg.Cooperation" style="width: 690px" size="small" placeholder="请输入合作条件"  maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <el-form-item label="物业需求" prop="">
-          <el-input
-            v-model="addMsg.PropertyDemand"
-            style="width: 690px"
-            size="small"
-            placeholder="请输入物业需求"
-          >
+          <el-input v-model="addMsg.PropertyDemand" style="width: 690px" size="small" placeholder="请输入物业需求"  maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <el-form-item label="配套需求" prop="">
-          <el-input
-            v-model="addMsg.Complementary"
-            style="width: 690px"
-            size="small"
-            placeholder="请输入配套需求"
-          >
+          <el-input v-model="addMsg.Complementary" style="width: 690px" size="small" placeholder="请输入配套需求"  maxlength="500" show-word-limit>
           </el-input>
         </el-form-item>
         <el-form-item :label="`${isBrand?'品牌':'服务'}简介`" class="ue-style">
-          <el-input
-            type="textarea"
-            :placeholder="`请输入${isBrand?'品牌':'服务'}简介`"
-            v-model="addMsg.Introduce"
-            maxlength="500"
-            show-word-limit
-            rows="8"
-            style="width: 690px;"
-          >
+          <el-input type="textarea" :placeholder="`请输入${isBrand?'品牌':'服务'}简介`" v-model="addMsg.Introduce"
+            maxlength="500" show-word-limit rows="8" style="width: 690px;">
           </el-input>
         </el-form-item>
       </el-card>
     </el-form>
     <div style="padding: 20px; background: #fff; margin-top: 10px">
-      <el-button @click="Save('addMsg')" size="small" type="primary"
-        >保存</el-button
-      >
+      <el-button @click="Save('addMsg')" size="small" type="primary">保存</el-button>
     </div>
     <!-- 选择图片文件 -->
     <el-dialog title="选择文件" :visible.sync="choicImg" width="1240px">
@@ -458,12 +312,12 @@
 </template>
 
 <script>
-import ChooseImg from "@/components/global/ChooseImg.vue";
-import Choosevideo from "@/components/global/Choosevideo.vue";
-import commonMap from "@/components/common/commonMap.vue";
-import draggable from "vuedraggable";
+  import ChooseImg from "@/components/global/ChooseImg.vue";
+  import Choosevideo from "@/components/global/Choosevideo.vue";
+  import commonMap from "@/components/common/commonMap.vue";
+  import draggable from "vuedraggable";
 
-export default {
+  export default {
     name: "editBrandEnter",
     data() {
       let validataType = (rule, value, callback) => {
@@ -515,59 +369,47 @@ export default {
           PaiYanBZ: "", //排烟量备注
           ShopSize: "", //店铺开口尺寸
           IsShopSize: 1, //店铺开口尺寸（0-否1-有）
-        OpenShopWish:5,//开店意愿
-        IsInChengdu:0,//是否成都落地
-        CategoryId: 0,//分类ID
-        BrandEnterpriseType: 1,//(1-品牌，2-企业服务)
-        Introduce: '',//品牌简介/企业简介
-        DevIntention: '',//发展意向
-        Cooperation: '',//合作条件
-        PropertyDemand: '',//物业需求
-        Complementary: '',//配套需求
+          OpenShopWish: 5, //开店意愿
+          IsInChengdu: 0, //是否成都落地
+          CategoryId: 0, //分类ID
+          BrandEnterpriseType: 1, //(1-品牌，2-企业服务)
+          Introduce: '', //品牌简介/企业简介
+          DevIntention: '', //发展意向
+          Cooperation: '', //合作条件
+          PropertyDemand: '', //物业需求
+          Complementary: '', //配套需求
         },
         rules: {
-        Logo: [
-          {
+          Logo: [{
             required: true,
             validator: validataLogo,
             trigger: "change",
-          },
-        ],
-        FullBrandName: [
-          {
+          }, ],
+          FullBrandName: [{
             required: true,
             message: "请输入品牌全名",
             trigger: "blur",
-          },
-        ],
-        BrandName: [
-          {
+          }, ],
+          BrandName: [{
             required: true,
             message: "请输入品牌名",
             trigger: "blur",
-          },
-        ],
-        Logo: [
-          {
+          }, ],
+          Logo: [{
             required: true,
             message: "请选择Logo",
             trigger: "blur",
-          },
-        ],
-        ShopNum: [
-          {
+          }, ],
+          ShopNum: [{
             required: true,
             message: "请输入店铺数量",
             trigger: "blur",
-          },
-        ],
-        CategoryId: [
-          {
+          }, ],
+          CategoryId: [{
             required: true,
             validator: validataType,
             trigger: "change",
-          },
-        ],
+          }, ],
         },
         ID: 0,
         type: -1,
@@ -585,7 +427,7 @@ export default {
     },
     created() {
       this.isBrand = this.$route.query.isBrand
-    this.addMsg.BrandEnterpriseType = this.isBrand?this.isBrand:2
+      this.addMsg.BrandEnterpriseType = this.isBrand ? this.isBrand : 2
       if (this.$route.query.ID) {
         this.ID = this.$route.query.ID;
         this.getData();
@@ -597,7 +439,7 @@ export default {
       //获取类型
       getTypeEnumList() {
         this.apipost("/api/Trade/GetBrandClassList", {
-        BrandCategory: this.isBrand?3:4
+          BrandCategory: this.isBrand ? 3 : 4
         }, (res) => {
           if (res.data.resultCode == 1) {
             this.CategoryList = res.data.data;
@@ -613,11 +455,11 @@ export default {
         //其他
         // let other = this.$refs.ueother.getUEContent();
         // this.addMsg.Other = other;
-      if(this.addMsg.BuiltUpArea==='' || this.addMsg.EndBuiltUpArea===''){
+        if (this.addMsg.BuiltUpArea === '' || this.addMsg.EndBuiltUpArea === '') {
           this.Error('请输入建筑面积')
           return
         }
-      if(this.addMsg.AreaRequirement==='' || this.addMsg.EndAreaRequirement===''){
+        if (this.addMsg.AreaRequirement === '' || this.addMsg.EndAreaRequirement === '') {
           this.Error('请输入需求面积')
           return
         }
@@ -628,7 +470,7 @@ export default {
               this.addMsg,
               (res) => {
                 if (res.data.resultCode === 1) {
-                this.CommonJump(this.isBrand?'BrandManager':'EnterpriseManager');
+                  this.CommonJump(this.isBrand ? 'BrandManager' : 'EnterpriseManager');
                   this.Success(res.data.message);
                 } else {
                   this.Error(res.data.message);
@@ -645,8 +487,7 @@ export default {
       getData() {
         this.pageloading = true;
         this.apipost(
-        "/api/Trade/GetBrandEnterpriseInfo",
-        {
+          "/api/Trade/GetBrandEnterpriseInfo", {
             ID: this.ID,
           },
           (res) => {
@@ -680,22 +521,23 @@ export default {
         this.changeState1 = false;
       },
     },
-};
+  };
+
 </script>
 
 <style>
-.editBrandEnter .content {
+  .editBrandEnter .content {
     background: #fff;
     margin-top: 10px;
     box-sizing: border-box;
-}
+  }
 
-.editBrandEnter .editIconImg {
+  .editBrandEnter .editIconImg {
     width: 80px;
     height: 80px;
-}
+  }
 
-.editBrandEnter .add-image-btn {
+  .editBrandEnter .add-image-btn {
     width: 100px;
     height: 100px;
     line-height: 100px;
@@ -703,43 +545,44 @@ export default {
     border: 1px solid #e2e2e2;
     cursor: pointer;
     text-align: center;
-}
+  }
 
-.editBrandEnter .nav_Main {
+  .editBrandEnter .nav_Main {
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-start;
-}
+  }
 
-.editBrandEnter .nav_IconContent {
+  .editBrandEnter .nav_IconContent {
     display: flex;
     flex-wrap: wrap;
     justify-content: flex-start;
-}
+  }
 
-/* .editBrandEnter .nav_IconContent div>div {
+  /* .editBrandEnter .nav_IconContent div>div {
     display: inline-block;
   } */
 
-.editBrandEnter .colapp-image {
+  .editBrandEnter .colapp-image {
     background-size: cover;
     background-position: center center;
     width: 100px;
     height: 100px;
     border-radius: 0%;
-}
+  }
 
-.editBrandEnter .delBtn {
+  .editBrandEnter .delBtn {
     position: absolute;
     right: -8px;
     top: -8px;
     padding: 4px 4px !important;
-}
+  }
 
-.delCarrClose {
+  .delCarrClose {
     position: absolute;
     right: 53px;
     top: 8px;
     padding: 4px 4px !important;
-}
+  }
+
 </style>

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: '', //资产权属