zhengnaiwen_citu 3 mēneši atpakaļ
vecāks
revīzija
500a03045f

+ 25 - 1
src/views/salary/sandbox/index.vue

@@ -2,7 +2,21 @@
   <div class="pa-3 white">
     <el-tabs v-model="activeName" @tab-click="handleClick">
       <el-tab-pane label="核算规则" name="Solution">
-        <Solution label="核算规则" ref="Solution" :permission="['add', 'edit', 'delete', 'view', 'rules', 'release', 'send']" @history="onHistory"></Solution>
+        <Solution
+          label="核算规则"
+          ref="Solution"
+          @history="onHistory"
+        >
+          <template #tool>
+            <m-button type="orange" size="small" icon="el-icon-plus" @click="onOpen('salarySolutionEditRefs')" >新增</m-button>
+          </template>
+          <template #actions="{ row }">
+            <m-button text type="primary" size="small" @click="onOpen('salarySolutionEditRefs', row)">编辑</m-button>
+            <m-button text type="primary" size="small" @click="onOpen('salarySolutionRulesRefs', row)">规则配置</m-button>
+            <m-button text type="success" size="small" @click="onCalculate(row)">计算</m-button>
+            <m-button text type="success" size="small" @click="onSend(row)">发布</m-button>
+          </template>
+        </Solution>
       </el-tab-pane>
       <el-tab-pane label="系数导向" name="Coefficient">
         <Coefficient label="系数导向" ref="Coefficient"></Coefficient>
@@ -20,11 +34,15 @@
         <SolutionDetails :item-data="itemData"></SolutionDetails>
       </div>
     </el-drawer>
+    <SalarySolutionEdit ref="salarySolutionEditRefs" @refresh="$refs.Solution.onInit()"></SalarySolutionEdit>
+    <SalarySandboxRules ref="salarySandboxRulesRefs" @refresh="$refs.Solution.onInit()"></SalarySandboxRules>
   </div>
 </template>
 
 <script>
 import Solution from '../solution/salarySolution'
+import SalarySolutionEdit from './salarySandboxEdit.vue'
+import SalarySandboxRules from './salarySandboxRules.vue'
 import Coefficient from '../solution/salaryCoefficient'
 import History from '../solution/salarySolutionHistory'
 import SolutionDetails from '../solution/components/solutionDetails.vue'
@@ -39,6 +57,8 @@ export default {
     }
   },
   components: {
+    SalarySolutionEdit,
+    SalarySandboxRules,
     Solution,
     Coefficient,
     History,
@@ -56,6 +76,10 @@ export default {
     this.$refs[this.activeName].onInit()
   },
   methods: {
+    onCalculate () {},
+    onOpen (ref, item) {
+      this.$refs[ref]?.open && this.$refs[ref].open(item)
+    },
     handleClick (tab, event) {
       this.$refs[this.activeName].onInit()
     },

+ 0 - 0
src/views/salary/solution/salarySolution/salarySolutionEdit.vue → src/views/salary/sandbox/salarySandboxEdit.vue


+ 2 - 2
src/views/salary/solution/salarySolution/salarySolutionRules.vue → src/views/salary/sandbox/salarySandboxRules.vue

@@ -38,14 +38,14 @@
 </template>
 
 <script>
-import SalarySolutionRulesEdit from './salarySolutionRulesEdit.vue'
+import SalarySolutionRulesEdit from './salarySandboxRulesEdit.vue'
 import {
   saveSolution,
   getSolutionDetails
 } from '@/api/salary'
 
 export default {
-  name: 'salary-solution-rules',
+  name: 'salarySandboxRules',
   components: {
     SalarySolutionRulesEdit
   },

+ 3 - 3
src/views/salary/solution/salarySolution/salarySolutionRulesEdit.vue → src/views/salary/sandbox/salarySandboxRulesEdit.vue

@@ -60,12 +60,12 @@
 <script>
 import { Editor, Toolbar } from '@wangeditor/editor-for-vue'
 import '@wangeditor/editor/dist/css/style.css'
-import SalarySolutionRulesEditParam from './salarySolutionRulesEditParam.vue'
+import SalarySolutionRulesEditParam from './salarySandboxRulesEditParam.vue'
 import {
   DICT_CATEGORY
-} from '../utils/Dict'
+} from '../solution/utils/Dict'
 export default {
-  name: 'salarySolutionRulesEdit',
+  name: 'salarySandboxRulesEdit',
   components: { Editor, Toolbar, SalarySolutionRulesEditParam },
   props: {
     item: {

+ 1 - 1
src/views/salary/solution/salarySolution/salarySolutionRulesEditParam.vue → src/views/salary/sandbox/salarySandboxRulesEditParam.vue

@@ -28,7 +28,7 @@
 <script>
 import {
   DICT_CATEGORY
-} from '../utils/Dict'
+} from '../solution/utils/Dict'
 export default {
   name: 'salarySolutionRulesEditParam',
   data () {

+ 1 - 1
src/views/salary/solution/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="white pa-3">
-    <TabTemplate :permission="['view', 'release', 'delete']" :import-context="(path) => import(`./${path}`)" @history="onHistory"></TabTemplate>
+    <TabTemplate :import-context="(path) => import(`./${path}`)" @history="onHistory"></TabTemplate>
     <el-drawer
       :title="itemData.title"
       :visible.sync="show"

+ 5 - 19
src/views/salary/solution/salarySolution/index.vue

@@ -2,20 +2,16 @@
   <div>
     <ListTemplate ref="listTemplateRefs" :card-title="$attrs.label" v-loading="loading">
       <template #tool>
-        <m-button type="orange" v-if="permission.includes('add')" size="small" icon="el-icon-plus" @click="onOpen('salarySolutionEditRefs')" >新增</m-button>
+        <slot name="tool"></slot>
       </template>
       <template #actions="{ row }">
-        <m-button v-if="permission.includes('view')" text type="primary" size="small" @click="onOpen('salarySolutionDetailsRefs', row)">查看</m-button>
-        <m-button v-if="permission.includes('edit')" text type="primary" size="small" @click="onOpen('salarySolutionEditRefs', row)">编辑</m-button>
-        <m-button v-if="permission.includes('rules')" text type="primary" size="small" @click="onOpen('salarySolutionRulesRefs', row)">规则配置</m-button>
-        <m-button v-if="permission.includes('release')" text type="primary" size="small" @click="onOpen('salarySolutionHistory', row)">版本记录</m-button>
-        <m-button v-if="permission.includes('send')" text type="success" size="small" @click="onSend(row)">发布</m-button>
-        <m-button v-if="permission.includes('delete')" text type="danger" size="small" @click="onDelete(row)">删除</m-button>
+        <m-button text type="primary" size="small" @click="onOpen('salarySolutionDetailsRefs', row)">查看</m-button>
+        <slot name="actions" :row="row"></slot>
+        <m-button text type="primary" size="small" @click="onOpen('salarySolutionHistory', row)">版本记录</m-button>
+        <m-button text type="danger" size="small" @click="onDelete(row)">删除</m-button>
       </template>
     </ListTemplate>
     <SalarySolutionDetails ref="salarySolutionDetailsRefs"></SalarySolutionDetails>
-    <SalarySolutionEdit ref="salarySolutionEditRefs" @refresh="onInit"></SalarySolutionEdit>
-    <SalarySolutionRules ref="salarySolutionRulesRefs" @refresh="onInit"></SalarySolutionRules>
     <SalarySolutionHistory ref="salarySolutionHistory">
       <template #actions="{ row }">
         <m-button type="primary" text @click="$emit('history', row)" size="small">查看规则配置</m-button>
@@ -30,22 +26,12 @@ import {
   sendSalaryRelease
 } from '@/api/salary'
 import ListTemplate from '../components/ListTemplate.vue'
-import SalarySolutionEdit from './salarySolutionEdit.vue'
-import SalarySolutionRules from './salarySolutionRules.vue'
 import SalarySolutionHistory from './salarySolutionHistory.vue'
 import SalarySolutionDetails from './salarySolutionDetails.vue'
 export default {
   name: 'salary-solution-list',
-  props: {
-    permission: {
-      type: Array,
-      default: () => []
-    }
-  },
   components: {
     ListTemplate,
-    SalarySolutionEdit,
-    SalarySolutionRules,
     SalarySolutionHistory,
     SalarySolutionDetails
   },