活动二次确认

src/api/volunteer/hdgl/index.js

@@ -1,71 +1,77 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
 
 // 获取活动list列表
 export function activityList(data) {
-    return request({
-        url: '/zhiyuanzhe/activity/list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "/zhiyuanzhe/activity/list",
+    method: "get",
+    params: data,
+  });
 }
 // 添加活动
 export function activityAdd(data) {
-    return request({
-        url: '/zhiyuanzhe/activity',
-        method: 'post',
-        data
-    })
+  return request({
+    url: "/zhiyuanzhe/activity",
+    method: "post",
+    data,
+  });
 }
 // 修改活动
 export function activityUpdate(data) {
-    return request({
-        url: '/zhiyuanzhe/activity',
-        method: 'put',
-        data
-    })
+  return request({
+    url: "/zhiyuanzhe/activity",
+    method: "put",
+    data,
+  });
 }
-//删除活动    
+//删除活动
 export function activityDelete(ids) {
-    return request({
-        url: `/zhiyuanzhe/activity/${ids}`,
-        method: 'delete',
-    })
+  return request({
+    url: `/zhiyuanzhe/activity/${ids}`,
+    method: "delete",
+  });
 }
 //查询单个活动详情
 export function activityGet(id) {
-    return request({
-        url: `/zhiyuanzhe/activity/${id}`,
-        method: 'get',
-    })
+  return request({
+    url: `/zhiyuanzhe/activity/${id}`,
+    method: "get",
+  });
 }
 //查看人员标签列表
 export function peopleList(data) {
-    return request({
-        url: '/zhiyuanzhe/tags/list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "/zhiyuanzhe/tags/list",
+    method: "get",
+    params: data,
+  });
 }
 //人员标签详情
 export function peopleGet(id) {
-    return request({
-        url: `/zhiyuanzhe/tags/${id}`,
-        method: 'get',
-    })
+  return request({
+    url: `/zhiyuanzhe/tags/${id}`,
+    method: "get",
+  });
 }
 //查看参与报名列表
 export function canyuList(data) {
-    return request({
-        url: '/zhiyuanzhe/zyzreport/list',
-        method: 'get',
-        params: data
-    })
+  return request({
+    url: "/zhiyuanzhe/zyzreport/list",
+    method: "get",
+    params: data,
+  });
 }
 //新增邀请
 export function yaoqingAdd(data) {
-    return request({
-        url: `/zhiyuanzhe/activity/inviteTwo/${data}`,
-        method: 'post',
-        
-    })
-}
+  return request({
+    url: `/zhiyuanzhe/activity/inviteTwo/${data}`,
+    method: "post",
+  });
+}
+export function postStatus(data) {
+  return request({
+    url: "/zhiyuanzhe/activity/enrollApproval",
+    method: "post",
+    data,
+  });
+}

src/views/volunteer/components/invite.vue

@@ -26,7 +26,7 @@
         </el-table-column>
         <el-table-column
           prop="content"
-          label="活动名称"
+          label="活动名称1"
           show-overflow-tooltip
           width="180"
         >
@@ -69,10 +69,14 @@
             <div class="activity">
               <div
                 :style="{
-                  color: scope.row.activityStatus == 2 ? '#67C23A' : '#F56C6C',
+                  color:
+                    scope.row.activityStatus == 2 ||
+                    scope.row.activityStatus == 3
+                      ? '#67C23A'
+                      : '#F56C6C',
                 }"
               >
-                {{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
+                {{ filterStatus(scope.row.activityStatus) }}
               </div>
             </div>
           </template>
@@ -208,6 +212,17 @@ export default {
   },
   watch: {},
   methods: {
+    filterStatus(status) {
+      if (status == 0 || status == 1) {
+        return "未报名";
+      } else if (status == 2) {
+        return "已报名";
+      } else if (status == 3) {
+        return "报名成功";
+      } else if (status == 4) {
+        return "报名失败";
+      }
+    },
     // 清空
     cleara() {
       this.getList("1");
@@ -263,20 +278,25 @@ export default {
         return "";
       }
     },
-    // 查看详情
-    //标签生成
-    labelgenerate(data = {}) {
-      let arrlist = [];
-      for (let key3 of this.arr) {
-        for (let key4 in data) {
-          if (key3 == key4) {
-            let a = data[key3];
-            arrlist.push(a);
+
+    labelgenerate(data) {
+      let result = [];
+      this.arr.forEach((item) => {
+        for (let itemB in data) {
+          if (item == itemB) {
+            //多选后值是数组类型 =》string
+            if (data[itemB]) {
+              data[itemB] = data[itemB].split(",");
+            } else {
+              data[itemB] = [];
+            }
+            result = [...result, ...data[itemB]];
           }
         }
-      }
-      return arrlist;
+      });
+      return result;
     },
+    // 查看详情
     async look(row) {
       this.loadingTwo = true;
       let data = await this.$api.huodongtuijian.activity(row.id);

src/views/volunteer/components/recommend.vue

@@ -69,10 +69,14 @@
             <div class="activity">
               <div
                 :style="{
-                  color: scope.row.activityStatus == 2 ? '#67C23A' : '#F56C6C',
+                  color:
+                    scope.row.activityStatus == 2 ||
+                    scope.row.activityStatus == 3
+                      ? '#67C23A'
+                      : '#F56C6C',
                 }"
               >
-                {{ scope.row.activityStatus == 2 ? "已报名" : "未报名" }}
+                {{ filterStatus(scope.row.activityStatus) }}
               </div>
             </div>
           </template>
@@ -87,9 +91,10 @@
               <div
                 class="look"
                 @click="participation(scope.row)"
-                v-if="scope.row.activityStatus != 2"
+                v-if="
+                  scope.row.activityStatus == 0 || scope.row.activityStatus == 1
+                "
               >
-                <!-- <img src="@/assets/images/look.png" alt=""> -->
                 <span>报名</span>
               </div>
             </div>
@@ -208,6 +213,17 @@ export default {
   },
   watch: {},
   methods: {
+    filterStatus(status) {
+      if (status == 0 || status == 1) {
+        return "未报名";
+      } else if (status == 2) {
+        return "已报名";
+      } else if (status == 3) {
+        return "报名成功";
+      } else if (status == 4) {
+        return "报名失败";
+      }
+    },
     // 清空
     cleara() {
       this.getList("1");
@@ -265,17 +281,22 @@ export default {
     },
     // 查看详情
     //标签生成
-    labelgenerate(data = {}) {
-      let arrlist = [];
-      for (let key3 of this.arr) {
-        for (let key4 in data) {
-          if (key3 == key4) {
-            let a = data[key3];
-            arrlist.push(a);
+    labelgenerate(data) {
+      let result = [];
+      this.arr.forEach((item) => {
+        for (let itemB in data) {
+          if (item == itemB) {
+            //多选后值是数组类型 =》string
+            if (data[itemB]) {
+              data[itemB] = data[itemB].split(",");
+            } else {
+              data[itemB] = [];
+            }
+            result = [...result, ...data[itemB]];
           }
         }
-      }
-      return arrlist;
+      });
+      return result;
     },
     async look(row) {
       this.loadingTwo = true;
@@ -425,15 +446,15 @@ export default {
 ::v-deep .mainsEvents {
   // height: 35px;
   display: flex;
-  align-items: center;
+  // align-items: center;
   font-family: "Alibaba-PuHuiTi-Regular";
-  margin-bottom: 12px;
+  margin-bottom: 20px;
   .itemE {
     width: 50%;
     display: flex;
     & > div:nth-of-type(1) {
       display: flex;
-      align-items: center;
+      // align-items: center;
       color: #4c4949;
       width: 26%;
     }

src/views/volunteer/hdtj/components/detailDialog.vue

@@ -138,8 +138,8 @@
                   <div class="mainTag">
                     <div
                       v-show="item != ''"
-                      v-for="(item, index) in item.arrlist"
-                      :key="index"
+                      v-for="(item, indx) in item.arrlist"
+                      :key="indx"
                     >
                       {{ item }}
                     </div>
@@ -151,8 +151,42 @@
                   <span>匹配度:</span>
                   <span>{{ item.degreeOfMatch }}%</span>
                 </div>
-                <div class="itemBtn" style="justify-content: center">
-                  <div class="look" @click="looks2(item)">查看</div>
+                <div class="btn-list">
+                  <div
+                    class="btn-text"
+                    @click="looks2(item)"
+                    style="color: #188ffe"
+                  >
+                    查看
+                  </div>
+                  <div
+                    class="btn-text"
+                    style="color: #49b28f"
+                    @click="handleStatus(item.id, 3, index)"
+                    v-show="item.status != 4"
+                  >
+                    {{
+                      item.status == 2
+                        ? "同意"
+                        : item.status == 3
+                        ? "已同意"
+                        : "未知"
+                    }}
+                  </div>
+                  <div
+                    class="btn-text"
+                    style="color: #e16a70"
+                    @click="handleStatus(item.id, 4, index)"
+                    v-show="item.status != 3"
+                  >
+                    {{
+                      item.status == 2
+                        ? "拒绝"
+                        : item.status == 4
+                        ? "已拒绝"
+                        : "未知"
+                    }}
+                  </div>
                 </div>
               </div>
             </div>
@@ -202,6 +236,7 @@ import {
   canyuList,
   peopleGet,
   yaoqingAdd,
+  postStatus,
 } from "@/api/volunteer/hdgl";
 export default {
   data() {
@@ -306,6 +341,26 @@ export default {
   props: {},
   created() {},
   methods: {
+    /**报名 同意不同意 */
+    handleStatus(id, status, index, indx) {
+      let _this = this;
+      if (
+        this.participationList[index].status == 3 ||
+        this.participationList[index].status == 4
+      )
+        return;
+      let data = {
+        id,
+        status,
+      };
+      this.$modal
+        .confirm(`你确认要${status == 3 ? "同意" : "拒绝"}改活动吗？`)
+        .then(function () {
+          postStatus(data).then((res) => {
+            _this.participationList[index].status = status;
+          });
+        });
+    },
     open(e) {
       console.log(e);
       this.e = e;
@@ -381,7 +436,7 @@ export default {
         this.beforeData.forEach((value, index) => {
           for (let key in res.data) {
             if (value.label == key) {
-              this.beforeData[index].value = res.data[key];
+              this.beforeData[index].value = res.data[key].toString();
             }
           }
         });
@@ -392,7 +447,7 @@ export default {
       this.beforeData.forEach((value, index) => {
         for (let key in item) {
           if (value.label == key) {
-            this.beforeData[index].value = item[key];
+            this.beforeData[index].value = item[key].toString();
           }
         }
       });
@@ -451,7 +506,7 @@ export default {
   padding: 0;
 }
 .mainTag-label {
-  position: absolute;
+  // position: absolute;
   width: 300px;
   left: 80px;
 }
@@ -534,9 +589,9 @@ export default {
   .mainsEvents {
     // height: 35px;
     display: flex;
-    align-items: center;
+    // align-items: center;
     font-family: "Alibaba-PuHuiTi-Regular";
-    margin-bottom: 12px;
+    margin-bottom: 20px;
 
     .itemE {
       position: relative;
@@ -677,4 +732,16 @@ export default {
 ::-webkit-scrollbar-track {
   background: #f4f1f1;
 }
+.btn-list {
+  display: flex;
+  align-items: center;
+  .btn-text {
+    margin-right: 4px;
+    cursor: pointer;
+    padding: 3px 6px;
+    background: #fff;
+    font-size: 13px;
+    font-family: "Alibaba-PuHuiTi-Regular";
+  }
+}
 </style>

src/views/volunteer/hdtj/hdGl/index.vue

@@ -536,36 +536,36 @@ export default {
     },
     //确定新增或者修改
     submit() {
-      console.log(this.ruleForm1);
-      let arr = [
-        "ageRange",
-        "sexRange",
-        "politicalRange",
-        "educationRange",
-        "housingRange",
-        "industryRange",
-        "interestRange",
-        "professionalRange",
-        "schoolRange",
-        "nationalityRange",
-      ];
-      let i = 0;
-      arr.forEach((item) => {
-        for (let itemB in this.ruleForm1) {
-          if (item == itemB) {
-            if (this.ruleForm1[itemB] != "") {
-              i++;
-            }
-            //多选后值是数组类型 =》string
-            this.ruleForm1[itemB] = this.ruleForm1[itemB].toString();
-          }
-        }
-      });
-      if (i < 3) {
-        this.$message.error("人员信息要求最低选择三条");
-      }
       this.$refs.ruleForm1.validate((valid) => {
         if (valid) {
+          let arr = [
+            "ageRange",
+            "sexRange",
+            "politicalRange",
+            "educationRange",
+            "housingRange",
+            "industryRange",
+            "interestRange",
+            "professionalRange",
+            "schoolRange",
+            "nationalityRange",
+          ];
+          let i = 0;
+          arr.forEach((item) => {
+            for (let itemB in this.ruleForm1) {
+              if (item == itemB) {
+                if (this.ruleForm1[itemB] != "") {
+                  i++;
+                }
+                //多选后值是数组类型 =》string
+                this.ruleForm1[itemB] = this.ruleForm1[itemB].toString();
+              }
+            }
+          });
+          if (i < 3) {
+            this.$message.error("人员信息要求最低选择三条");
+            return;
+          }
           if (this.ruleForm1.id != undefined) {
             activityUpdate(this.ruleForm1).then((res) => {
               this.$modal.msgSuccess("修改成功");