walter 1 yıl önce
ebeveyn
işleme
e44f259d22

+ 1 - 0
src/components/Steps.vue

@@ -42,6 +42,7 @@
               <el-descriptions-item label="申请分值">{{item.point ? item.point : ''}}</el-descriptions-item>
               <el-descriptions-item v-if="item.remark != '发起'" label="审批分值">{{item.review_point ? item.review_point : ''}}</el-descriptions-item>
               <el-descriptions-item v-if="item.review_remark" label="备注">{{item.review_remark}}</el-descriptions-item>
+              <el-descriptions-item v-if="item.time" label="时间">{{item.time}}</el-descriptions-item>
             </el-descriptions>
 
 <!--            <div class="fontColorB" style="margin: 5px 0;">{{ item.review_remark }}</div>-->

+ 1 - 1
src/point/views/statistics/integral_event.vue

@@ -395,7 +395,7 @@ export default {
       formData: {
         page: 1,
         page_size: 10,
-
+        add_subtract:0
       },
       time_slot: [this.$moment().startOf('month').format('YYYY-MM-DD'),this.$moment().endOf('month').format('YYYY-MM-DD')],
       rule_trees: [],

+ 8 - 4
src/point/views/statistics/managerStatisticsV2.vue

@@ -174,6 +174,10 @@ export default {
   name:'manager_statistics_v2',
   components: {Template,downloadexcel},
   data(){
+    let startDate = new Date();
+    startDate.setTime(startDate.getTime() - 3600 * 1000 * 24 * 7);
+    startDate = this.$moment(startDate).format('YYYY-MM-DD');
+    let endDate = this.$moment().format('YYYY-MM-DD');
     return {
       tabs:[
         {label:'奖扣目标',name:'target'},
@@ -184,15 +188,15 @@ export default {
       deptTrees: [],
       formData:{
         month: this.$moment().format('YYYY-MM'),
-        startDate: this.$moment().startOf('week').format('YYYY-MM-DD'),
-        endDate: this.$moment().format('YYYY-MM-DD'),
+        startDate: startDate,
+        endDate: endDate,
         deptId: 0,
         keyword: '',
         complete: false
       },
       timeScope:[
-        this.$moment().startOf('week').format('YYYY-MM-DD'),
-        this.$moment().format('YYYY-MM-DD')
+        startDate,
+        endDate
       ],
       dept_name_xq_xq: '',
       target:{