Merge remote-tracking branch 'origin/master'

ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtRepairOrderServiceImpl.java

@@ -1182,7 +1182,7 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
 
         // 记录退回流转信息
         if (result > 0) {
-            // 退回删除之前选的工作负责人
+            // 退回删除旧的工作负责人
             gxtRepairOrderPersonMapper.deleteGxtRepairOrderPersonByOrderId(gxtRepairOrder.getId());
 
             GxtRepairOrderFlow flow = new GxtRepairOrderFlow();

ygtx-ui/src/components/misInfoSelect/single.vue

@@ -65,8 +65,8 @@
           <el-table-column label="检修内容" align="center" key="content" prop="content" :show-overflow-tooltip="true" />
           <el-table-column label="工作票号" align="center" key="workPermitNum" prop="workPermitNum" :show-overflow-tooltip="true" min-width="120" />
           <el-table-column label="状态" align="center" key="workOrderStatus" prop="workOrderStatus" :show-overflow-tooltip="true" />
-          <el-table-column label="计划开始时间" align="center" key="planStartTime" prop="planStartTime" :show-overflow-tooltip="true" />
-          <el-table-column label="计划结束时间" align="center" key="planEndTime" prop="planEndTime" :show-overflow-tooltip="true" />
+<!--          <el-table-column label="计划开始时间" align="center" key="planStartTime" prop="planStartTime" :show-overflow-tooltip="true" />-->
+<!--          <el-table-column label="计划结束时间" align="center" key="planEndTime" prop="planEndTime" :show-overflow-tooltip="true" />-->
           <el-table-column label="开始时间" align="center" key="realStartTime" prop="realStartTime" :show-overflow-tooltip="true" />
           <el-table-column label="结束时间" align="center" key="realEndTime" prop="realEndTime" :show-overflow-tooltip="true" />
         </el-table>

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

@@ -2057,6 +2057,18 @@ function handleUpdate(row) {
   const id = row.id || ids.value
   getGxtOrder(id).then(response => {
     form.value = response.data
+    // 关键：处理 inspectionType 逗号字符串 -> 数组，支持多选回填
+    if (form.value.inspectionType) {
+      // 1. 分割字符串为数组（去除首尾空格，避免空值）
+      form.value.inspectionType = form.value.inspectionType
+          .toString() // 确保是字符串类型，防止报错
+          .trim() // 去除首尾空格
+          .split(',') // 按逗号分割为数组
+          .filter(item => item) // 过滤空字符串（避免分割后出现 [""] 无效值）
+    } else {
+      // 无数据时赋值为空数组，避免 v-model 绑定非数组类型
+      form.value.inspectionType = []
+    }
     if (form.value.orderEntryType == '2') {
       backfillDialogVisible.value = true
     } else {