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

src/components/system/menu.vue

 <style>
- 
   .menuDiv .query-box {
     width: 100%;
     padding: 0 0 20px;
@@ -23,8 +22,10 @@
 <template>
   <div class="menuDiv">
     <div class="query-box">
-      名称： <el-input type="text" style="width:234px;" size="small" v-model="msg.MenuName" clearable 
-       @keyup.enter.native="msg.pageIndex=1,getPageList()" @clear="msg.pageIndex=1,getPageList()"></el-input>
+      名称： <el-input type="text" style="width:234px;" size="small" v-model="msg.MenuName" clearable
+        @keyup.enter.native="msg.pageIndex=1,getPageList()" @clear="msg.pageIndex=1,getPageList()"></el-input>
+      链接地址： <el-input type="text" style="width:234px;" size="small" v-model="msg.MenuUrl" clearable
+        @keyup.enter.native="msg.pageIndex=1,getPageList()" @clear="msg.pageIndex=1,getPageList()"></el-input>
       等级： <el-select style="width:234px;" size="small" v-model="msg.MenuLevel" @change="msg.pageIndex=1,getPageList()">
         <el-option label="全部" :key="0" :value="0"></el-option>
         <el-option label="一级" :key="1" :value="1"></el-option>
@@ -122,6 +123,7 @@
           pageSize: 15,
           MenuLevel: 0,
           MenuName: "", //菜单名称
+          MenuUrl: "", //菜单URL
         },
         dataList: [],
         addMsg: {
@@ -141,7 +143,7 @@
             trigger: 'blur'
           }],
         },
-        menuTitle:"新增菜单",
+        menuTitle: "新增菜单",
       };
     },
     created() {
@@ -205,8 +207,8 @@
           if (res.data.resultCode == 1) {
             this.addMsg = res.data.data;
             this.menuDialog = true;
-            this.menuTitle='修改菜单',
-            this.getChildMenuList(this.addMsg.MenuLevel);
+            this.menuTitle = '修改菜单',
+              this.getChildMenuList(this.addMsg.MenuLevel);
           } else {
             this.Info(res.data.message);
           }

src/components/system/minimenu.vue

@@ -24,6 +24,8 @@
     <div class="query-box">
       名称： <el-input type="text" style="width:234px;" size="small" v-model="msg.PageName" clearable
         @keyup.enter.native="msg.pageIndex=1,getPageList()" @clear="msg.pageIndex=1,getPageList()"></el-input>
+      地址： <el-input type="text" style="width:234px;" size="small" v-model="msg.PageUrl" clearable
+        @keyup.enter.native="msg.pageIndex=1,getPageList()" @clear="msg.pageIndex=1,getPageList()"></el-input>
       类型： <el-select style="width:234px;" size="small" v-model="msg.QPageType" @change="msg.pageIndex=1,getPageList()">
         <el-option label="全部" :key="0" :value="0"></el-option>
         <el-option v-for="item in pageType" :key="item.Id" :value="item.Id" :label="item.Name"></el-option>
@@ -129,6 +131,7 @@
           pageSize: 15,
           QPageType: 0,
           PageName: "", //菜单名称
+          PageUrl:"",//链接地址
           Status: -1, //菜单状态
         },
         dataList: [],
@@ -150,7 +153,7 @@
             trigger: 'blur'
           }],
         },
-        miniTitle:"新增小程序菜单",
+        miniTitle: "新增小程序菜单",
       };
     },
     created() {
@@ -223,7 +226,7 @@
           if (res.data.resultCode == 1) {
             this.addMsg = res.data.data;
             this.menuDialog = true;
-            this.miniTitle="修改小程序菜单";
+            this.miniTitle = "修改小程序菜单";
           } else {
             this.Info(res.data.message);
           }

src/components/tradePavilion/BrandEnterEdit.vue

@@ -60,7 +60,7 @@
             </div>
           </div>
         </el-form-item>
-        <el-form-item :label="`${isBrand?'品牌':'服务'}分类`" class="is-required" prop="CategoryId">
+        <el-form-item :label="`${isBrand?'品牌':'服务'}分类`">
           <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>
@@ -68,10 +68,10 @@
         </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 style="width: 690px;">
+            maxlength="500"   autosize style="width: 690px;">
           </el-input>
         </el-form-item>
-        <el-form-item label="店铺数量" prop="ShopNum" class="is-required" size="small">
+        <el-form-item label="店铺数量" 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">

src/components/tradePavilion/BuildingManager.vue

@@ -129,11 +129,11 @@
         </el-table-column>
         <el-table-column prop="Address" width="200" label="项目地址">
         </el-table-column>
-        <el-table-column prop="Developers" width="200" label="开发商">
+        <el-table-column prop="Developers" width="100" label="开发商">
         </el-table-column>
-        <el-table-column prop="OpenTime" width="180" label="开业时间">
+        <el-table-column prop="OpenTime" width="100" label="开业时间">
         </el-table-column>
-        <el-table-column prop="CategoryName" min-width="200" label="物业构成">
+        <el-table-column prop="CategoryName" min-width="120" label="物业构成">
           <template slot-scope="scope">
             {{ scope.row.CategoryName }}
           </template>

src/components/tradePavilion/BuildingVehicle.vue

@@ -131,7 +131,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="商业体量" prop="CarrierSize">
+        <el-form-item label="商业体量">
           <el-input v-model="addMsg.CarrierSize" @keyup.native="checkPrice(addMsg, 'CarrierSize')" style="width: 690px"
             size="small" placeholder="请输入商业体量">
             <template slot="append">㎡</template>
@@ -183,11 +183,11 @@
             maxlength="500" show-word-limit>
           </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="请输入开发商" maxlength="180">
           </el-input>
         </el-form-item>
-        <el-form-item label="物业构成" prop="CategoryId">
+        <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>
@@ -215,7 +215,6 @@
             show-word-limit>
           </el-input>
         </el-form-item>
-
         <el-form-item label="联系人">
           <el-input v-model="addMsg.ContactName" style="width: 690px" size="small" placeholder="请输入联系人" maxlength="50">
           </el-input>

src/components/tradePavilion/addbrand.vue

@@ -563,7 +563,7 @@ export default {
       this.changeState1 = false;
     },
     getBrandClassList() {
-      this.apipost("/api/Trade/GetBrandClassList", {}, (res) => {
+      this.apipost("/api/Trade/GetBrandClassList", { BrandCategory:3}, (res) => {
         if (res.data.resultCode == 1) {
           this.BrandClassList = res.data.data;
         } else {

src/components/tradePavilion/brandManagement.vue

@@ -414,7 +414,9 @@
         });
       },
       getBrandClassList() {
-        this.apipost("/api/Trade/GetBrandClassList", {}, (res) => {
+        this.apipost("/api/Trade/GetBrandClassList", {
+          BrandCategory:3
+        }, (res) => {
           if (res.data.resultCode == 1) {
             this.BrandClassList = res.data.data;
           } else {

src/components/tradePavilion/firmEdit.vue

@@ -60,8 +60,12 @@
           </div>
         </el-form-item>
         <el-form-item :label="`企业简介`" class="ue-style">
-          <el-input type="textarea" :placeholder="`请输入企业简介`" v-model="addMsg.Introduction" maxlength="500"
-            show-word-limit autosize style="width: 690px;">
+          <el-input type="textarea" :placeholder="`请输入企业简介`" v-model="addMsg.Introduction" maxlength="500" autosize
+            style="width: 690px;">
+          </el-input>
+        </el-form-item>
+        <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="企业类别">
@@ -70,12 +74,6 @@
             </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="意向楼宇位置">
           <el-input v-model="addMsg.Address" style="width: 690px" size="small" placeholder="请输入意向楼宇位置"></el-input>
         </el-form-item>
@@ -88,9 +86,11 @@
           <el-input v-model="addMsg.OperationTime" style="width: 690px" size="small" placeholder="请输入投运时间">
           </el-input>
         </el-form-item>
-        <el-form-item label="企业发展意向">
-          <el-input v-model="addMsg.DevIntention" style="width: 690px" size="small" placeholder="请输入企业发展意向">
-          </el-input>
+        <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="楼宇装修">
           <el-input v-model="addMsg.Renovation" style="width: 690px" size="small" placeholder="请输入楼宇装修">

src/components/tradePavilion/tenementVehicle.vue

@@ -40,7 +40,6 @@
             <el-button @click="isShowMap = true" slot="append">展开地图</el-button>
           </el-input>
         </el-form-item>
-
         <el-form-item label="投运时间">
           <el-input v-model="addMsg.OperationTime" style="width: 690px" size="small" placeholder="请输入投运时间">
           </el-input>