'1.1.2.4'

src/home.vue

@@ -1277,92 +1277,92 @@ export default {
 		window.removeEventListener('resize', this.selfAdaption); //取消echarts自适应
 	},
 	created() {
-	// var user = {
-    //   accedence_time: "2020-12-26 15:04:33",
-    //   company_id: '',
-    //   company_info: { creator_ids: [167], id: 15, industry: '计算机软件', is_official: 1, logo_url: '', name: '测试组织', status: 1, user_count_max: 50 },
-    //   employee_detail: {
-    //     dept_list: [],
-    //     manage_scope: [{"id": 164,"name": "刘瑞欣"},{"id": 165,"name": "方慧毅"},{"id": 166,"name": "郭家裕（创始人）"},{"id": 184,"name": "莫仕钊"},{"id": 185,"name": "秦杨升"}],
-    //     permission_list: [],
-    //     role_list: [
-    //       { id: 15, name: 'employee', remark: '员工' },
-    //       { id: 12, name: 'admin', remark: '公司管理员' },
-    //       { id: 14, name: 'dept_manager', remark: '部门管理者' },
-    //       { id: 13, name: 'point_manager', remark: '积分管理员' },
-    //     //   { id: 11, name: 'creator', remark: '创始人' }
-    //     ],
-    //     superior_list: [{id: 164,name: "刘瑞欣"},
-	// 			{id: 165,name: "方慧毅"},
-	// 			{id: 166,name: "郭家裕（创始人）"},
-	// 			{id: 184,name: "莫仕钊"},
-	// 			{id: 185,name: "秦杨升"},
-	// 			{id: 187,name: "梁丽焕"},
-	// 			{id: 188,name: "刘俊华"},{id: 167,name: "蔡文"}]
-    //   },
-    //   id: 186,
-    //   img_url: "https://static-legacy.dingtalk.com/media/lADPBE1Xcf-wCfbNAwvNAwA_768_779.jpg",
-    //   is_admin: 0,
-    //   is_creator: 0,
-    //   is_official: 1,
-    //   is_scope: 1,
-    //   letter_index: 'C',
-    //   name: '程健',
-    //   point_config: {
-    //     deduct_task_monthly: [
-    //       {
-    //         name: "A分",
-    //         point: "0",
-    //         pt_id: 2
-    //       },
-    //       {
-    //         name: "B分",
-    //         point: "0",
-    //         pt_id: 3
-    //       }
-    //     ],
-    //     reward_ratio: 0,
-    //     exec_count: 0,
-    //     exec_count_point: 0,
-    //     reward_ratio_point: 0,
-    //     service_point: 0,
-    //     entry_limit: 1000,
-    //     point_limit: [
-    //       {
-    //         name: "A分",
-    //         point: "200",
-    //         pt_id: 2
-    //       },
-    //       {
-    //         name: "B分",
-    //         point: "100",
-    //         pt_id: 3
-    //       }
-    //     ],
-    //     reward_task_monthly: [
-    //       {
-    //         name: "A分",
-    //         point: "0",
-    //         pt_id: 2
-    //       },
-    //       {
-    //         name: "B分",
-    //         point: "0",
-    //         pt_id: 3
-    //       }
-    //     ],
-    //   },
-    //   post: '',
-    //   site_config: {
-    //     base_point: 120,
-    //     rule_limit_check: 1,
-    //     task_review: 0,
-    //     service_point: 120,
-    //     a2b: 0
-    //   },
-    //   site_id: 15
-    // };
-    // localStorage.setItem('userData',JSON.stringify(user));
+	var user = {
+      accedence_time: "2020-12-26 15:04:33",
+      company_id: '',
+      company_info: { creator_ids: [167], id: 15, industry: '计算机软件', is_official: 1, logo_url: '', name: '测试组织', status: 1, user_count_max: 50 },
+      employee_detail: {
+        dept_list: [],
+        manage_scope: [{"id": 164,"name": "刘瑞欣"},{"id": 165,"name": "方慧毅"},{"id": 166,"name": "郭家裕（创始人）"},{"id": 184,"name": "莫仕钊"},{"id": 185,"name": "秦杨升"}],
+        permission_list: [],
+        role_list: [
+          { id: 15, name: 'employee', remark: '员工' },
+          { id: 12, name: 'admin', remark: '公司管理员' },
+        //   { id: 14, name: 'dept_manager', remark: '部门管理者' },
+        //   { id: 13, name: 'point_manager', remark: '积分管理员' },
+        //   { id: 11, name: 'creator', remark: '创始人' }
+        ],
+        superior_list: [{id: 164,name: "刘瑞欣"},
+				{id: 165,name: "方慧毅"},
+				{id: 166,name: "郭家裕（创始人）"},
+				{id: 184,name: "莫仕钊"},
+				{id: 185,name: "秦杨升"},
+				{id: 187,name: "梁丽焕"},
+				{id: 188,name: "刘俊华"},{id: 167,name: "蔡文"}]
+      },
+      id: 186,
+      img_url: "https://static-legacy.dingtalk.com/media/lADPBE1Xcf-wCfbNAwvNAwA_768_779.jpg",
+      is_admin: 0,
+      is_creator: 0,
+      is_official: 1,
+      is_scope: 1,
+      letter_index: 'C',
+      name: '程健',
+      point_config: {
+        deduct_task_monthly: [
+          {
+            name: "A分",
+            point: "0",
+            pt_id: 2
+          },
+          {
+            name: "B分",
+            point: "0",
+            pt_id: 3
+          }
+        ],
+        reward_ratio: 0,
+        exec_count: 0,
+        exec_count_point: 0,
+        reward_ratio_point: 0,
+        service_point: 0,
+        entry_limit: 1000,
+        point_limit: [
+          {
+            name: "A分",
+            point: "200",
+            pt_id: 2
+          },
+          {
+            name: "B分",
+            point: "100",
+            pt_id: 3
+          }
+        ],
+        reward_task_monthly: [
+          {
+            name: "A分",
+            point: "0",
+            pt_id: 2
+          },
+          {
+            name: "B分",
+            point: "0",
+            pt_id: 3
+          }
+        ],
+      },
+      post: '',
+      site_config: {
+        base_point: 120,
+        rule_limit_check: 1,
+        task_review: 0,
+        service_point: 120,
+        a2b: 0
+      },
+      site_id: 15
+    };
+    localStorage.setItem('userData',JSON.stringify(user));
 	}
 };
 </script>

src/views/abPoint/apply_list.vue

@@ -121,7 +121,7 @@
 							<!-- 优化 -->
 							<div v-for="(item, index) in detail_info.process" :key="index" v-show="item.review_point != 0">
 								<p v-if="detail_info.status == 1">
-									<span
+									<!-- <span
 										v-show="
 											(item.point !== 0 && item.review_point >= 0 && detail_info.item_prize_type == 1) ||
 												(item.point !== 0 && item.review_point >= 0 && detail_info.item_prize_type == -1) ||
@@ -140,6 +140,26 @@
 										style="color:#67C23A;font-size:16px;padding-left:8px"
 									>
 										{{ item.review_point }}
+									</span> -->
+									<span
+										v-show="
+											(item.review_point >= 0 && detail_info.item_prize_type == 1) ||
+												(item.review_point >= 0 && detail_info.item_prize_type == -1) ||
+												(item.review_point >= 0 && detail_info.item_prize_type == 0)
+										"
+										style="color:#f56c6c;font-size:16px;padding-left:8px"
+									>
+										+{{ item.review_point }}
+									</span>
+									<span
+										v-show="
+											(item.review_point <= 0 && detail_info.item_prize_type == 2) ||
+												(item.review_point <= 0 && detail_info.item_prize_type == -1) ||
+												(item.review_point <= 0 && detail_info.item_prize_type == 0)
+										"
+										style="color:#67C23A;font-size:16px;padding-left:8px"
+									>
+										{{ item.review_point }}
 									</span>
 									<span v-show="detail_info.point">
 										{{ detail_info.pt_id == 1 ? '绩效分' : detail_info.pt_id == 2 ? 'A分' : detail_info.pt_id == 3 ? 'B分' : '' }}

src/views/ranking/integral_event.vue

@@ -50,7 +50,7 @@
 				  </el-input>
 			  </el-form-item>
 			  <el-form-item>
-				  <el-button type="success" size="medium" @click="excelImportShow = true" plain>导入数据</el-button>
+				  <el-button v-if="employeeOrdept" type="success" size="medium" @click="excelImportShow = true" plain>导入数据</el-button>
 				  <el-button type="primary" size="medium" @click="exportExcel" plain>导出当前数据</el-button>
 				  <!-- <el-button type="primary" size="medium" plain @click="swiperShow = true">轮播事件</el-button> -->
 			  </el-form-item>
@@ -184,8 +184,8 @@
 									<div style="color: #303133;font-size:14px;margin-top:-2px;">
 										{{ item.name }} {{ item.remark }}
 										<strong v-show="item.point !== 0" style="font-weight: 500;">
-											<span class="color_red point" v-show="item.point >= 0">+{{ item.point }}</span>
-											<span class="color_green point" v-show="item.point < 0">{{ item.point }}</span>
+											<span class="color_red point" v-show="item.review_point >= 0">+{{ item.review_point }}</span>
+											<span class="color_green point" v-show="item.review_point < 0">{{ item.review_point }}</span>
 										</strong>
 									</div>
 								</template>
@@ -196,7 +196,7 @@
 						</el-steps>
 					</div>
 				</div>
-				<div style="position: absolute; bottom: 20px; display: block; right: 20px;">
+				<div v-if="!this.$authoritys('employee')" style="position: absolute; bottom: 20px; display: block; right: 20px;">
 					<el-button @click="close_integral_event">取消</el-button>
 					<el-button type="danger" @click="del_integral_event(detail_info)">删除</el-button>
 				</div>
@@ -299,6 +299,7 @@ export default {
 			error_list: [],
 			importErrorInfoShow: false,
 			fileList: [],
+			employeeOrdept:!this.$authoritys('employee') && !this.$authoritys('dept_manager'),
 		};
 	},
 	components: { noData },

src/views/ranking/manager_statistics.vue

@@ -356,6 +356,7 @@ export default {
         this.condition.complete!=0?data+="&complete="+this.condition.complete:data+="&complete=0"
       //当前页数
         data+="&page="+this.condition.page
+        console.log(data)
 		window.open(process.env.VUE_APP_BASE_API  + "api/download/prize/list/v4?employee_id="+ this.$getUserData().id +  data, "_blank");
         this.dialogVisible = false;
     },

src/views/task/get_task.vue

@@ -14,7 +14,7 @@
           <el-table-column label="截止时间" prop="expire_time"></el-table-column>
           <el-table-column label="操作" prop="owner_id">
             <template slot-scope="scope">
-              <el-link type="primary" :underline='false'>领取任务</el-link>
+              <el-link type="primary" :underline='false'>查看</el-link>
               <!-- <span>{{scope.row.receiver_id == owner_id?'（发布人）':''}}</span> -->
             </template>
           </el-table-column>