合并

src/main.js

@@ -21,7 +21,7 @@ Vue.use(print)
 
 // 头像
 import userImage from '@/components/UserImage'
-import NoData from '@/components/NoData'
+import NoData from '@/components/noData'
 import BrawerBox from '@/components/BrawerBox';
 import FormBox from '@/components/FormBox';
 Vue.component('BrawerBox', BrawerBox)

src/views/ranking/dept_rank.vue

@@ -366,7 +366,49 @@ export default {
 							const endDate = new Date(now.getFullYear(), now.getMonth(), 0);
 							picker.$emit('pick', [moment(startDate.getTime()).format('YYYY-MM-DD'), moment(endDate.getTime()).format('YYYY-MM-DD')]);
 						}
-					}
+					},
+          {
+            text: '一季度',
+            onClick(picker){
+              let year = moment().year()
+              let startDate = year + "-01-01"
+              let endDate = year + "-03-31"
+              picker.$emit('pick',[startDate,endDate])
+            }
+          },
+          {
+            text: '二季度',
+            onClick(picker){
+              let year = moment().year()
+              let startDate = year + "-04-01"
+              let endDate = year + "-06-30"
+              picker.$emit('pick',[startDate,endDate])
+            }
+          },
+          {
+            text: '三季度',
+            onClick(picker){
+              let year = moment().year()
+              let startDate = year + "-07-01"
+              let endDate = year + "-09-30"
+              picker.$emit('pick',[startDate,endDate])
+            }
+          },
+          {
+            text: '四季度',
+            onClick(picker){
+              let year = moment().year()
+              let startDate = year + "-10-01"
+              let endDate = year + "-12-31"
+              picker.$emit('pick',[startDate,endDate])
+            }
+          },
+          {
+            text: '本年',
+            onClick(picker){
+              picker.$emit('pick',[moment().startOf('year').format('YYYY-MM-DD'),moment().endOf('year').format('YYYY-MM-DD')])
+            }
+          },
 				],
                 onPick: (obj) => {
 					if(!this.dialogVisible){

src/views/ranking/total_rank.vue

@@ -95,18 +95,18 @@
 							placeholder="全公司"
 						></el-cascader>
 					</el-form-item>
-					<el-form-item label="时间范围">
-						<el-date-picker
-							v-model="Dc_Data.value1"
-							type="daterange"
-							 size="medium"
-							value-format="yyyy-MM-dd"
-							format="yyyy-MM-dd"
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-						></el-date-picker>
-					</el-form-item>
+<!--					<el-form-item label="时间范围">-->
+<!--						<el-date-picker-->
+<!--							v-model="Dc_Data.value1"-->
+<!--							type="daterange"-->
+<!--							 size="medium"-->
+<!--							value-format="yyyy-MM-dd"-->
+<!--							format="yyyy-MM-dd"-->
+<!--							range-separator="至"-->
+<!--							start-placeholder="开始日期"-->
+<!--							end-placeholder="结束日期"-->
+<!--						></el-date-picker>-->
+<!--					</el-form-item>-->
 				</el-form>
 
 			<span slot="footer" class="dialog-footer">
@@ -201,10 +201,10 @@ export default {
 			}
 			this.Dc_Data.rule_id = rule_id;
 			let data = '';
-			if (this.Dc_Data.value1) {
-				data += '&start_date=' + this.Dc_Data.value1[0];
-				data += '&end_date=' + this.Dc_Data.value1[1];
-			}
+			// if (this.Dc_Data.value1) {
+			// 	data += '&start_date=' + this.Dc_Data.value1[0];
+			// 	data += '&end_date=' + this.Dc_Data.value1[1];
+			// }
 			data += '&position=' + this.Dc_Data.DC_position;
 			this.Dc_Data.dept_name > 0 ? (data += '&dept_id=' + this.Dc_Data.dept_name) : (data += '&dept_id=0');
 			if (this.Dc_Data.rule_id.length > 0) {

src/views/workbench/review.vue

@@ -105,7 +105,13 @@
 						<el-input size="medium" clearable max="20" v-model="formData.keyword" placeholder="请输入"></el-input>
 					</div>
 				</div>
-				
+<!--				<div class="form-item">-->
+<!--					<div class="form-label">分值查询</div>-->
+<!--					<div class="form-search">-->
+<!--						<el-input size="medium" type="number" clearable v-model="formData.point" placeholder="请输入"></el-input>-->
+<!--					</div>-->
+<!--				</div>-->
+
 
 			</FormBox>
 			<div style="padding: 10px 0;position: relative;z-index: 1;background-color: #fff;" v-if="active=='review'">
@@ -418,6 +424,7 @@ export default {
 				page_size: 10,
 				dc_status:JSON.stringify([0]),
 				is_enable:1,
+        point:''
 			},
 			time_slot: null,
 			rule_trees: [],
@@ -516,6 +523,13 @@ export default {
 				this.get_integral_list(this.formData);
 			}, 1000)
 		},
+    'formData.point':{
+      deep: true,
+      handler: _debounce(function(v){
+        this.formData.page = 1;
+        this.get_integral_list(this.formData)
+      },1000)
+    },
 		'formData.is_enable'(val, old_val) {
 			this.formData.page = 1;
 			this.get_integral_list(this.formData);