Merge remote-tracking branch 'origin/master'

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

@@ -38,11 +38,11 @@
           v-if="item.type === 'select'"
           :placeholder="'请选择' + item.label"
         >
-          <el-option
-            label="全部"
+          <!-- <el-option
+            label=""
             value=""
             v-if="!item.multiple && !item.notShowAll"
-          ></el-option>
+          ></el-option> -->
           <el-option
             :label="label"
             :value="value"

attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue

@@ -63,7 +63,9 @@
         </div>
       </div>
       <div class="mt20">
-        <el-button type="primary" @click="saveForm">确定</el-button>
+        <el-button type="primary" @click="saveForm" :loading="btnLoading"
+          >确定</el-button
+        >
         <el-button @click="cancleFn">取消</el-button>
       </div>
     </div>
@@ -110,6 +112,7 @@ export default {
         errorStatus: "",
       },
       duration: "",
+      btnLoading: false,
     };
   },
 
@@ -162,12 +165,21 @@ export default {
           "分钟";
         this.dealParams.durtion = this.duration;
       }
+      this.btnLoading = true;
       // 保存结果处理
-      this.$post(this.urls.saveUrl, this.dealParams).then((res) => {
-        if (res.code == 1) {
-          this.cancleFn();
-        }
-      });
+      this.$post(this.urls.saveUrl, this.dealParams)
+        .then((res) => {
+          this.btnLoading = false;
+          if (res.code == 1) {
+            this.cancleFn();
+            this.$message.success(res.msg);
+          }
+        })
+        .catch((error) => {
+          this.btnLoading = false;
+          console.log(error);
+          this.$message.error(error.message);
+        });
     },
     cancleFn() {
       this.open = false;

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

@@ -486,6 +486,12 @@ export default {
             label: "班次",
             fuzzy: false,
           },
+          {
+            name: "punchResult",
+            type: "select",
+            label: "打卡结果",
+            fuzzy: false,
+          },
           {
             name: "attendanceDateStart",
             type: "date",