缺陷修复

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/mobile/GxtMobileOrderController.java

@@ -1,6 +1,7 @@
 package com.ygtx.gxt.controller.mobile;
 
 import com.ygtx.common.core.controller.BaseController;
+import com.ygtx.common.core.domain.AjaxResult;
 import com.ygtx.common.core.page.TableDataInfo;
 import com.ygtx.gxt.domain.*;
 import com.ygtx.gxt.service.IGxtOrderScoreService;
@@ -42,4 +43,22 @@ public class GxtMobileOrderController extends BaseController
         List<OrderScoreInfo> list = gxtOrderScoreService.selectMobileUnionOrderList(repairOrder, workOrder,keyword);
         return getDataTable(list);
     }
+
+    /**
+     * 获取维修工单详细信息
+     */
+    @GetMapping(value = "/repairOrder/{id}")
+    public AjaxResult getRepairOrderInfo(@PathVariable("id") Long id)
+    {
+        return success(gxtRepairOrderService.selectGxtRepairOrderById(id));
+    }
+
+    /**
+     * 获取维保工单详细信息
+     */
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(gxtWorkOrderService.selectGxtWorkOrderById(id));
+    }
 }

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

@@ -1088,7 +1088,7 @@
     </el-dialog>
 
     <!-- 审批挂起对话框 -->
-    <el-dialog title="审批" v-model="approveDialogVisible" width="800px"  append-to-body>
+    <el-dialog title="审批挂起申请" v-model="approveDialogVisible" width="800px"  append-to-body>
 <!--      <div style="max-height: 500px; overflow-y: auto; padding-right: 10px;">-->
         <el-alert type="info" :closable="false" style="border-color: #a855f7; background-color: #f8f5ff; color: #6d28d9; height: 35px;">
           <template #default>
@@ -1125,43 +1125,56 @@
                 </el-select>
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="维保中心">
                 <el-input v-model="approveForm.gxtCenter" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="场站">
                 <el-input v-model="approveForm.pcsStationName" disabled />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="品牌">
                 <el-input v-model="approveForm.brand" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="机型">
                 <el-input v-model="approveForm.model" disabled />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="MIS工单编码">
                 <el-input v-model="approveForm.misNo" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="工作负责人">
                 <el-input v-model="approveForm.teamLeaderName" disabled />
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="挂起原因">
+                <el-select v-model="approveForm.suspendReason" style="width: 100%" disabled>
+                  <el-option
+                      v-for="dict in gxt_order_suspend_reason"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
           </el-row>
+
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="维保内容" prop="content">
@@ -1173,25 +1186,6 @@
 
         <!-- 挂起信息 -->
         <el-form ref="approveRef" :model="approveForm" :rules="approveRules" label-width="120px" label-position="top">
-          <el-form-item label="挂起原因" prop="suspendReason">
-<!--            <el-input v-model="approveForm.suspendReason" type="textarea" :rows="3" disabled />-->
-            <el-select v-model="approveForm.suspendReason" placeholder="请选择挂起原因" style="width: 100%" disabled>
-              <el-option
-                  v-for="dict in gxt_order_suspend_reason"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-
-<!--          <el-form-item label="审批结果" prop="workOrderStatus">-->
-<!--            <el-radio-group v-model="approveForm.workOrderStatus">-->
-<!--              <el-radio label="suspended">通过</el-radio>-->
-<!--              <el-radio label="to_finish">驳回</el-radio>-->
-<!--            </el-radio-group>-->
-<!--          </el-form-item>-->
-
           <el-form-item label="驳回理由" prop="rejectionReason">
             <el-input v-model="approveForm.rejectionReason" type="textarea" placeholder="请输入驳回理由" :rows="3" />
           </el-form-item>
@@ -1260,9 +1254,9 @@
                     <el-form-item label="机型">{{ detailData.model || '-' }}</el-form-item>
                   </el-col>
 
-                  <el-col :span="24">
-                    <el-form-item label="维保内容">{{ detailData.content || '-' }}</el-form-item>
-                  </el-col>
+<!--                  <el-col :span="24">-->
+<!--                    <el-form-item label="维保内容">{{ detailData.content || '-' }}</el-form-item>-->
+<!--                  </el-col>-->
                 </el-row>
               </el-form>
             </div>
@@ -1345,7 +1339,15 @@
           </div>
         </el-col>
       </el-row>
-
+      <el-form label-position="top">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="维保内容">
+              <div class="content-text">{{ detailData.content || '-' }}</div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
       <!-- 附件信息 -->
       <div class="info-section" v-if="detailData.attachmentUrls">
         <h3 class="section-title">结单附件</h3>
@@ -2957,4 +2959,9 @@ getList()
 :deep(.el-form-item) {
   margin-bottom: 18px;
 }
+.content-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+  line-height: 1.5;
+}
 </style>

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

@@ -718,7 +718,7 @@
     </el-dialog>
 
     <!-- 审批对话框 -->
-    <el-dialog title="审批" v-model="approveDialogVisible" width="800px" append-to-body @close="closeApproveDialog">
+    <el-dialog title="审批挂起申请" v-model="approveDialogVisible" width="800px" append-to-body @close="closeApproveDialog">
       <el-alert type="info" :closable="false" style="border-color: #a855f7; background-color: #f8f5ff; color: #6d28d9; height: 35px;">
         <template #default>
           <i class="fa fa-edit mr-2" style="color: #6d28d9;"> 请审批该工单的挂起申请，选择通过或驳回。</i>
@@ -771,18 +771,18 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="下发人"><el-input v-model="approveForm.assignUserName" disabled /></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="下发时间"><el-input v-model="approveForm.assignTime" disabled /></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接单人"><el-input v-model="approveForm.acceptUserName" disabled /> </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接单时间"><el-input v-model="approveForm.acceptTime" disabled /> </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="下发人"><el-input v-model="approveForm.assignUserName" disabled /></el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="下发时间"><el-input v-model="approveForm.assignTime" disabled /></el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="接单人"><el-input v-model="approveForm.acceptUserName" disabled /> </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="接单时间"><el-input v-model="approveForm.acceptTime" disabled /> </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="工作负责人"><el-input v-model="approveForm.teamLeaderName" disabled /> </el-form-item>
           </el-col>
@@ -1425,7 +1425,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="故障信息">
-              {{ viewForm.faultBarcode || '-' }}
+              <div class="content-text">{{ viewForm.faultBarcode || '-' }}</div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -3305,4 +3305,9 @@ function onMisInfoSelected(row) {
 :deep(.el-form-item) {
   margin-bottom: 18px;
 }
+.content-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+  line-height: 1.5;
+}
 </style>