'1.1.2.7'

src/components/season.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <span @click="showDoubleMonth">
-      <el-input v-model="choseQuarter" prefix-icon="el-icon-date" placeholder="请选择" />
+      <el-input v-model="choseQuarter" prefix-icon="el-icon-date" :placeholder="defaultHint?yearFullMonth+'年 '+defaultQuarter:'请选择'" />
     </span>
     <div v-show="showTime1a" class="show1">
       <p>
@@ -21,10 +21,14 @@
 </template>
 
 <script>
+import moment from "moment";
   export default {
     name: 'season',
     data() {
       return {
+        defaultQuarter:'',
+        quarterFullMonth:moment().format("Q"),//默认
+        yearFullMonth:moment().format("YYYY"),//默认
         value: '',
         showTime2: false,
         showTime1a: false,
@@ -38,9 +42,21 @@
       isActive:{
         type:Boolean,
         default:false
+      },
+      defaultHint:{
+        type:Boolean,
+        default:false
       }
     },
     mounted() {
+      if(this.defaultHint){
+        this.defaultQuarter =this.quarterFullMonth == '1'?
+        '第一季度':this.quarterFullMonth == '2'?
+        '第二季度':this.quarterFullMonth == '3'?
+        '第三季度':this.quarterFullMonth == '4'?
+        '第四季度':''
+      }
+      
       if(!this.isActive){
         var date=new Date().getMonth()+1;
         var arrs=this.fullMonth;

src/views/ranking/custom_rank.vue

@@ -136,7 +136,7 @@
         <el-form-item label="分组名称" prop="group_name"><el-input v-model="newGroupForm.group_name" placeholder="请输入分组名称" auto-complete="off"></el-input></el-form-item>
 
         <el-form-item label="分组成员" :required="true">
-          <el-input auto-complete="off" v-model="employees" placeholder="全公司成员"></el-input>
+          <el-input auto-complete="off" v-model="employees" placeholder="请选择分组成员"></el-input>
           <div @click="isEmployeeShow = true" style=" position: absolute; top: 0; right: 0; left: 0; bottom: 0; z-index: 9;"></div>
           <!-- <EmployeeSelector
             :employee_not_select="employee_not_select"
@@ -370,7 +370,7 @@ export default {
       clickItem: null,
       groupShow: false,
       rules: {
-        // group_name: [{ required: true, message: '请输入分组名称', trigger: 'blur' }, { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }]
+        group_name: [{ required: true, message: '请输入分组名称', trigger: 'blur' }, { min: 3, max: 10, message: '长度在 3 到 10 个字符', trigger: 'blur' }],
         // employees:[
         // 	{ required: true, message: '请选择成员', trigger: 'blur' },
         // ],
@@ -746,7 +746,6 @@ export default {
             self.newGroupForm.group_name = res.data.data.name;
             this.loading = false;
             if (!ifs) {
-              console.log("123")
               this.open_right(item);
             }
           } else {