pref:添加绩效工作人员考核统计维度及添加员工关怀，组织管理

src/assets/mixins/table.js

@@ -31,9 +31,36 @@ export default {
   watch: {
     $route(route) {
       this.query = Object.assign({}, this.query, route.query);
+      console.log(this.query);
+
       if (this.query.yearmonth == undefined) {
         delete this.query.month;
+      }
+      if (
+        this.query.yearmonth == undefined &&
+        this.query.yearseason == undefined &&
+        this.query.timeType != 2
+      ) {
         delete this.query.year;
+        delete this.query.month;
+        delete this.query.season;
+      }
+      if (this.query.timeType == 1) {
+        delete this.query.month;
+        delete this.query.yearmonth;
+      }
+      if (this.query.timeType == 0) {
+        delete this.query.season;
+        delete this.query.yearseason;
+      }
+      if (this.query.timeType == 2) {
+        delete this.query.season;
+        delete this.query.yearseason;
+        delete this.query.month;
+        delete this.query.yearmonth;
+      }
+      if (this.query.yearseason == undefined) {
+        delete this.query.season;
       }
       if (this.query.createTimeMonth == undefined) {
         if (this.query.createTimeStart1 || this.query.createTimeEnd1) {

src/components/SearchForm.vue

@@ -51,6 +51,28 @@
             :key="value"
           ></el-option>
         </el-select>
+        <el-select
+          v-model="form[item.name]"
+          :filterable="item.filterable"
+          :multiple="item.multiple"
+          :clearable="true"
+          @change="handleChange"
+          @clear="item.clear && item.clear"
+          v-if="item.type === 'timeType'"
+          :placeholder="'请选择' + item.label"
+        >
+          <!-- <el-option
+            label=""
+            value=""
+            v-if="!item.multiple && !item.notShowAll"
+          ></el-option> -->
+          <el-option
+            :label="label"
+            :value="value"
+            v-for="(label, value) in timeDict"
+            :key="value"
+          ></el-option>
+        </el-select>
         <el-select
           v-model="form[item.name]"
           :filterable="item.filterable"
@@ -180,7 +202,26 @@
           :placeholder="item.label ? item.label : '选择月份'"
         >
         </el-date-picker>
-
+        <el-date-picker
+          v-model="form[item.name]"
+          v-if="
+            item.type === 'yearmonth' &&
+            !item.valueFormat &&
+            form['timeType'] == 0
+          "
+          type="month"
+          value-format="yyyy-MM"
+          :placeholder="item.label ? item.label : '选择月份'"
+        >
+        </el-date-picker>
+        <el-date-picker
+          v-model="form[item.name]"
+          v-if="item.type === 'year' && form['timeType'] == 2"
+          type="year"
+          value-format="yyyy"
+          :placeholder="item.label ? item.label : '选择年份'"
+        >
+        </el-date-picker>
         <el-date-picker
           v-model="form[item.name]"
           v-if="item.type === 'datetime'"
@@ -189,6 +230,11 @@
           :placeholder="item.label"
         >
         </el-date-picker>
+        <el-quarter-picker
+          v-model="form[item.name]"
+          placeholder="选择季度"
+          v-if="item.type === 'season' && form['timeType'] == 1"
+        />
       </el-form-item>
 
       <el-form-item>
@@ -231,7 +277,10 @@ import {
   getLastDay,
   timestampToTime,
 } from "@/assets/utils/dateFormat.js";
+
+import ElQuarterPicker from "./ElQuarterPicker";
 export default {
+  components: { ElQuarterPicker },
   props: {
     search: {
       type: Array,
@@ -286,6 +335,18 @@ export default {
     this.initForm(this.$route.query);
   },
   methods: {
+    handleChange() {
+      this.form.year = undefined;
+      this.form.month = undefined;
+      this.form.season = undefined;
+      this.form.yearseason = undefined;
+      this.form.yearmonth = undefined;
+      delete this.$route.query.year;
+      delete this.$route.query.month;
+      delete this.$route.query.season;
+      delete this.$route.query.yearseason;
+      delete this.$route.query.yearmonth;
+    },
     salaChange() {
       this.form.deptId = "";
       this.$get("/dept/getDeptBySalaId", { salaId: this.form.salaId })
@@ -471,6 +532,9 @@ export default {
       });
 
       delete this.$route.query.yearmonth;
+      delete this.$route.query.year;
+      delete this.$route.query.season;
+      delete this.$route.query.yearseson;
       delete this.$route.query.createTimeMonth;
       delete this.$route.query.orderColList;
 
@@ -496,10 +560,20 @@ export default {
         this.form.year = arr[0];
         this.form.month = arr[1];
       } else {
-        this.form.year = undefined;
         this.form.month = undefined;
       }
-
+      if (this.form.year) {
+        this.form.year = this.form.year;
+      } else {
+        this.form.year = undefined;
+      }
+      if (this.form.yearseason) {
+        let arr = this.form.yearseason.split("-");
+        this.form.year = arr[0];
+        this.form.season = arr[1];
+      } else {
+        this.form.season = undefined;
+      }
       if (this.form.createTimeMonth) {
         // this.form.createTimeStart = this.form.createTimeMonth + "-01";
         // this.form.createTimeEnd = this.form.createTimeMonth + "-31";
@@ -596,11 +670,25 @@ export default {
       let data = this.decode(params);
 
       // Object.assign({}, query, data)
+      // if (query.timeType) {
+      //   if (!query.yearmonth) {
+      //     query.year = undefined;
+      //     query.month = undefined;
+      //   }
+      //   if (!query.year) {
+      //     query.year = undefined;
+      //   }
+      //   if (!query.yearseason) {
+      //     query.year = undefined;
+      //     query.season = undefined;
+      //   }
+      // } else {
+      //   if (!query.yearmonth) {
+      //     query.year = undefined;
+      //     query.month = undefined;
+      //   }
+      // }
 
-      if (!query.yearmonth) {
-        query.year = undefined;
-        query.month = undefined;
-      }
       if (!query.createTimeMonth) {
         if (query.createTimeStart1 || query.createTimeEnd1) {
           query.createTimeEnd = query.createTimeEnd1;
@@ -613,10 +701,13 @@ export default {
         }
       }
 
-      console.log({
+      console.log(
+        {
           ...query,
           ...data,
-      });
+        },
+        123123123123
+      );
       this.$router.push({
         path: path,
         query: {
@@ -712,6 +803,11 @@ export default {
       visible: false,
       salaArr: [],
       deptArr: [],
+      timeDict: {
+        0: "按月",
+        1: "按季度",
+        2: "按年",
+      },
     };
   },
 };

src/components/SearchFormDrawer.vue

@@ -476,6 +476,8 @@ export default {
       });
 
       delete this.$route.query.yearmonth;
+      delete this.$route.query.yearseason;
+      delete this.$route.query.year;
       delete this.$route.query.createTimeMonth;
       delete this.$route.query.orderColList;
       this.form = Object.assign({}, this.form, newData);

src/views/check/window/workman/perform/list.vue

 <template>
   <div class="page">
-    <div class="btn_box" style="position: absolute;top: 54px;left: 10px;">
+    <div class="btn_box" style="position: absolute; top: 54px; left: 10px">
       <el-radio-group v-model="radio1" @input="changeRadio">
         <el-radio-button label="1">窗口考核</el-radio-button>
         <el-radio-button label="2">工作人员考核</el-radio-button>
@@ -35,6 +35,7 @@ export default {
   mixins: [table],
   created() {
     // this.getData();
+    console.log(this.tableData);
   },
   methods: {
     /** 重写新增方法 */
@@ -77,6 +78,9 @@ export default {
         ? this.$router.push("/check/window/workman/perform/detail/list?page=1")
         : "";
     },
+    changeTime() {
+      console.log(123);
+    },
   },
   data() {
     return {
@@ -103,10 +107,27 @@ export default {
             label: "核查状态",
             fuzzy: false,
           },
+          {
+            name: "timeType",
+            type: "timeType",
+            label: "核查类型",
+          },
           {
             name: "yearmonth",
-            type: "month",
-            label: "请选择登记年月",
+            type: "yearmonth",
+            label: "请选择考核年月",
+            fuzzy: false,
+          },
+          {
+            name: "year",
+            type: "year",
+            label: "请选择考核年",
+            fuzzy: false,
+          },
+          {
+            name: "yearseason",
+            type: "season",
+            label: "请选择考核季度",
             fuzzy: false,
           },
           {

src/views/dept/list.vue

@@ -26,6 +26,7 @@ export default {
     return {
       // 表格配置项
       config: {
+        isshowTabPane: true,
         /** 树表是否默认展开 */
         expand: true,
         showType: "treetable",

src/views/login/login.vue

@@ -33,7 +33,7 @@
             native-type="submit"
             :loading="loading"
             @click="onSubmit"
-            style="font-size: 20px;"
+            style="font-size: 20px"
             >登录</el-button
           >
         </el-form-item>
@@ -88,6 +88,8 @@ export default {
       // createSocket("ws://"+process.env.VUE_APP_BASE_API +"/ws?accessToken="+data.id)
     },
     loginFail(error) {
+      console.log(error);
+
       this.loading = false;
       //this.refreshCode();
       this.$message.error(error.message);

src/views/window/perform/summary/list.vue

@@ -104,7 +104,7 @@ import table from "@/assets/mixins/table";
 import { timestampToTime } from "@/assets/utils/dateFormat.js";
 
 export default {
-  name: "StaffPerformSummaryList",
+  name: "WindowPerformSummaryList",
   components: {
     dialogShow,
   },