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/perform/drawershow.vue

@@ -427,7 +427,8 @@ export default {
       this.form = row;
       this.reset();
       this.query = { id: row.id };
-      await this.$get("/window/perform/info", { id: row.id }).then((res) => {
+      await this.$get("/window/perform/info", { id: row.id })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.form.id = row.id;
@@ -462,7 +463,10 @@ export default {
                 }).then((responsed) => {
                   if (responsed.code == 1) {
                     this.dict = { ...this.dict, ...responsed.dict };
-                  if (this.form.bonusReport && this.form.bonusReport != "[]") {
+                    if (
+                      this.form.bonusReport &&
+                      this.form.bonusReport != "[]"
+                    ) {
                       let bonusArr = [];
                       bonusArr = JSON.parse(this.form.bonusReport);
                       let bonusarrText = responsed.data.data.filter((item) =>
@@ -491,11 +495,15 @@ export default {
 
           this.tableData = [];
           this.tableData.push({
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
+            discipline: this.form["discipline"]
+              ? this.form["discipline"]
+              : "--",
             specification: this.form["specification"]
               ? this.form["specification"]
               : "--",
-          bonusScore: this.form["bonusScore"] ? this.form["bonusScore"] : "--",
+            bonusScore: this.form["bonusScore"]
+              ? this.form["bonusScore"]
+              : "--",
             sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
             selfLevel: this.form["selfLevel"]
               ? this.form["selfLevel"] == 1
@@ -503,6 +511,9 @@ export default {
                 : "黑旗窗口"
               : "--",
           });
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口考核登记表";
@@ -526,7 +537,8 @@ export default {
       this.form = row;
       this.reset();
       this.query = { id: row.id };
-      await this.$get("/window/perform/info", { id: row.id }).then((res) => {
+      await this.$get("/window/perform/info", { id: row.id })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.dict = res.dict;
@@ -560,7 +572,10 @@ export default {
                 }).then((responsed) => {
                   if (responsed.code == 1) {
                     this.dict = { ...this.dict, ...responsed.dict };
-                  if (this.form.bonusReport && this.form.bonusReport != "[]") {
+                    if (
+                      this.form.bonusReport &&
+                      this.form.bonusReport != "[]"
+                    ) {
                       let bonusArr = [];
                       bonusArr = JSON.parse(this.form.bonusReport);
                       let bonusarrText = responsed.data.data.filter((item) =>
@@ -588,11 +603,15 @@ export default {
           );
           this.tableData = [];
           this.tableData.push({
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
+            discipline: this.form["discipline"]
+              ? this.form["discipline"]
+              : "--",
             specification: this.form["specification"]
               ? this.form["specification"]
               : "--",
-          bonusScore: this.form["bonusScore"] ? this.form["bonusScore"] : "--",
+            bonusScore: this.form["bonusScore"]
+              ? this.form["bonusScore"]
+              : "--",
             sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
             selfLevel: this.form["selfLevel"]
               ? this.form["selfLevel"] == 1
@@ -600,6 +619,9 @@ export default {
                 : "黑旗窗口"
               : "--",
           });
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口考核登记表";

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

@@ -337,7 +337,8 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
+      })
+        .then((res) => {
           console.log(res);
           if (res.code == 1) {
             this.form = res.data;
@@ -348,6 +349,9 @@ export default {
           }
           this.form.view = "修改";
           this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
@@ -437,7 +441,8 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
+      })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.form.id = row.id;
@@ -455,6 +460,9 @@ export default {
               }
             }
           );
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";

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

@@ -427,7 +427,8 @@ export default {
       this.form = row;
       this.reset();
       this.query = { id: row.id };
-      await this.$get("/window/perform/info", { id: row.id }).then((res) => {
+      await this.$get("/window/perform/info", { id: row.id })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.dict = res.dict;
@@ -461,7 +462,10 @@ export default {
                 }).then((responsed) => {
                   if (responsed.code == 1) {
                     this.dict = { ...this.dict, ...responsed.dict };
-                  if (this.form.bonusReport && this.form.bonusReport != "[]") {
+                    if (
+                      this.form.bonusReport &&
+                      this.form.bonusReport != "[]"
+                    ) {
                       let bonusArr = [];
                       bonusArr = JSON.parse(this.form.bonusReport);
                       let bonusarrText = responsed.data.data.filter((item) =>
@@ -490,11 +494,15 @@ export default {
 
           this.tableData = [];
           this.tableData.push({
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
+            discipline: this.form["discipline"]
+              ? this.form["discipline"]
+              : "--",
             specification: this.form["specification"]
               ? this.form["specification"]
               : "--",
-          bonusScore: this.form["bonusScore"] ? this.form["bonusScore"] : "--",
+            bonusScore: this.form["bonusScore"]
+              ? this.form["bonusScore"]
+              : "--",
             sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
             selfLevel: this.form["selfLevel"]
               ? this.form["selfLevel"] == 1
@@ -502,6 +510,9 @@ export default {
                 : "黑旗窗口"
               : "--",
           });
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口考核登记表";
@@ -525,7 +536,8 @@ export default {
       this.form = row;
       this.reset();
       this.query = { id: row.id };
-      await this.$get("/window/perform/info", { id: row.id }).then((res) => {
+      await this.$get("/window/perform/info", { id: row.id })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.dict = res.dict;
@@ -559,7 +571,10 @@ export default {
                 }).then((responsed) => {
                   if (responsed.code == 1) {
                     this.dict = { ...this.dict, ...responsed.dict };
-                  if (this.form.bonusReport && this.form.bonusReport != "[]") {
+                    if (
+                      this.form.bonusReport &&
+                      this.form.bonusReport != "[]"
+                    ) {
                       let bonusArr = [];
                       bonusArr = JSON.parse(this.form.bonusReport);
                       let bonusarrText = responsed.data.data.filter((item) =>
@@ -592,11 +607,15 @@ export default {
           // });
           this.tableData = [];
           this.tableData.push({
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
+            discipline: this.form["discipline"]
+              ? this.form["discipline"]
+              : "--",
             specification: this.form["specification"]
               ? this.form["specification"]
               : "--",
-          bonusScore: this.form["bonusScore"] ? this.form["bonusScore"] : "--",
+            bonusScore: this.form["bonusScore"]
+              ? this.form["bonusScore"]
+              : "--",
             sumScore: this.form["sumScore"] ? this.form["sumScore"] : "--",
             selfLevel: this.form["selfLevel"]
               ? this.form["selfLevel"] == 1
@@ -604,6 +623,9 @@ export default {
                 : "黑旗窗口"
               : "--",
           });
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口考核登记表";

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

@@ -337,7 +337,8 @@ export default {
       this.query = { id: row.id };
       await this.$get("/window/workman/perform/info", {
         id: row.recordId,
-      }).then((res) => {
+      })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.dict = res.dict;
@@ -346,6 +347,9 @@ export default {
           }
           this.form.view = "修改";
           this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "edit";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";
@@ -435,7 +439,8 @@ export default {
       this.query = { id: row.id };
       await this.$get("/check/window/workman/perform/info", {
         id: row.id,
-      }).then((res) => {
+      })
+        .then((res) => {
           if (res.code == 1) {
             this.form = res.data;
             this.dict = res.dict;
@@ -478,14 +483,24 @@ export default {
           this.tableData = [];
           this.tableData.push({
             staffName: this.form["staffName"] ? this.form["staffName"] : "--",
-          discipline: this.form["discipline"] ? this.form["discipline"] : "--",
+            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"] : "--",
+            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"]
@@ -493,6 +508,9 @@ export default {
           });
           this.form.view = "查看";
           this.open = true;
+        })
+        .catch((error) => {
+          this.$message.error(error.message);
         });
       this.pageInfo.type = "view";
       this.title = "市政务服务大厅窗口工作人员考核汇总表";