迁移

src/api/salary.js

@@ -31,43 +31,3 @@ export function addConfig (param) {
 export function updateConfig (param) {
   return http.put('/configurations', param)
 }
-
-// 福利待遇 - 分页查询
-export function getWelfarePage (param) {
-  return http.post('/subsidy/category/page', param)
-}
-
-// 福利待遇 - 明细查询
-export function getWelfareDetail (param) {
-  return http.post('/subsidy/category/detail', param)
-}
-
-// 福利待遇 - 保存
-export function saveWelfare (param) {
-  return http.post('/subsidy/category/save', param)
-}
-
-// 福利待遇 - 删除
-export function deleteWelfare (param) {
-  return http.post('/subsidy/category/del', param)
-}
-
-// 福利待遇 - 福利类型 分页查询
-export function getWelfareCategoryPage (param) {
-  return http.post('/subsidy/personnel/category/page', param)
-}
-
-// 福利待遇 - 福利类型 明细
-export function getWelfareCategoryDetails (param) {
-  return http.post('/subsidy/personnel/category/detail', param)
-}
-
-// 福利待遇 - 福利类型 保存
-export function saveWelfareCategory (param) {
-  return http.post('/subsidy/personnel/category/save', param)
-}
-
-// 福利待遇 - 福利类型 删除
-export function deleteWelfareCategory (param) {
-  return http.post('/subsidy/personnel/category/del', param)
-}

src/api/welfare.js

@@ -0,0 +1,42 @@
+
+import http from '@/utils/request'
+
+// 福利待遇 - 分页查询
+export function getWelfarePage (param) {
+  return http.post('/subsidy/category/page', param)
+}
+
+// 福利待遇 - 明细查询
+export function getWelfareDetail (param) {
+  return http.post('/subsidy/category/detail', param)
+}
+
+// 福利待遇 - 保存
+export function saveWelfare (param) {
+  return http.post('/subsidy/category/save', param)
+}
+
+// 福利待遇 - 删除
+export function deleteWelfare (param) {
+  return http.post('/subsidy/category/del', param)
+}
+
+// 福利待遇 - 福利类型 分页查询
+export function getWelfareCategoryPage (param) {
+  return http.post('/subsidy/personnel/category/page', param)
+}
+
+// 福利待遇 - 福利类型 明细
+export function getWelfareCategoryDetails (param) {
+  return http.post('/subsidy/personnel/category/detail', param)
+}
+
+// 福利待遇 - 福利类型 保存
+export function saveWelfareCategory (param) {
+  return http.post('/subsidy/personnel/category/save', param)
+}
+
+// 福利待遇 - 福利类型 删除
+export function deleteWelfareCategory (param) {
+  return http.post('/subsidy/personnel/category/del', param)
+}

src/components/AutoComponents/MDialog/index.vue

@@ -12,8 +12,8 @@
   >
     <slot></slot>
     <span slot="footer">
-      <m-button type="primary" @click="sure">确 定</m-button>
       <m-button @click="show = false">取 消</m-button>
+      <m-button type="primary" @click="sure">确 定</m-button>
     </span>
   </el-dialog>
 </template>

src/components/AutoComponents/MSearch/index.vue

@@ -19,7 +19,7 @@
           v-if="item.type === 'input'"
           v-model="form[item.prop]"
           @keydown.enter.native="onSubmit"
-          :clearable="item.option.clearable ?? true"
+          :clearable="item.option?.clearable ?? true"
           v-bind="item.option"
           v-on="item.handles"
         ></el-input>
@@ -28,7 +28,7 @@
         <el-select
           v-if="item.type === 'select'"
           v-model="form[item.prop]"
-          :clearable="item.option.clearable ?? true"
+          :clearable="item.option?.clearable ?? true"
           v-bind="item.option"
           v-on="item.handles"
         >

src/views/humanResources/welfare/welfareList.vue

@@ -32,7 +32,7 @@ import {
   getWelfareDetail,
   getWelfareCategoryPage,
   deleteWelfare
-} from '@/api/salary'
+} from '@/api/welfare'
 import welfareListEdit from './welfareListEdit.vue'
 export default {
   name: 'welfare-list',
@@ -209,7 +209,7 @@ export default {
         } catch (error) {
           this.$message.error(error)
         }
-      })
+      }).catch(() => {})
     }
   }
 }

src/views/humanResources/welfare/welfareListEdit.vue

@@ -1,6 +1,6 @@
 <template>
   <m-dialog ref="dialog" v-bind="$attrs" v-on="$listeners" @sure="onSure">
-    <m-form ref="form" :items="items" label-width="180px" v-model="values"></m-form>
+    <m-form ref="form" :items="items" label-width="180px" v-model="values" v-loading="loadingPage"></m-form>
   </m-dialog>
 </template>
 
@@ -9,12 +9,13 @@ import {
   getWelfareCategoryPage,
   saveWelfare,
   getWelfareCategoryDetails
-} from '@/api/salary'
+} from '@/api/welfare'
 export default {
   name: 'welfare-list-edit',
   data () {
     return {
       loading: false,
+      loadingPage: false,
       subsidyPersonnelCategoryIdItems: [],
       values: {}
     }
@@ -102,6 +103,7 @@ export default {
       this.values = item
       this.$refs.dialog.open()
       if (item.subsidyCategoryId) {
+        this.loadingPage = true
         try {
           const { data } = await getWelfareCategoryDetails({
             subsidyPersonnelCategoryId: item.subsidyPersonnelCategoryId
@@ -109,6 +111,8 @@ export default {
           this.subsidyPersonnelCategoryIdItems = [data]
         } catch (error) {
           this.$message.error(error)
+        } finally {
+          this.loadingPage = false
         }
       }
     },

src/views/humanResources/welfare/welfareType.vue

@@ -29,7 +29,7 @@ import {
   getWelfareCategoryPage,
   getWelfareCategoryDetails,
   deleteWelfareCategory
-} from '@/api/salary'
+} from '@/api/welfare'
 export default {
   name: 'welfare-type',
   components: {
@@ -128,7 +128,7 @@ export default {
         } catch (error) {
           this.$message.error(error)
         }
-      })
+      }).catch(_ => {})
     },
     onSearch () {
       this.pageInfo.current = 1

src/views/humanResources/welfare/welfareTypeEdit.vue

@@ -29,7 +29,7 @@
 import { organizationDrill, getOrganizationTree } from '@/api/system'
 import {
   saveWelfareCategory
-} from '@/api/salary'
+} from '@/api/welfare'
 export default {
   name: 'welfare-type-edit',
   data () {

src/views/salary/comparison/index.vue

@@ -1,6 +1,11 @@
 <template>
   <div class="white pa-3">
-    <m-search :items="searchItems" v-model="searchValues" class="mb-3"></m-search>
+    <m-search :items="searchItems" v-model="searchValues" class="mb-3">
+      <template #button>
+        <m-button type="primary" icon="el-icon-plus">导入手工数据</m-button>
+        <m-button type="primary" icon="el-icon-check">提交薪酬对比</m-button>
+      </template>
+    </m-search>
     <m-table
       :items="items"
       :headers="headers"
@@ -19,10 +24,9 @@ export default {
   data () {
     return {
       searchItems: [
-        { label: '姓名', prop: 'name', type: 'input' },
-        { label: '部门', prop: 'department', type: 'input' },
-        { label: '岗位', prop: 'post', type: 'input' },
-        { label: '月份', prop: 'month', type: 'month' }
+        { label: '月份', prop: 'month', type: 'date', option: { placeholder: '请选择月份', type: 'month' } },
+        { label: '姓名', prop: 'name', type: 'input', option: { placeholder: '请输入姓名' } },
+        { label: '部门', prop: 'department', type: 'input', option: { placeholder: '请输入部门' } }
       ],
       searchValues: {},
       headers: [