Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/store/modules/user.js

@@ -215,7 +215,10 @@ const user = {
             let serviceUrl = encodeURIComponent(sevice)
             // window.location.href = process.env.VUE_APP_CAS_BASE_URL + '/logout?service=' + serviceUrl
             window.location.href = window._CONFIG['casPrefixUrl']+"/logout?service="+serviceUrl;
-          resolve()
+          // resolve()
+            setTimeout(function(){
+              resolve()
+            },0)
         }).catch(() => {
           resolve()
         })

src/views/dashboard/MyToDo.vue

@@ -62,7 +62,9 @@
       <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="9" :style="{ marginBottom: '8px', paddingRight: 0 }">
         <a-card title="企业公告" :bordered="false" style="height:400px;">
           <template #extra>
-            <a href="javascript:void(0);" @click="openEnterAnn">更多</a>
+            
+            <!-- <a href="javascript:void(0);" @click="openEnterAnn">更多</a> -->
+            <a href="javascript:void(0);" @click="()=>modal.visible=true">更多</a>
           </template>
 
           <div class="dataV">
@@ -76,8 +78,8 @@
         <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="7" :style="{ marginBottom: '8px' }">
           <a-row :gutter="24">
             <!-- 我的计划 -->
-            <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
-              <a-card title="我的计划" :bordered="false" style="width:100%;height:176px">
+            <!-- <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px', paddingRight: 0 }"> -->
+              <!-- <a-card title="我的计划" :bordered="false" style="width:100%;height:176px">
                 <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="12" :style="{ marginBottom: '8px', paddingRight: 0 }">
                   <p>
                     上月我的计划：
@@ -103,12 +105,13 @@
                     >份
                   </p>
                 </a-col>
-              </a-card>
-            </a-col>
+              </a-card> -->
+            <!-- </a-col> -->
             <!-- 友情链接 -->
             <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" :style="{ marginBottom: '8px', paddingRight: 0 }">
-              <a-card title="友情链接" :bordered="false" style="width:100%;height:216px">
-                <template #extra><a href="javascript:void(0);" @click="openMyLinks">更多</a></template>
+              <a-card title="友情链接" :bordered="false" style="width:100%;height:400px">
+                <template #extra><a href="javascript:void(0);"  @click="()=>modal1.visible=true">更多</a></template>
+                <!-- <template #extra><a href="javascript:void(0);" @click="openMyLinks">更多</a></template> -->
                 <div v-for="item in linksList.slice(0, 8)" :key="item.id" class="links">
                   <button class="itemLink">
                     <a href="#" @click="openItemLink(item)">
@@ -156,6 +159,39 @@
 
     <!-- 企业公告详情 弹框-->
     <detAnn-modal ref="DetAnnModal" @ok="modalFormOk" :fatherData="annDetail"></detAnn-modal>
+    <!-- 企业公告更多 弹框-->
+    <j-modal
+      :visible.sync="modal.visible"
+      :width="1300"
+      :title="modal.title"
+      :fullscreen.sync="modal.fullscreen"
+      :switchFullscreen="modal.switchFullscreen"
+    >
+    
+    <dv-scroll-board class="board" :config="config" style="height:280px;" @click="getMethod" />
+      <!-- <template v-for="(i,k) of 30">
+        <p :key="k">这是主体内容，高度是自适应的</p>
+      </template> -->
+    
+    </j-modal>
+    <!-- 友情链接更多 弹框-->
+    <j-modal
+      :visible.sync="modal1.visible"
+      :width="1300"
+      :title="modal1.title"
+      :fullscreen.sync="modal1.fullscreen"
+      :switchFullscreen="modal1.switchFullscreen"
+    >
+    
+    <div v-for="item in linksList.slice(0, 8)" :key="item.id" class="links">
+      <button class="itemLink">
+        <a href="#" @click="openItemLink(item)">
+          <span width="2em"> {{ item.name }}</span>
+        </a>
+      </button>
+    </div>
+    
+    </j-modal>
   </div>
 </template>
 
@@ -194,7 +230,18 @@ export default {
       mtp: '', //本月我的计划
       olp: '', //上月他计划
       otp: '', //本月他计划
-
+      modal: {
+          title: '企业公告',
+          visible: false,
+          fullscreen: false,
+          switchFullscreen: true,
+        },
+        modal1: {
+            title: '友情链接',
+            visible: false,
+            fullscreen: false,
+            switchFullscreen: true,
+          },
       menuALL: [], //所有菜单
       // value: 0,
       annDetail: {}, //公告详情 数据

src/views/oa/enterpriseAnnouncement.vue

@@ -222,6 +222,7 @@ export default {
             showInfo: {}, // 编辑时回显的公告数据
             // 查询条件
             queryParam: {
+                parSelect: '2', // 查询参数
                 pageNo: '1', // 页码
                 title: '', // 标题
                 isRelease: '' // 是否发布

src/views/system/modules/AddressListRight.vue

@@ -19,8 +19,8 @@
 
           <a-col :md="6" :sm="12">
             <a-form-item label="部门" style="margin-left:8px">
-               <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择用户名称" 
-                   dict="sys_depart,depart_name,depart_name"/>
+               <j-search-select-tag v-model="queryParam.deptName" placeholder="请选择部门" 
+                   dict="sys_depart,depart_name,depart_name,org_type='3' or org_code='TBD' order by org_code"/>
             </a-form-item>
           </a-col>