1

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

@@ -139,6 +139,10 @@
               fixed:'left'
             },
             {
+              title: '公司',
+              align:"center",
+              dataIndex: 'orgName',
+            },{
               title: '基本薪资',
               align:"center",
               dataIndex: 'beforeAdjustment',

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

@@ -23,12 +23,12 @@
                                 <a-select  v-model="formState.type" @change="changeType">
                                     <a-select-option value="加班工资单">加班工资单</a-select-option>
                                     <a-select-option value="年休工资单">年休工资单</a-select-option>
-                                    <a-select-option value="月度工资">月度工资</a-select-option>
+                                    <a-select-option value="月度工资单">月度工资单</a-select-option>
                                 </a-select>
                             </a-form-model-item>
                         </a-col>
                         <a-col :md="24" >
-                            <a-form-model-item label="计算月份"  prop="yearWithMonth" :labelCol="{offset:1}" v-if="formState.type=='加班工资单'||formState.type=='月度工资'">
+                            <a-form-model-item label="计算月份"  prop="yearWithMonth" :labelCol="{offset:1}" v-if="formState.type=='加班工资单'||formState.type=='月度工资单'">
                                 <a-month-picker placeholder="请选择" v-model="formState.yearWithMonth"  style="width:100% !important"/>
                             </a-form-model-item>
                         </a-col>
@@ -73,7 +73,7 @@
         data() {
           return {
               formState:{
-                type:'月度工资',
+                type:'月度工资单',
                 yearWithMonth:moment().subtract(1, 'months'),
                 DateTime:[],
                 yearWith:''
@@ -101,15 +101,15 @@
             handleCancel(){
                 this.visible = false
                 this.formState={
-                    type:'月度工资',
+                    type:'月度工资单',
                     yearWithMonth:moment().subtract(1, 'months')
                 }
                 // this.DateTime = []
             },
             changeType(data){
-                if(data=='月度工资'){
+                if(data=='月度工资单'){
                     this.formState={
-                        type:'月度工资',
+                        type:'月度工资单',
                         yearWithMonth:moment().subtract(1, 'months')
                     }
                 }else if(data=='加班工资单'){
@@ -134,7 +134,7 @@
                             this.formState.endMonth = moment(this.formState.DateTime[1]).format('YYYY-MM')
                             delete this.formState.DateTime
                         }
-                        if(this.formState.type=='加班工资单'||this.formState.type=='月度工资'){
+                        if(this.formState.type=='加班工资单'||this.formState.type=='月度工资单'){
                             this.formState.yearWithMonth = moment(this.formState.yearWithMonth).format('YYYY-MM')
                         }
                         if(this.formState.type=='年休工资单'){