Merge branch 'personnelPerformance' into dev

src/views/performanceManage/monthlyAssess/index.vue

@@ -282,7 +282,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="红线指标触发次数">
-                <el-input v-model="nonCadreForm.redLineTriggerCount" disabled placeholder="不可编辑，红线明细的次数之和" />
+                <el-input v-model="nonCadreForm.redLineIndexTriggerCount" disabled placeholder="不可编辑，红线明细的次数之和" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -298,7 +298,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="核心指标分值">
-                <el-input v-model="nonCadreForm.coreIndicatorScore" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.coreIndexScore" disabled placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -314,7 +314,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="其他指标中的安全指标（仅含SOC/站品控检查扣分）分值">
-                <el-input v-model="nonCadreForm.safetyWithSocScore" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.otherIndexSafetyScoreWithSocStationQcDeduction" disabled placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -330,7 +330,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="其他指标中的非安全指标分值">
-                <el-input v-model="nonCadreForm.nonSafetyIndicatorScore" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.otherIndexNonSafetyDeduction" disabled placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -346,7 +346,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="SOC/站品控检查的涉及核心、安全指标扣分">
-                <el-input v-model="nonCadreForm.socSafetyCoreDeduction" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.socStationQcInvolvedCoreSafetyDeduction" disabled placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -362,12 +362,12 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="非核心安全+核心扣分">
-                <el-input v-model="nonCadreForm.nonCoreSafetyCoreDeduction" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.nonCoreSafetyPlusCoreDeduction" disabled placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="分管员工数量" prop="managedEmployeeCount">
-                <el-input-number v-model="nonCadreForm.managedEmployeeCount" :min="0" style="width: 100%" />
+              <el-form-item label="分管员工数量" prop="inChargeEmployeeCount">
+                <el-input-number v-model="nonCadreForm.inChargeEmployeeCount" :min="0" style="width: 100%" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -375,7 +375,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="扣分平均值">
-                <el-input v-model="nonCadreForm.averageDeduction" disabled placeholder="不可编辑，计算" />
+                <el-input v-model="nonCadreForm.deductionAverage" disabled placeholder="不可编辑，计算" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -637,7 +637,7 @@ const getEmptyNonCadreForm = () => ({
   nonSafetyIndicatorScore: '',
   socSafetyCoreDeduction: '',
   nonCoreSafetyCoreDeduction: '',
-  averageDeduction: '',
+  deductionAverage: '',
   rewardDetailsSummary: '',
   penaltyDetailsSummary: '',
   redLineIndexAccordList: [],