推

attendance-performance-manager-ui/admin/src/assets/mixins/table.js

@@ -24,8 +24,13 @@ export default {
         delete this.query.year;
       }
       if (this.query.createTimeMonth == undefined) {
-        delete this.query.createTimeStart;
-        delete this.query.createTimeEnd;
+        if (this.query.createTimeStart1 || this.query.createTimeEnd1) {
+          this.query.createTimeEnd = this.query.createTimeEnd1;
+          this.query.createTimeStart = this.query.createTimeStart1;
+        } else {
+          delete this.query.createTimeStart;
+          delete this.query.createTimeEnd;
+        }
       }
       this.getData();
     },
@@ -80,7 +85,7 @@ export default {
         return;
       }
       this.tableData.loading = true;
-
+      console.log(this.query);
       this.$post(this.pageInfo.list, this.query, {
         cancelToken: this.source.token,
       })

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -111,7 +111,7 @@
           v-if="item.type === 'date' && !item.valueFormat"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择日期"
+          :placeholder="item.label ? item.label : '选择日期'"
         >
         </el-date-picker>
 
@@ -120,7 +120,7 @@
           v-if="item.type === 'date' && item.valueFormat"
           type="date"
           :value-format="item.valueFormat"
-          placeholder="选择日期"
+          :placeholder="item.label ? item.label : '选择日期'"
         >
         </el-date-picker>
 
@@ -352,6 +352,9 @@ export default {
       if (this.form.createTimeMonth) {
         this.form.createTimeStart = this.form.createTimeMonth + "-01";
         this.form.createTimeEnd = this.form.createTimeMonth + "-31";
+      } else if (this.form.createTimeStart1 || this.form.createTimeEnd1) {
+        this.form.createTimeStart = this.form.createTimeStart1;
+        this.form.createTimeEnd = this.form.createTimeEnd1;
       } else {
         this.form.createTimeStart = undefined;
         this.form.createTimeEnd = undefined;
@@ -397,18 +400,24 @@ export default {
       let data = this.decode(params);
 
       // Object.assign({}, query, data)
-      console.log({
-        ...query,
-        ...data,
-      });
+
       if (!query.yearmonth) {
         query.year = undefined;
         query.month = undefined;
       }
       if (!query.createTimeMonth) {
-        query.createTimeEnd = undefined;
-        query.createTimeStart = undefined;
+        if (query.createTimeStart1 || query.createTimeEnd1) {
+          query.createTimeEnd = query.createTimeEnd1;
+          query.createTimeStart = query.createTimeStart1;
+        } else {
+          query.createTimeEnd = undefined;
+          query.createTimeStart = undefined;
+        }
       }
+      console.log({
+        ...query,
+        ...data,
+      });
       this.$router.push({
         path: path,
         query: {

attendance-performance-manager-ui/admin/src/views/attendance/leave/record/list.vue

@@ -94,13 +94,13 @@ export default {
             label: "请假类型",
           },
           {
-            name: "createTimeStart",
+            name: "createTimeStart1",
             type: "date",
             label: "开始时间",
             fuzzy: false,
           },
           {
-            name: "createTimeEnd",
+            name: "createTimeEnd1",
             type: "date",
             label: "结束时间",
             fuzzy: false,