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

src/components/blindDate/recruitStick.vue

@@ -196,7 +196,7 @@
             <el-tooltip
               class="item"
               effect="dark"
-              content="编辑评价"
+              content="新增评价"
               placement="top"
             >
               <img

src/components/tradePavilion/brandManagement.vue

@@ -2,7 +2,10 @@
   <div class="brandManagement">
     <div class="el-card__header">
       <span>品牌列表</span>
-      <div style="display: flex; flex-direction: row; align-items: center">
+      <div
+        style="display: flex; flex-direction: row; align-items: center"
+        v-if="!readonly"
+      >
         <el-button type="primary" class="el-button--small" @click="addTopic"
           >新增</el-button
         >
@@ -15,7 +18,7 @@
         </el-button>
       </div>
     </div>
-    <div class="content">
+    <div class="content" v-if="!readonly">
       <div style="display: flex; flex-direction: row; align-items: center">
         <div class="block">
           <span style="margin-left: 10px">品牌名</span>
@@ -65,10 +68,21 @@
           </el-select>
           <span style="margin-left: 10px">认证用户</span>
 
-          <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable  @change="(msg.pageIndex = 1), getList()"
-            placeholder="请选择">
+          <el-select
+            size="small"
+            v-model="msg.UserId"
+            :filter-method="ChangeListName"
+            filterable
+            @change="(msg.pageIndex = 1), getList()"
+            placeholder="请选择"
+          >
             <el-option label="不限" :value="0"></el-option>
-            <el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
+            <el-option
+              v-for="item in userList"
+              :key="item.Id"
+              :label="item.Name"
+              :value="item.Id"
+            >
             </el-option>
           </el-select>
         </div>
@@ -230,9 +244,13 @@
         </el-table-column>
         <el-table-column prop="CustomerType" label="客群定位" width="160">
         </el-table-column>
-        <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
+        <el-table-column
+          prop="UserName"
+          width="100"
+          label="认证用户"
+        ></el-table-column>
         <el-table-column fixed="right" label="操作" width="120">
-          <template slot-scope="scope">
+          <template slot-scope="scope" v-if="!readonly">
             <el-tooltip
               class="item"
               effect="dark"
@@ -342,18 +360,18 @@ export default {
         XinFeng: -1, //新风（0-否1-有）
         BrandClassId: 0, //分类
         ExcelEnumIds: [],
-        UserId:0,//用户认证
+        UserId: 0, //用户认证
       },
       usermsg: {
-            pageIndex: 1,
-            pageSize: 20,
-            Name: '',
-            Source: 0,
-            MemberGrade: 0,
-            Id: 0,
-            Moblie: ''
+        pageIndex: 1,
+        pageSize: 20,
+        Name: "",
+        Source: 0,
+        MemberGrade: 0,
+        Id: 0,
+        Moblie: "",
       },
-      userList:[],
+      userList: [],
       addMsg: {},
       dialogVisible: false,
       dataList: [],
@@ -366,41 +384,55 @@ export default {
       loading: false,
       BrandClassList: [], //品牌分类列表
       ProjectTypeList: [], //商铺性质列表
+      readonly: false,
     };
   },
   created() {
-    if(this.$route.query && this.$route.query.UserId){
-      this.msg.UserId = Number(this.$route.query.UserId) 
-      this.usermsg.Id = Number(this.$route.query.UserId) 
-      this.getuserList(1)
-    }else{
-      this.getuserList()
+    if (this.$route.query && this.$route.query.UserId) {
+      this.msg.UserId = Number(this.$route.query.UserId);
+      this.usermsg.Id = Number(this.$route.query.UserId);
+      this.getuserList(1);
+    } else {
+      this.getuserList();
     }
     this.getBrandClassList();
     this.getProjectType();
     this.getDown();
-   
-
   },
   mounted() {
-    this.getList();
-
+    if (this.$route.query && this.$route.query.readonly) {
+      this.readonly = this.$route.query.readonly;
+    }
+    if (this.$route.query && this.$route.query.data) {
+      this.dataList = this.$route.query.data;
+      this.pageCount = this.dataList.length;
+      this.dataList.forEach((x) => {
+        x.LogoList = [];
+        x.LogoList.push(x.Logo);
+      });
+    } else {
+      this.getList();
+    }
   },
   methods: {
     ChangeListName(val) {
-        this.usermsg.Name = val;
-        this.getuserList();
+      this.usermsg.Name = val;
+      this.getuserList();
     },
-    getuserList(type=0) {
-        this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
-        if (res.data.resultCode == 1) {
+    getuserList(type = 0) {
+      this.apipost(
+        "/api/user/GetMemberUserDropDownList",
+        this.usermsg,
+        (res) => {
+          if (res.data.resultCode == 1) {
             let pageData = res.data.data.pageData;
             this.userList = pageData;
-            if(type==1){
-              this.usermsg.Id = 0
+            if (type == 1) {
+              this.usermsg.Id = 0;
             }
+          }
         }
-        })
+      );
     },
     Export() {
       this.msg.ExcelEnumIds = this.checkedCities;

src/components/tradePavilion/plugin/dropdown.vue

@@ -13,7 +13,7 @@
         <el-form label-width="90px">
           <el-form-item :label="searchData.CompData.Name" :required="searchData.CompData.IsRequire"
             style="margin-bottom:0">
-            <el-select v-model="defaultValue" style="width:328px;">
+            <el-select v-model="defaultValue" style="width:328px;" :popper-append-to-body="false">
               <el-option v-for="item in searchData.CompData.OptionList" :key="item.Id" :label="item.Name"
                 :value="item.Id">
               </el-option>

src/router/index.js

@@ -722,17 +722,17 @@ export default new Router({
         name: 'newsList',
         component: resolve => require(['@/components/tradePavilion/newsList'], resolve),
       },
-       //贸易管理--榜单报名
-      {
-        path: '/registrationLogin',
-        name: 'registrationLogin',
-        component: resolve => require(['@/components/tradePavilion/registrationLogin'], resolve),
-      },
-       //贸易管理--新增榜单报名
+      //贸易管理--榜单报名
+      {
+        path: '/registrationLogin',
+        name: 'registrationLogin',
+        component: resolve => require(['@/components/tradePavilion/registrationLogin'], resolve),
+      },
+      //贸易管理--新增榜单报名
       {
         path: '/registrationAdd',
-        name: 'registrationAdd',
-        component: resolve => require(['@/components/tradePavilion/registrationAdd'], resolve),
+        name: 'registrationAdd',
+        component: resolve => require(['@/components/tradePavilion/registrationAdd'], resolve),
       },
       //贸易管理--服务类型
       {
@@ -812,32 +812,38 @@ export default new Router({
         name: 'firstStoreDetail',
         component: resolve => require(['@/components/tradePavilion/firstStoreDetail'], resolve),
       },
+      //贸易管理--奖项列表
+      {
+        path: '/prizeMange',
+        name: 'prizeMange',
+        component: resolve => require(['@/components/tradePavilion/prizeMange'], resolve),
+      },
       //贸易管理--榜单管理
       {
         path: '/billboardList',
         name: 'billboardList',
         component: resolve => require(['@/components/tradePavilion/billboardList'], resolve),
       },
-       //贸易管理--新增/修改榜单
-       {
+      //贸易管理--新增/修改榜单
+      {
         path: '/addbillboard',
         name: 'addbillboard',
         component: resolve => require(['@/components/tradePavilion/addbillboard'], resolve),
       },
-       //贸易管理--报名列表
-       {
+      //贸易管理--报名列表
+      {
         path: '/listRegistration',
         name: 'listRegistration',
         component: resolve => require(['@/components/tradePavilion/listRegistration'], resolve),
       },
-       //贸易管理--放榜页面
-       {
+      //贸易管理--放榜页面
+      {
         path: '/publishAlist',
         name: 'publishAlist',
         component: resolve => require(['@/components/tradePavilion/publishAlist'], resolve),
       },
-      
-      
+
+
     ]
   },