Merge remote-tracking branch 'origin/master'

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

@@ -29,11 +29,11 @@ public class GxtOrderData extends BaseEntity
     private Date endTime;
 
     /** 中心 */
-    @Excel(name = "归属地")
+    @Excel(name = "中心")
     private String center;
 
     /** 场站 */
-    @Excel(name = "归属地")
+    @Excel(name = "场站")
     private String pcs;
 
     /** 编码 */
@@ -52,7 +52,10 @@ public class GxtOrderData extends BaseEntity
     @Excel(name = "系统")
     private String system;
 
-    @Excel(name = "类型")
+    /**
+     * 工单类型
+     */
+    @Excel(name = "工单类型")
     private String orderType;
 
     /** 维修工单 */
@@ -69,14 +72,14 @@ public class GxtOrderData extends BaseEntity
     @Excel(name = "工作负责人")
     private String chargePerson;
 
-    /** 维修工单数 */
-    @Excel(name = "维修工单数")
-    private Integer repairOrderNum;
-
     /** 维保工单数 */
     @Excel(name = "维保工单数")
     private Integer workOrderNum;
 
+    /** 维修工单数 */
+    @Excel(name = "维修工单数")
+    private Integer repairOrderNum;
+
     /** 工时统计 */
     private String gstj;
 

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -791,9 +791,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND wopp.wop_num>0 AND wo.work_order_status IS NOT NULL AND wo.work_order_status IN ('completed','archived')
             </where>
             ) o
-        <where>
-            <if test="orderType != null and orderType != '' "> AND o.orderType = #{orderType}</if>
-        </where>
         <choose>
             <when test="(xfsc != null and xfsc == 'true') or (xysc != null and xysc == 'true') or (zbsc != null and zbsc == 'true') or (tjsc != null and tjsc == 'true') or (qjbwsc != null and qjbwsc == 'true') or (clsc != null and clsc == 'true') or (gqsc != null and gqsc == 'true') or (score != null and score == 1)">
                 <trim prefix="ORDER BY" suffixOverrides=",">

ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -1979,7 +1979,7 @@ watch(
 );
 
 function getFromRoute () {
-  // 检查是否从月度工分汇总页面跳转而来，如果有工单编号则自动筛选
+  // 检查是否从月度工分汇总页面跳转而来，如果有工单编码则自动筛选
   const fromRoute = sessionStorage.getItem('fromRoute');
   const workOrderNo = sessionStorage.getItem('workOrderProjectNo');
   if (fromRoute === '/workScore/monthScore' && workOrderNo) {

ygtx-ui/src/views/gxt/monthScore/index.vue

@@ -108,7 +108,7 @@
                   <el-button link type="primary" @click="handleWorkOrderClick(scope.row)">{{ scope.row.workOrderProjectNo }}</el-button>
                 </template>
               </el-table-column>
-              <el-table-column prop="leader" label="工作负责人"></el-table-column>
+              <el-table-column prop="teamLeaderName" label="工作负责人"></el-table-column>
               <el-table-column prop="acceptUserName" label="接单人"></el-table-column>
               <el-table-column prop="pauseTime" label="停机时间"></el-table-column>
               <el-table-column prop="restartTime" label="恢复运行时间"></el-table-column>
@@ -153,7 +153,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="model" width="200px" label="机型"></el-table-column>
-              <el-table-column prop="leader" label="工作负责人"></el-table-column>
+              <el-table-column prop="teamLeaderName" label="工作负责人"></el-table-column>
               <el-table-column prop="acceptUserName" label="接单人"></el-table-column>
               <el-table-column prop="occurTime" label="停机时间"></el-table-column>
               <el-table-column prop="restartTime" label="恢复运行时间"></el-table-column>

ygtx-ui/src/views/gxt/monthScore/info.vue

@@ -43,7 +43,7 @@
                   <el-button link type="primary" @click="handleWorkOrderClick(scope.row)">{{ scope.row.workOrderProjectNo }}</el-button>
                 </template>
               </el-table-column>
-              <el-table-column prop="leader" label="工作负责人"></el-table-column>
+              <el-table-column prop="teamLeaderName" label="工作负责人"></el-table-column>
               <el-table-column prop="acceptUserName" label="接单人"></el-table-column>
               <el-table-column prop="pauseTime" label="停机时间"></el-table-column>
               <el-table-column prop="restartTime" label="恢复运行时间"></el-table-column>
@@ -89,7 +89,7 @@
                 </template>
               </el-table-column>
               <el-table-column prop="model" width="200px" label="机型"></el-table-column>
-              <el-table-column prop="leader" label="工作负责人"></el-table-column>
+              <el-table-column prop="teamLeaderName" label="工作负责人"></el-table-column>
               <el-table-column prop="acceptUserName" label="接单人"></el-table-column>
               <el-table-column prop="occurTime" label="停机时间"></el-table-column>
               <el-table-column prop="restartTime" label="恢复运行时间"></el-table-column>

ygtx-ui/src/views/gxt/repairOrder/index.vue

@@ -2335,7 +2335,7 @@ const returnRules = ref({
 })
 
 function getFromRoute() {
-  // 检查是否从月度工分汇总页面跳转而来，如果有工单编号则自动筛选
+  // 检查是否从月度工分汇总页面跳转而来，如果有工单编码则自动筛选
   const fromRoute = sessionStorage.getItem('fromRouteRepair');
   const workOrderNo = sessionStorage.getItem('workOrderProjectNoRepair');
   if (fromRoute === '/workScore/monthScore' && workOrderNo) {

ygtx-ui/src/views/index4.vue

@@ -453,7 +453,7 @@
             </div>
           </template>
           <el-table :data="orderList" style="width: 100%">
-            <el-table-column v-if="hasOrderCode()" prop="orderCode" label="工单编号" :style="{ width: changeWidth() * 2 + '%' }" header-align="center" align="center"></el-table-column>
+            <el-table-column v-if="hasOrderCode()" prop="orderCode" label="工单编码" :style="{ width: changeWidth() * 2 + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.code" prop="code" label="风机编号" :style="{ width: changeWidth() * 1.5 + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.brand" prop="brand" label="品牌" :style="{ width: changeWidth() + '%' }" header-align="center" align="center"></el-table-column>
             <el-table-column v-if="queryParams.model" prop="model" label="机型" :style="{ width: changeWidth() * 2 + '%' }" header-align="center" align="center"></el-table-column>
@@ -1456,6 +1456,9 @@ export default {
       return parseFloat(rounded).toString();
     },
     handleExport() {
+      if (this.queryParams.workOrder || this.queryParams.repairOrder) {
+        this.queryParams.orderType = true;
+      }
       this.download("gxt/order/exportHomePageOrderList", this.queryParams, `homePageOrderList_${new Date().getTime()}.xlsx`);
     },
     // 加载首页统计数据

ygtx-ui/src/views/index6.vue

@@ -235,7 +235,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="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"