daiqisheng 3 vuotta sitten
vanhempi
commit
deafa09090

+ 1 - 6
src/pages/main/performance/components/dialog.vue

@@ -4,7 +4,6 @@
     :visible.sync="visible"
     :fullscreen="fullscreen"
     :key="reload"
-    :props="props"
     :before-close="handleCancel"
     :modal-append-to-body="false"
     :width="width"
@@ -34,10 +33,6 @@ export default {
       type: String,
       default: "",
     },
-    props: {
-      type: String,
-      default: "",
-    },
     reload: {
       type: Number,
       default: 0,
@@ -61,7 +56,7 @@ export default {
     },
     //   取消的回调
     handleCancel() {
-      this.$emit("cancel", { visible: false,props: this.props});
+      this.$emit("cancel", false);
     },
   },
 };

+ 62 - 9
src/pages/main/performance/department.vue

@@ -25,10 +25,10 @@
       fullscreen
       title="部门绩效"
       :visible="visible"
+      
       :reload="reload"
       width="1200px"
-      props="visible"
-      @cancel="beforeCancel"
+      @cancel="handleCancel('visible')"
     >
       <template>
         <!-- 按钮部分 -->
@@ -40,7 +40,9 @@
             <el-button type="primary" size="small">导出</el-button>
           </div>
           <div>
-            <el-button @click="handleCancel('visible')" type="primary">返回</el-button>
+            <el-button @click="handleCancel('visible')" type="primary"
+              >返回</el-button
+            >
           </div>
         </div>
         <!-- 主体部分 -->
@@ -54,7 +56,6 @@
       :reload="reload"
       width="500px"
       props="approve_visible"
-      @cancel="beforeCancel"
     >
       <el-form :model="approveForm" :rules="approverules" ref="approveForm"
         ><el-form-item label="审批意见" prop="comments" label-width="80px"
@@ -92,7 +93,7 @@
       width="600px"
       props="track_visible"
       @confirm="handleConfirm"
-      @cancel="beforeCancel"
+      @cancel="handleCancel('track_visible')"
     >
       <el-table :data="trackList" border>
         <el-table-column
@@ -252,6 +253,51 @@ export default {
           preCata6: "周钰",
           preCata7: "已完成",
         },
+          {
+          preCata1: "KPI",
+          preCata2: "信息技术中心2021年度部门KPI绩效计划",
+          preCata3: "XXXXXXXXX",
+          preCata4: "XXXXXXXXX",
+          preCata5: "2021.02.01",
+          preCata6: "周钰",
+          preCata7: "待处理",
+        },
+        {
+          preCata1: "GS",
+          preCata2: "信息技术中心2021年度部门GS绩效计划",
+          preCata3: "XXXXXXXXX",
+          preCata4: "XXXXXXXXX",
+          preCata5: "2021.02.01",
+          preCata6: "周钰",
+          preCata7: "待汇总",
+        },
+        {
+          preCata1: "KPI",
+          preCata2: "信息技术中心2021年度部门KPI绩效计划",
+          preCata3: "XXXXXXXXX",
+          preCata4: "XXXXXXXXX",
+          preCata5: "2021.02.01",
+          preCata6: "周钰",
+          preCata7: "待审批",
+        },
+        {
+          preCata1: "GS",
+          preCata2: "信息技术中心2021年度部门GS绩效计划",
+          preCata3: "XXXXXXXXX",
+          preCata4: "XXXXXXXXX",
+          preCata5: "2021.02.01",
+          preCata6: "周钰",
+          preCata7: "待处理",
+        },
+        {
+          preCata1: "KPI",
+          preCata2: "信息技术中心2021年度部门KPI绩效计划",
+          preCata3: "XXXXXXXXX",
+          preCata4: "XXXXXXXXX",
+          preCata5: "2021.02.01",
+          preCata6: "周钰",
+          preCata7: "已完成",
+        },
       ],
       table_loading: false,
       //   表格里的操作按钮
@@ -327,9 +373,6 @@ export default {
     handleTrack() {
       this.track_visible = true;
     },
-    beforeCancel({visible,props}) {
-      this[props] = visible;
-    },
     handleTurn(type) {
       console.log(type);
     },
@@ -339,7 +382,17 @@ export default {
     },
     // 关闭方法
     handleCancel(data) {
-      this[data] = false;
+      switch (data) {
+        case "visible": {
+          this.visible = false;
+        }
+        case "approve_visible": {
+          this.approve_visible = false;
+        }
+        case "track_visible": {
+          this.track_visible = false;
+        }
+      }
     },
   },
 };