zhengnaiwen_citu 5 месяцев назад
Родитель
Сommit
72b4f3044f

+ 15 - 0
src/views/humanResources/accumulatePoints/accumulatePointsEntering/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div class="pa-3 white">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'accumulatePointsEntering'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 15 - 0
src/views/humanResources/accumulatePoints/accumulatePointsRules/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div class="pa-3 white">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'accumulatePointsRules'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 15 - 0
src/views/humanResources/accumulatePoints/accumulatePointsStatistics/index.vue

@@ -0,0 +1,15 @@
+<template>
+  <div class="pa-3 white">
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'accumulatePointsStatistics'
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+ 21 - 32
src/views/system/menu/index.vue

@@ -102,28 +102,31 @@ export default {
         work: 0
       }, this.items, null)
     },
+    assignData (data) {
+      const meta = JSON.parse(data.metastr)
+      return {
+        parentId: data.parentId,
+        label: data.label,
+        type: data.type,
+        path: data.path,
+        component: data.component,
+        name: data.name,
+        icon: data.icon,
+        code: data.code,
+        sort: data.sort,
+        hidden: data.hidden,
+        window: meta?.window ?? false,
+        keepAlive: meta?.keepAlive ?? false,
+        panorama: meta?.panorama ?? false,
+        work: meta?.work ?? 0
+      }
+    },
     async onEdit ({ id }) {
       try {
         const { data } = await getRoutersDetail({ id })
         this.title = '编辑菜单'
         this.itemData = data
-        const meta = JSON.parse(data.metastr)
-        this.$refs.menuEdit.open({
-          parentId: data.parentId,
-          label: data.label,
-          type: data.type,
-          path: data.path,
-          component: data.component,
-          name: data.name,
-          icon: data.icon,
-          code: data.code,
-          sort: data.sort,
-          hidden: data.hidden,
-          window: meta?.window ?? false,
-          keepAlive: meta?.keepAlive ?? false,
-          panorama: meta?.panorama ?? false,
-          work: meta?.work ?? 0
-        }, this.items, data.id)
+        this.$refs.menuEdit.open(this.assignData(data), this.items, data.id)
       } catch (error) {
         this.$message.error(error)
       }
@@ -133,21 +136,7 @@ export default {
         const { data } = await getRoutersDetail({ id })
         this.title = '添加菜单'
         this.itemData = data
-        const meta = JSON.parse(data.metastr)
-        this.$refs.menuEdit.open({
-          parentId: data.parentId,
-          label: data.label,
-          type: data.type,
-          path: data.path,
-          component: data.component,
-          name: data.name,
-          icon: data.icon,
-          code: data.code,
-          sort: data.sort,
-          hidden: data.hidden,
-          window: meta?.window ?? false,
-          keepAlive: meta?.keepAlive ?? false
-        }, this.items, null)
+        this.$refs.menuEdit.open(this.assignData(data), this.items, null)
       } catch (error) {
         this.$message.error(error)
       }

+ 3 - 3
src/views/workOrder/approval/index.vue

@@ -2,9 +2,9 @@
   <div>
     <IndexPage ref="indexPageRefs" :dataType="3">
       <template #actions="{ row }">
-        <m-button type="primary" text @click="onDetails(row)">查看申请单</m-button>
-        <m-button  type="primary" text @click="onApproval(row.workFlowInstanceId)">通过审核</m-button>
-        <m-button type="danger" text @click="onApprovalReject(row)">拒绝通过</m-button>
+        <m-button type="danger" text @click="onDetails(row)">审批</m-button>
+        <!-- <m-button  type="primary" text @click="onApproval(row.workFlowInstanceId)">通过审核</m-button>
+        <m-button type="danger" text @click="onApprovalReject(row)">拒绝通过</m-button> -->
       </template>
     </IndexPage>
     <ApprovalReject ref="approvalRejectRefs" @refresh="onRefresh"></ApprovalReject>

+ 1 - 1
src/views/workOrder/components/ApprovalProgress.vue

@@ -1,5 +1,5 @@
 <template>
-  <m-dialog ref="dialog" title="审批明细">
+  <m-dialog ref="dialog" title="审批进度">
     <el-steps align-center finish-status="success" v-loading="loading" :space="800 / items.length">
       <el-step
         v-for="(item) in items"