版本管理

src/views/salary/solution/components/ListTemplate.vue

@@ -39,8 +39,8 @@ export default {
       default: true
     },
     history: {
-      type: Boolean,
-      default: false
+      type: Number,
+      default: 0
     },
     uuid: String
   },
@@ -56,7 +56,7 @@ export default {
           prop: 'title',
           type: 'input',
           options: {
-            placeholder: '请输入方案名称'
+            placeholder: '请输入规则名称'
           }
         }
       ],
@@ -81,7 +81,8 @@ export default {
     }
   },
   methods: {
-    async onInit (entity) {
+    async onInit (entity, headers) {
+      this.headers = headers ?? this.headers
       this.query = entity ? { ...entity } : {}
       this.getList()
     },
@@ -95,7 +96,7 @@ export default {
           },
           entity: {
             ...this.searchQuery,
-            history: this.history ? 1 : 0,
+            history: this.history,
             uuid: this.uuid,
             env: this.env,
             ...this.query

src/views/salary/solution/components/solutionDetails.vue

@@ -101,8 +101,8 @@ export default {
 
       activeNames: null,
       columnHeaders: [
-        { name: '方案名称', prop: 'title' },
-        { name: '方案描述', prop: 'tag' },
+        { name: '规则名称', prop: 'title' },
+        { name: '规则描述', prop: 'tag' },
         { name: '绩效机构', prop: 'organizationName' },
         { name: '绩效职务', prop: 'postNames' }
       ]

src/views/salary/solution/salaryCoefficient/salaryCoefficientHistory.vue

@@ -1,6 +1,6 @@
 <template>
   <m-dialog ref="dialog" :title="title + '  版本记录'">
-    <ListTemplate ref="listTemplateRefs" history :versionType="1" :show-search="false" shadow="never" :uuid="uuid" clearHeader>
+    <ListTemplate ref="listTemplateRefs" :history="2" :versionType="1" :show-search="false" shadow="never" :uuid="uuid" clearHeader>
       <template #actions="{ row }">
         <m-button text type="primary" @click="onOpen(row)">查看系数变化</m-button>
       </template>
@@ -34,7 +34,12 @@ export default {
       this.$nextTick(() => {
         this.$refs.listTemplateRefs.onInit({
           versionType: 1
-        })
+        }, [
+          { label: '名称', prop: 'title' },
+          { label: '修改说明', prop: 'versionTag' },
+          { label: '创建日期', prop: 'createDate' },
+          { label: '操作', prop: 'actions' }
+        ])
       })
     },
     onOpen (item) {

src/views/salary/solution/salarySolution/salarySolutionEdit.vue

@@ -36,22 +36,22 @@ export default {
     items () {
       return [
         {
-          label: '方案名称',
+          label: '规则名称',
           prop: 'title',
           type: 'input',
           rules: [
-            { required: true, message: '请输入方案名称', trigger: 'blur' }
+            { required: true, message: '请输入规则名称', trigger: 'blur' }
           ],
           options: {
-            placeholder: '请输入方案名称'
+            placeholder: '请输入规则名称'
           }
         },
         {
-          label: '方案描述',
+          label: '规则描述',
           prop: 'tag',
           type: 'input',
           options: {
-            placeholder: '请输入方案描述'
+            placeholder: '请输入规则描述'
           }
         },
         {

src/views/salary/solution/salarySolution/salarySolutionHistory.vue

@@ -1,6 +1,6 @@
 <template>
   <m-dialog ref="dialog" :title="title + ' 历史记录'">
-    <ListTemplate ref="listTemplateRefs" history :show-search="false" shadow="never" :uuid="uuid" clearHeader>
+    <ListTemplate ref="listTemplateRefs" :history="2" :show-search="false" shadow="never" :uuid="uuid" clearHeader>
       <template #actions="{ row }">
         <slot name="actions" :row="row"></slot>
       </template>
@@ -30,7 +30,12 @@ export default {
       this.$nextTick(() => {
         this.$refs.listTemplateRefs.onInit({
           versionType: 0
-        })
+        }, [
+          { label: '名称', prop: 'title' },
+          { label: '修改说明', prop: 'versionTag' },
+          { label: '创建日期', prop: 'createDate' },
+          { label: '操作', prop: 'actions' }
+        ])
       })
     }
   }

src/views/salary/solution/salarySolution/salarySolutionRules.vue

@@ -33,6 +33,9 @@
           </el-tabs>
         </template>
       </el-form-item>
+      <el-form-item label="提交说明">
+        <el-input v-model="versionTag" placeholder="请输入本次修改的记录描述"></el-input>
+      </el-form-item>
     </el-form>
   </m-dialog>
 </template>
@@ -53,6 +56,7 @@ export default {
   inject: ['env'],
   data () {
     return {
+      versionTag: null,
       editableTabsValue: '1',
       editableTabs: [],
       ids: 1,
@@ -63,6 +67,7 @@ export default {
   methods: {
     async open (item) {
       this.itemData = item
+      this.versionTag = null
       this.$refs.dialog.open()
       this.loading = true
       this.ids = 1
@@ -123,11 +128,16 @@ export default {
     async onSure () {
       // 验证
       Promise.all(this.$refs.salarySolutionRulesEditRefs.map(e => e.valid())).then(async data => {
+        if (!this.versionTag) {
+          this.$message.error('请填写提交说明')
+          return
+        }
         try {
           await saveSolution({
             entity: {
               performanceSolutionId: this.itemData.performanceSolutionId,
               env: this.env,
+              versionTag: this.versionTag,
               versionType: 0 // 规则变更
             },
             performanceSolutionDetailRespCategoryVos: data

src/views/salary/solution/salarySolutionHistory/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ListTemplate ref="listTemplateRefs" history :card-title="$attrs.label">
+    <ListTemplate ref="listTemplateRefs" :history="1" :card-title="$attrs.label">
       <template #actions="{ row }">
         <m-button type="primary" text @click="$emit('history', row)" size="small">查看配置规则</m-button>
       </template>