Merge remote-tracking branch 'origin/master'

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

@@ -56,7 +56,6 @@ export default {
           //
           res.entity = this.util_toDateStr(res.entity, this.toDate);
           this.form = Object.assign({}, this.form, res.entity);
-
           this.dict = Object.assign({}, this.dict, res.dict);
           this.afterRender(res);
         })
@@ -89,6 +88,9 @@ export default {
       el.validate((valid) => {
         if (!valid) return;
         this.loading = true;
+        this.form.leaveType
+          ? (this.form.leaveType = this.form.leaveType.toString())
+          : "";
         this.$post(url, this.beforeSubmit(this.form))
           .then((res) => {
             this.$message.success(res.msg);

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

@@ -166,7 +166,8 @@ export default {
       // 是否显示弹出层
       open: false,
       direction: "rtl",
-      toString: ["leaveType", "deptId", "approverId", "auditResult"],
+      toString: ["auditResult"],
+      // toString: ["leaveType", "deptId", "approverId", "auditResult"],
       toDate: ["startTime", "endTime", "createTime"],
       // 表单校验
       rules: {
@@ -256,11 +257,11 @@ export default {
       this.title = "新增请假记录信息";
     },
     /** 查看*/
-    view(row) {
+    async view(row) {
       this.reset();
       this.query = { id: row.id };
       this.urls.currUrl = "attendance/leave/record/view";
-      this.getData();
+      await this.getData();
       this.pageInfo.type = "view";
       this.title = "请假记录信息详细";
     },

attendance-performance-manager-ui/admin/src/views/check/window/workman/perform/drawershow.vue

@@ -337,18 +337,22 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
-        console.log(res);
-        if (res.code == 1) {
-          this.form = res.data;
-          this.form.id = row.id;
-          this.dict = res.dict;
-        } else {
-          this.form = row;
-        }
-        this.form.view = "修改";
-        this.open = true;
-      });
+      })
+        .then((res) => {
+          console.log(res);
+          if (res.code == 1) {
+            this.form = res.data;
+            this.form.id = row.id;
+            this.dict = res.dict;
+          } else {
+            this.form = row;
+          }
+          this.form.view = "修改";
+          this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
       // await this.$get("/check/window/workman/perform/info", {
@@ -437,25 +441,29 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
-        if (res.code == 1) {
-          this.form = res.data;
-          this.form.id = row.id;
-          this.dict = res.dict;
-        } else {
-          this.form = row;
-        }
-        this.form.view = "查看";
-        this.open = true;
-        this.$get("/check/window/workman/perform/info", { id: row.id }).then(
-          (response) => {
-            if (response.code == 1) {
-              this.form = { ...this.form, ...response.data };
-              this.dict = { ...this.dict, ...response.dict };
-            }
+      })
+        .then((res) => {
+          if (res.code == 1) {
+            this.form = res.data;
+            this.form.id = row.id;
+            this.dict = res.dict;
+          } else {
+            this.form = row;
           }
-        );
-      });
+          this.form.view = "查看";
+          this.open = true;
+          this.$get("/check/window/workman/perform/info", { id: row.id }).then(
+            (response) => {
+              if (response.code == 1) {
+                this.form = { ...this.form, ...response.data };
+                this.dict = { ...this.dict, ...response.dict };
+              }
+            }
+          );
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
       // this.form = row;

attendance-performance-manager-ui/admin/src/views/window/workman/perform/drawershow.vue

@@ -337,16 +337,20 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
-        if (res.code == 1) {
-          this.form = res.data;
-          this.dict = res.dict;
-        } else {
-          this.form = row;
-        }
-        this.form.view = "修改";
-        this.open = true;
-      });
+      })
+        .then((res) => {
+          if (res.code == 1) {
+            this.form = res.data;
+            this.dict = res.dict;
+          } else {
+            this.form = row;
+          }
+          this.form.view = "修改";
+          this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
+        });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
       // await this.$get("/check/window/workman/perform/info", {
@@ -435,65 +439,79 @@ export default {
       this.query = { id: row.id };
       await this.$get("/check/window/workman/perform/info", {
         id: row.id,
-      }).then((res) => {
-        if (res.code == 1) {
-          this.form = res.data;
-          this.dict = res.dict;
-        } else {
-          this.form = row;
-        }
-        for (let key in this.form) {
-          key == "fillDate"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "createTime"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "deductTime"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "updateTime"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "checkTime"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : key == "reviewTime"
-            ? (this.form[key] = timestampToTime(this.form[key], 6))
-            : "";
-        }
-        this.$get("/window/workman/perform/detail/info", { id: row.id }).then(
-          (response) => {
-            if (response.code == 1) {
-              this.form = { ...this.form, ...response.data };
+      })
+        .then((res) => {
+          if (res.code == 1) {
+            this.form = res.data;
+            this.dict = res.dict;
+          } else {
+            this.form = row;
+          }
+          for (let key in this.form) {
+            key == "fillDate"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : key == "createTime"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : key == "deductTime"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : key == "updateTime"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : key == "checkTime"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : key == "reviewTime"
+              ? (this.form[key] = timestampToTime(this.form[key], 6))
+              : "";
+          }
+          this.$get("/window/workman/perform/detail/info", { id: row.id }).then(
+            (response) => {
+              if (response.code == 1) {
+                this.form = { ...this.form, ...response.data };
 
-              this.dict = { ...this.dict, ...response.dict };
+                this.dict = { ...this.dict, ...response.dict };
+              }
             }
-          }
-        );
-        this.$get("/window/workman/perform/info", { id: row.id }).then(
-          (responses) => {
-            if (responses.code == 1) {
-              this.form = { ...this.form, ...responses.data };
+          );
+          this.$get("/window/workman/perform/info", { id: row.id }).then(
+            (responses) => {
+              if (responses.code == 1) {
+                this.form = { ...this.form, ...responses.data };
 
-              this.dict = { ...this.dict, ...responses.dict };
+                this.dict = { ...this.dict, ...responses.dict };
+              }
             }
-          }
-        );
-        this.tableData = [];
-        this.tableData.push({
-          staffName: this.form["staffName"] ? this.form["staffName"] : "--",
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
-          specification: this.form["specification"]
-            ? this.form["specification"]
-            : "--",
-          management: this.form["management"] ? this.form["management"] : "--",
-          evaluation: this.form["evaluation"] ? this.form["evaluation"] : "--",
-          efficiency: this.form["efficiency"] ? this.form["efficiency"] : "--",
-          bonusScore: this.form["bonusScore"] ? this.form["bonusScore"] : "--",
-          sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
-          examineLevel: this.form["examineLevel"]
-            ? this.dict["examineLevel"]
-            : "--",
+          );
+          this.tableData = [];
+          this.tableData.push({
+            staffName: this.form["staffName"] ? this.form["staffName"] : "--",
+            discipline: this.form["discipline"]
+              ? this.form["discipline"]
+              : "--",
+            specification: this.form["specification"]
+              ? this.form["specification"]
+              : "--",
+            management: this.form["management"]
+              ? this.form["management"]
+              : "--",
+            evaluation: this.form["evaluation"]
+              ? this.form["evaluation"]
+              : "--",
+            efficiency: this.form["efficiency"]
+              ? this.form["efficiency"]
+              : "--",
+            bonusScore: this.form["bonusScore"]
+              ? this.form["bonusScore"]
+              : "--",
+            sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
+            examineLevel: this.form["examineLevel"]
+              ? this.dict["examineLevel"]
+              : "--",
+          });
+          this.form.view = "查看";
+          this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
-        this.form.view = "查看";
-        this.open = true;
-      });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
     },