推

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

@@ -12,7 +12,7 @@
     :empty-text="emptytxt ? emptytxt : emptyText"
     border
     style="width: 100%"
-    height="570"
+    height="530"
   >
     <el-table-column
       v-for="column in columns"

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

@@ -524,7 +524,6 @@ export default {
     formatterDate,
     // 下载附件
     hanldeDownloadFile(val) {
-      console.log(val);
       downloadFile(val.filePath, val.fileName);
     },
     picMatter(val) {
@@ -620,10 +619,20 @@ export default {
     view(row) {
       this.reset();
       this.query = { id: row.id };
-      this.urls.currUrl = "perform/attend/appeal/view";
-      this.getData();
-      this.form.view = "查看";
-      this.pageInfo.type = "view";
+      // this.urls.currUrl = "perform/attend/appeal/view";
+      // this.getData();
+      this.$get("/perform/attend/appeal/view", { id: row.id }).then((res) => {
+        if (res.code == 1) {
+          this.form = res.data.entity;
+          this.dict = res.data.dict;
+        } else {
+          this.reset();
+        }
+        this.form.view = "查看";
+        this.pageInfo.type = "view";
+        this.open = true;
+      });
+
       this.title = "绩效记录申诉信息详细";
     },
     /**取消按钮 */

attendance-performance-manager-ui/admin/src/views/perform/attend/appeal/list.vue

@@ -13,8 +13,17 @@
         <div class="content">
           <div class="search_box">
             <div class="search">
-              <el-select v-model="dateValue" placeholder="请选择" style="margin: 0 10px;">
-                <el-option v-for="item in optionsMonths" :key="item.value" :label="item.label" :value="item.value">
+              <el-select
+                v-model="dateValue"
+                placeholder="请选择"
+                style="margin: 0 10px;"
+              >
+                <el-option
+                  v-for="item in optionsMonths"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
                 </el-option>
               </el-select>
               <el-button type="primary" @click="getChartsData">搜索</el-button>
@@ -23,17 +32,32 @@
           <div class="data_box">
             <div class="top">
               <div class="box">
-                <bar-charts :title="'申诉次数部门排名TOP20'" :id="'dept_20'" :legendName="'申诉次数'"
-                  :styleObj="{ width: '800px', height: '360px' }" :chartsData="depChartsData" />
+                <bar-charts
+                  :title="'申诉次数部门排名TOP20'"
+                  :id="'dept_20'"
+                  :legendName="'申诉次数'"
+                  :styleObj="{ width: '800px', height: '360px' }"
+                  :chartsData="depChartsData"
+                />
               </div>
               <div class="box">
-                <bar-charts :title="'申诉次数个人排名TOP20'" :id="'person_20'" :legendName="'申诉次数'"
-                  :styleObj="{ width: '800px', height: '360px' }" :chartsData="personChartsData" />
+                <bar-charts
+                  :title="'申诉次数个人排名TOP20'"
+                  :id="'person_20'"
+                  :legendName="'申诉次数'"
+                  :styleObj="{ width: '800px', height: '360px' }"
+                  :chartsData="personChartsData"
+                />
               </div>
             </div>
             <div class="down">
-              <bar-charts :title="'申诉次数规则排名TOP20'" :id="'rule_20'" :legendName="'申诉次数'"
-                :styleObj="{ width: '1800px', height: '320px' }" :chartsData="depChartsData" />
+              <bar-charts
+                :title="'申诉次数规则排名TOP20'"
+                :id="'rule_20'"
+                :legendName="'申诉次数'"
+                :styleObj="{ width: '1800px', height: '320px' }"
+                :chartsData="depChartsData"
+              />
             </div>
           </div>
         </div>
@@ -71,28 +95,37 @@ export default {
     getData() {
       this.activeName == 1 || this.activeName == 2
         ? this.$post("/perform/attend/appeal/list", {
-          processStatus: this.activeName,
-        }).then((res) => {
-          console.log(res);
-          if (res.code == 1) {
-            this.tableData = res.data;
-          }
-        })
+            processStatus: this.activeName,
+          }).then((res) => {
+            console.log(res);
+            if (res.code == 1) {
+              this.tableData = res.data;
+            }
+          })
         : this.getChartsData();
     },
     getChartsData() {
-      this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 1 }).then(res => {
-        console.log(res)
-        this.depChartsData = res.data
-      })
-      this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 2 }).then(res => {
-        console.log(res)
-        this.personChartsData = res.data
-      })
-      this.$post('/perform/attend/appeal/stat', { appealTimeStart: this.dateValue, statType: 3 }).then(res => {
-        console.log(res)
-        this.ruleChartsData = res.data
-      })
+      this.$post("/perform/attend/appeal/stat", {
+        appealTimeStart: this.dateValue,
+        statType: 1,
+      }).then((res) => {
+        console.log(res);
+        this.depChartsData = res.data;
+      });
+      this.$post("/perform/attend/appeal/stat", {
+        appealTimeStart: this.dateValue,
+        statType: 2,
+      }).then((res) => {
+        console.log(res);
+        this.personChartsData = res.data;
+      });
+      this.$post("/perform/attend/appeal/stat", {
+        appealTimeStart: this.dateValue,
+        statType: 3,
+      }).then((res) => {
+        console.log(res);
+        this.ruleChartsData = res.data;
+      });
     },
     renderTable(tableData) {
       return (
@@ -171,10 +204,19 @@ export default {
 
           { label: "所属部门", prop: "deptName" },
 
-          { label: "违规类型", prop: "irregularOtherType" },
+          {
+            label: "违规类型",
+            prop: "irregularType",
+            formatter: this.formatter,
+          },
+          
           { label: "绩效规则", prop: "ruleId", formatter: this.formatter },
 
-          { label: "加分/扣分方式", prop: "subAddType", formatter: this.formatter },
+          {
+            label: "加分/扣分方式",
+            prop: "subAddType",
+            formatter: this.formatter,
+          },
 
           {
             label: "加分/扣分时间",
@@ -225,7 +267,6 @@ export default {
                   onDel={this.toDel}
                 />
               ) : (
-
                 <table-buttons
                   noAdd
                   noDel
@@ -293,7 +334,7 @@ export default {
           label: "12月",
         },
       ],
-      dateValue: '2023-07-01 00:00:00',
+      dateValue: "2023-07-01 00:00:00",
     };
   },
 };