11

src/components/tradePavilion/BrandEnterEdit.vue

@@ -68,7 +68,7 @@
         </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;">
+            maxlength="500" show-word-limit autosize style="width: 690px;">
           </el-input>
         </el-form-item>
         <el-form-item label="店铺数量" prop="ShopNum" class="is-required" size="small">

src/components/tradePavilion/BuildingManager.vue

@@ -133,12 +133,16 @@
         </el-table-column>
         <el-table-column prop="OpenTime" width="180" label="开业时间">
         </el-table-column>
-        <el-table-column prop="ProjectType" min-width="200" label="物业构成">
+        <el-table-column prop="CategoryName" min-width="200" label="物业构成">
           <template slot-scope="scope">
             {{ scope.row.CategoryName }}
           </template>
         </el-table-column>
-        <el-table-column prop="CarrierSize" label="商业体量"> </el-table-column>
+        <el-table-column prop="CarrierSize" label="商业体量">
+          <template slot-scope="scope">
+            {{ scope.row.CarrierSize }} ㎡
+          </template>
+        </el-table-column>
         <el-table-column prop="LayersNum" width="150" label="商业层数"></el-table-column>
         <!-- <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column> -->
 

src/components/tradePavilion/firmEdit.vue

@@ -59,71 +59,77 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item :label="`企业简介`" class="ue-style" prop="Introduction">
+        <el-form-item :label="`企业简介`" class="ue-style">
           <el-input type="textarea" :placeholder="`请输入企业简介`" v-model="addMsg.Introduction" maxlength="500"
-            show-word-limit rows="8" style="width: 690px;">
+            show-word-limit autosize style="width: 690px;">
           </el-input>
         </el-form-item>
-        <el-form-item label="企业发展意向" prop="DevIntention">
-          <el-input v-model="addMsg.DevIntention" style="width: 690px" size="small" placeholder="请输入企业发展意向">
-          </el-input>
+        <el-form-item label="企业类别">
+          <el-select v-model="addMsg.EType" size="small" placeholder="请选择企业类别">
+            <el-option v-for="item in ETypeList" :key="item.ID" :label="item.ClassName" :value="item.ID">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="意向楼宇等级">
+          <el-select 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="楼宇位置" prop="Address">
-          <el-input v-model="addMsg.Address" style="width: 690px" size="small" placeholder="请输入楼宇位置"></el-input>
+        <el-form-item label="意向楼宇位置">
+          <el-input v-model="addMsg.Address" style="width: 690px" size="small" placeholder="请输入意向楼宇位置"></el-input>
         </el-form-item>
         <el-form-item label="经纬度" style="margin-top: 15px" size="small">
           <el-input v-model="addMsg.LatAndLon" style="width: 690px" :disabled="true">
             <el-button @click="isShowMap = true" slot="append">展开地图</el-button>
           </el-input>
         </el-form-item>
-        <el-form-item label="投运时间" prop="OperationTime">
+        <el-form-item label="投运时间">
           <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="请选择楼宇等级">
-            <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
-            </el-option>
-          </el-select>
+        <el-form-item label="企业发展意向">
+          <el-input v-model="addMsg.DevIntention" style="width: 690px" size="small" placeholder="请输入企业发展意向">
+          </el-input>
         </el-form-item>
-        <el-form-item label="楼宇装修" prop="Renovation">
+        <el-form-item label="楼宇装修">
           <el-input v-model="addMsg.Renovation" style="width: 690px" size="small" placeholder="请输入楼宇装修">
           </el-input>
         </el-form-item>
-        <el-form-item label="支付方式" prop="Payment">
+        <el-form-item label="支付方式">
           <el-input v-model="addMsg.Payment" style="width: 690px" size="small" placeholder="请输入支付方式">
           </el-input>
         </el-form-item>
-        <el-form-item label="交房日期" prop="HandoverDate">
-          <el-date-picker v-model="addMsg.HandoverDate" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd"
-            size="small" type="datetime" placeholder="请选择交房日期">
+        <el-form-item label="交房日期">
+          <el-date-picker v-model="addMsg.HandoverDate" clearable format="yyyy-MM" value-format="yyyy-MM" size="small"
+            type="month" placeholder="请选择交房日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="意向楼层" prop="IntentionalFloor">
+        <el-form-item label="意向楼层">
           <el-input v-model="addMsg.IntentionalFloor" style="width: 690px" size="small" placeholder="请输入意向楼层">
           </el-input>
         </el-form-item>
-        <el-form-item label="电梯数" prop="ElevatorNum">
+        <el-form-item label="电梯数">
           <el-input v-model="addMsg.ElevatorNum" style="width: 690px" size="small" placeholder="请输入电梯数">
           </el-input>
         </el-form-item>
-        <el-form-item label="物业费(元)" prop="PropertyFee">
+        <el-form-item label="物业费(元)">
           <el-input v-model="addMsg.PropertyFee" @keyup.native="checkPrice(addMsg, 'PropertyFee')" style="width: 690px"
             size="small" placeholder="请输入物业费">
             <template slot="append">㎡/月</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="月租金(元)" prop="RentFee">
+        <el-form-item label="月租金(元)">
           <el-input v-model="addMsg.RentFee" @keyup.native="checkPrice(addMsg, 'RentFee')" style="width: 690px"
             size="small" placeholder="请输入月租金">
             <template slot="append">㎡/月</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="联系人名字" prop="ContactName">
+        <el-form-item label="联系人名字">
           <el-input v-model="addMsg.ContactName" style="width: 690px" size="small" placeholder="请输入楼负责人名字">
           </el-input>
         </el-form-item>
-        <el-form-item label="联系人电话" prop="ContactPhone">
+        <el-form-item label="联系人电话">
           <el-input v-model="addMsg.ContactPhone" style="width: 690px" size="small" placeholder="请输入楼负责人电话">
           </el-input>
         </el-form-item>
@@ -183,6 +189,7 @@
           LatAndLon: "", //经纬度
           OperationTime: "", //投运时间
           CategoryId: 0, //楼宇等级
+          EType: 0, //企业类别
           Renovation: "", //楼宇装修
           Payment: "", //支付方式
           HandoverDate: "", //交房日期
@@ -286,6 +293,7 @@
         changeState1: false,
         LogoList: [],
         CategoryList: [],
+        ETypeList: [],
         isShowMap: false,
       };
     },
@@ -324,6 +332,18 @@
             this.CategoryList.unshift(obj);
           }
         });
+        this.apipost("/api/Trade/GetBrandClassList", {
+          BrandCategory: 4
+        }, (res) => {
+          if (res.data.resultCode == 1) {
+            this.ETypeList = res.data.data;
+            let obj = {
+              ClassName: "请选择",
+              ID: 0,
+            };
+            this.ETypeList.unshift(obj);
+          }
+        });
       },
       Save(formName) {
         this.$refs[formName].validate((valid) => {

src/components/tradePavilion/firmManager.vue

@@ -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="`楼宇等级`">
+          <el-select size="small" v-model="msg.CategoryId" filterable @change="(msg.pageIndex = 1), getList()"
+            :placeholder="`楼宇等级`">
             <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
             </el-option>
           </el-select>
@@ -62,12 +62,11 @@
             </el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="Introduction" :label="`企业简介`" width="150"> </el-table-column>
-        <!-- <el-table-column prop="DevIntention" :label="`企业发展意向`" width="130"> </el-table-column> -->
-        <el-table-column prop="Address" :label="`楼宇位置`" width="150"> </el-table-column>
-        <el-table-column prop="OperationTime" :label="`投运时间`" width="120"> </el-table-column>
-        <el-table-column prop="CategoryName" :label="`楼宇等级`" width="150">
+        <el-table-column prop="ETypeName" :label="`企业类别`" width="100"> </el-table-column>
+        <el-table-column prop="Address" :label="`意向楼宇位置`" width="150"> </el-table-column>
+        <el-table-column prop="CategoryName" :label="`意向楼宇等级`" width="150">
         </el-table-column>
+        <el-table-column prop="OperationTime" :label="`投运时间`" width="120"> </el-table-column>
         <el-table-column prop="Renovation" :label="`楼宇装修`"> </el-table-column>
         <el-table-column prop="Payment" :label="`支付方式`" width="150"> </el-table-column>
         <el-table-column prop="HandoverDate" :label="`交房日期`" width="120"> </el-table-column>
@@ -88,8 +87,8 @@
         <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('firmEdit', { ID: scope.row.ServiceId })"
-              src="../../assets/img/setup/edit.png" alt="" class="imgstyle" />
+              <img @click="CommonJump('firmEdit', { ID: scope.row.ServiceId })" 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" />

src/components/tradePavilion/tenementVehicle.vue

@@ -32,7 +32,7 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item label="楼宇位置" prop="Address">
+        <el-form-item label="楼宇位置">
           <el-input v-model="addMsg.Address" style="width: 690px" size="small" placeholder="请输入楼宇位置"></el-input>
         </el-form-item>
         <el-form-item label="经纬度" style="margin-top: 15px" size="small">
@@ -40,11 +40,8 @@
             <el-button @click="isShowMap = true" slot="append">展开地图</el-button>
           </el-input>
         </el-form-item>
-        <el-form-item label="建设时间" prop="ConstructionTime">
-          <el-input v-model="addMsg.ConstructionTime" style="width: 690px" size="small" placeholder="请输入建设时间">
-          </el-input>
-        </el-form-item>
-        <el-form-item label="投运时间" prop="OperationTime">
+
+        <el-form-item label="投运时间">
           <el-input v-model="addMsg.OperationTime" style="width: 690px" size="small" placeholder="请输入投运时间">
           </el-input>
         </el-form-item>
@@ -54,75 +51,79 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="楼宇建筑面积" prop="Areas">
+        <el-form-item label="楼宇建筑面积">
           <el-input v-model="addMsg.Areas" style="width: 690px" size="small" placeholder="请输入楼宇建筑面积">
           </el-input>
         </el-form-item>
-        <el-form-item label="楼栋数量" prop="BuildingNum">
+        <el-form-item label="楼栋数量">
           <el-input v-model="addMsg.BuildingNum" style="width: 690px" size="small" placeholder="请输入楼栋数量">
           </el-input>
         </el-form-item>
-        <el-form-item label="楼层量" prop="FloorNum">
+        <el-form-item label="楼层量">
           <el-input v-model="addMsg.FloorNum" style="width: 690px" size="small" placeholder="请输入楼层量">
           </el-input>
         </el-form-item>
-        <el-form-item label="电梯数" prop="ElevatorNum">
+        <el-form-item label="电梯数">
           <el-input v-model="addMsg.ElevatorNum" style="width: 690px" size="small" placeholder="请输入电梯数">
           </el-input>
         </el-form-item>
-        <el-form-item label="层高" prop="FloorHeight">
+        <el-form-item label="层高">
           <el-input v-model="addMsg.FloorHeight" @keyup.native="checkPrice(addMsg, 'FloorHeight')" style="width: 690px"
             size="small" placeholder="请输入层高">
             <template slot="append">m</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="开发商" prop="Developers">
+        <el-form-item label="开发商">
           <el-input v-model="addMsg.Developers" style="width: 690px" size="small" placeholder="请输入开发商"></el-input>
         </el-form-item>
-        <el-form-item label="物业公司" prop="PropertyComp">
+        <el-form-item label="物业公司">
           <el-input v-model="addMsg.PropertyComp" style="width: 690px" size="small" placeholder="请输入物业公司">
           </el-input>
         </el-form-item>
-        <el-form-item label="销售/自持比例" prop="SaleOrSelf">
+        <el-form-item label="销售/自持比例">
           <el-input v-model="addMsg.SaleOrSelf" style="width: 690px" size="small" placeholder="请输入销售/自持比例">
           </el-input>
         </el-form-item>
-        <el-form-item label="是否统一运营" prop="">
+        <el-form-item label="是否统一运营">
           <el-switch v-model="addMsg.IsAllOperate" :active-value="Number(1)" :inactive-value="Number(0)">
           </el-switch>
         </el-form-item>
-        <el-form-item label="物业费(元)" prop="PropertyFee">
+        <el-form-item label="建设时间">
+          <el-input v-model="addMsg.ConstructionTime" style="width: 690px" size="small" placeholder="请输入建设时间">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="物业费(元)">
           <el-input v-model="addMsg.PropertyFee" @keyup.native="checkPrice(addMsg, 'PropertyFee')" style="width: 690px"
             size="small" placeholder="请输入物业费">
             <template slot="append">㎡/月</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="月租金(元)" prop="RentFee">
+        <el-form-item label="月租金(元)">
           <el-input v-model="addMsg.RentFee" @keyup.native="checkPrice(addMsg, 'Areas')" style="width: 690px"
             size="small" placeholder="请输入月租金">
             <template slot="append">㎡/月</template>
           </el-input>
         </el-form-item>
-        <el-form-item label="拟主导产业方向" prop="IndustryDirection">
-          <el-input type="textarea" v-model="addMsg.IndustryDirection" show-word-limit rows="4" style="width: 690px"
-            size="small" placeholder="请输入拟主导产业方向">
+        <el-form-item label="拟主导产业方向">
+          <el-input v-model="addMsg.IndustryDirection" show-word-limit rows="4" style="width: 690px" size="small"
+            placeholder="请输入拟主导产业方向">
           </el-input>
         </el-form-item>
-        <el-form-item label="目标企业招引需求" prop="BrandDemand">
+        <el-form-item label="目标企业招引需求">
           <el-input type="textarea" v-model="addMsg.BrandDemand" show-word-limit rows="4" style="width: 690px"
-            size="small" placeholder="请输入目标企业招引需求">
+            size="small" placeholder="请输入目标企业招引需求" autosize>
           </el-input>
         </el-form-item>
-        <el-form-item label="其他需求" prop="">
+        <el-form-item label="其他需求">
           <el-input type="textarea" v-model="addMsg.Other" show-word-limit rows="4" style="width: 690px" size="small"
-            placeholder="请输入其他需求">
+            placeholder="请输入其他需求" autosize>
           </el-input>
         </el-form-item>
-        <el-form-item label="负责人名字" prop="ContactName">
+        <el-form-item label="负责人名字">
           <el-input v-model="addMsg.ContactName" style="width: 690px" size="small" placeholder="请输入楼负责人名字">
           </el-input>
         </el-form-item>
-        <el-form-item label="负责人电话" prop="ContactPhone">
+        <el-form-item label="负责人电话">
           <el-input v-model="addMsg.ContactPhone" @keyup.native="checkPrice(addMsg, 'ContactPhone')"
             style="width: 690px" size="small" placeholder="请输入楼负责人电话">
           </el-input>