11

src/components/tradePavilion/BrandEnterEdit.vue

 <template>
   <div v-loading="pageloading" class="editBrandEnter">
     <div class="head-title">
-      <span @click="CommonJump(isBrand?'BrandManager':'EnterpriseManager')"
+      <span @click="CommonJump(isBrand?'BrandEnterpriseManager':'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-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;" />
@@ -65,22 +60,37 @@
             </div>
           </div>
         </el-form-item>
+        <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-option>
+          </el-select>
+        </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 autosize="{ minRows: 2, maxRows: 6 }" style="width: 690px;">
+          </el-input>
+        </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>
-        <el-form-item label="建筑面积" size="small">
+        <!-- <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-form-item>
+        </el-form-item> -->
         <el-form-item label="需求面积" size="small">
-          <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.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" />
+            maxlength="7" /> -->
+          <el-input v-model="addMsg.AreaRequirement" placeholder="请输入店铺数量" type="number" maxlength="3"
+            style="width: 690px;">
+            <template slot="append">㎡</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="客群定位" size="small">
           <el-input v-model="addMsg.CustomerType" placeholder="请输入客群定位" maxlength="200" style="width: 690px;" />
@@ -274,25 +284,33 @@
           ></UE>
         </el-form-item> -->
 
-        <el-form-item label="发展意向" prop="">
-          <el-input v-model="addMsg.DevIntention" style="width: 690px" size="small" placeholder="请输入发展意向"  maxlength="500" show-word-limit>
+        <!-- <el-form-item label="发展意向" prop="">
+          <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> -->
         <el-form-item label="合作条件" prop="">
-          <el-input v-model="addMsg.Cooperation" style="width: 690px" size="small" placeholder="请输入合作条件"  maxlength="500" show-word-limit>
+          <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="请输入物业需求"  maxlength="500" show-word-limit>
+          <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="请输入配套需求"  maxlength="500" show-word-limit>
+          <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-form-item label="联系人">
+          <el-input v-model="addMsg.ContactName" style="width: 690px" size="small" placeholder="请输入联系人" maxlength="50">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="联系电话">
+          <el-input v-model="addMsg.ContactPhone" style="width: 690px" size="small" placeholder="请输入联系电话"
+            maxlength="50">
           </el-input>
         </el-form-item>
       </el-card>
@@ -378,6 +396,8 @@
           Cooperation: '', //合作条件
           PropertyDemand: '', //物业需求
           Complementary: '', //配套需求
+          ContactName: "", //联系人
+          ContactPhone: '', //联系电话
         },
         rules: {
           Logo: [{
@@ -454,14 +474,14 @@
         //其他
         // let other = this.$refs.ueother.getUEContent();
         // this.addMsg.Other = other;
-        if (this.addMsg.BuiltUpArea === '' || this.addMsg.EndBuiltUpArea === '') {
-          this.Error('请输入建筑面积')
-          return
-        }
-        if (this.addMsg.AreaRequirement === '' || this.addMsg.EndAreaRequirement === '') {
-          this.Error('请输入需求面积')
-          return
-        }
+        // if (this.addMsg.BuiltUpArea === '' || this.addMsg.EndBuiltUpArea === '') {
+        //   this.Error('请输入建筑面积')
+        //   return
+        // }
+        // if (this.addMsg.AreaRequirement === '' || this.addMsg.EndAreaRequirement === '') {
+        //   this.Error('请输入需求面积')
+        //   return
+        // }
         this.$refs[formName].validate((valid) => {
           if (valid) {
             this.apipost(
@@ -469,7 +489,7 @@
               this.addMsg,
               (res) => {
                 if (res.data.resultCode === 1) {
-                  this.CommonJump(this.isBrand ? 'BrandManager' : 'EnterpriseManager');
+                  this.CommonJump(this.isBrand ? 'BrandEnterpriseManager' : 'EnterpriseManager');
                   this.Success(res.data.message);
                 } else {
                   this.Error(res.data.message);
@@ -482,7 +502,6 @@
           }
         });
       },
-
       getData() {
         this.pageloading = true;
         this.apipost(
@@ -492,7 +511,6 @@
           (res) => {
             this.pageloading = false;
             if (res.data.resultCode == 1) {
-              let data = res.data.data;
               this.addMsg = res.data.data;
               this.LogoList = [];
               this.LogoList.push(this.addMsg.Logo);

src/components/tradePavilion/BrandEnterpriseManager.vue

@@ -30,8 +30,8 @@
       <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"
-            size="small" clearable>
+            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="
               color: #979dad;
@@ -41,8 +41,8 @@
             "></span>
         </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?'消费品牌':'企业服务'}分类`" clearable @clear="(msg.pageIndex = 1), getList()">
+          <el-select size="small" v-model="msg.CategoryId" filterable @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>
@@ -66,23 +66,26 @@
         </el-table-column>
         <el-table-column prop="ShopNum" label="店铺数量" width="80">
         </el-table-column>
-        <el-table-column prop="BuiltUpArea" label="建筑面积" width="200">
+        <el-table-column prop="BuiltUpArea" label="需求面积" width="100">
           <template slot-scope="scope">
-            <span>{{ scope.row.BuiltUpArea }} 至
-              {{ scope.row.EndBuiltUpArea }} 平</span>
+            <span>{{ scope.row.AreaRequirement }} ㎡</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="ProjectName" label="商铺性质" width="150">
         </el-table-column> -->
         <el-table-column prop="BrandType" :label="`${isBrand?'品牌':'服务'}定位`" width="180">
         </el-table-column>
-        <el-table-column prop="CustomerType" label="客群定位" width="160">
+        <el-table-column prop="CustomerType" label="客群定位" width="180">
+        </el-table-column>
+        <el-table-column prop="ContactName" label="联系人" width="120">
+        </el-table-column>
+        <el-table-column prop="ContactPhone" label="联系电话" width="150">
         </el-table-column>
         <el-table-column fixed="right" label="操作" width="120" v-if="!readonly">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
               <img @click="CommonJump('BrandEnterEdit', { ID: scope.row.ID,isBrand:isBrand?1:0 })"
-              src="../../assets/img/setup/edit.png" alt="" class="imgstyle" />
+                src="../../assets/img/setup/edit.png" alt="" class="imgstyle" />
             </el-tooltip>
             <el-tooltip class="item" effect="dark" content="删除" placement="top">
               <img @click="delManage(scope.row)" src="../../assets/img/setup/del.png" alt="" class="imgstyle" />
@@ -175,7 +178,7 @@
       if (this.$route.query && this.$route.query.readonly) {
         this.readonly = this.$route.query.readonly;
       }
-      this.isBrand = this.$route.name == 'BrandManager'
+      this.isBrand = this.$route.name == 'BrandEnterpriseManager'
       this.msg.BrandEnterpriseType = this.isBrand ? 1 : 2
       this.getList();
       this.getTypeEnumList();
@@ -187,7 +190,7 @@
           if (this.$route.query && this.$route.query.readonly) {
             this.readonly = this.$route.query.readonly;
           }
-          this.isBrand = val.name == 'BrandManager'
+          this.isBrand = val.name == 'BrandEnterpriseManager'
           this.msg = {
             BrandName: "", //名称
             pageIndex: 1,

src/components/tradePavilion/firmEdit.vue

@@ -77,9 +77,8 @@
           </el-input>
         </el-form-item>
         <el-form-item label="投运时间" prop="OperationTime">
-            <el-input v-model="addMsg.OperationTime" style="width: 690px" size="small" placeholder="请输入投运时间">
+          <el-input v-model="addMsg.OperationTime" style="width: 690px" size="small" placeholder="请输入投运时间">
           </el-input>
-       
         </el-form-item>
         <el-form-item label="楼宇等级" prop="CategoryId">
           <el-select v-model="addMsg.CategoryId" size="small" placeholder="请选择楼宇等级">

src/components/tradePavilion/tenementVehicle.vue

@@ -55,23 +55,19 @@
           </el-select>
         </el-form-item>
         <el-form-item label="楼宇建筑面积" prop="Areas">
-          <el-input v-model="addMsg.Areas"  style="width: 690px" size="small"
-            placeholder="请输入楼宇建筑面积">
+          <el-input v-model="addMsg.Areas" style="width: 690px" size="small" placeholder="请输入楼宇建筑面积">
           </el-input>
         </el-form-item>
         <el-form-item label="楼栋数量" prop="BuildingNum">
-          <el-input v-model="addMsg.BuildingNum" @keyup.native="checkPrice(addMsg, 'BuildingNum')" style="width: 690px"
-            size="small" placeholder="请输入楼栋数量">
+          <el-input v-model="addMsg.BuildingNum" style="width: 690px" size="small" placeholder="请输入楼栋数量">
           </el-input>
         </el-form-item>
         <el-form-item label="楼层量" prop="FloorNum">
-          <el-input v-model="addMsg.FloorNum" @keyup.native="checkPrice(addMsg, 'FloorNum')" style="width: 690px"
-            size="small" placeholder="请输入楼层量">
+          <el-input v-model="addMsg.FloorNum" style="width: 690px" size="small" placeholder="请输入楼层量">
           </el-input>
         </el-form-item>
         <el-form-item label="电梯数" prop="ElevatorNum">
-          <el-input v-model="addMsg.ElevatorNum" @keyup.native="checkPrice(addMsg, 'ElevatorNum')" style="width: 690px"
-            size="small" placeholder="请输入电梯数">
+          <el-input v-model="addMsg.ElevatorNum" style="width: 690px" size="small" placeholder="请输入电梯数">
           </el-input>
         </el-form-item>
         <el-form-item label="层高" prop="FloorHeight">

src/components/tradePavilion/tradePavilionIndex.vue

@@ -262,7 +262,7 @@
           </li>
         </ul>
         <!-- 宜宾商载通 -->
-        <ul class="FsettingUU" v-if="currentUser.TenantId==30">
+        <ul class="FsettingUU" v-else>
           <li class="menu_item" :class="{ Fchecked: isChecked == '/ybrandClassification' }" @click="
               (isChecked = '/ybrandClassification'),
                 CommonJump('ybrandClassification')
@@ -275,17 +275,17 @@
             ">
             <i class="el-icon-menu"></i><span>商业载体管理</span>
           </li>
+          <li class="menu_item" :class="{ Fchecked: isChecked == '/BrandEnterpriseManager' }" @click="
+              (isChecked = '/BrandEnterpriseManager'), CommonJump('BrandEnterpriseManager')
+            ">
+            <i class="el-icon-menu"></i><span>消费品牌管理</span>
+          </li>
           <li class="menu_item" :class="{ Fchecked: isChecked == '/tenementManager' }" @click="
               (isChecked = '/tenementManager'),
                 CommonJump('tenementManager')
             ">
             <i class="el-icon-menu"></i><span>楼宇管理</span>
           </li>
-          <li class="menu_item" :class="{ Fchecked: isChecked == '/BrandManager' }" @click="
-              (isChecked = '/BrandManager'), CommonJump('BrandManager')
-            ">
-            <i class="el-icon-menu"></i><span>消费品牌管理</span>
-          </li>
           <li class="menu_item" :class="{ Fchecked: isChecked == '/firmManager' }" @click="
               (isChecked = '/firmManager'), CommonJump('firmManager')
             ">
@@ -403,8 +403,14 @@
       this.ERPEmpId = this.currentUser.ERPEmpId;
       this.isChecked = this.$route.path;
       if (this.$route.query.FIndex) {
-        this.CommonJump("companyList");
-        this.isChecked = "/companyList";
+        if (this.currentUser.TenantId == 18) {
+          this.CommonJump("companyList");
+          this.isChecked = "/companyList";
+        } else {
+          this.CommonJump("BuildingServiceManager");
+          this.isChecked = "/BuildingServiceManager";
+        }
+
       }
     },
     methods: {},

src/router/index.js

@@ -816,8 +816,8 @@ export default new Router({
         },
         //消费品牌管理【商载通】
         {
-          path: '/BrandManager',
-          name: 'BrandManager',
+          path: '/BrandEnterpriseManager',
+          name: 'BrandEnterpriseManager',
           component: resolve => require(['@/components/tradePavilion/BrandEnterpriseManager'], resolve),
         },