From 8e3a9afe9c170652b9308fc6bfa0a76e96ad7934 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Tue, 28 Sep 2021 20:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=BC=9A=E8=AE=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/meetingImgs/end.png                | Bin 0 -> 2530 bytes
 src/assets/meetingImgs/ing.png                | Bin 0 -> 2596 bytes
 src/assets/meetingImgs/meeting-address.png    | Bin 0 -> 542 bytes
 src/assets/meetingImgs/meeting-time.png       | Bin 0 -> 518 bytes
 src/assets/meetingImgs/meeting-user.png       | Bin 0 -> 553 bytes
 src/assets/meetingImgs/meeting_paymode.png    | Bin 0 -> 397 bytes
 src/assets/meetingImgs/no-start.png           | Bin 0 -> 2942 bytes
 src/views/meetingActivity/MeetingActivity.vue | 380 +++++++++++++++++-
 src/views/system/UserAnnouncementList.vue     |   8 +-
 9 files changed, 376 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/meetingImgs/end.png
 create mode 100644 src/assets/meetingImgs/ing.png
 create mode 100644 src/assets/meetingImgs/meeting-address.png
 create mode 100644 src/assets/meetingImgs/meeting-time.png
 create mode 100644 src/assets/meetingImgs/meeting-user.png
 create mode 100644 src/assets/meetingImgs/meeting_paymode.png
 create mode 100644 src/assets/meetingImgs/no-start.png

diff --git a/src/assets/meetingImgs/end.png b/src/assets/meetingImgs/end.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9dd0bd0125c10990c48b27661ca166d2c8359d7
GIT binary patch
literal 2530
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

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/ing.png b/src/assets/meetingImgs/ing.png
new file mode 100644
index 0000000000000000000000000000000000000000..11efb72f87d45950951fa739773681f8b4e41a82
GIT binary patch
literal 2596
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
GLSTYBd+$;J

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/meeting-address.png b/src/assets/meetingImgs/meeting-address.png
new file mode 100644
index 0000000000000000000000000000000000000000..7371f20f8bedbb1e3a321b116ccef46eef06e2fc
GIT binary patch
literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000aC000gM1^@s68@>JP00001b5ch_0Itp)
z=>Px$*hxe|R47wjkv(XWQ51%s^L?Kk>>x=X5(V)Gm7*OwNJkNL6NC-{!AXRS2BbqN
z;`ImArR@^(g9#FFlY+P?NF(Ck;2?q$#6cVqb*mytoAkbNLki*<?|q+h&ift%aLz@!
zT<(~pb7poLI0VE%N773(d(`cA-#F*`7R1?Xb|#MFdEgANYb*}EJn%=-d++^Hzu$jq
z<#PGBnOy}!_X%Jf_#$awX8VC`ASJz%bjxbB+JdAjKpObwy}vK%Ns=UeNwbnJnb{1m
zX=bZdtyZ5&I%#GbK&{v7-7OZ2KSI}LvpL!8^)3L{$CJJW;4^R-_$g^VolZZ<=kr?u
z2vsVTP9#ZE2d0Cc0DJ_dfZyKx<tU1l3xz`PL95kD+U@pS6h%wGUP-?K@DMl)>;OJV
zT8ZO$4H!t8mQ(~z0SWLSq;xTgqHDlDU`x_>GYeBUBporc1Hgo&bu+tX^?H5Ja5%gS
z6vj8$&R_rBV-t8R>5hfpMx$|XFc>TV=Yh#>!{hviX7=2B?=qRp+YtZ+FGnRUn%Nw%
zbNn7wd}U@Xl}fz`>1_ies8Xp+nb{%`pm6oqz|C&AyXKr5jzs^B4<XDZNpb_&4czW@
gI;+mP;9*pM0pWk&Rl?2C^#A|>07*qoM6N<$f*{uLYybcN

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/meeting-time.png b/src/assets/meetingImgs/meeting-time.png
new file mode 100644
index 0000000000000000000000000000000000000000..15b36514453a0b44fc19acce98707241b1e8cd63
GIT binary patch
literal 518
zcmV+h0{Q)kP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$z)3_wR5(wClDmsjK^Vn<XTrS^pD1V%5Va5yEVl8ng;<G&*eIfH3XKpIAEiyy
z#?{IYm7B)GLW$@f;aXUTh24t9vapCK8x|LKA!d$DxPc%pelWw#oH^g?e4@0XD6$yi
zp%B73;Dn^zF~$%=_-1=n(%US{KGo~>wM0?c+U<5V&-2rgt^-rRW}s5~jKB);#rD(T
zaQM2}Y_6!+>s9*w{u$d3fc=sJ@EceHs=yW?y%|`reYaYzzEro{owEHHI6lq*_zpa>
zeNfUxVAHrH;ByG!W+L9VeGS+)0WL_oZ2K5+yNo)5ZLdliMSNd=7}u2WM7(1A2yivk
zY+I7DGOIZiMKKTTnTVE-i;^zI7#%`58DrcaX$No$*e>bEdc<YmNsRGb2*JrDCFgg5
zy}-{z{9yZV+0Aj_B*Cw8r4A=<E@>x_+5Vb{4}k`-^{;f-yRO-OqfV!DG|%&P*@*vg
zZO>IIm0N1HT6wKjJ8%0Qux~=ke>qvSJu@5*pN~eaD2k1?&q}%h94G}JVdccE+Mbv6
z40zFKG?vHUXkN1{o0fDz(loHE)NaZ4#}LA+!C)|(<}`Wx1HqQZb0pE<Jpcdz07*qo
IM6N<$f`<h2UjP6A

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/meeting-user.png b/src/assets/meetingImgs/meeting-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5d41c924411bf0e30de0dc790145c01ff2ac230
GIT binary patch
literal 553
zcmV+^0@nSBP)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$<4Ht8R5(v<kuhjfQ51&1|Grmaf~ZME-=GMhC=NO}h;<ML#X$#AItfBiUI`UJ
zaI=u1ICQFk(v%3&O(N<f2r3RrL8@+2a8T@$BC&C?l{EJqd6GgJde?J4&iCJ6^u0=@
zvNw~-+yX8E0r1j$|DaSVeFtoPUA<hTQrVu#WbObZU>A_iTfpqv+S>T&=;*Ia!CI|$
z%zIy#bhuCC2XHNp<M*3^nx39M@0^<j_Vj_x)FPkHKN}hv^66}Y>eSTKU=Re4CGG14
z&1^~1^*D}St>^3qqc997&FqS#unQ+<_D0f;IF1)L%~&p%T@*zpB~1WF(<L+eW@h(_
z#p3IA%?+ycdOc{hTHCVOY-eR<<)EZNz?s>HTrRh;y1E)R8jU~Ya=G&#oSB&!NWb39
zPN&OeHdiPVUNoD{L(aJ^g+k%W^78T-=iIp@Nj|pQ?RQZW{ZzGDy#S0zItAo_r=3n`
zEDXb&W>yTtaKd|k8yE)Kz$Zx$Q}BtTi@?@y@cAT3hMjXGz;5sTcn}1Wz}ar*j&ts9
zsyYvx=&2?x`>vT?1$F?BfcugT^i;HvUR><!?KkioINnvC11<yk9<Y&K{0!^|lJ4NI
rnSGVC6Bv-RlqAU!N!hMyAZhU*#dEu<0tVp*00000NkvXXu0mjfns@&-

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/meeting_paymode.png b/src/assets/meetingImgs/meeting_paymode.png
new file mode 100644
index 0000000000000000000000000000000000000000..961bb909abd18e857ee9ec4847647b6647324a22
GIT binary patch
literal 397
zcmV;80doF{P)<h;3K|Lk000e1NJLTq000gE000gM1^@s6A4o0H00001b5ch_0Itp)
z=>Px$M@d9MR5(wSlD$p>K@^40SrDR?Vw6x&Sz72b_ySf^X=zI=jn%w>t$|mdve3d<
zSojbY+ViI_MhGsu&N0`l$%ZK4lymQQ=H7FL_~SU|f=Z=QCb=i+7{G?4vr?&aRjbuL
z`5V`2wQ^w??f^Ifun(Y|_FYC%bW*R^`*h9~s?};SNs=HVvIXEk(k_4kfC)*f_eh?{
zas0$aqj5-bn`A+fQg}tuGD$BfA!#L&-vdr0_1SDT9|2SVWXCpv1c0Af#d?+ij13F{
zto~(E=Kg0IgGUDT%&{4uy=vkQ06s_-B@GPh0@$1ZzDc?Oa7XgRd*99H^T{G$TheK|
zZ@bg!+&kyuxuB#mfNPSs-upoi1S68sTo8bn5~X`uJUNm>%ki1y`U0+ITi)%(R{(4O
r0VNF$yh*>7jW8Yfw4P;{1JL~f>KdEP@Ml)000000NkvXXu0mjf5u&V0

literal 0
HcmV?d00001

diff --git a/src/assets/meetingImgs/no-start.png b/src/assets/meetingImgs/no-start.png
new file mode 100644
index 0000000000000000000000000000000000000000..fab521c21cda1b80f5c3ca6d22509ffd855c4883
GIT binary patch
literal 2942
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

literal 0
HcmV?d00001

diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue
index 7fb9e12..9531540 100644
--- a/src/views/meetingActivity/MeetingActivity.vue
+++ b/src/views/meetingActivity/MeetingActivity.vue
@@ -1,13 +1,383 @@
 <template>
-  <div>会议活动</div>
+  <div class="meeting">
+    <div class="title">
+      <a-icon type="user"/>
+      <span class="my-meeting">我的会议</span>
+      <span class="download"><a-button icon="cloud-download" type="primary">资料下载</a-button></span>
+    </div>
+    <div class="content">
+      <section class="meeting—status">
+        <span>会议分类：</span>
+        <span @click="filterMeeting(item.key)" class="inactive-status"
+              :class="{'active-status':item.key === meetingKey}" v-for="item of meetingStatusArr"
+              :key="item.key">{{ item.value }}</span>
+      </section>
+      <!--查询区域begin-->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="searchQuery">
+          <a-row :gutter="24">
+            <a-col :xl="7" :lg="8" :md="8" :sm="24">
+              <a-form-item label="会议名称">
+                <a-input placeholder="请输入会议名称" v-model="queryParam.meetingName"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="7" :lg="8" :md="8" :sm="24">
+              <a-form-item label="会议类型">
+                <j-dict-select-tag dict-code="meeting_type" placeholder="请选择会议类型"
+                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+            <a-col :xxl="7" :xl="10" :md="10" :sm="24">
+              <a-form-item label="提醒时间">
+                <j-date
+                  placeholder="请选择开始日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingStartTime"
+                  :disabled-date="disabledStartDate">
+                </j-date>
+                <span class="query-group-split-cust"></span>
+                <j-date
+                  placeholder="请选择结束日期"
+                  class="query-group-cust"
+                  v-model="queryParam.meetingEndTime"
+                  :disabled-date="disabledEndDate">
+                </j-date>
+              </a-form-item>
+            </a-col>
+
+            <a-col :xl="7" :lg="8" :md="8" :sm="24">
+              <a-form-item label="会议状态">
+                <j-dict-select-tag dict-code="meeting_status" placeholder="请选择会议状态"
+                                   v-model="queryParam.meetingType"></j-dict-select-tag>
+              </a-form-item>
+            </a-col>
+
+            <a-col :xl="6" :lg="8" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button class="reset-button" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!--查询区域end-->
+      <!--列表区域begin-->
+      <a-spin :spinning="loading">
+       <div class="list" v-if="true">
+         <div class="item-meeting" v-for="(item,index) of 20" :key="index">
+           <p class="item-meeting-meetingName">会议名称</p>
+           <p class="item-meeting-meetingCost"><span>￥</span>199.9</p>
+           <p class="item-meeting-img item-meeting-meetingDirector">
+             <img src="../../assets/meetingImgs/meeting-user.png"/>
+             张益达
+           </p>
+           <p class="item-meeting-img item-meeting-meetingAddress">
+             <img src="../../assets/meetingImgs/meeting-address.png"/>
+             天津是河西区花店给值过的高房价和
+           </p>
+           <p class="item-meeting-img item-meeting-meetingTime">
+             <img src="../../assets/meetingImgs/meeting-time.png"/>
+             2021124545454247
+           </p>
+           <p class="item-meeting-img item-meeting-meetingPaymode">
+             <img src="../../assets/meetingImgs/meeting_paymode.png"/>
+             缴费方式
+             <a-button type="primary" @click="uploadPaymentRecord">上传凭证</a-button>
+           </p>
+           <img class="meeting-img-status" src="../../assets/meetingImgs/no-start.png"/>
+           <!--          <img class="meeting-img-status" src="../../assets/meetingImgs/ing.png" />-->
+           <!--          <img class="meeting-img-status" src="../../assets/meetingImgs/end.png.png" />-->
+         </div>
+       </div>
+        <section v-else class="list">
+          <a-empty/>
+        </section>
+      </a-spin>
+      <!--列表区域end-->
+      <div class="fenye">
+        <!--分页-->
+        <a-pagination
+          v-model="current"
+          :page-size.sync="pageSize"
+          class="pagination"
+          show-size-changer
+          :show-total="(total, range) => `${range[0]}-${range[1]} 共 ${total} 条`"
+          :pageSizeOptions="['10','20','50','100']"
+          show-quick-jumper
+          :total="total"
+          @change="changePagination"
+          @showSizeChange="onShowSizeChange"
+        />
+      </div>
+    </div>
+    <!--上传凭证-->
+    <upload-meeting-certificate-modal ref="upload"></upload-meeting-certificate-modal>
+  </div>
 </template>
 <script>
+import JDictSelectTag from '@comp/dict/JDictSelectTag'
+import {RangeDateMixin} from '@/mixins/RangeDateMixin'
+import JDate from '@comp/tools/JDate'
+import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCertificateModal'
+import {getAction} from '@api/manage'
+
 export default {
   name: 'MeetingActivity',
-  data() {
-    return {}
+  mixins: [RangeDateMixin],
+  components: {
+    JDictSelectTag,
+    JDate,
+    UploadMeetingCertificateModal
   },
-  methods: {}
+  data() {
+    return {
+      // 会议分类 全部 1 未开始 2 进行中 3 已结束 4
+      meetingStatusArr: [
+        {
+          key: '1',
+          value: '全部'
+        },
+        {
+          key: '2',
+          value: '未开始'
+        },
+        {
+          key: '3',
+          value: '进行中'
+        },
+        {
+          key: '4',
+          value: '已结束'
+        }
+      ],
+      // 会议的key值  默认是全部
+      meetingKey: '1',
+      // 禁用时间的key值
+      dateKeyObj: {
+        beginKey: 'meetingStartTime',
+        endKey: 'meetingEndTime'
+      },
+      url: {
+        list: '/meeting/payMeeting/page'
+      },
+      tableData: [],
+      // 查询参数
+      queryParam: {},
+      lastQueryParam: {},
+      // 分页参数
+      pageNo: 1,
+      pageSize: 10,
+      total: 0,
+      // 当前页
+      current: 1,
+      // 加载状态
+      loading: false,
+    }
+  },
+  methods: {
+    /*
+    *  会议分类筛选
+    * */
+    filterMeeting(key) {
+      this.meetingKey = key
+    },
+    /*
+     *  分页
+     * */
+    onShowSizeChange(current, pageSize) {
+      this.pageNo = current
+      this.pageSize = pageSize
+      console.log(current, pageSize)
+      this.initData()
+    },
+    /*
+    * 页码改变后的回调
+    * */
+    changePagination(pageNo, pageSize) {
+      this.pageSize = pageSize
+      this.pageNo = pageNo
+      this.initData()
+    },
+    /*
+    * 初始化加载数据
+    * */
+    initData(arg) {
+      if (!this.url.list) {
+        this.$message.error('请设置url.list属性!')
+        return
+      }
+      //加载数据 若传入参数1则加载第一页的内容
+      if (arg === 1) {
+        this.pageNo = 1
+      }
+      var params = Object.assign({}, this.lastQueryParam)
+      params.pageNo = this.pageNo
+      params.pageSize = this.pageSize
+      this.loading = true
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.tableData = [...res.result.records]
+          this.current = res.result.current
+          if (res.result.total) {
+            this.total = res.result.total
+          } else {
+            this.total = 0
+          }
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.loading = false
+      })
+    },
+    /*
+    * 查询
+    * */
+    searchQuery() {
+      this.lastQueryParam = {...this.queryParam}
+      console.log(this.lastQueryParam)
+      this.initData(1)
+    },
+    /*
+    * 重置
+    * */
+    searchReset() {
+      this.queryParam = {}
+      this.lastQueryParam = {}
+      this.pageNo = 1
+      this.pageSize = 10
+      this.initData(1)
+    },
+    /*
+    * 上传凭证
+    * */
+    uploadPaymentRecord(item){
+      if(item){
+        this.$refs.upload.open(item)
+      }
+    }
+  }
 }
 </script>
-<style scoped lang="less"></style>
\ No newline at end of file
+<style scoped lang="less">
+@import '~@assets/less/common.less';
+
+.meeting {
+  background: #fff;
+}
+
+.title {
+  height: 56px;
+  line-height: 56px;
+  background: #fff;
+  border-bottom: 2px solid #f2f2f2;
+  padding: 0 20px;
+
+  .my-meeting {
+    margin-left: 6px;
+    font-size: 16px;
+  }
+}
+
+.download {
+  float: right;
+}
+
+/*内容begin*/
+.content {
+  padding: 0 20px 20px 20px;
+}
+
+.meeting—status {
+  height: 56px;
+  box-sizing: border-box;
+  line-height: 56px;
+  color: #666;
+}
+
+.inactive-status {
+  padding: 0 20px;
+  cursor: pointer;
+}
+
+.active-status {
+  background: #069f99;
+  padding: 8px 20px;
+  border-radius: 4px;
+  color: white;
+}
+.list {
+  display: flex;
+  justify-content: space-between;
+  flex-wrap: wrap;
+}
+.item-meeting {
+  position: relative;
+  margin-bottom: 20px;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  font-size: 14px;
+  color: #999;
+  padding: 10px;
+  width: 323px;
+  height: 219px;
+  opacity: 1;
+  background: #ffffff;
+  border-radius: 4px;
+  box-shadow: -2px 0px 10px 10px rgba(51, 51, 51, 0.10);
+
+  & > p {
+    margin: 0;
+    padding: 0;
+  }
+
+  &-img > img {
+    margin-right: 4px;
+    margin-bottom: 2px;
+  }
+
+  &-meetingName {
+    color: #333;
+    font-size: 16px;
+    font-weight: 700;
+  }
+
+  &-meetingCost {
+    color: #FF5252;
+    font-size: 22px;
+    font-weight: 700;
+    font-family: Acre, Acre-Medium;
+
+    & > span {
+      font-size: 16px;
+    }
+  }
+
+  &-meetingPaymode {
+    .ant-btn {
+      float: right;
+    }
+  }
+}
+
+.meeting-img-status {
+  position: absolute;
+  right: 0;
+  top: 0;
+}
+
+/*内容end*/
+
+.fenye {
+  background: #fff;
+  height: 50px;
+}
+
+.pagination {
+  float: right;
+  margin-right: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/system/UserAnnouncementList.vue b/src/views/system/UserAnnouncementList.vue
index c38f9e6..d703ba1 100644
--- a/src/views/system/UserAnnouncementList.vue
+++ b/src/views/system/UserAnnouncementList.vue
@@ -11,7 +11,7 @@
                                  v-model="queryParam.titile"></j-dict-select-tag>
             </a-form-item>
           </a-col>
-          <a-col :xl="7" :lg="8" :md="8" :sm="24">
+          <a-col :xxl="7" :xl="10"  :md="10" :sm="24">
             <a-form-item label="提醒时间">
               <j-date
                 placeholder="请选择开始日期"
@@ -228,12 +228,6 @@ export default {
         }
       })
     },
-    meetingDetail(){
-      this.$refs.meetingDetailModal.open({id:'1442374989698080770'})
-    },
-    uploadMeeting(){
-      this.$refs.upload.open()
-    }
   }
 }
 </script>