基本薪资

src/views/oa/salary_management/personnelSalary/BasicSalary.vue

@@ -23,7 +23,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="姓名">
-                <a-input placeholder="请输入" v-model="formState.name"  />
+                <a-input placeholder="请输入" v-model="queryParam.name"  />
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -38,23 +38,7 @@
       </div>
   
       <!-- 操作按钮区域 -->
-      <div class="table-operator">
-        <a-button @click="createMonthlyPayroll" type="primary" icon="plus">生成月度工资单</a-button>
-        <a-button @click="createOvertimePayroll" type="primary" icon="plus">生成加班工资单</a-button>
-        <a-button @click="createLeavePayroll" type="primary" icon="plus">生成年休工资单</a-button>
-      </div>
-  
-      <!-- table区域-begin -->
-      <div>
-        <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-          <i class="anticon anticon-info-circle ant-alert-icon"></i>
-          <span>已选择</span>
-          <a style="font-weight: 600">
-            {{ selectedRowKeys.length }}
-          </a>
-          <span>项</span>
-          <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-        </div>
+
   
         <a-table
           ref="table"
@@ -68,20 +52,16 @@
           :loading="loading"
           :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
           @change="handleTableChange">
-           <span slot="operation" slot-scope="text, record">
-                <a @click="handleDetail(record)" >查看详情</a>
-                <a-divider type="vertical" />
-                <a @click="handleDownload(record)" >下载</a>
-                <a-divider type="vertical" />
-                <a @click="handleexport(record)" >导出</a>
-
+           <span slot="basicSalary" slot-scope="text, record">
+                <!-- <a @click="handleBasicSalary(record)" >record.basicSalary</a> -->
+                <a @click="handleBasicSalary(record)" >333333</a>
            </span>
         </a-table>
       </div>
       <!-- table区域-end -->
   
       <!-- 表单区域 -->
-      <PayrollDetail ref="PayrollDetail"></PayrollDetail>
+      <ChangeBasicSalary ref="ChangeBasicSalary"></ChangeBasicSalary>
     </a-card>
   </template>
   
@@ -90,13 +70,15 @@
     import { JeecgListMixin } from '@/mixins/JeecgListMixin'
     import { getAction } from '@/api/manage'
     import moment from 'moment'
-    import PayrollDetail from './modules/PayrollDetail.vue'
+    import ChangeBasicSalary from './modules/ChangeBasicSalary.vue'
+    import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
     export default {
       name: "BasicSalary",
       mixins: [JeecgListMixin],
       components: {
         moment,
-        PayrollDetail
+        ChangeBasicSalary,
+        JSearchSelectTag
       },
       data () {
         return {
@@ -110,7 +92,10 @@
               title: '序号',
               width: 80,
               align:"center",
-              dataIndex: 'code'
+              dataIndex: 'code',
+              customRender:function (t, r, index) {
+                    return parseInt(index)+1;
+              }
             },
             {
               title: '编号',
@@ -140,7 +125,8 @@
             {
               title: '基本薪资',
               align:"center",
-              dataIndex: 'basicSalary'
+              dataIndex: 'basicSalary',
+              scopedSlots: { customRender: 'basicSalary' } 
             },
             {
               title: '最后变更时间',
@@ -164,28 +150,14 @@
         getTableList(){
 
         },
-        createMonthlyPayroll(){
-
-        },
-        createOvertimePayroll(){
-
+        handleBasicSalary(){
+          this.$refs.ChangeBasicSalary.visible = true
         },
         searchQuery(){
 
         },
         searchReset(){
 
-        },
-        createLeavePayroll(){
-
-        },
-        handleDetail(record){
-        },
-        handleDownload(record){
-
-        },
-        handleexport(record){
-
         },
         onSelectChange(selectedRowKeys, selectionRows) {
             this.selectedRowKeys = selectedRowKeys;

src/views/oa/salary_management/personnelSalary/modules/ChangeBasicSalary.vue

@@ -0,0 +1,115 @@
+<template>
+    <div class="reply" ref = "replyModal">
+      <a-modal
+        title="薪资调整"
+        width="25%"
+        :visible="visible"
+        :confirmLoading="loading"
+        :getContainer ='()=>$refs.replyModal'
+        @cancel="handleCancel"
+        destroyOnClose
+       >
+            <template #footer>
+                <a-button  @click="handleCancel" style="margin-left: 8px;">取消</a-button>
+                <a-button  @click="handleOk" style="margin-left: 8px;">确认</a-button>
+            </template>
+            <div class="table-page-search-wrapper">
+                <a-form-model layout="inline" ref="form" :model="formState" >
+                    <a-row :gutter="24">
+                        <a-col :md="24" >
+                            <a-form-model-item label="姓名"  :labelCol="{offset: 2}">
+                                <a-input placeholder="请输入" v-model="formState.name" />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24" >
+                            <a-form-model-item label="组织"  prop="name" :labelCol="{offset: 2}">
+                                <a-input  v-model="formState.organization" />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24" >
+                            <a-form-model-item label="当前薪资"  prop="totalNum" >
+                                <a-input placeholder="" v-model="formState.currentSalary" />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24">
+                            <a-form-model-item label="加薪" :labelCol="{offset: 2}">
+                                <a-input placeholder="请输入" v-model="formState.salaryIncrease"  />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24">
+                            <a-form-model-item label="减薪" :labelCol="{offset: 2}">
+                                <a-input placeholder="请输入" v-model="formState.salaryReduction"  />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24">
+                            <a-form-model-item label="调后薪资">
+                                <a-input placeholder="请输入" v-model="formState.salaryReduction"  />
+                            </a-form-model-item>
+                        </a-col>
+                        <a-col :md="24" > 
+                            <a-form-model-item label="调整说明"  class="nresume" style="height:100px !important">
+                                <a-input type="textarea" placeholder="请输入" v-model="formState.adjustedSalary" />
+                            </a-form-model-item>
+                        </a-col>
+                    </a-row>
+                </a-form-model>
+            </div>
+      </a-modal>
+    </div>
+</template>
+<script>
+    
+      import moment from 'moment'
+      import pick from 'lodash.pick'
+      import { FormTypes } from '@/utils/JEditableTableUtil'
+      import { putAction,getAction } from '@/api/manage'
+      export default {
+        name: 'ChangeBasicSalary',
+        components: {
+            moment,
+        },
+        data() {
+          return {
+              formState:{},
+              dataSource: [{}],
+              visible:false,
+              loading:false,
+          }
+        },
+        created(){
+        },
+        watch: {
+        },
+        methods: {
+            handleCancel(){
+                this.visible = false
+            },
+            handleOk(){
+                
+            }
+        }
+    }
+    </script>
+    
+    <style scoped lang="less">
+    /deep/ .nresume .ant-input{
+      height: 100px !important;
+    }
+
+    /deep/ .ant-select{
+      width: 100%;
+    }
+    .form-table-heard:before {
+          content: '*';
+          color: red;
+    }
+    /deep/ .ant-calendar-picker{
+      width: 113px !important;
+    }
+    /deep/.ant-modal-root>.ant-modal-wrap>.ant-modal {
+      min-width: 0 !important;
+    }
+    /deep/.table-page-search-wrapper .ant-form-inline .ant-form-item>.ant-form-item-label{
+        padding-right:0 !important
+    }
+    </style>