11.10

src/components/SelectRule.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog append-to-body :title="title" :visible.sync="visible_" :close-on-click-modal="false" :before-close="close_before" width="1000px" top="5%">
+  <el-dialog :modal-append-to-body="false" append-to-body :title="title" :visible.sync="visible_" :close-on-click-modal="false" :before-close="close_before" width="1000px" top="5%">
     <div class="flex-box" style="border-bottom: 1px solid #f1f1f1;">
       <div class="left scroll-bar">
         <el-tree node-key="id"  ref="tree" :data="rule_tree" :props="defaultProps" @node-click="dept_click" highlight-current class="cate-tree"></el-tree>

src/styles/index.scss

@@ -30,7 +30,12 @@ html {
 #app{
   height: 100%;
 }
-
+.v-modal {
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom:0
+}
 *,
 *:before,
 *:after {

src/views/attendance/AttendanceStatistic.vue

@@ -228,6 +228,7 @@
       top="50px"
       width="500px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <div v-for="(item, index) in attendance_info" :key="index" style="line-height: 2">
         {{item.att_setting_name}}({{$moment(item.base_time * 1000).format('HH:mm')}})：

src/views/common/EmployeeSelector.vue

@@ -3,6 +3,7 @@
     :title="title"
     :visible.sync="visible_"
     :close-on-click-modal="false"
+    :modal-append-to-body="false"
     :before-close="close_before"
     append-to-body
     @open="openDialog"

src/views/common/applicationIntegrationPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 积分申请 -->
-    <el-dialog :title="title" :visible.sync="visible" :close-on-click-modal="false" :before-close="closePopup" width="600px">
+    <el-dialog :title="title" :modal-append-to-body="false" :visible.sync="visible" :close-on-click-modal="false" :before-close="closePopup" width="600px">
       <div>
         <el-form :model="dialogData" ref="dialogData" label-width="80px" v-loading="loading">
           <div v-for="(item,index) in dialogData.items" :key="index" @click="itemIndex = index">
@@ -124,6 +124,7 @@
       :title="'提交结果'"
       :visible.sync="error_list_show"
       :append-to-body='true'
+      :modal-append-to-body="false"
       width="700px">
       <el-table :data="error_list">
         <el-table-column prop="target" label="员工">

src/views/common/bonusPointsPopup.vue

@@ -5,6 +5,7 @@
       :title="title"
       :visible.sync="visible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="closePopup"
       width="600px">
       <div>
@@ -141,6 +142,7 @@
     <el-dialog
       :title="'提交结果'"
       :visible.sync="error_list_show"
+      :modal-append-to-body="false"
       :append-to-body='true'
       @close='error_list_SX'
       width="700px">

src/views/common/examinePopup.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-drawer :title="title" :visible.sync="show" :with-header="false" :size="'600px'" :before-close="closeDetail" direction="rtl">
+    <el-drawer :title="title" :modal-append-to-body="false" :visible.sync="show" :with-header="false" :size="'600px'" :before-close="closeDetail" direction="rtl">
       <div class="drawer_title">审批详情</div>
       <div v-loading="detail_loading">
         <div class="detail_popup" v-if="detail_info !== null">
@@ -100,7 +100,7 @@
       </div>
     </el-drawer>
 
-    <el-dialog title="审批驳回" :visible.sync="rejectShow" :before-close="rejectClose" width="520px">
+    <el-dialog title="审批驳回" :modal-append-to-body="false" :visible.sync="rejectShow" :before-close="rejectClose" width="520px">
       <el-form :model="rejectForm" ref="rejectForm" label-width="80px" v-loading="rejectLoading">
         <el-form-item
           label="审批意见"
@@ -124,7 +124,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog title="审批通过" :visible.sync="adoptShow" width="571px" :before-close="adoptClose">
+    <el-dialog title="审批通过" :modal-append-to-body="false" :visible.sync="adoptShow" width="571px" :before-close="adoptClose">
       <el-form :model="adoptForm" ref="adoptForm" label-width="80px" v-loading="determinedBy">
         <el-form-item label="指定规则" v-if="!detail_info.rule_id && !detail_info.item_id && detail_info.source_type != 4">
           <el-switch v-model="adoptForm.ruleOrItem" active-color="#13ce66"></el-switch>

src/views/common/pastDue.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :visible.sync="$store.state.user.pastDue" width="400px" append-to-body class="pastDue" @close="pastDueclose">
+    <el-dialog :modal-append-to-body="false" :visible.sync="$store.state.user.pastDue" width="400px" append-to-body class="pastDue" @close="pastDueclose">
         <p style="font-size:21px;">系统已到期</p>
         <p style="margin:0;">请在功道云积分服务群中联系专属客服或微信扫码添加功道云客服进行续费</p>
         <img src="static/images/lADPBG1Q6uyvMTLNAa7NAa4_430_430.jpg" style="width:100%">

src/views/common/repeatTaskDetailsPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 重复任务详情弹窗 -->
-    <el-drawer :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
+    <el-drawer :modal-append-to-body="false" :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
       <div class="details_title">{{title}}</div>
       <div class="details_content" v-if="workDetailData" v-loading="loading">
         <ul>

src/views/common/rewardTask.vue

@@ -5,6 +5,7 @@
       :title="showTitle"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="closeDialog"
       width="600px">
       <div v-loading="forTheTaskLoading">

src/views/common/rewardTaskAmend.vue

@@ -6,6 +6,7 @@
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
       :before-close="closeDialog"
+      :modal-append-to-body="false"
       width="600px">
       <div v-loading="forTheTaskLoading">
         <el-form :model="formData" ref="formData" label-width="80px">

src/views/common/rewardTaskDetailsPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 悬赏任务详情弹窗 -->
-    <el-drawer :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
+    <el-drawer :modal-append-to-body="false" :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
       <div class="details_title">{{title}}</div>
       <div class="details_content" v-if="workDetailData" v-loading="loading">
         <el-row>

src/views/common/selectionrules.vue

@@ -4,6 +4,7 @@
     title="选择规则"
     :visible.sync="ruleDialogTableVisible"
     @close="closeNone"
+    :modal-append-to-body="false"
     append-to-body
     :before-close="handleClose"
   >

src/views/common/taskDetailsPopup.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 任务详情弹窗 -->
-    <el-drawer :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
+    <el-drawer :modal-append-to-body="false" :visible.sync="Delay_to_open"  :with-header="false" :size="'500px'" :before-close="handleClose" :custom-class="'drawer_details'">
       <div class="details_title">{{title}}</div>
       <div class="details_content" v-if="workDetailData" v-loading="loading">
         <div class="flex-box flex-v-ce">

src/views/common/team_item.vue

@@ -6,6 +6,7 @@
       top="40px"
       width="620px"
       :visible.sync="show"
+      :modal-append-to-body="false"
     >
       <div style="padding:0 40px;">
         <el-form :model="team_info">

src/views/common/temporaryTask.vue

@@ -5,6 +5,7 @@
       :title="showTitle"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="closeDialog"
       width="600px">
       <div>

src/views/common/temporaryTaskAmend.vue

@@ -5,6 +5,7 @@
       :title="showTitle"
       :visible.sync="dialogVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="closeDialog"
       width="600px">
       <div>

src/views/dashboard/components/IntegralCreateApplicationBtn.vue

@@ -6,6 +6,7 @@
       title="积分申请"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="initialCreateDialog"
       width="650px"
     >

src/views/dashboard/components/IntegralCreateReviewBtn.vue

@@ -10,6 +10,7 @@
       ref="integral_create_review_dialog"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="setDefaultValueForDialog"
     >
       <el-steps :active="activeIndex" finish-status="success" simple style="margin:10px 22px">

src/views/dashboard/components/PointAutoCom.vue

@@ -8,6 +8,7 @@
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
       @open="initialCreateDialog"
+      :modal-append-to-body="false"
       width="650px">
 
 

src/views/dashboard/components/RewardList.vue

@@ -59,6 +59,7 @@
       width="450px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="CreateOpen"
     >
       <RewardCreate ref="RewardCreateCom" @send-success="InfoSendSuccess"></RewardCreate>
@@ -74,6 +75,7 @@
       width="450px"
       :visible.sync="dialogEditVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <RewardCreate ref="RewardEditCom" @send-success="InfoSendSuccess"></RewardCreate>
       <div slot="footer" class="dialog-footer">

src/views/dashboard/components/Scale.vue

@@ -6,6 +6,7 @@
       :visible.sync="showScale"
       width="600px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="handleClose"
     >
       <el-form

src/views/dashboard/components/TaskCreateBtn.vue

@@ -6,6 +6,7 @@
       :visible.sync="dialogTaskVisible"
       width="600px"
       @close="formReset"
+      :modal-append-to-body="false"
       :close-on-click-modal="false"
     >
       <el-form

src/views/dashboard/components/daiyu.vue

@@ -28,7 +28,7 @@
           style="right:55px;"
           v-if="is_creator==1 || manager_type==2 || manager_type ==3"
         >发布</a>
-      </el-tab-pane> 
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog
@@ -36,6 +36,7 @@
       :visible.sync="dialogRewardVisible"
       width="600px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @close="load_fulilist"
     >
       <RewardList ></RewardList>
@@ -48,6 +49,7 @@
       width="450px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="CreateOpen"
     >
       <RewardCreate :type="activeName2" ref="RewardCreateCom" @send-success="InfoSendSuccess"></RewardCreate>

src/views/dashboard/components/fuli.vue

@@ -144,7 +144,7 @@
       </el-scrollbar>
     </div>
     <!-- 福利弹框 -->
-      <el-dialog :title="fuli_item.name" :visible.sync="fuliVisible">
+      <el-dialog :modal-append-to-body="false" :title="fuli_item.name" :visible.sync="fuliVisible">
 
         <div style="font-size: 0.2remp;color: #909399;
        display:flex;

src/views/dashboard/components/notice.vue

@@ -146,7 +146,7 @@
       </el-scrollbar>
     </div>
     <!-- 福利弹框 -->
-    <el-dialog :title="fuli_item.name" :visible.sync="fuliVisible">
+    <el-dialog :title="fuli_item.name" :modal-append-to-body="false" :visible.sync="fuliVisible">
         <div style="font-size: 0.2remp;color: #909399;
        display:flex;
        align-items: center;

src/views/dashboard/index.vue

@@ -354,7 +354,7 @@
     </el-row>
 
     <examinePopup :title="'审核详情'" :id="detail_id" :show.sync="detailShow"></examinePopup>
-    <el-dialog :visible.sync="innerVisible" width="400px" append-to-body class="innerVisible">
+    <el-dialog :modal-append-to-body="false" :visible.sync="innerVisible" width="400px" append-to-body class="innerVisible">
       <p style="font-size:21px;">续费/升级</p>
       <p style="margin:0;">请在功道云积分服务群中联系客服顾问或微信扫码添加功道云客服进行续费</p>
       <img src="static/images/vtRemewService.png" style="width:100%" />
@@ -624,6 +624,11 @@ export default {
         page: '1',
         page_size: '1'
       };
+      let roat=this.$supremeAuthority();
+      if(roat=='dept_manager'||roat=='employee'){
+      	params.employee_id=this.$userInfo().id
+      }
+      console.log(this.$userInfo())
       this.$http('get', '/api/integral/statistics/prize/buckle/ranking', params)
         .then(res => {
           if (res.data.code == 1) {

src/views/integral/AttendanceManage.vue

@@ -217,6 +217,7 @@
       width="700px"
       top="50px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <el-form :model="taskForm" ref="newTaskForm" :rules="taskFormRules" @submit.native.prevent>
         <div class style="padding:50px 90px 0 90px;">
@@ -343,6 +344,7 @@
       width="700px"
       top="50px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <el-form :model="checkinSettingForm" ref="checkinSettingForm" :rules="checkinSettingFormRules" @submit.native.prevent>
         <div class style="padding:50px 90px 0 90px;">

src/views/integral/AuthManage.vue

@@ -67,7 +67,7 @@
       :current-page.sync="currentPage"
       @current-change="changePage">
     </el-pagination>
-    <el-dialog :title="dialogTitle" width="680px" :visible.sync="dialogSettingVisible" :close-on-click-modal="false"
+    <el-dialog :title="dialogTitle" width="680px" :visible.sync="dialogSettingVisible" :modal-append-to-body="false" :close-on-click-modal="false"
                @close="resetAccessDialog">
       <el-form ref="accessDetailForm" :model="accessFormData" :rules="rules" @submit.native.prevent>
 
@@ -143,15 +143,12 @@
 
 
 
-
-
-
-
     <el-dialog
       :title="dialogAssignManager.title"
       width="660px"
       :visible.sync="dialogAssignManagerVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @close="resetDialogAssignManager">
       <div style="padding-left:60px; padding-bottom:10px;">
         <el-transfer

src/views/integral/DeptManage.vue

@@ -73,6 +73,7 @@
       width="600px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="loadDeptTree"
       @close="onDismissCreateDialog"
     >
@@ -100,6 +101,7 @@
       width="600px"
       :visible.sync="dialogEditVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @close="onDismissEditDialog"
     >
       <el-form
@@ -126,6 +128,7 @@
       width="660px"
       :visible.sync="dialogAssignManagerVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @close="resetDialogAssignManager"
     >
       <div style="padding-left:60px; padding-bottom:10px;">

src/views/integral/EmployeeAPoint.vue

@@ -132,6 +132,7 @@
       width="600px"
       :visible.sync="dialogExcelVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <div style="padding:0 50px;">
         <div class="align-center" style="margin-bottom:20px;">
@@ -174,6 +175,7 @@
       @close="detailFormreturn"
       :visible.sync="dialogTableVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <EmployeeTableshow ref="EditInformation"></EmployeeTableshow>
     </el-dialog>
@@ -184,6 +186,7 @@
       width="400px"
       :visible.sync="deduct_a_point_show"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
 
 
@@ -221,6 +224,7 @@
       width="400px"
       :visible.sync="deduct_a_point_show1"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
 
 

src/views/integral/EmployeeTable.vue

@@ -132,7 +132,7 @@
 
 
 
-    <el-dialog  :close-on-click-modal="false" ref="EditInformation_list" title="员工详情" width="500px" :visible.sync="diaTableVisible">
+    <el-dialog  :modal-append-to-body="false" :close-on-click-modal="false" ref="EditInformation_list" title="员工详情" width="500px" :visible.sync="diaTableVisible">
     	<div style="padding-right:20px;">
     		<el-form ref="detailForm" v-loading="show_loading">
     			<el-form-item label="管理上级" prop="name" :label-width="'100px'">

src/views/integral/IntegralApplication.vue

@@ -158,6 +158,7 @@
         title="积分申请"
         :visible.sync="dialogCreateVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         @open="initialCreateDialog"
         width="650px"
       >
@@ -261,6 +262,7 @@
         title="积分申请"
         :visible.sync="dialogEditVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         width="650px"
       >
         <el-form
@@ -319,7 +321,7 @@
             label="积分分类"
             prop="category_id"
             :label-width="formLabelWidth"
-            
+
           >
             <el-cascader
               clearable
@@ -335,7 +337,7 @@
             label="积分规则"
             prop="rule_item_id"
             :label-width="formLabelWidth"
-           
+
           >
             <el-select
               v-model="applicationForm.rule_item_id"

src/views/integral/IntegralPkCreateApplicationLeaderBtn.vue

@@ -9,6 +9,7 @@
       height="300px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="setDefaultValueForDialog">
 
       <el-form ref="newEventForm" :model="newEventForm" :rules="rules" @submit.native.prevent style="padding:0 30px;">

src/views/integral/IntegralPkCreateApplicationTeamBtn.vue

@@ -9,6 +9,7 @@
       height="300px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="setDefaultValueForDialog">
 
       <el-form ref="newEventForm" :model="newEventForm" :rules="rules" @submit.native.prevent style="padding:0 30px;">

src/views/integral/IntegralRecord.vue

@@ -145,6 +145,7 @@
         width="600px"
         :visible.sync="dialogCreateVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         @open="setDefaultValueForDialog">
         <el-form ref="newEventForm" :model="newEventForm" :rules="rules" @submit.native.prevent>
           <el-form-item label="奖扣对象" prop="target_id_set" :label-width="formLabelWidth">
@@ -238,7 +239,7 @@
           <el-button type="primary" @click="submitCreateForm('newEventForm')">确 定</el-button>
         </div>
       </el-dialog>
-      <el-dialog title="事件编辑" width="650px" :visible.sync="dialogEditVisible" :close-on-click-modal="false"
+      <el-dialog title="事件编辑" width="650px" :modal-append-to-body="false" :visible.sync="dialogEditVisible" :close-on-click-modal="false"
                  @close="onDismissEditDialog">
         <el-form ref="eventForm" :model="eventForm" @submit.native.prevent>
           <el-form-item label="奖扣对象" :label-width="formLabelWidth">
@@ -297,6 +298,7 @@
         title="积分事件Excel导入"
         :visible.sync="dialogExcelVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         class="dialog-type-section">
         <el-row :gutter="15">
           <el-col :span="10">

src/views/integral/JobManage.vue

@@ -221,6 +221,7 @@
             width="600px"
             :visible.sync="dialogCreateJobVisible"
             :close-on-click-modal="false"
+            :modal-append-to-body="false"
             @close="onDismissCreateJobDialog"
           >
             <el-form
@@ -255,6 +256,7 @@
             width="600px"
             :visible.sync="dialogEditJobVisible"
             :close-on-click-modal="false"
+            :modal-append-to-body="false"
             @close="onDismissEditJobDialog"
           >
             <el-form

src/views/integral/PkDetail.vue

@@ -245,6 +245,7 @@
       width="620px"
       :visible.sync="dialogAddteamVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
     >
       <div v-loading="teameditloading">
         <div style="padding:0 40px;">
@@ -316,6 +317,7 @@
       :visible.sync="dialogPkVisible"
       width="600px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       :before-close="cancelHandle"
     >
       <el-form

src/views/integral/PkManage.vue

@@ -106,6 +106,7 @@
         :visible.sync="dialogTaskVisible"
         width="600px"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
       >
         <el-scrollbar
           wrap-class="column-wrapper scrollable-items-container"
@@ -227,6 +228,7 @@
         width="660px"
         :visible.sync="dialogAssignManagerVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
       >
         <div style="padding-left:60px; padding-bottom:10px;">
           <el-transfer

src/views/integral/PkRuleCreate.vue

@@ -9,6 +9,7 @@
       height="150px"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       >
         <el-form style="padding:0 30px;" :model="Formdata" ref="newTaskForm" :rules="FormRules" @submit.native.prevent>
 

src/views/integral/PointAutoCreateBtn.vue

@@ -11,6 +11,7 @@
       ref="integral_create_review_dialog"
       :visible.sync="dialogCreateVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @open="setDefaultValueForDialog"
     >
       <el-steps :active="activeIndex" finish-status="success" simple style="margin:10px 22px">

src/views/integral/ReviewManageAwaited.vue

@@ -154,6 +154,7 @@
       :title="title"
       :visible.sync="dialogReviewTaskVisible"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       width="500px"
       @close="resetTaskForm"
     >
@@ -439,6 +440,7 @@
       title="审批驳回"
       :visible.sync="retrunAgree"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       width="500px"
       height="468px;"
       :before-close="handleClose"
@@ -1464,7 +1466,7 @@
         //  rule_item_id: self.taskForm.rule_item_id,
           category_id: self.taskForm.category_id[self.taskForm.category_id.length - 1]
         }
-       
+
         // params.reviewer_other_ids = this.eventForm.reviewer_other_ids;
         //if(self.taskForm.point_type != 20) {
            params.point = self.returnTask.point;  // 最终积分
@@ -1515,12 +1517,12 @@
           // }
         )
           .then(function(response) {
-             
+
             self.loadingsend = false
             console.log(response.data);
             console.log(response.data.msg);
             if (response.data.code == 1000) {
-           
+
            //  self.reviewPassLoaing[reviewId] = false
              if (response.data.code == 1000) {
               self.currentPage = 1

src/views/integral/RuleCategoryManage.vue

@@ -19,6 +19,7 @@
         width="600px"
         :visible.sync="dialogCreateCategoryVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         @close="onDismissCreateCategoryDialog" append-to-body>
         <el-form ref="newCategoryForm" :model="newCategoryForm" :rules="rules" @submit.native.prevent
                  style="padding-right:20px;">
@@ -37,6 +38,7 @@
         width="600px"
         :visible.sync="dialogEditCategoryVisible"
         :close-on-click-modal="false"
+        :modal-append-to-body="false"
         @close="onDismissEditCategoryDialog" append-to-body>
         <el-form ref="categoryForm" :model="categoryForm" :rules="rules" @submit.native.prevent style="padding-right:20px;">
           <el-form-item label="分类名称" prop="name" label-width="100px">

src/views/integral/framework.vue

@@ -125,6 +125,7 @@
 		<el-dialog
 		title="设置是否参与排名"
 		:visible.sync="dialogVisible"
+    :modal-append-to-body="false"
 		top="30vh"
 		width="520px"
 		:before-close="handleClose">

src/views/integral/integral_apply_list.vue

@@ -115,6 +115,7 @@
     <el-dialog
       class="attendance_group"
       title="录入详情"
+      :modal-append-to-body="false"
       :visible.sync="ReviewDetailDialogVisible"
       width="600px"
       top="50px"

src/views/integral/rule/rule_category.vue

@@ -50,7 +50,7 @@
       </el-col>
     </el-row>
     <!-- 编辑添加分类 -->
-    <el-dialog :title="class_type=='add'?'添加规则分类':'编辑规则分类'" @close="add_dept_close('dept_formdata')" :visible.sync="class_show" :close-on-click-modal="false"
+    <el-dialog :modal-append-to-body="false" :title="class_type=='add'?'添加规则分类':'编辑规则分类'" @close="add_dept_close('dept_formdata')" :visible.sync="class_show" :close-on-click-modal="false"
       width="500px">
       <el-form :model="dept_formdata" ref="dept_formdata" :rules="dept_formdata_rules" label-width="80px">
         <el-form-item label="规则分类" prop="name">
@@ -68,7 +68,7 @@
       </el-form>
     </el-dialog>
     <!-- 添加编辑规则 -->
-    <el-dialog :title="rule_type=='add'?'添加规则':'编辑规则'" :visible.sync="rule_show" @close="rule_close('rules_detail_form')" :close-on-click-modal="false"
+    <el-dialog :modal-append-to-body="false" :title="rule_type=='add'?'添加规则':'编辑规则'" :visible.sync="rule_show" @close="rule_close('rules_detail_form')" :close-on-click-modal="false"
       width="700px">
       <el-form :model="rules_detail_form" ref="rules_detail_form" :rules="rules" label-width="80px">
         <el-form-item label="规则内容" prop="remark">
@@ -122,6 +122,7 @@
     <!-- 导入规则 -->
     <el-dialog
       title="导入规则"
+      :modal-append-to-body="false"
       :visible.sync="import_rules_show"
       width="500px"
       @before-close="close_import">
@@ -168,6 +169,7 @@
       :visible.sync="error_list_show"
       @close='error_list_SX'
       :append-to-body='true'
+      :modal-append-to-body="false"
       width="700px">
       <el-table :data="error_list">
         <el-table-column prop="line" label="行数">

src/views/layout/components/Navbar.vue

@@ -73,7 +73,7 @@
       </div>
     </el-dialog> -->
     
-		<el-dialog title="设置向导" :visible.sync="usingTheStrategy" width="600px">
+		<el-dialog title="设置向导" :modal-append-to-body="false" :visible.sync="usingTheStrategy" width="600px">
       <div v-for="(item,index) in routers_one" :key="index">
 				<div class="wn-title fontColorF">{{item.name}}</div>
 				<div class="flex-box flex-v-ce wn-box">

src/views/login/index.vue

@@ -93,7 +93,7 @@
           <!--</div>-->
 
         </div>
-        <el-dialog :title="$t('login.dialogVisible')" :visible.sync="dialogVisible" append-to-body width="400">
+        <el-dialog  :modal-append-to-body="false" :title="$t('login.dialogVisible')" :visible.sync="dialogVisible" append-to-body width="400">
           <el-button style="margin:5px 0; width:100%;" @click="loginBySite(item.site.id)" v-for="(item,index) in site_list"
             :key="index" size="medium">{{item.site.name}}
           </el-button>

src/views/login/resetPwd.vue

@@ -56,7 +56,7 @@
       </div>
     </el-form>
 
-    <el-dialog :title="$t('login.dialogVisible')" :visible.sync="dialogVisible" append-to-body width="400">
+    <el-dialog :modal-append-to-body="false" :title="$t('login.dialogVisible')" :visible.sync="dialogVisible" append-to-body width="400">
       <el-button
         style="margin:5px 0; width:100%;"
         @click="loginBySite(item.id)"

src/views/performance/AuthManage.vue

@@ -39,7 +39,7 @@
       :current-page.sync="currentPage"
       @current-change="changePage"
     ></el-pagination>
-    <el-dialog :title="dialogTitle" width="680px" :visible.sync="dialogSettingVisible" :close-on-click-modal="false" @close="resetAccessDialog">
+    <el-dialog :modal-append-to-body="false" :title="dialogTitle" width="680px" :visible.sync="dialogSettingVisible" :close-on-click-modal="false" @close="resetAccessDialog">
       <el-form ref="accessDetailForm" :model="accessFormData" :rules="rules" @submit.native.prevent>
         <el-tabs v-model="activeName">
           <el-tab-pane label="积分权限" name="first">
@@ -86,7 +86,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="dialogAssignManager.title" width="660px" :visible.sync="dialogAssignManagerVisible" :close-on-click-modal="false" @close="resetDialogAssignManager">
+    <el-dialog :modal-append-to-body="false" :title="dialogAssignManager.title" width="660px" :visible.sync="dialogAssignManagerVisible" :close-on-click-modal="false" @close="resetDialogAssignManager">
       <div style="padding-left:60px; padding-bottom:10px;">
         <el-transfer v-model="assignedValues" filterable target-order="origin" :titles="dialogAssignManager.transferTitles" :data="assignableList"></el-transfer>
       </div>
@@ -96,7 +96,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog class="attendance_group" title="绩效基础设置" :visible.sync="RuleDetailBaseDialogVisible" width="500px" top="50px">
+    <el-dialog :modal-append-to-body="false" class="attendance_group" title="绩效基础设置" :visible.sync="RuleDetailBaseDialogVisible" width="500px" top="50px">
       <el-form ref="baseformdata" :model="baseformdata" label-width="150px">
         <el-form-item label="效分转B分比例">
           <el-select v-model="baseformdata.task_point_convert" placeholder="请选择">

src/views/performance/EmployeeSetting.vue

@@ -80,7 +80,7 @@
       </el-col>
     </el-row>
 
-    <el-dialog class="attendance_group" title="基准分设置" :visible.sync="RuleDetailBaseDialogVisible" width="400px" top="50px">
+    <el-dialog :modal-append-to-body="false" class="attendance_group" title="基准分设置" :visible.sync="RuleDetailBaseDialogVisible" width="400px" top="50px">
       <el-form ref="setting_form" :model="setting_form" label-width="50px">
         <el-form-item>
           <el-select v-model="setting_form.type" placeholder="请选择周期" style="width:120px;">

src/views/setting/approver_set.vue

@@ -256,7 +256,7 @@
     </el-row>
 
     <!-- 设置直属上级弹窗 -->
-    <el-dialog title="设置直属上级" :visible.sync="outerVisible" width="25%">
+    <el-dialog title="设置直属上级" :modal-append-to-body="false" :visible.sync="outerVisible" width="25%">
       <span>为</span>
       <!-- <div style="width:50px;height:16px; overflow: hidden;text-overflow:ellipsis;display:block"> -->
       <b v-for="(item, index) in multipleSelection" :key="index">

src/views/setting/company_info.vue

@@ -95,7 +95,7 @@
       </el-tab-pane> -->
     </el-tabs>
 
-    <el-dialog :title="popup_title" :visible.sync="edit_tel_show" width="480px" @close="close_edit_tel" custom-class="alert_tel_box">
+    <el-dialog :title="popup_title" :modal-append-to-body="false" :visible.sync="edit_tel_show" width="480px" @close="close_edit_tel" custom-class="alert_tel_box">
       <el-form :model="formData" ref="formData" label-width="80px" v-show="!newTel_show">
         <el-form-item label="旧手机号">
           <el-input autocomplete="off" v-model="employee_info.tel" disabled placeholder="请输入当前账号绑定的手机号"></el-input>
@@ -127,7 +127,7 @@
       </el-form>
 
     </el-dialog>
-    <el-dialog title="更换登录密码" :visible.sync="changePasw_show" width="480px" @close="close_changePasw('changePaswFormData')">
+    <el-dialog title="更换登录密码" :modal-append-to-body="false" :visible.sync="changePasw_show" width="480px" @close="close_changePasw('changePaswFormData')">
       <el-form :model="changePaswFormData" :rules="changePaswRules" ref="changePaswFormData" label-width="100px">
         <el-form-item label="原密码" prop="old_password">
           <el-input v-model="changePaswFormData.old_password" type="password" autocomplete="off" placeholder="请输入旧密码"></el-input>
@@ -144,7 +144,7 @@
         </el-form-item>
       </el-form>
     </el-dialog>
-		<el-dialog :visible.sync="innerVisible" width="400px" append-to-body class="innerVisible">
+		<el-dialog :modal-append-to-body="false" :visible.sync="innerVisible" width="400px" append-to-body class="innerVisible">
         <p style="font-size:21px;">续费/升级</p>
         <p style="margin:0;">请在功道云积分服务群中联系客服顾问或微信扫码添加功道云客服进行续费</p>
         <img src="static/images/vtRemewService.png" style="width:100%">

src/views/setting/fixed_integral.vue

@@ -168,6 +168,7 @@
       :title="grouping_type == 'add'?'新增分类':'编辑分类'"
       :visible.sync="grouping_show"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       width="500px"
     >
       <el-form :model="grouping" ref="grouping" :rules="grouping_rules" label-width="100px">
@@ -187,6 +188,7 @@
       :visible.sync="rules_detail_show"
       width="532px"
       :close-on-click-modal="false"
+      :modal-append-to-body="false"
       @close="rules_detail_close('rules_detail_form')"
     >
       <el-form
@@ -250,6 +252,7 @@
       title="添加人员"
       :visible.sync="add_employee_show"
       :before-close="add_employee_close"
+      :modal-append-to-body="false"
       width="700px"
     >
       <el-form :model="add_employee_form" ref="add_employee_form" label-width="80px">
@@ -293,6 +296,7 @@
     <el-dialog
       title="导入自动积分"
       :visible.sync="import_rules_show"
+      :modal-append-to-body="false"
       width="500px"
       @before-close="close_import">
       <el-row>

src/views/setting/integral_rule.vue

@@ -12,7 +12,7 @@
 
     <el-row :gutter="0" class="rule_box">
       <el-col :span="4" class="rule_class">
-        
+
         <el-row :gutter="0" style="margin:0;padding:0;">
           <el-col :span="24"><el-button plain style="display:inblpadding:10px 25px;margin:20px auto 0;">+ 添加规则分类</el-button></el-col>
           <el-col :span="24">
@@ -31,7 +31,7 @@
       </el-col>
 
       <el-col :span="20" class="rule_list">
-      
+
        <el-row style="margin-top:20px;">
           <el-col :span="6" style="font-size:20px;color:#303133;line-height:36px;">分类名称过长过长</el-col>
           <el-col :span="3"><el-button plain style="padding:10px 12px;" @click="edit_rule = true">编辑</el-button></el-col>
@@ -60,10 +60,10 @@
 
 
       </el-col>
-      
+
     </el-row>
 
-    <el-dialog title="编辑规则分类" :visible.sync="edit_rule" width="38%" custom-class="alert_rule_box">
+    <el-dialog title="编辑规则分类" :modal-append-to-body="false" :visible.sync="edit_rule" width="38%" custom-class="alert_rule_box">
       <el-form :model="form">
         <el-form-item label="规则分类" :label-width="formLabelWidth" >
           <el-input autocomplete="off" placeholder="分类名称过长过长"></el-input>
@@ -81,7 +81,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="添加规则分类" :visible.sync="add_rule" width="38%" custom-class="alert_rule_box">
+    <el-dialog title="添加规则分类" :modal-append-to-body="false" :visible.sync="add_rule" width="38%" custom-class="alert_rule_box">
       <el-form :model="form">
         <el-form-item label="规则分类" :label-width="formLabelWidth" >
           <el-input autocomplete="off" placeholder="请输入分类名称"></el-input>
@@ -99,7 +99,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="导入规则" :visible.sync="import_rule" width="38%" custom-class="alert_rule_box">
+    <el-dialog title="导入规则" :modal-append-to-body="false" :visible.sync="import_rule" width="38%" custom-class="alert_rule_box">
       <div style="display:flex" class="export_box">
         <div class="export_list">
             <span style="display:block;">1、下载规则模版，填写好规则</span>
@@ -130,7 +130,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="导出/修改规则" :visible.sync="export_rule" width="38%" custom-class="alert_rule_box">
+    <el-dialog title="导出/修改规则" :modal-append-to-body="false" :visible.sync="export_rule" width="38%" custom-class="alert_rule_box">
       <div style="display:flex" class="export_box">
         <div class="export_list">
             <span style="display:block;">1、导出规则表</span>
@@ -249,7 +249,7 @@ export default {
     methods: {
       handleNodeClick(data) {
       },
-      
+
     }
   };
 </script>
@@ -353,4 +353,4 @@ export default {
       display:none;
     }
 }
-</style>
+</style>

src/views/setting/new_employee.vue

@@ -50,6 +50,7 @@
         title="完善信息"
         :visible.sync="perfect_dialog_show"
         :before-close="colse"
+        :modal-append-to-body="false"
         width="25%">
         <el-form :model="infoForm" :rules="rules" ref="infoForm" label-width="80px">
           <el-form-item label="姓名">

src/views/setting/set_role.vue

@@ -273,7 +273,7 @@
 
     <!-- 添加人员 -->
     <EmployeeSelector title="添加管理人员" :isChecKedAll="true" :visible.sync="add_employee_show" @confirm="add_employee_confirm" />
-    <el-dialog title="数据查看权限" :visible.sync="dataAccessShow" width="700px">
+    <el-dialog :modal-append-to-body="false" title="数据查看权限" :visible.sync="dataAccessShow" width="700px">
       <div v-loading="dataAccessLoading">
         <el-form label-width="120px">
           <el-form-item v-for="(item, index) in jurisdiction" :key="index" :label="item.title">
@@ -302,7 +302,7 @@
       @confirm="management_scope_confirm"
     />
 
-    <el-dialog title="设置积分权限" :visible.sync="integral_limit_show" :close-on-click-modal="false" width="700px">
+    <el-dialog :modal-append-to-body="false" title="设置积分权限" :visible.sync="integral_limit_show" :close-on-click-modal="false" width="700px">
       <el-form label-width="150px" :model="integral_limit_form" ref="integral_limit_form" v-loading="integral_limit_loading">
         <span v-for="(item, index) in integral_limit_form.point_limit" :key="index" v-show="item.pt_id !== 1">
           <el-form-item :label="item.name + '权限(单次奖扣)'" :rules="[{ required: true, message: '请输入', trigger: 'blur' }]">
@@ -319,7 +319,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog :title="setPowerTitle" :visible.sync="setPowerShow" :close-on-click-modal="false" :before-close="powerClose" width="700px">
+    <el-dialog :modal-append-to-body="false" :title="setPowerTitle" :visible.sync="setPowerShow" :close-on-click-modal="false" :before-close="powerClose" width="700px">
       <el-form label-width="100px">
         <el-row class="red_tips">
           <el-col :span="24" v-show="setPowerType == 'aAll'">将统一修改全部{{ item_info.remark }}的A分权限</el-col>
@@ -447,7 +447,7 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog title="B分奖扣任务" :visible.sync="bonus_deducted_show" width="600px">
+    <el-dialog :modal-append-to-body="false" title="B分奖扣任务" :visible.sync="bonus_deducted_show" width="600px">
       <el-form :model="integral_limit_form" ref="integral_limit_form" :rules="integral_limit_rules" label-width="130px" v-loading="bonus_deducted_loading">
         <span v-for="(item, index) in integral_limit_form.reward_task_monthly" :key="index" v-show="item.name == 'B分'">
           <el-form-item>
@@ -557,7 +557,7 @@
     </el-dialog>
 
     <!-- 导出员工 -->
-    <el-dialog title="导出/修改部门管理员信息" width="600px" :visible.sync="exportEmploye" :close-on-click-modal="false" :before-close="close_export">
+    <el-dialog :modal-append-to-body="false" title="导出/修改部门管理员信息" width="600px" :visible.sync="exportEmploye" :close-on-click-modal="false" :before-close="close_export">
       <div style="float: left;width:49%">
         <div style="margin-left: 20%;">
           <p>1.导出部门管理员信息</p>

src/views/statistics_new/balanceA.vue

@@ -84,6 +84,7 @@
 			<el-dialog
 				title="清空A分余额"
 				:visible.sync="clearAPointShow"
+        :modal-append-to-body="false"
 				width="500px"
 				@close="clearAPointClose('popupForm')">
 					<el-form :model="popupForm" ref="popupForm">

src/views/statistics_new/custom_rank.vue

@@ -32,11 +32,11 @@
         </el-row>
         <el-form :model="params" :inline="true" ref="params">
           <el-form-item label="月份" label-width="40px" v-if="newGroupForm.date_interval == 1">
-            <el-date-picker v-model="time.month" type="month" placeholder="请选择月份" value-format="yyyy-MM"></el-date-picker>
+            <el-date-picker v-model="time.month" type="month" :clearable="false" placeholder="请选择月份" value-format="yyyy-MM"></el-date-picker>
           </el-form-item>
 
           <el-form-item label="年份" label-width="40px" v-if="newGroupForm.date_interval == 3">
-            <el-date-picker v-model="time.year" type="year" placeholder="请选择年份" value-format="yyyy"></el-date-picker>
+            <el-date-picker v-model="time.year" type="year" :clearable="false" placeholder="请选择年份" value-format="yyyy"></el-date-picker>
           </el-form-item>
           <el-form-item label="季度" label-width="40px" v-if="newGroupForm.date_interval == 2">
             <!-- <el-date-picker
@@ -94,6 +94,14 @@
               <span style="line-height: 50px; padding-left: 10px;"><WWOpenData type="userName" :openid="scope.row.name"></WWOpenData></span>
             </template>
           </el-table-column>
+          <el-table-column label="部门">
+            <template slot-scope="scope">
+              <div class="flex-box-ce" v-if="scope.row.dept_list.length>0">
+                <span v-for="item in scope.row.dept_list" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item"></WWOpenData></span>
+              </div>
+              <span v-else class="fontColorB">--</span>
+            </template>
+          </el-table-column>
           <el-table-column label="B分" align="left" prop="point"></el-table-column>
           <template slot="empty">
             <div class="nopoint_box">
@@ -119,7 +127,7 @@
     </el-row>
 
     <!-- 新增分组 -->
-    <el-dialog :title="popupType ? '新增分组' : '编辑分组'" width="460px" :visible.sync="groupShow" :close-on-click-modal="false">
+    <el-dialog :modal-append-to-body="false" :title="popupType ? '新增分组' : '编辑分组'" width="460px" :visible.sync="groupShow" :close-on-click-modal="false">
       <!-- :close="resetForm('newGroupForm')" -->
       <el-form ref="newGroupForm" v-loading="loading" :model="newGroupForm" :rules="rules" label-width="85px" @submit.native.prevent>
         <el-form-item label="分组名称" prop="group_name"><el-input v-model="newGroupForm.group_name" placeholder="请输入分组名称" auto-complete="off"></el-input></el-form-item>
@@ -147,7 +155,7 @@
           <div style="margin-bottom:12px;">
             <span style="font-size:13px;color:rgb(138 138 138);position: absolute; top: 30px; left: 0;">{{ruleHint}}</span>
           </div>
-          <el-dialog title="选择规则" width="952px" :visible.sync="ruleDialogTableVisible" @close="closeNone" append-to-body :before-close="handleClose">
+          <el-dialog :modal-append-to-body="false" title="选择规则" width="952px" :visible.sync="ruleDialogTableVisible" @close="closeNone" append-to-body :before-close="handleClose">
             <div style="display:flex;position: relative;width:100%;height:40px">
               <span style="position: absolute;line-height:40px;left:20px">已选：{{ valuesOrLength.length }}条</span>
               <el-input type="text" class="search" style="position: absolute;right:20px;width:20%" placeholder="输入关键字搜索" v-model.trim="keyword" />
@@ -770,7 +778,7 @@ export default {
             self.getGroupsList(self.clickItem.id); //传入当前ID.为了修改后页面不切换
             // self.open_right(self.clickItem)
             // }
-            
+
             this.employeeNames = []
             this.employees = '';
             this.employee_not_select = [];

src/views/statistics_new/dept_rank.vue

@@ -109,6 +109,14 @@
             <span style="line-height: 50px; padding-left: 10px;"><WWOpenData type="userName" :openid="scope.row.employee_name"></WWOpenData></span>
           </template>
         </el-table-column>
+        <el-table-column label="部门">
+          <template slot-scope="scope">
+            <div class="flex-box-ce" v-if="scope.row.dept_list.length>0">
+              <span v-for="item in scope.row.dept_list" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item"></WWOpenData></span>
+            </div>
+            <span v-else class="fontColorB">--</span>
+          </template>
+        </el-table-column>
         <el-table-column :label="typeName" align="left" prop="point"></el-table-column>
         <template slot="empty">
           <div class="nopoint_box">
@@ -132,7 +140,7 @@
       </center>
     </div>
     <!-- 导出弹窗 -->
-    <el-dialog title="导出排名" :visible.sync="dialogVisible" width="730px">
+    <el-dialog :modal-append-to-body="false" title="导出排名" :visible.sync="dialogVisible" width="730px">
       <div style="font-size:15px;margin-top:20px;">系统将按以下已选条件导出对应的排名报表</div>
       <el-form :inline="true">
         <div class="picker_er">

src/views/statistics_new/integral_event.vue

@@ -138,7 +138,7 @@
         ></el-pagination>
       </center>
     </div>
-    <el-drawer title="事件详情" :visible.sync="detail_popup" ref="drawer" :with-header="false" :width="'500px'" direction="rtl">
+    <el-drawer :modal-append-to-body="false" title="事件详情" :visible.sync="detail_popup" ref="drawer" :with-header="false" :width="'500px'" direction="rtl">
       <div class="drawer_title">事件详情</div>
       <div class="detail_popup" v-loading="detail_loading" v-if="detail_info !== null">
         <el-row style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">
@@ -222,7 +222,7 @@
     </el-drawer>
 
     <!-- 导入数据 -->
-    <el-dialog title="导入积分事件数据" width="600px" :visible.sync="excelImportShow" :close-on-click-modal="false" :before-close="close_import">
+    <el-dialog :modal-append-to-body="false" title="导入积分事件数据" width="600px" :visible.sync="excelImportShow" :close-on-click-modal="false" :before-close="close_import">
       <div style="padding:0 50px;">
         <div class="align-center" style="margin-bottom:20px;">
           <p>
@@ -256,7 +256,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="导入结果" :visible.sync="importErrorInfoShow" width="30%">
+    <el-dialog :modal-append-to-body="false" title="导入结果" :visible.sync="importErrorInfoShow" width="30%">
       <div>
         <el-table :data="error_list" border stripe>
           <el-table-column prop="name" label="备注信息">
@@ -269,7 +269,7 @@
       <span slot="footer"><el-button type="primary" @click="importErrorInfoShow = false">确 定</el-button></span>
     </el-dialog>
 
-    <el-dialog title="轮播排名" :visible.sync="swiperShow" width="500px">
+    <el-dialog :modal-append-to-body="false" title="轮播排名" :visible.sync="swiperShow" width="500px">
       <div>
         <el-form :inline="true">
           <div style="color:rgb(122 202 126);font-size: 13px;padding:5px 0 20px 0">设置后，相关排名信息可在各类智能终端屏幕上的网页浏览器滚屏展示</div>

src/views/statistics_new/integral_statistics.vue

@@ -23,13 +23,14 @@
             <span style="margin-left: 10px; line-height: 50px; display: inline-block"><WWOpenData type="userName" :openid="scope.row.employee_name"></WWOpenData></span>
           </template>
         </el-table-column>
-        <!-- <el-table-column prop="performance" label="绩效分" align="center">
+        <el-table-column label="部门">
           <template slot-scope="scope">
-            <span :class="scope.row.performance < 0 ? 'color_green' : ''">{{
-              scope.row.performance
-            }}</span>
+            <div class="flex-box-ce" v-if="scope.row.dept_list.length>0">
+              <span v-for="item in scope.row.dept_list" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item.depart_id"></WWOpenData></span>
+            </div>
+            <span v-else class="fontColorB">--</span>
           </template>
-        </el-table-column> -->
+        </el-table-column>
         <el-table-column prop="a" label="A分" align="center">
           <template slot-scope="scope">
             <span :class="scope.row.a < 0 ? 'color_green' : ''">{{ scope.row.a }}</span>
@@ -59,7 +60,7 @@
         ></el-pagination>
       </center>
 
-      <el-drawer :visible.sync="all_integral_show" :before-close="drawer_close" :with-header="false">
+      <el-drawer :modal-append-to-body="false" :visible.sync="all_integral_show" :before-close="drawer_close" :with-header="false">
         <div class="drawer_title">
           <WWOpenData type="userName" :openid="all_integral_row.employee_name"></WWOpenData>
           的积分

src/views/statistics_new/manager_statistics.vue

@@ -1,103 +1,73 @@
 <template>
   <div>
     <div class="manager_statistics_box wlj">
-      <el-tabs v-model="activeName" type="card"
-        ><!-- 奖扣完成情况 -->
+      <el-tabs v-model="activeName" type="card"><!-- 奖扣完成情况 -->
         <el-tab-pane label="奖扣完成情况" name="second">
           <el-form :model="condition" :inline="true" ref="formData">
             <!-- 部门 -->
             <el-form-item label="部门">
-                <ShowDeptName :deptId.sync="condition.dept_id"></ShowDeptName>
+              <ShowDeptName :deptId.sync="condition.dept_id"></ShowDeptName>
             </el-form-item>
 
             <!-- 时间 -->
             <el-form-item label="时间">
-              <el-date-picker
-                class="date-picker-width"
-                v-model="condition.month"
-                clearable
-                width="100%"
-                type="month"
-                placeholder="请选择月份"
-                value-format="yyyy-MM"
-              ></el-date-picker>
+              <el-date-picker class="date-picker-width" v-model="condition.month" clearable width="100%" type="month"
+                placeholder="请选择月份" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
 
             <!-- 搜索框 -->
             <el-form-item class="persons_names">
-              <el-input
-                v-model="condition.keyword"
-                placeholder="输入同事姓名"
-                maxlength="20"
-                @keyup.enter.native="keyWordSelect"
-                class="persons_name"
-              >
-                <el-button
-                  slot="append"
-                  icon="el-icon-search"
-                  @click="search_box"
-                ></el-button>
+              <el-input v-model="condition.keyword" placeholder="输入同事姓名" maxlength="20"
+                @keyup.enter.native="keyWordSelect" class="persons_name">
+                <el-button slot="append" icon="el-icon-search" @click="search_box"></el-button>
               </el-input>
             </el-form-item>
 
             <!-- 达标选项 -->
             <br />
             <el-form-item>
-              <el-checkbox
-                v-model="allPass"
-                size="medium"
-                label="只看全部达标的"
-              ></el-checkbox>
+              <el-checkbox v-model="allPass" size="medium" label="只看全部达标的"></el-checkbox>
             </el-form-item>
 
             <!-- 导出报表 -->
-           <el-form-item>
-              <el-button type="primary" plain @click="exportExcel" style="margin-left:20px"  :disabled="deriveDis">导出报表</el-button>
+            <el-form-item>
+              <el-button type="primary" plain @click="exportExcel" style="margin-left:20px"
+                :disabled="deriveDis">导出报表</el-button>
             </el-form-item>
           </el-form>
 
           <el-table :data="last" style="width: 100%" v-loading="loading">
             <el-table-column label="管理者">
               <template slot-scope="scope">
-                <userImage
-                  class="fl"
-                  :id="scope.row.id"
-                  :user_name="scope.row.name"
-                  :img_url="scope.row.img_url"
-                  width="50px"
-                  height="50px"
-                ></userImage>
-                <span
-                  style=" margin-left: 10px; line-height: 50px; display: inline-block;"
-                  ><WWOpenData
-                    type="userName"
-                    :openid="scope.row.name"
-                  ></WWOpenData
-                ></span>
+                <userImage class="fl" :id="scope.row.id" :user_name="scope.row.name" :img_url="scope.row.img_url"
+                  width="50px" height="50px"></userImage>
+                <span style=" margin-left: 10px; line-height: 50px; display: inline-block;">
+                  <WWOpenData type="userName" :openid="scope.row.name"></WWOpenData>
+                </span>
+              </template>
+            </el-table-column>
+            <el-table-column label="部门">
+              <template slot-scope="scope">
+                <div class="flex-box-ce" v-if="scope.row.dept.length>0">
+                  <span v-for="item in scope.row.dept" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item"></WWOpenData></span>
+                </div>
+                <span v-else class="fontColorB">--</span>
               </template>
             </el-table-column>
             <el-table-column label="奖分" prop="scope_count">
               <template slot-scope="scope">
                 <b>{{ scope.row.reward.point }}&nbsp;</b>
                 <span
-                  :class="scope.row.reward.status == 1 ? 'color_green' : ''"
-                  >{{ scope.row.reward.status == 1 ? "达标" : "" }}</span
-                ><br />
-                <span class="span_h"
-                  >奖分目标 {{ scope.row.reward.target }}</span
-                >
+                  :class="scope.row.reward.status == 1 ? 'color_green' : ''">{{ scope.row.reward.status == 1 ? "达标" : "" }}</span><br />
+                <span class="span_h">奖分目标 {{ scope.row.reward.target }}</span>
               </template>
             </el-table-column>
             <el-table-column label="扣分" prop="reward_count">
               <template slot-scope="scope">
                 <b>{{ scope.row.deduction.point }}&nbsp;</b>
                 <span
-                  :class="scope.row.deduction.status == 1 ? 'color_green' : ''"
-                  >{{ scope.row.deduction.status == 1 ? "达标" : "" }}</span
-                ><br />
-                <span class="span_h"
-                  >扣分目标 {{ scope.row.deduction.target }}</span
-                >
+                  :class="scope.row.deduction.status == 1 ? 'color_green' : ''">{{ scope.row.deduction.status == 1 ? "达标" : "" }}</span><br />
+                <span class="span_h">扣分目标 {{ scope.row.deduction.target }}</span>
               </template>
             </el-table-column>
             <el-table-column label="奖扣比例" prop="deduct_count">
@@ -105,13 +75,9 @@
                 <div v-if="scope.row.ratio.enable == 1">
                   <b>{{ scope.row.ratio.reward_ratio }}&nbsp;:1 </b>
                   <span
-                    :class="scope.row.ratio.status == 1 ? 'color_green' : ''"
-                    >{{ scope.row.ratio.status == 1 ? "达标" : "" }}</span
-                  ><br />
-                  <span class="span_h"
-                    >比例目标 小于 {{ scope.row.ratio.target
-                    }}<b>:</b>&nbsp;1</span
-                  >
+                    :class="scope.row.ratio.status == 1 ? 'color_green' : ''">{{ scope.row.ratio.status == 1 ? "达标" : "" }}</span><br />
+                  <span class="span_h">比例目标 小于 {{ scope.row.ratio.target
+                    }}<b>:</b>&nbsp;1</span>
                 </div>
                 <div v-else style="padding-left:21px">—</div>
               </template>
@@ -120,12 +86,8 @@
               <template slot-scope="scope">
                 <b>{{ scope.row.exec.count }}&nbsp;</b>
                 <span
-                  :class="scope.row.exec.status == 1 ? 'color_green' : ''"
-                  >{{ scope.row.exec.status == 1 ? "达标" : "" }}</span
-                ><br />
-                <span class="span_h"
-                  >人次目标 {{ scope.row.exec.target }}人次</span
-                >
+                  :class="scope.row.exec.status == 1 ? 'color_green' : ''">{{ scope.row.exec.status == 1 ? "达标" : "" }}</span><br />
+                <span class="span_h">人次目标 {{ scope.row.exec.target }}人次</span>
               </template>
             </el-table-column>
             <template slot="empty">
@@ -137,73 +99,35 @@
           </el-table>
 
           <center style="padding: 20px 0;">
-            <el-pagination
-              background
-              @size-change="handleSizeChange_xq"
-              @current-change="handleCurrentChange_xq"
-              :current-page="condition.page"
-              layout="total, sizes, prev, pager, next"
-              :page-size="condition.page_size"
-              :page-sizes="[10, 20, 50, 100]"
-              :total="totals"
-            ></el-pagination>
+            <el-pagination background @size-change="handleSizeChange_xq" @current-change="handleCurrentChange_xq"
+              :current-page="condition.page" layout="total, sizes, prev, pager, next" :page-size="condition.page_size"
+              :page-sizes="[10, 20, 50, 100]" :total="totals"></el-pagination>
           </center>
         </el-tab-pane>
 
         <el-tab-pane label="奖扣执行对比" name="first">
           <el-form :model="formData" :inline="true" ref="formData">
             <el-form-item label="部门">
-                <ShowDeptName :deptId.sync="formData.dept_id"></ShowDeptName>
+              <ShowDeptName :deptId.sync="formData.dept_id"></ShowDeptName>
             </el-form-item>
             <el-form-item label="时间">
-              <el-date-picker
-                class="date-picker-width"
-                v-model="formData.month"
-                clearable
-                width="100%"
-                type="month"
-                placeholder="请选择月份"
-                value-format="yyyy-MM"
-              ></el-date-picker>
+              <el-date-picker class="date-picker-width" v-model="formData.month" clearable width="100%" type="month"
+                placeholder="请选择月份" value-format="yyyy-MM"></el-date-picker>
             </el-form-item>
           </el-form>
-          <el-table
-            :data="list"
-            style="width: 100%"
-            v-loading="loading"
-            @row-click="open_detail"
-          >
+          <el-table :data="list" style="width: 100%" v-loading="loading" @row-click="open_detail">
             <el-table-column label="管理者">
               <template slot-scope="scope">
-                <userImage
-                  class="fl"
-                  :id="scope.row.id"
-                  :user_name="scope.row.name"
-                  :img_url="scope.row.img_url"
-                  width="50px"
-                  height="50px"
-                ></userImage>
-                <span
-                  style=" margin-left: 10px; line-height: 50px; display: inline-block;"
-                  ><WWOpenData
-                    type="userName"
-                    :openid="scope.row.name"
-                  ></WWOpenData
-                ></span>
+                <userImage class="fl" :id="scope.row.id" :user_name="scope.row.name" :img_url="scope.row.img_url"
+                  width="50px" height="50px"></userImage>
+                <span style=" margin-left: 10px; line-height: 50px; display: inline-block;">
+                  <WWOpenData type="userName" :openid="scope.row.name"></WWOpenData>
+                </span>
               </template>
             </el-table-column>
-            <el-table-column
-              label="管理范围(人)"
-              prop="scope_count"
-            ></el-table-column>
-            <el-table-column
-              label="人均奖分(次)"
-              prop="reward_count"
-            ></el-table-column>
-            <el-table-column
-              label="人均扣分(次)"
-              prop="deduct_count"
-            ></el-table-column>
+            <el-table-column label="管理范围(人)" prop="scope_count"></el-table-column>
+            <el-table-column label="人均奖分(次)" prop="reward_count"></el-table-column>
+            <el-table-column label="人均扣分(次)" prop="deduct_count"></el-table-column>
             <template slot="empty">
               <div class="nopoint_box">
                 <div class="noimg noperson"></div>
@@ -213,30 +137,16 @@
           </el-table>
 
           <center style="padding: 20px 0;">
-            <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"
-              :current-page="formData.page"
-              :page-sizes="[10, 20, 50, 100]"
-              layout="total, sizes, prev, pager, next"
-              :page-size="formData.page_size"
-              :total="total"
-            ></el-pagination>
+            <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+              :current-page="formData.page" :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next"
+              :page-size="formData.page_size" :total="total"></el-pagination>
           </center>
 
-          <el-drawer
-            size="500px"
-            :visible.sync="detail_show"
-            :with-header="false"
-            direction="rtl"
-          >
-            <el-button type="info" style="position: absolute; left: -100px;"
-              >test</el-button
-            >
+          <el-drawer size="500px" :visible.sync="detail_show" :with-header="false" :modal-append-to-body="false"
+            direction="rtl">
+            <el-button type="info" style="position: absolute; left: -100px;">test</el-button>
             <div class="drawer_title">
-              <WWOpenData type="userName" :openid="item.name"></WWOpenData
-              >的奖扣统计
+              <WWOpenData type="userName" :openid="item.name"></WWOpenData>的奖扣统计
               <el-tooltip placement="top">
                 <div slot="content" style="width: 300px">
                   作为管理者，管理执行力是关键，每月按要求完成奖分和扣分任务。
@@ -245,11 +155,7 @@
               </el-tooltip>
             </div>
             <div class="chart_content">
-              <el-row
-                :gutter="20"
-                v-if="personalData !== null"
-                v-loading="personalData_loading"
-              >
+              <el-row :gutter="20" v-if="personalData !== null" v-loading="personalData_loading">
                 <el-col :span="4">
                   <div class="dataItem">
                     <p class="point">{{ personalData.task.reward.point }}</p>
@@ -293,22 +199,14 @@
                 <span class="chart-legend__pink">奖分</span>
                 <span class="chart-legend__green">扣分</span>
               </div>
-              <div
-                id="situationChart"
-                v-loading="echart_loading"
-                style="height: 300px;"
-              ></div>
+              <div id="situationChart" v-loading="echart_loading" style="height: 300px;"></div>
 
               <div class="chart-legend__wrap">
                 <div class="fl">月奖扣人次</div>
                 <span class="chart-legend__pink">奖分人次</span>
                 <span class="chart-legend__green">扣分人次</span>
               </div>
-              <div
-                id="passengersChart"
-                v-loading="echart_loading"
-                style="height: 300px;"
-              ></div>
+              <div id="passengersChart" v-loading="echart_loading" style="height: 300px;"></div>
             </div>
           </el-drawer>
         </el-tab-pane>
@@ -317,482 +215,532 @@
   </div>
 </template>
 <script>
-import { getToken } from "@/utils/auth";
-import ECharts from "echarts";
-export default {
-  data() {
-    return {
-      last: [],
-      dept_trees: [],
-      //完成情况
-      condition: {
-        month: this.$moment().format("YYYY-MM"), //时间
-        page: 1, //当前页
-        page_size: 10, //每页数量
-        dept_id: 0, //部门id
-        keyword: "", //关键字
-        complete: "" //是否达标 1是
-      },
-      activeName: "second",
-      totals: null,
-      dept_name_xq_xq: "",
+  import {
+    getToken
+  } from "@/utils/auth";
+  import ECharts from "echarts";
+  export default {
+    data() {
+      return {
+        last: [],
+        dept_trees: [],
+        //完成情况
+        condition: {
+          month: this.$moment().format("YYYY-MM"), //时间
+          page: 1, //当前页
+          page_size: 10, //每页数量
+          dept_id: 0, //部门id
+          keyword: "", //关键字
+          complete: "" //是否达标 1是
+        },
+        activeName: "second",
+        totals: null,
+        dept_name_xq_xq: "",
 
-      //对比
-      loading: false,
-      choose_time: "",
-      input: "",
-      radio: "1",
-      formData: {
-        // employee_id:"",
-        month: this.$moment().format("YYYY-MM"),
-        page: 1,
-        page_size: 10,
-        dept_id: 0
-        // complete:'0',
-      },
-      total: null,
-      allPass: false,
-      list: [],
-      detail_show: false,
-      echart_loading: false,
-      item: {},
-      dept_name_xq: "",
-      dept_tree: [],
-      personalData_loading: false,
-      personalData: null,
-      toPdept: 0,
-      toPdepts: 0,
-
-      deriveJobId: "",
-      deriveJobIf: 0,
-      deriveDis: false,
-      aherfUrl: ""
-    };
-  },
-  watch: {
-    //对比
-    "formData.month"(val, old_val) {
-      this.formData.page = 1;
-      this.get_list();
-    },
-    //情况
-    "condition.month"(val, old_val) {
-      this.condition.page = 1;
-      this.get_last();
-    },
-    //查看全部达标
-    allPass(val, old_val) {
-      if (val) {
-        this.condition.complete = "1";
-      } else {
-        this.condition.complete = "0";
-      }
-      this.condition.page = 1;
-      this.get_last();
-    },
-    'condition.dept_id'(){
-      this.condition.page = 1;
-      this.get_last();
+        //对比
+        loading: false,
+        choose_time: "",
+        input: "",
+        radio: "1",
+        formData: {
+          // employee_id:"",
+          month: this.$moment().format("YYYY-MM"),
+          page: 1,
+          page_size: 10,
+          dept_id: 0
+          // complete:'0',
+        },
+        total: null,
+        allPass: false,
+        list: [],
+        detail_show: false,
+        echart_loading: false,
+        item: {},
+        dept_name_xq: "",
+        dept_tree: [],
+        personalData_loading: false,
+        personalData: null,
+        toPdept: 0,
+        toPdepts: 0,
+
+        deriveJobId: "",
+        deriveJobIf: 0,
+        deriveDis: false,
+        aherfUrl: ""
+      };
     },
-    'formData.dept_id'(){
+    watch: {
+      //对比
+      "formData.month"(val, old_val) {
         this.formData.page = 1;
         this.get_list();
-    }
-  },
-  methods: {
-    //情况
-    get_last() {
-      this.loading = true;
-      this.$http("get","/api/integral/statistics/prize/list",this.condition, "v4").then(res => {
-        if (res.data.code == 1) {
-          this.last = res.data.data.list;
-          this.totals = res.data.data.total;
+      },
+      //情况
+      "condition.month"(val, old_val) {
+        this.condition.page = 1;
+        this.get_last();
+      },
+      //查看全部达标
+      allPass(val, old_val) {
+        if (val) {
+          this.condition.complete = "1";
         } else {
-          this.$message.error(res.data.data.msg);
+          this.condition.complete = "0";
         }
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    //搜索框
-    search_box() {
-      this.get_last();
+        this.condition.page = 1;
+        this.get_last();
+      },
+      'condition.dept_id'() {
+        this.condition.page = 1;
+        this.get_last();
+      },
+      'formData.dept_id'() {
+        this.formData.page = 1;
+        this.get_list();
+      }
     },
-    downloadResult() {
-      if (this.deriveJobIf < 5) {
-        this.$http("get", "/api/download/result", {
-          job_id: this.deriveJobId
-        }).then(res => {
+    methods: {
+      //情况
+      get_last() {
+        this.loading = true;
+        this.$http("get", "/api/integral/statistics/prize/list", this.condition, "v4").then(res => {
           if (res.data.code == 1) {
-            this.aherfUrl = res.data.data.url;
-            this.deriveJobId = "";
-            this.deriveDis = false;
-            this.$nextTick(() => {
-              this.$refs.aherfClick.click();
-            });
+            this.last = res.data.data.list;
+            this.totals = res.data.data.total;
           } else {
-            setTimeout(() => {
-              this.deriveJobIf++;
-              this.downloadResult();
-            }, 3000);
+            this.$message.error(res.data.data.msg);
           }
+        }).finally(() => {
+          this.loading = false;
         });
-      } else {
-        this.deriveJobIf = 0;
-        this.deriveJobId = "";
-        this.deriveDis = false;
-        this.aherfUrl = "";
-        this.$message.warning("导出超时");
-      }
-    },
-    //导出报表
-    exportExcel() {
-      let params = {
-        employee_id: this.$userInfo().id,
-        month: this.condition.month,
-        dept_id:this.condition.dept_id||0,
-        keyword:this.condition.keyword,
-        complete:this.condition.complete
-      };
-      this.$downloadFile('api/download/prize/list/v4',params,this.$route.path);
-    },
-    //分页选择显示多少条
-    handleCurrentChange_xq(val) {
-      this.condition.page = val;
-      this.get_last();
-    },
-    //分页
-    handleSizeChange_xq(val) {
-      this.condition.page_size = val;
-      this.get_last();
-    },
+      },
+      //搜索框
+      search_box() {
+        this.get_last();
+      },
+      downloadResult() {
+        if (this.deriveJobIf < 5) {
+          this.$http("get", "/api/download/result", {
+            job_id: this.deriveJobId
+          }).then(res => {
+            if (res.data.code == 1) {
+              this.aherfUrl = res.data.data.url;
+              this.deriveJobId = "";
+              this.deriveDis = false;
+              this.$nextTick(() => {
+                this.$refs.aherfClick.click();
+              });
+            } else {
+              setTimeout(() => {
+                this.deriveJobIf++;
+                this.downloadResult();
+              }, 3000);
+            }
+          });
+        } else {
+          this.deriveJobIf = 0;
+          this.deriveJobId = "";
+          this.deriveDis = false;
+          this.aherfUrl = "";
+          this.$message.warning("导出超时");
+        }
+      },
+      //导出报表
+      exportExcel() {
+        let params = {
+          employee_id: this.$userInfo().id,
+          month: this.condition.month,
+          dept_id: this.condition.dept_id || 0,
+          keyword: this.condition.keyword,
+          complete: this.condition.complete
+        };
+        this.$downloadFile('api/download/prize/list/v4', params, this.$route.path);
+      },
+      //分页选择显示多少条
+      handleCurrentChange_xq(val) {
+        this.condition.page = val;
+        this.get_last();
+      },
+      //分页
+      handleSizeChange_xq(val) {
+        this.condition.page_size = val;
+        this.get_last();
+      },
 
-    handleSizeChange(val) {
-      this.formData.page_size = val;
-      this.get_list();
-    },
-    handleCurrentChange(val) {
-      this.formData.page = val;
-      this.get_list();
-    },
+      handleSizeChange(val) {
+        this.formData.page_size = val;
+        this.get_list();
+      },
+      handleCurrentChange(val) {
+        this.formData.page = val;
+        this.get_list();
+      },
 
-    get_list() {
-      this.loading = true;
-      this.$http("get","/api/integral/statistics/prize/list", this.formData,"v3").then(res => {
+      get_list() {
+        this.loading = true;
+        this.$http("get", "/api/integral/statistics/prize/list", this.formData, "v3").then(res => {
           this.list = res.data.data.list;
           this.total = res.data.data.total;
-      }).finally(() => {
-        this.loading = false;
-      });
-    },
-    search() {
-      this.get_list();
-    },
-    open_detail(row, column, event) {
-      this.detail_show = true;
-      this.item = row;
-      this.$nextTick(() => {
-        this.situationChart = ECharts.init(
-          document.getElementById("situationChart")
-        );
-        this.passengersChart = ECharts.init(
-          document.getElementById("passengersChart")
-        );
-      });
-      this.getData(() => (this.echart_loading = false));
-      this.getDataV1(() => (this.personalData_loading = false));
-    },
-    getChartOption(xAxisData, rewardData, deductionData) {
-      return {
-        tooltip: {
-          trigger: "axis"
-        },
-        grid: {
-          containLabel: true,
-          top: "4%",
-          right: "4%",
-          bottom: "5%",
-          left: "7%"
-        },
-        xAxis: {
-          type: "category",
-          boundaryGap: false,
-          axisLine: { lineStyle: { color: "#eee" } },
-          axisLabel: { color: "#333" },
-          data: xAxisData
-        },
-        yAxis: {
-          position: "right",
-          axisLine: { lineStyle: { color: "#eee" } },
-          axisLabel: { color: "#333" },
-          type: "value",
-          splitLine: { lineStyle: { color: "#eee" } }
-        },
-        series: [
-          {
-            name: "奖分",
-            type: "line",
-            data: rewardData,
-            lineStyle: { normal: { color: "#F56C6C" } }
+        }).finally(() => {
+          this.loading = false;
+        });
+      },
+      search() {
+        this.get_list();
+      },
+      open_detail(row, column, event) {
+        this.detail_show = true;
+        this.item = row;
+        this.$nextTick(() => {
+          this.situationChart = ECharts.init(
+            document.getElementById("situationChart")
+          );
+          this.passengersChart = ECharts.init(
+            document.getElementById("passengersChart")
+          );
+        });
+        this.getData(() => (this.echart_loading = false));
+        this.getDataV1(() => (this.personalData_loading = false));
+      },
+      getChartOption(xAxisData, rewardData, deductionData) {
+        return {
+          tooltip: {
+            trigger: "axis"
           },
-          {
-            name: "扣分",
-            type: "line",
-            data: deductionData,
-            lineStyle: { normal: { color: "#53B87F" } }
-          }
-        ]
-      };
-    },
-    // v2
-    getData(callBack) {
-      this.echart_loading = true;
-      const data = {
-        employee_id: this.item.id || 0,
-        month: this.formData.month
-      };
-      this.$http("get", "/api/integral/statistics/prize", data).then(res => {
-            const item = res.data.data;
-            this.employeeName = item.name;
-            const deduct = item.chart.deduct;
-            const situationRewardData = [];
-            const situationDeductionData = [];
-            const passengersRewardData = [];
-            const passengersDeductionData = [];
-
-            const xAxisData = item.chart.reward.map((o, i) => {
-              // 降分分数
-              situationDeductionData.push(item.chart.reward[i].point);
-              // 扣分分数
-              passengersDeductionData.push(item.chart.deduct[i].point);
-              // 奖分次数
-              situationRewardData.push(item.chart.reward[i].count);
-              // 扣分次数
-              passengersRewardData.push(item.chart.deduct[i].count);
-              return o.date;
-            });
-            this.situationChart.setOption(
-              this.getChartOption(
-                xAxisData,
-                situationDeductionData,
-                passengersDeductionData
-              )
-            ); //奖分数值、扣分数值
-            this.passengersChart.setOption(
-              this.getChartOption(
-                xAxisData,
-                situationRewardData,
-                passengersRewardData
-              )
-            ); //月奖扣人次
+          grid: {
+            containLabel: true,
+            top: "4%",
+            right: "4%",
+            bottom: "5%",
+            left: "7%"
+          },
+          xAxis: {
+            type: "category",
+            boundaryGap: false,
+            axisLine: {
+              lineStyle: {
+                color: "#eee"
+              }
+            },
+            axisLabel: {
+              color: "#333"
+            },
+            data: xAxisData
+          },
+          yAxis: {
+            position: "right",
+            axisLine: {
+              lineStyle: {
+                color: "#eee"
+              }
+            },
+            axisLabel: {
+              color: "#333"
+            },
+            type: "value",
+            splitLine: {
+              lineStyle: {
+                color: "#eee"
+              }
+            }
+          },
+          series: [{
+              name: "奖分",
+              type: "line",
+              data: rewardData,
+              lineStyle: {
+                normal: {
+                  color: "#F56C6C"
+                }
+              }
+            },
+            {
+              name: "扣分",
+              type: "line",
+              data: deductionData,
+              lineStyle: {
+                normal: {
+                  color: "#53B87F"
+                }
+              }
+            }
+          ]
+        };
+      },
+      // v2
+      getData(callBack) {
+        this.echart_loading = true;
+        const data = {
+          employee_id: this.item.id || 0,
+          month: this.formData.month
+        };
+        this.$http("get", "/api/integral/statistics/prize", data).then(res => {
+          const item = res.data.data;
+          this.employeeName = item.name;
+          const deduct = item.chart.deduct;
+          const situationRewardData = [];
+          const situationDeductionData = [];
+          const passengersRewardData = [];
+          const passengersDeductionData = [];
+
+          const xAxisData = item.chart.reward.map((o, i) => {
+            // 降分分数
+            situationDeductionData.push(item.chart.reward[i].point);
+            // 扣分分数
+            passengersDeductionData.push(item.chart.deduct[i].point);
+            // 奖分次数
+            situationRewardData.push(item.chart.reward[i].count);
+            // 扣分次数
+            passengersRewardData.push(item.chart.deduct[i].count);
+            return o.date;
+          });
+          this.situationChart.setOption(
+            this.getChartOption(
+              xAxisData,
+              situationDeductionData,
+              passengersDeductionData
+            )
+          ); //奖分数值、扣分数值
+          this.passengersChart.setOption(
+            this.getChartOption(
+              xAxisData,
+              situationRewardData,
+              passengersRewardData
+            )
+          ); //月奖扣人次
         }).finally(() => {
           this.echart_loading = false;
         });
-    },
-    getDataV1(callBack) {
-      this.personalData_loading = true;
-      const data = {
-        employee_id: this.item.id || 0,
-        month: this.formData.month
-      };
-      this.$http("get", "/api/integral/statistics", data).then(res => {
+      },
+      getDataV1(callBack) {
+        this.personalData_loading = true;
+        const data = {
+          employee_id: this.item.id || 0,
+          month: this.formData.month
+        };
+        this.$http("get", "/api/integral/statistics", data).then(res => {
           this.personalData = res.data.data;
-      }).finally(() => {
-        this.personalData_loading = false;
-      });
-    },
-    // 递归判断列表，把最后的children设为undefined
-    getTreeData(data) {
-      for (var i = 0; i < data.length; i++) {
-        if (data[i].children.length < 1) {
-          // children若为空数组，则将children设为undefined
-          data[i].children = undefined;
-        } else {
-          // children若不为空数组，则继续 递归调用 本方法
-          this.getTreeData(data[i].children);
+        }).finally(() => {
+          this.personalData_loading = false;
+        });
+      },
+      // 递归判断列表，把最后的children设为undefined
+      getTreeData(data) {
+        for (var i = 0; i < data.length; i++) {
+          if (data[i].children.length < 1) {
+            // children若为空数组，则将children设为undefined
+            data[i].children = undefined;
+          } else {
+            // children若不为空数组，则继续 递归调用 本方法
+            this.getTreeData(data[i].children);
+          }
         }
+        return data;
       }
-      return data;
+    },
+    mounted() {
+      if (localStorage.getItem("dept_tree")) {
+        this.dept_tree = this.getTreeData(
+          JSON.parse(localStorage.getItem("dept_tree"))
+        );
+        this.dept_trees = this.getTreeData(
+          JSON.parse(localStorage.getItem("dept_tree"))
+        );
+      }
+
+      this.get_list();
+      this.get_last();
     }
-  },
-  mounted() {
-    if (localStorage.getItem("dept_tree")) {
-      this.dept_tree = this.getTreeData(
-        JSON.parse(localStorage.getItem("dept_tree"))
-      );
-      this.dept_trees = this.getTreeData(
-        JSON.parse(localStorage.getItem("dept_tree"))
-      );
+  };
+</script>
+<style scoped lang="scss">
+  .search_box {
+    /deep/ button:active {
+      background: #26a2ff;
     }
 
-    this.get_list();
-    this.get_last();
+    /deep/ button:active .el-icon-search {
+      color: #fff;
+    }
   }
-};
-</script>
-<style scoped lang="scss">
-.search_box {
-  /deep/ button:active {
-    background: #26a2ff;
+
+  .date-picker-width {
+    width: 100% !important;
   }
-  /deep/ button:active .el-icon-search {
-    color: #fff;
+
+  .color_green {
+    color: #67c23a;
   }
-}
-.date-picker-width {
-  width: 100% !important;
-}
-.color_green {
-  color: #67c23a;
-}
-.nopoint_box {
-  display: inline-block;
-  text-align: center;
-  width: 100%;
-  margin-bottom: 10px;
-}
-.noimg {
-  display: inline-block;
-  width: 110px;
-  height: 110px;
-  margin: 22px auto 16px;
-  /* background:url(/images/nodata_default.png) no-repeat center; */
-  background-size: 99%;
-}
-.noperson {
-  display: inline-block;
-  width: 110px;
-  height: 110px;
-  line-height: none;
-  margin: 22px auto 16px;
-  background: url(/images/noperson_default.png) no-repeat center;
-  background-size: 99%;
-}
-.title {
-  display: block;
-  text-align: center;
-  font-size: 12px !important;
-  line-height: 30px;
-  color: #909399 !important;
-  padding: 0;
-}
-.nopoint_box a {
-  color: #26a2ff;
-}
-.chart_content {
-  height: 90vh;
-  overflow-y: auto;
-  overflow-x: hidden;
-  .chart-legend__wrap {
-    text-align: right;
-    padding: 20px;
-    padding-right: 50px;
-    & .chart-legend__pink {
-      position: relative;
-      padding-left: 12px;
-      padding-right: 5px;
-      &:after {
-        content: "";
-        position: absolute;
-        margin-top: -2px;
-        top: 35%;
-        left: 0;
-        width: 8px;
-        height: 8px;
-        background: #f56c6c;
-        border-radius: 100%;
+
+  .nopoint_box {
+    display: inline-block;
+    text-align: center;
+    width: 100%;
+    margin-bottom: 10px;
+  }
+
+  .noimg {
+    display: inline-block;
+    width: 110px;
+    height: 110px;
+    margin: 22px auto 16px;
+    /* background:url(/images/nodata_default.png) no-repeat center; */
+    background-size: 99%;
+  }
+
+  .noperson {
+    display: inline-block;
+    width: 110px;
+    height: 110px;
+    line-height: none;
+    margin: 22px auto 16px;
+    background: url(/images/noperson_default.png) no-repeat center;
+    background-size: 99%;
+  }
+
+  .title {
+    display: block;
+    text-align: center;
+    font-size: 12px !important;
+    line-height: 30px;
+    color: #909399 !important;
+    padding: 0;
+  }
+
+  .nopoint_box a {
+    color: #26a2ff;
+  }
+
+  .chart_content {
+    height: 90vh;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    .chart-legend__wrap {
+      text-align: right;
+      padding: 20px;
+      padding-right: 50px;
+
+      & .chart-legend__pink {
+        position: relative;
+        padding-left: 12px;
+        padding-right: 5px;
+
+        &:after {
+          content: "";
+          position: absolute;
+          margin-top: -2px;
+          top: 35%;
+          left: 0;
+          width: 8px;
+          height: 8px;
+          background: #f56c6c;
+          border-radius: 100%;
+        }
       }
-    }
 
-    & .chart-legend__green {
-      position: relative;
-      padding-left: 12px;
-      &:after {
-        content: "";
-        position: absolute;
-        margin-top: -2px;
-        top: 35%;
-        left: 0;
-        width: 8px;
-        height: 8px;
-        background: #53b87f;
-        border-radius: 100%;
+      & .chart-legend__green {
+        position: relative;
+        padding-left: 12px;
+
+        &:after {
+          content: "";
+          position: absolute;
+          margin-top: -2px;
+          top: 35%;
+          left: 0;
+          width: 8px;
+          height: 8px;
+          background: #53b87f;
+          border-radius: 100%;
+        }
       }
     }
   }
-}
-
-// 滚动条样式
-.chart_content::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 5px rgb(255, 255, 255);
-  border-radius: 5px;
-  background-color: rgb(255, 255, 255);
-}
-.chart_content::-webkit-scrollbar {
-  width: 5px;
-  background-color: rgba(201, 201, 201, 0);
-}
-.chart_content::-webkit-scrollbar-thumb {
-  border-radius: 5px;
-  -webkit-box-shadow: inset 0 0 5px rgb(153, 145, 145) (160, 154, 154);
-  background-color: rgb(168, 167, 167);
-}
-
-.dataItem {
-  text-align: center;
-  .point {
-    font-size: 22px;
-    color: #26a2ff;
-    margin: 10px 0;
+
+  // 滚动条样式
+  .chart_content::-webkit-scrollbar-track {
+    -webkit-box-shadow: inset 0 0 5px rgb(255, 255, 255);
+    border-radius: 5px;
+    background-color: rgb(255, 255, 255);
+  }
+
+  .chart_content::-webkit-scrollbar {
+    width: 5px;
+    background-color: rgba(201, 201, 201, 0);
+  }
+
+  .chart_content::-webkit-scrollbar-thumb {
+    border-radius: 5px;
+    -webkit-box-shadow: inset 0 0 5px rgb(153, 145, 145) (160, 154, 154);
+    background-color: rgb(168, 167, 167);
+  }
+
+  .dataItem {
+    text-align: center;
+
+    .point {
+      font-size: 22px;
+      color: #26a2ff;
+      margin: 10px 0;
+    }
+
+    .target {
+      font-size: 12px;
+      color: #909399;
+    }
+  }
+
+  .drawer_title {
+    font-size: 18px;
+    padding: 20px;
+  }
+
+  .manager_statistics_box {
+    background-color: #ffffff;
+    padding: 20px;
+    min-height: calc(100vh - 160px);
+
+    /deep/ .el-row .el-checkbox .el-checkbox__label {
+      line-height: 20px;
+    }
   }
-  .target {
+
+  .tips {
+    background: #409eff;
+    border-radius: 50%;
+    width: 14px;
+    height: 14px;
+    color: #fff;
+    display: inline-block;
     font-size: 12px;
-    color: #909399;
+    line-height: 14px;
+    text-align: center;
   }
-}
-.drawer_title {
-  font-size: 18px;
-  padding: 20px;
-}
-.manager_statistics_box {
-  background-color: #ffffff;
-  padding: 20px;
-  min-height: calc(100vh - 160px);
-  /deep/ .el-row .el-checkbox .el-checkbox__label {
-    line-height: 20px;
+
+  .el-form-item__label {
+    width: 0px !important;
+  }
+
+  // .persons_names{
+  // 	margin-left: 160px;
+  // }
+  .wlj {
+    & .color_green {
+      color: #49d3a7;
+    }
+
+    & .color_red {
+      color: #f04b56;
+    }
   }
-}
-.tips {
-  background: #409eff;
-  border-radius: 50%;
-  width: 14px;
-  height: 14px;
-  color: #fff;
-  display: inline-block;
-  font-size: 12px;
-  line-height: 14px;
-  text-align: center;
-}
-.el-form-item__label {
-  width: 0px !important;
-}
-
-// .persons_names{
-// 	margin-left: 160px;
-// }
-.wlj {
-  & .color_green {
-    color: #49d3a7;
+
+  b {
+    font-size: 14px;
   }
-  & .color_red {
-    color: #f04b56;
+
+  .span_h {
+    font-size: 13px;
+    color: #898c94;
   }
-}
-b {
-  font-size: 14px;
-}
-.span_h {
-  font-size: 13px;
-  color: #898c94;
-}
 </style>

src/views/statistics_new/total_rank.vue

@@ -37,6 +37,14 @@
             <span style="line-height: 50px; padding-left: 10px;"><WWOpenData type="userName" :openid="scope.row.employee_name"></WWOpenData></span>
           </template>
         </el-table-column>
+        <el-table-column label="部门">
+          <template slot-scope="scope">
+            <div class="flex-box-ce" v-if="scope.row.dept_list.length>0">
+              <span v-for="item in scope.row.dept_list" :key="item" style="padding-right: 6px;"><WWOpenData type="departmentName" :openid="item"></WWOpenData></span>
+            </div>
+            <span v-else class="fontColorB">--</span>
+          </template>
+        </el-table-column>
         <el-table-column label="B分" align="left" prop="point"></el-table-column>
         <template slot="empty">
           <div class="nopoint_box">
@@ -61,7 +69,7 @@
     </div>
 
     <!-- 导出弹窗 -->
-    <el-dialog title="导出排名" :visible.sync="dialogVisible" width="730px">
+    <el-dialog :modal-append-to-body="false" title="导出排名" :visible.sync="dialogVisible" width="730px">
       <div style="font-size:15px;margin-top:20px;"><span>系统将按以下已选条件导出对应的排名报表 </span>
           <el-checkbox v-model="deriveAgePolyethism" style="margin-left:20px;"><b>只看工龄分</b></el-checkbox></div>
       <el-form :inline="true">

src/views/workbench/grade/apply_list.vue

@@ -115,7 +115,7 @@
       ></el-pagination>
     </center>
 
-    <el-drawer :visible.sync="detailShow" :with-header="false" :size="'600px'">
+    <el-drawer :modal-append-to-body="false" :visible.sync="detailShow" :with-header="false" :size="'600px'">
       <div class="drawer_title">申请详情</div>
       <div class="detail_popup" v-loading="detail_loading" v-if=" detail_info!== null">
         <el-row :gutter="10" style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">

src/views/workbench/grade/award_punish.vue

@@ -84,7 +84,7 @@
       ></el-pagination>
     </center>
 
-    <el-drawer title="奖扣详情" :visible.sync="drawer" ref="drawer" :with-header="false" :size="'600px'" direction="rtl">
+    <el-drawer title="奖扣详情" :modal-append-to-body="false" :visible.sync="drawer" ref="drawer" :with-header="false" :size="'600px'" direction="rtl">
       <div class="drawer_title">奖扣详情</div>
       <div class="detail_popup" v-loading="detail_loading" v-if="detail_info !== null">
         <el-row :gutter="10" style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">
@@ -174,7 +174,7 @@
       </div>
     </el-drawer>
 
-    <el-drawer title="奖扣详情" :visible.sync="detailShow" :with-header="false" :size="'600px'" direction="rtl">
+    <el-drawer title="奖扣详情" :modal-append-to-body="false" :visible.sync="detailShow" :with-header="false" :size="'600px'" direction="rtl">
       <div class="drawer_title">奖扣详情</div>
       <div class="detail_popup" v-loading="detail_loading" v-if="detail_info !== null">
         <el-row :gutter="10" style="padding-bottom:10px;border-bottom:1px #f8f8f8 solid;">

src/views/workbench/grade/award_punish_BF.vue

@@ -43,7 +43,7 @@
       <template slot="empty">
         <noData></noData>
       </template>
-      
+
     </el-table>
 
     <el-table v-if="tabs !=='success'" :data="dataList" stripe fit v-loading="table_loading" @row-click="open_detail1" >
@@ -68,7 +68,7 @@
       <template slot="empty">
         <noData></noData>
       </template>
-      
+
     </el-table>
 
     <center style="margin-top: 15px;" >
@@ -89,6 +89,7 @@
       :visible.sync="drawer"
       ref="drawer"
       :with-header="false"
+      :modal-append-to-body="false"
       :size="'600px'"
       direction="rtl">
       <div class="drawer_title">奖扣详情</div>
@@ -169,7 +170,7 @@
                   <userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
                 </template>
                 <template slot="title">
-                  <div style="color: #303133;font-size:14px;margin-top:-2px;"><WWOpenData type="userName" :openid="item.name"></WWOpenData> {{item.remark}} 
+                  <div style="color: #303133;font-size:14px;margin-top:-2px;"><WWOpenData type="userName" :openid="item.name"></WWOpenData> {{item.remark}}
                     <!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
                    </div>
                 </template>
@@ -185,6 +186,7 @@
       title="奖扣详情"
       :visible.sync="detailShow"
       :with-header="false"
+      :modal-append-to-body="false"
       :size="'600px'"
       direction="rtl">
       <div class="drawer_title">奖扣详情</div>
@@ -228,7 +230,7 @@
 
           <el-col :span="20" v-else>{{item.value}}</el-col>
         </el-row>
-        
+
         <el-row :gutter="10" :v-if="detail_info.files">
           <el-col v-for="(item,index) in detail_info.files" :key="index" :span="4">{{index == 0?'图片':''}}</el-col>
           <el-col :span="20">
@@ -251,7 +253,7 @@
                   <userImage width="36px" height="36px" :img_url="item.img_url" :user_name="item.name"></userImage>
                 </template>
                 <template slot="title">
-                  <div style="color: #303133;font-size:14px;margin-top:-2px;"><WWOpenData type="userName" :openid="item.name"></WWOpenData> {{item.remark}} 
+                  <div style="color: #303133;font-size:14px;margin-top:-2px;"><WWOpenData type="userName" :openid="item.name"></WWOpenData> {{item.remark}}
                     <!-- <span v-show="item.point !== 0">{{item.point}}</span> -->
                   </div>
                 </template>
@@ -390,7 +392,7 @@
             return this.employee_name[key].name
           }
         }
-      }, 
+      },
       open_detail1(item){
         let self = this
         self.detailShow = true

src/views/workbench/task/get_task.vue

@@ -78,6 +78,7 @@
         :custom-class="'drawer_details'"
         :visible.sync="detailShow"
         :with-header="false"
+        :modal-append-to-body="false"
         size="500px">
         <div class="details_title">任务详情</div>
         <div class="details_content" v-loading="detail_loading">

src/views/workbench/task/my_task.vue

@@ -88,6 +88,7 @@
       :visible.sync="completeShow"
       wrapperClosable
       :with-header="false"
+      :modal-append-to-body="false"
       size="500px">
       <div class="details_title">完成任务</div>
       <div class="details_content">