Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,7 @@
       <div class="text_line">
         <div class="text_box">
           <span style="width: 160px;">窗口 (单位) 名称：</span>
-          <span>{{ form.deptName || "--" }}</span>
+          <span>{{ windowName || "--" }}</span>
         </div>
         <div class="text_box">
           <span>登记年月：</span>
@@ -301,6 +301,7 @@ export default {
   },
   data() {
     return {
+      windowName: "",
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -324,6 +325,7 @@ export default {
     },
     /** 编辑 */
     async edit(row) {
+      this.windowName = row.windowName;
       //   this.reset();
       //   this.query = { id: row.id };
       this.urls.saveUrl = "check/window/workman/perform/examine";
@@ -429,14 +431,13 @@ export default {
       //   this.getData();
       //   this.pageInfo.type = "view";
       //   this.title = "窗口人员考核汇总核查详细";
-
+      this.windowName = row.windowName;
       this.form = row;
       this.reset();
       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;

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/dialogshow.vue

@@ -12,7 +12,10 @@
         </div>
       </div>
       <div class="user-right">
-        <div class="n">{{ form.totalScore }}</div>
+        <div class="n">{{ form.otherScore }}</div>
+        <div class="m">{{ form.month }}月自评绩效得分</div>
+
+        <div class="n" style="margin-top: 10px;">{{ form.totalScore }}</div>
         <div class="m">{{ form.month }}月得分</div>
       </div>
     </div>

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/view.vue

 <template>
   <layout-view>
-        <el-descriptions  :title="title" :column="column" :size="size" :colon="false" border>
+    <el-descriptions
+      :title="title"
+      :column="column"
+      :size="size"
+      :colon="false"
+      border
+    >
       <template slot="title">
         <i class="el-icon-tickets"></i>
         基本详细信息
       </template>
       <template slot="extra">
-                <el-button type="primary" @click="$router.go(-1)" size="small">返回</el-button>
+        <el-button type="primary" @click="$router.go(-1)" size="small"
+          >返回</el-button
+        >
       </template>
-                                    <el-descriptions-item label="人员id" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.staffId}}
+      <el-descriptions-item
+        label="人员id"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.staffId }}
       </el-descriptions-item>
-                        <el-descriptions-item label="工号" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.workNum}}
+      <el-descriptions-item
+        label="工号"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.workNum }}
       </el-descriptions-item>
-                        <el-descriptions-item label="人员名称" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.staffName}}
+      <el-descriptions-item
+        label="人员名称"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.staffName }}
       </el-descriptions-item>
-                        <el-descriptions-item label="部门id号" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.deptId}}
+      <el-descriptions-item
+        label="部门id号"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.deptId }}
       </el-descriptions-item>
-                        <el-descriptions-item label="部门名称" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.deptName}}
+      <el-descriptions-item
+        label="部门名称"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.deptName }}
       </el-descriptions-item>
-                        <el-descriptions-item label="考勤绩效指标分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.attendScore}}
+      <el-descriptions-item
+        label="考勤绩效指标分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.attendScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="评价绩效指标分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.assessScore}}
+      <el-descriptions-item
+        label="评价绩效指标分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.assessScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="办件绩效分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.workScore}}
+      <el-descriptions-item
+        label="办件绩效分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.workScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="效能绩效分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.effectScore}}
+      <el-descriptions-item
+        label="效能绩效分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.effectScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="自评绩效分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.otherScore}}
+      <el-descriptions-item
+        label="自评绩效分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.otherScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="累计异常分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.errorScore}}
+      <el-descriptions-item
+        label="累计异常分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.errorScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="当月得分数" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.totalScore}}
+      <el-descriptions-item
+        label="当月得分数"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.totalScore }}
       </el-descriptions-item>
-                        <el-descriptions-item label="备注" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.remark}}
+      <el-descriptions-item
+        label="备注"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.remark }}
       </el-descriptions-item>
-                        <el-descriptions-item label="年" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.year}}
+      <el-descriptions-item
+        label="年"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.year }}
       </el-descriptions-item>
-                        <el-descriptions-item label="月" label-class-name="labelClass" content-class-name="contentClass">
-                            {{form.month}}
+      <el-descriptions-item
+        label="月"
+        label-class-name="labelClass"
+        content-class-name="contentClass"
+      >
+        {{ form.month }}
       </el-descriptions-item>
     </el-descriptions>
-
   </layout-view>
 </template>
 
 <script>
-    import view from "@/assets/mixins/view";
-    export default {
+import view from "@/assets/mixins/view";
+export default {
   mixins: [view],
-        components: {
-        },
-        methods: {
-
-        },
+  components: {},
+  methods: {},
   data() {
     return {
-                size:"small",
-                column:2,
-                toString:[
-                    "month",
-                ],
-                toArrays: [
-
-                ],
-                toDate: [
-
-                ]
-            }
-        }
-    }
+      size: "small",
+      column: 2,
+      toString: ["month"],
+      toArrays: [],
+      toDate: [],
+    };
+  },
+};
 </script>
 <style lang="less">
-    .labelClass{
+.labelClass {
   width: 200px;
-    }
-    .el-descriptions__body{
+}
+.el-descriptions__body {
   margin-left: 5px;
   margin-right: 5px;
   color: #606266;
-        background-color: #FFF;
-    }
-    .contentClass{
+  background-color: #fff;
+}
+.contentClass {
   width: 600px;
-    }
+}
 </style>

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

@@ -11,7 +11,7 @@
       <div class="text_line">
         <div class="text_box">
           <span style="width: 160px;">窗口 (单位) 名称：</span>
-          <span>{{ form.deptName || "--" }}</span>
+          <span>{{ windowName || "--" }}</span>
         </div>
         <div class="text_box">
           <span>登记年月：</span>
@@ -301,6 +301,7 @@ export default {
   },
   data() {
     return {
+      windowName: "",
       // 遮罩层
       loading: true,
       // 弹出层标题
@@ -324,6 +325,7 @@ export default {
     },
     /** 编辑 */
     async edit(row) {
+      this.windowName = row.windowName;
       //   this.reset();
       //   this.query = { id: row.id };
       this.urls.currUrl = "check/window/workman/perform/save";
@@ -421,6 +423,7 @@ export default {
     },
     /** 查看*/
     async view(row) {
+      this.windowName = row.windowName;
       //   this.reset();
       //   this.query = { id: row.id };
       //   this.urls.currUrl = "check/window/workman/perform/view";