1

src/components/tradePavilion/billboardList.vue

@@ -16,7 +16,7 @@
           type="primary"
           :disabled="multipleSelection.length === 0"
           @click="downloadMultipleExcel"
-          >下载多榜单报名
+          >批量下载榜单报名
         </el-button>
       </div>
     </div>
@@ -172,13 +172,15 @@
         </el-table-column>
         <el-table-column prop="ListStateName" label="状态"> </el-table-column>
 
-        <el-table-column label="操作" width="270">
+        <el-table-column label="操作" width="200">
           <template slot-scope="scope">
+            <div style="height: 32px; display: flex; align-items: center">
               <el-tooltip
                 class="item"
                 effect="dark"
                 content="报名列表"
                 placement="top"
+                style="margin-right: 10px"
               >
                 <img
                   src="../../assets/img/userman/baoming.png"
@@ -187,12 +189,20 @@
                   @click="getItem(scope.row)"
                 />
               </el-tooltip>
+              <el-dropdown size="medium">
+                <el-button type="primary" size="mini">
+                  更多菜单<i class="el-icon-arrow-down el-icon--right"></i
+                ></el-button>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item>
                     <el-tooltip
                       class="item"
                       effect="dark"
                       content="放榜"
                       placement="top"
-              v-if="scope.row.ListState === 2"
+                      v-if="
+                        scope.row.ListState === 2 || scope.row.ListState === 3
+                      "
                     >
                       <img
                         src="../../assets/img/setup/fangbang.png"
@@ -201,6 +211,9 @@
                         @click="fangbang(scope.row)"
                       />
                     </el-tooltip>
+                  </el-dropdown-item>
+
+                  <el-dropdown-item v-if="scope.row.ListState == 5">
                     <el-tooltip
                       class="item"
                       effect="dark"
@@ -212,12 +225,13 @@
                         alt=""
                         class="imgstyle"
                         @click="EditgoUrl(scope.row)"
-              />
-            </el-tooltip>
+                      /> </el-tooltip
+                  ></el-dropdown-item>
+                  <el-dropdown-item v-if="scope.row.ListState === 5">
                     <el-tooltip
                       class="item"
                       effect="dark"
-              content="取消"
+                      content="删除"
                       placement="top"
                     >
                       <img
@@ -225,8 +239,9 @@
                         alt=""
                         class="imgstyle"
                         @click="delete_b(scope.row)"
-              />
-            </el-tooltip>
+                      /> </el-tooltip
+                  ></el-dropdown-item>
+                  <el-dropdown-item>
                     <el-tooltip
                       class="item"
                       effect="dark"
@@ -234,22 +249,27 @@
                       placement="top"
                     >
                       <img
-                src="../../assets/img/userman/imgsc.png"
+                        src="../../assets/img/userman/status_1_active.png"
                         alt=""
                         class="imgstyle"
                         @click="downloadSingerExcel(scope.row)"
-              />
-            </el-tooltip>
+                      /> </el-tooltip
+                  ></el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </div>
           </template>
         </el-table-column>
       </el-table>
       <el-pagination
         style="text-align: right"
         background
+        :current-page.sync="msg.pageIndex"
         @current-change="handleCurrentChange"
+        @size-change="handleSizeChange"
+        :page-sizes="[15, 30, 45, 60, 75, 90]"
         :page-size="msg.pageSize"
-        :current-page.sync="msg.pageIndex"
-        layout="total,prev, pager, next"
+        layout="sizes,total,prev, pager, next"
         :total="total"
       >
       </el-pagination>
@@ -342,7 +362,11 @@ export default {
       this.msg.pageIndex = val;
       this.getList();
     },
-
+    handleSizeChange(val) {
+      this.msg.pageSize = val;
+      this.getList();
+      console.log(`每页 ${val} 条`);
+    },
     delete_b(row) {
       let that = this;
       that.Confirm("是否删除?", function () {
@@ -386,7 +410,7 @@ export default {
         name: "listRegistration",
         query: {
           Id: row.Id,
-          blank: "y",
+          status: row.ListState,
         },
       });
     },
@@ -424,7 +448,7 @@ export default {
       this.GetLocalFile(
         "/api/Trade/GetFirstShopMoreListEnrollToExcel",
         { ListIds: ids },
-        "榜单报名列表.xls"
+        "批量下载榜单报名列表.xls"
       );
     },
   },
@@ -469,4 +493,7 @@ export default {
   padding: 20px;
   box-sizing: border-box;
 }
+.el-icon-arrow-down {
+  font-size: 12px;
+}
 </style>
\ No newline at end of file

src/components/tradePavilion/listRegistration.vue

@@ -84,15 +84,15 @@
                         <el-tooltip class="item" effect="dark" content="详情" placement="top">
                             <img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" />
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="淘汰" placement="top">
+                        <el-tooltip class="item" effect="dark" content="淘汰" placement="top" v-if="listStatus!=3">
                             <img src="../../assets/img/userman/nopass.png" alt="" class="imgstyle"
                                 @click="eliminate(scope.row)" />
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="候选" placement="top">
+                        <el-tooltip class="item" effect="dark" content="候选" placement="top" v-if="listStatus!=3">
                             <img src="../../assets/img/userman/pass.png" alt="" class="imgstyle"
                                 @click="candidate(scope.row)" />
                         </el-tooltip>
-                        <el-tooltip class="item" effect="dark" content="重置" placement="top">
+                        <el-tooltip class="item" effect="dark" content="重置" placement="top" v-if="listStatus!=3">
                             <img src="../../assets/img/userman/reset.png" alt="" class="imgstyle"
                                 @click="delete_b(scope.row)" />
                         </el-tooltip>
@@ -124,7 +124,7 @@
     </div>
 </template>
 <script>
-    export default {
+export default {
   data() {
     return {
       loading: false,
@@ -135,7 +135,7 @@
         ListId: 0, //
         UserId: 0, //	用户
         ObjectType: 0,
-                    CandidateState: 0,//1报名中 2候选 3淘汰
+        CandidateState: 0, //1报名中 2候选 3淘汰
       },
       total: 0,
       tableData: [], //数据列表
@@ -144,74 +144,81 @@
       usermsg: {
         pageIndex: 1,
         pageSize: 20,
-                    Name: '',
+        Name: "",
         Source: 0,
         MemberGrade: 0,
         Id: 0,
-                    Moblie: ''
+        Moblie: "",
       },
-                ListObjectType:[]
-                
-
-
+      ListObjectType: [],
+      listStatus: -1,
     };
   },
   created() {
     if (this.$route.query.Id) {
-                this.msg.ListId = this.$route.query.Id
+      this.msg.ListId = this.$route.query.Id;
       this.getList();
     }
-            this.getuserList()
-            this.getListObject()//面向群体 枚举
+    if (this.$route.query.status) {
+      this.listStatus = this.$route.query.status;
+    }
+    this.getuserList();
+    this.getListObject(); //面向群体 枚举
 
     // this.getList();
   },
   methods: {
     getListObject() {
-                this.apipost("/api/Trade/GetListObjectTypeEnumList", {}, res => {
+      this.apipost("/api/Trade/GetListObjectTypeEnumList", {}, (res) => {
         if (res.data.resultCode == 1) {
-                        this.ListObjectType = res.data.data
+          this.ListObjectType = res.data.data;
         }
-                })
+      });
     },
     ChangeListName(val) {
       this.usermsg.Name = val;
       this.getuserList();
     },
     getuserList() {
-                this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
+      this.apipost(
+        "/api/user/GetMemberUserDropDownList",
+        this.usermsg,
+        (res) => {
           if (res.data.resultCode == 1) {
             let pageData = res.data.data.pageData;
             this.userList = pageData;
           }
-                })
+        }
+      );
     },
     getList() {
       this.loading = true;
 
-                this.apipost("/api/Trade/GetFirstShopEnrollPageList", this.msg, res => {
+      this.apipost("/api/Trade/GetFirstShopEnrollPageList", this.msg, (res) => {
         this.loading = false;
         if (res.data.resultCode == 1) {
           this.total = res.data.data.count;
           let pageData = res.data.data.pageData;
           this.tableData = pageData;
         }
-                })
+      });
     },
     handleCurrentChange(val) {
       this.msg.pageIndex = val;
       this.getList();
     },
-            eliminate(row) {//淘汰对象
+    eliminate(row) {
+      //淘汰对象
       let that = this;
       that.Confirm("你确定要将改对象淘汰吗?", function () {
-                    console.log('你确定要将改对象淘汰吗')
+        console.log("你确定要将改对象淘汰吗");
       });
     },
-            candidate(row) {//候选对象
+    candidate(row) {
+      //候选对象
       let that = this;
       that.Confirm("你确定将该对象纳入为候选吗?", function () {
-                    console.log('你确定将该对象纳入为候选吗')
+        console.log("你确定将该对象纳入为候选吗");
       });
     },
     delete_b(row) {
@@ -233,41 +240,34 @@
         );
       });
     },
-            EditgoUrl() {
-
+    EditgoUrl() {},
   },
-
-
-
-
-        },
-        mounted() { }
-    };
-
+  mounted() {},
+};
 </script>
 <style>
-    .listRegistration .content .searchInput {
-        border: 1px solid #DCDFE6;
+.listRegistration .content .searchInput {
+  border: 1px solid #dcdfe6;
   border-radius: 4px;
-    }
+}
 
-    .listRegistration .app-image {
+.listRegistration .app-image {
   background-position: center center;
   width: 50px;
   height: 50px;
   border-radius: 0%;
   float: left;
   margin-right: 8px;
-    }
+}
 
-    .listRegistration .content .searchInput .el-input__inner {
+.listRegistration .content .searchInput .el-input__inner {
   border: none;
   outline: none;
   height: 30px;
   line-height: 30px;
-    }
+}
 
-    .listRegistration .content .searchInput {
+.listRegistration .content .searchInput {
   line-height: normal;
   display: inline-table;
   width: 100%;
@@ -275,12 +275,12 @@
   border-spacing: 0;
   width: 250px;
   margin-right: 20px;
-    }
+}
 
-    .listRegistration .content {
+.listRegistration .content {
   background: #fff;
   margin-top: 10px;
   padding: 20px;
   box-sizing: border-box;
-    }
+}
 </style>
\ No newline at end of file

src/components/tradePavilion/publishAlist.vue

@@ -37,7 +37,7 @@
             <el-option
               v-for="item in enterpriseList"
               :key="item.Id"
-              :label="item.CompanyName"
+              :label="item.CompanyNameObj"
               :value="item.Id"
               :disabled="item.disabled"
             >
@@ -169,6 +169,12 @@ export default {
     //   this.msgListindex = index;
     // },
     synchro(index) {
+      this.$confirm("后面所有奖章都将同步为当前奖章, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
           //奖章同步
           let Small = "";
           let Grand = "";
@@ -183,6 +189,18 @@ export default {
               // x.MedalImageBig = Grand;
             }
           });
+          this.$message({
+            type: "success",
+            message: "同步成功!",
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消同步",
+          });
+        });
+      return;
     },
     selectdis(val, index) {
       this.enterpriseList.forEach((e) => {
@@ -259,7 +277,9 @@ export default {
           if (res.data.resultCode == 1) {
             this.enterpriseList = [];
             this.enterpriseList = res.data.data;
+
             this.enterpriseList.forEach((e, i) => {
+              e.CompanyNameObj = e.CompanyName + "-" + e.ObjectName;
               e.disabled = false;
             });
           }