Merge remote-tracking branch 'origin/master'

ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtOrderPerson.java

@@ -38,11 +38,11 @@ public class GxtOrderPerson {
     @Excel(name = "日期")
     private String finishDate;
 
-    @Excel(name = "奖惩类型")
+    @Excel(name = "工分项类型")
     private String scoreType;
 
     /** 得分 */
-    @Excel(name = "奖惩分")
+    @Excel(name = "工分项分值")
     private BigDecimal score;
 
     public Long getUserId() {

ygtx-ui/src/views/index5.vue

@@ -246,8 +246,8 @@
             <el-table-column prop="pcs" label="作业场站" header-align="center" align="center"></el-table-column>
             <el-table-column prop="orderType" label="工单类型" header-align="center" align="center"></el-table-column>
             <el-table-column prop="finishDate" label="日期" header-align="center" align="center"></el-table-column>
-            <el-table-column prop="scoreType" label="奖惩类型" header-align="center" align="center"></el-table-column>
-            <el-table-column prop="score" label="奖惩分" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column prop="scoreType" label="工分项类型" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="score" label="工分项分值" header-align="center" align="center" :formatter="formatScore"></el-table-column>
           </el-table>
           <pagination
               v-show="total > 0"

ygtx-ui/src/views/index6.vue

@@ -246,8 +246,8 @@
             <el-table-column prop="pcs" label="作业场站" header-align="center" align="center"></el-table-column>
             <el-table-column prop="orderType" label="工单类型" header-align="center" align="center"></el-table-column>
             <el-table-column prop="finishDate" label="日期" header-align="center" align="center"></el-table-column>
-            <el-table-column prop="scoreType" label="奖惩类型" header-align="center" align="center"></el-table-column>
-            <el-table-column prop="score" label="奖惩分" header-align="center" align="center" :formatter="formatScore"></el-table-column>
+            <el-table-column prop="scoreType" label="工分项类型" header-align="center" align="center"></el-table-column>
+            <el-table-column prop="score" label="工分项分值" header-align="center" align="center" :formatter="formatScore"></el-table-column>
           </el-table>
           <pagination
               v-show="total > 0"