缺陷修复

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

@@ -36,6 +36,10 @@ public class GxtWorkOrder extends BaseEntity
     @Excel(name = "工单状态", readConverterExp = "draft=草稿,to_assign=待派单,assigned=已派单,accepted=已接单,processing=处理中,paused=暂停中,to_approve=待审批,suspended=已挂起,completed=已完成,to_finish=待结单,to_archive=待归档,archived=已归档")
     private String workOrderStatus;
 
+    /** 工单录入类别（1默认，2补录工单） */
+    @Excel(name = "录入类别", readConverterExp = "1=新建工单,2=补录工单")
+    private String orderEntryType;
+
     /** 维保中心ID */
     private Long gxtCenterId;
 
@@ -187,9 +191,6 @@ public class GxtWorkOrder extends BaseEntity
 
     /** 工单类型 */
     private Long orderType;
-    
-    /** 工单录入类别（1默认，2补录工单） */
-    private String orderEntryType; 
 
      /** 优先级 */  
     private Long priorityType;

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

@@ -1172,13 +1172,6 @@ public class GxtRepairOrderServiceImpl implements IGxtRepairOrderService
     public int returnGxtRepairOrder(GxtRepairOrder gxtRepairOrder) {
         String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
         GxtRepairOrder oldOrder = gxtRepairOrderMapper.selectGxtRepairOrderById(gxtRepairOrder.getId());
-//        if (gxtRepairOrder.getReturnType().equals("1")) {
-//            // 待接单
-//            gxtRepairOrder.setWorkOrderStatus("assigned");
-//        } else {
-//            // 待下发
-//            gxtRepairOrder.setWorkOrderStatus("to_issue");
-//        }
         gxtRepairOrder.setUpdateBy(SecurityUtils.getUsername());
         gxtRepairOrder.setUpdateTime(DateUtils.getNowDate());
         int result = gxtRepairOrderMapper.updateGxtRepairOrder(gxtRepairOrder);

ygtx-ui/src/api/gxt/gxtOrder.js

@@ -116,7 +116,7 @@ export function getWorkOrderFlow(orderId) {
   })
 }
 
-// 接单（支持一次性选择处理人员和检修人员）
+// 接单（支持一次性选择处理人员和工作班成员）
 export function acceptOrder(id, gxtWorkOrder) {
   return request({
     url: '/gxt/order/accept/' + id,

ygtx-ui/src/api/gxt/misInfo.js

@@ -9,7 +9,7 @@ export function listMisInfo(query) {
   })
 }
 
-// 查询检修人员列表
+// 查询工作班成员列表
 export function listWorkPerson(query) {
   return request({
     url: '/gxt/misInfo/listWorkPerson',

ygtx-ui/src/components/gxtOrder/backfillFinalize.vue

@@ -169,10 +169,10 @@
 <!--      </el-row>-->
 <!--      <el-row>-->
         <el-col :span="12">
-          <el-form-item label="检修人员" prop="workGroupMemberName">
+          <el-form-item label="工作班成员" prop="workGroupMemberName">
             <el-input
                 v-model="formData.workGroupMemberName"
-                placeholder="请选择检修人员"
+                placeholder="请选择工作班成员"
                 :readonly="formData.infoEntry == '1'"
             >
               <template #append v-if="formData.infoEntry == '2'">
@@ -288,7 +288,7 @@ const finishRules = ref({
     }
   ],
   workGroupMemberName: [
-    { required: false, message: "请输入检修人员", trigger: "change" },
+    { required: false, message: "请输入工作班成员", trigger: "change" },
     {
       validator: async (rule, value, callback) => {
         // 如果值为空、关联MIS，直接通过验证
@@ -298,32 +298,32 @@ const finishRules = ref({
         }
         try {
           inputUsers.value = []
-          // 将输入的检修人员姓名按逗号分割
+          // 将输入的工作班成员姓名按逗号分割
           const names = value.split(',').map(name => name.trim());
-          // 验证每个检修人员是否存在于组织架构中
+          // 验证每个工作班成员是否存在于组织架构中
           for (const name of names) {
             if (name.length > 0) {
               // 检查输入中重复
               if (inputUsers.value.some(u => u.nickName === name)) {
-                return callback(new Error(`检修人员"${name}"重复，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"重复，请重新输入`));
               }
               // 使用从属性传入的listUserData方法（如果有的话）
               if (props.listUserData) {
                 const response = await props.listUserData({nickName: name});
                 if (!response.rows || response.rows.length === 0) {
-                  return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                  return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
                 }else{
                   inputUsers.value.push(response.rows[0]);
                 }
               }
             } else {
-              return callback(new Error(`请正确输入检修人员名单`));
+              return callback(new Error(`请正确输入工作班成员名单`));
             }
           }
           selectedUsers.value = inputUsers.value;
           callback();
         } catch (error) {
-          callback(new Error('验证检修人员时发生错误'));
+          callback(new Error('验证工作班成员时发生错误'));
         }
       },
       trigger: 'change'

ygtx-ui/src/components/gxtOrder/finalize.vue

@@ -221,10 +221,10 @@
 <!--      </el-row>-->
 <!--      <el-row>-->
         <el-col :span="12">
-          <el-form-item label="检修人员" prop="workGroupMemberName">
+          <el-form-item label="工作班成员" prop="workGroupMemberName">
             <el-input
                 v-model="formData.workGroupMemberName"
-                placeholder="请选择检修人员"
+                placeholder="请选择工作班成员"
                 :readonly="formData.infoEntry == '1'"
             >
               <template #append v-if="formData.infoEntry == '2'">
@@ -369,7 +369,7 @@ const finishRules = ref({
     }
   ],
   workGroupMemberName: [
-    { required: false, message: "请输入检修人员", trigger: "change" },
+    { required: false, message: "请输入工作班成员", trigger: "change" },
     {
       validator: async (rule, value, callback) => {
         // 如果值为空、关联MIS，直接通过验证
@@ -379,32 +379,32 @@ const finishRules = ref({
         }
         try {
           inputUsers.value = []
-          // 将输入的检修人员姓名按逗号分割
+          // 将输入的工作班成员姓名按逗号分割
           const names = value.split(',').map(name => name.trim());
-          // 验证每个检修人员是否存在于组织架构中
+          // 验证每个工作班成员是否存在于组织架构中
           for (const name of names) {
             if (name.length > 0) {
               // 检查输入中重复
               if (inputUsers.value.some(u => u.nickName === name)) {
-                return callback(new Error(`检修人员"${name}"重复，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"重复，请重新输入`));
               }
               // 使用从属性传入的listUserData方法（如果有的话）
               if (props.listUserData) {
                 const response = await props.listUserData({nickName: name});
                 if (!response.rows || response.rows.length === 0) {
-                  return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                  return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
                 }else{
                   inputUsers.value.push(response.rows[0]);
                 }
               }
             } else {
-              return callback(new Error(`请正确输入检修人员名单`));
+              return callback(new Error(`请正确输入工作班成员名单`));
             }
           }
           selectedUsers.value = inputUsers.value;
           callback();
         } catch (error) {
-          callback(new Error('验证检修人员时发生错误'));
+          callback(new Error('验证工作班成员时发生错误'));
         }
       },
       trigger: 'change'

ygtx-ui/src/components/gxtOrder/view.vue

@@ -63,7 +63,7 @@
                   <el-form-item label="工作负责人">{{ formData.teamLeaderName || '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="检修人员">{{ formData.workGroupMemberName || '-' }}</el-form-item>
+                  <el-form-item label="工作班成员">{{ formData.workGroupMemberName || '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24" v-if="formData.infoEntry == '1'">
                   <el-form-item label="MIS工单编码">{{ formData.misNo || '-' }}</el-form-item>

ygtx-ui/src/components/repairOrder/approve.vue

@@ -52,7 +52,7 @@
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+          <el-form-item label="故障条文"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.faultDesc">
           <el-form-item label="故障描述">

ygtx-ui/src/components/repairOrder/finalize.vue

@@ -39,7 +39,7 @@
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /> </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /> </el-form-item>
+          <el-form-item label="故障条文"><el-input v-model="formData.faultBarcode" disabled /> </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="故障描述">
@@ -179,10 +179,10 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="检修人员" prop="workGroupMemberName">
+          <el-form-item label="工作班成员" prop="workGroupMemberName">
             <el-input
                 v-model="formData.workGroupMemberName"
-                placeholder="请选择检修人员"
+                placeholder="请选择工作班成员"
                 :readonly="formData.infoEntry == '1'"
             >
               <template #append v-if="formData.infoEntry == '2'">
@@ -378,7 +378,7 @@ const finalizeRules = ref({
     }
   ],
   workGroupMemberName: [
-    { required: false, message: "请输入检修人员", trigger: "change" },
+    { required: true, message: "请选择工作班成员", trigger: "change" },
     {
       validator: async (rule, value, callback) => {
         // 如果值为空、关联MIS，直接通过验证
@@ -388,14 +388,14 @@ const finalizeRules = ref({
         }
         try {
           inputUsers.value = []
-          // 将输入的检修人员姓名按逗号分割
+          // 将输入的工作班成员姓名按逗号分割
           const names = value.split(',').map(name => name.trim());
-          // 验证每个检修人员是否存在于组织架构中
+          // 验证每个工作班成员是否存在于组织架构中
           for (const name of names) {
             if (name.length > 0) {
               // 检查输入中重复
               if (inputUsers.value.some(u => u.nickName === name)) {
-                return callback(new Error(`检修人员"${name}"重复，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"重复，请重新输入`));
               }
               // 使用从属性传入的listUserData方法
               if (!props.listUserData) {
@@ -403,18 +403,18 @@ const finalizeRules = ref({
               }
               const response = await props.listUserData({nickName: name});
               if (!response.rows || response.rows.length === 0) {
-                return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
               }else{
                 inputUsers.value.push(response.rows[0]);
               }
             } else {
-              return callback(new Error(`请正确输入检修人员名单`));
+              return callback(new Error(`请正确输入工作班成员名单`));
             }
           }
           selectedUsers.value = inputUsers.value;
           callback();
         } catch (error) {
-          callback(new Error('验证检修人员时发生错误'));
+          callback(new Error('验证工作班成员时发生错误'));
         }
       },
       trigger: 'blur'

ygtx-ui/src/components/repairOrder/reset.vue

@@ -42,7 +42,7 @@
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+          <el-form-item label="故障条文"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="故障描述">

ygtx-ui/src/components/repairOrder/return.vue

@@ -54,7 +54,7 @@
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+          <el-form-item label="故障条文"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.faultDesc">
           <el-form-item label="故障描述">
@@ -66,11 +66,26 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="12" v-if="formData.workOrderStatus == 'return' && formData.returnType">
+          <el-form-item label="结单退回原因">
+            <el-select v-model="formData.returnType" style="width: 100%" disabled>
+              <el-option
+                  v-for="dict in returnTypeOptions"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12" v-if="formData.workOrderStatus == 'return' && formData.returnReason">
+          <el-form-item label="结单退回说明"><el-input v-model="formData.returnReason" disabled /></el-form-item>
+        </el-col>
         <el-col :span="12" v-if="formData.workOrderStatus == 'to_finish'">
           <el-form-item label="退回原因" prop="returnType">
             <el-select
               v-model="formData.returnType"
-              placeholder="请选择退回类型"
+              placeholder="请选择退回原因"
               style="width: 100%"
               :disabled="formData.workOrderStatus === 'return'"
               @change="handleReturnTypeChange"
@@ -88,12 +103,12 @@
           <el-form-item label="退回原因" prop="acceptReturnType">
             <el-select
                 v-model="formData.acceptReturnType"
-                placeholder="请选择退回类型"
+                placeholder="请选择退回原因"
                 style="width: 100%"
                 @change="handleReturnTypeChange"
             >
               <el-option
-                  v-for="dict in returnTypeOptions"
+                  v-for="dict in acceptReturnTypeOptions"
                   :key="dict.value"
                   :label="dict.label"
                   :value="dict.value"
@@ -161,6 +176,10 @@ const props = defineProps({
     type: Function,
     default: null
   },
+  acceptReturnTypeOptions: {
+    type: Array,
+    default: () => ([])
+  },
 })
 
 // 定义事件

ygtx-ui/src/components/repairOrder/suspend.vue

@@ -17,7 +17,7 @@
           <el-form-item label="故障代码"><el-input v-model="formData.faultCode" disabled /></el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="故障条纹"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
+          <el-form-item label="故障条文"><el-input v-model="formData.faultBarcode" disabled /></el-form-item>
         </el-col>
         <el-col :span="24" v-if="formData.faultDesc">
           <el-form-item label="故障描述">

ygtx-ui/src/components/repairOrder/view.vue

@@ -38,7 +38,7 @@
                   <el-form-item label="故障代码">{{ formData.faultCode || '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="故障条纹">{{ formData.faultBarcode || '-' }}</el-form-item>
+                  <el-form-item label="故障条文">{{ formData.faultBarcode || '-' }}</el-form-item>
                 </el-col>
 <!--                <el-col :span="24">-->
 <!--                  <el-form-item label="故障描述">{{ formData.faultDesc || '-' }}</el-form-item>-->
@@ -72,7 +72,7 @@
                   <el-form-item label="工作负责人">{{ formData.teamLeaderName || '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24">
-                  <el-form-item label="检修人员">{{ formData.workGroupMemberName || '-' }}</el-form-item>
+                  <el-form-item label="工作班成员">{{ formData.workGroupMemberName || '-' }}</el-form-item>
                 </el-col>
                 <el-col :span="24" v-if="formData.returnType">
                   <el-form-item label="结单退回原因">

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

@@ -175,7 +175,7 @@
       </el-table-column>
       <el-table-column label="录入类别" align="center" prop="workOrderStatus" min-width="100">
         <template #default="scope">
-          {{ scope.row.orderEntryType == '1' ? '默认' : '补录工单' }}
+          {{ scope.row.orderEntryType == '1' ? '新建工单' : '补录工单' }}
         </template>
       </el-table-column>
       <el-table-column label="维保中心" align="center" prop="gxtCenter" min-width="140" :show-overflow-tooltip="true">
@@ -622,18 +622,18 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="12" v-if="acceptForm.infoEntry == '1'">
-              <el-form-item label="MIS工单编码">
-                <el-input v-model="acceptForm.misNo" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="acceptForm.infoEntry == '2'">
-              <el-form-item label="工作票编号">
-                <el-input v-model="acceptForm.workPermitNum" disabled />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row :gutter="20">-->
+<!--            <el-col :span="12" v-if="acceptForm.infoEntry == '1'">-->
+<!--              <el-form-item label="MIS工单编码">-->
+<!--                <el-input v-model="acceptForm.misNo" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="12" v-if="acceptForm.infoEntry == '2'">-->
+<!--              <el-form-item label="工作票编号">-->
+<!--                <el-input v-model="acceptForm.workPermitNum" disabled />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="维保内容" prop="content">
@@ -982,7 +982,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="检修人员">
+              <el-form-item label="工作班成员">
                 <el-input v-model="rateForm.workGroupMemberName" disabled />
               </el-form-item>
             </el-col>
@@ -1822,7 +1822,7 @@ const data = reactive({
     // inspectionType: [{ required: true, message: "请选择维保类型", trigger: "change" }],
     // content: [{ required: true, message: "请输入维保内容", trigger: "blur" }],
     // teamLeaderId: [{ required: true, message: "请选择工作负责人", trigger: "change" }],
-    // memberIds: [{ required: true, message: "请至少选择一名检修人员", trigger: "change" }]
+    // memberIds: [{ required: true, message: "请至少选择一名工作班成员", trigger: "change" }]
   },
   finishRules: {
     realStartTime: [{ required: true, message: "请选择开始时间", trigger: "change" },
@@ -1854,7 +1854,7 @@ const data = reactive({
       }
     ],
     workGroupMemberName: [
-      { required: false, message: "请输入检修人员", trigger: "blur" },
+      { required: false, message: "请输入工作班成员", trigger: "blur" },
       {
         validator: async (rule, value, callback) => {
           // 如果值为空、关联MIS，直接通过验证
@@ -1862,22 +1862,22 @@ const data = reactive({
             return callback();
           }
           try {
-            // 将输入的检修人员姓名按逗号分割
+            // 将输入的工作班成员姓名按逗号分割
             const names = value.split(',').map(name => name.trim());
-            // 验证每个检修人员是否存在于组织架构中
+            // 验证每个工作班成员是否存在于组织架构中
             for (const name of names) {
               if (name.length > 0) {
                 const response = await listUserData({nickName: name});
                 if (!response.rows || response.rows.length === 0) {
-                  return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                  return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
                 }
               } else {
-                return callback(new Error(`请正确输入检修人员名单`));
+                return callback(new Error(`请正确输入工作班成员名单`));
               }
             }
             callback();
           } catch (error) {
-            callback(new Error('验证检修人员时发生错误'));
+            callback(new Error('验证工作班成员时发生错误'));
           }
         },
         trigger: 'blur'
@@ -1886,7 +1886,7 @@ const data = reactive({
     // teamLeaderId: [{ required: true, message: "请选择工作负责人", trigger: "change" }],
     // inspectionType: [{ required: true, message: "请选择维保类型", trigger: "change" }],
     // realContent: [{ required: true, message: "请输入实际维保内容", trigger: "change" }],
-    // memberIds: [{ required: true, message: "请至少选择一名检修人员", trigger: "change" }],
+    // memberIds: [{ required: true, message: "请至少选择一名工作班成员", trigger: "change" }],
   },
   restartForm: {
     orderId: undefined,
@@ -2549,7 +2549,7 @@ function handleSuspend(row) {
   })
 }
 
-/** 检修人员选择变化 */
+/** 工作班成员选择变化 */
 function handleMembersChange() {
   // 根据选中的memberIds构建 workOrderPersonList
   finishForm.value.workOrderPersonList = []
@@ -2877,6 +2877,7 @@ function handleExport() {
     '工单编码',
     '风机编号',
     '工单状态',
+    '录入类别',
     '维保中心',
     '场站',
     '品牌',

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

@@ -234,7 +234,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misOrderNo || '-' }}</el-form-item>
@@ -371,7 +371,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misNo || '-' }}</el-form-item>
@@ -577,7 +577,7 @@ function handleView(row) {
     detailData.value = response.data;
     // 从工单详情中获取流转记录
     flowList.value = response.data.workOrderFlowList || response.data.repairOrderFlowList || [];
-    
+
     if (row.orderType === 1) {
       // 维修工单
       repairDetailDialogVisible.value = true;
@@ -703,4 +703,4 @@ function handleResize() {
   word-break: break-word;
   line-height: 1.5;
 }
-</style>
+</style>

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

@@ -66,7 +66,7 @@
           </div>
       </el-form-item>
     </el-form>
-   
+
     <!-- 操作按钮区域 -->
     <el-row :gutter="10" class="mb8">
       <!-- 空的按钮区域，保持与其他页面一致的间距 -->
@@ -234,7 +234,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misOrderNo || '-' }}</el-form-item>
@@ -371,7 +371,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misNo || '-' }}</el-form-item>
@@ -577,7 +577,7 @@ function handleView(row) {
     detailData.value = response.data;
     // 从工单详情中获取流转记录
     flowList.value = response.data.workOrderFlowList || response.data.repairOrderFlowList || [];
-    
+
     if (row.orderType === 1) {
       // 维修工单
       repairDetailDialogVisible.value = true;
@@ -703,4 +703,4 @@ function handleResize() {
   word-break: break-word;
   line-height: 1.5;
 }
-</style>
+</style>

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

@@ -234,7 +234,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misOrderNo || '-' }}</el-form-item>
@@ -371,7 +371,7 @@
                     <el-form-item label="工作负责人">{{ detailData.teamLeaderName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
-                    <el-form-item label="检修人员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
+                    <el-form-item label="工作班成员">{{ detailData.workGroupMemberName || '-' }}</el-form-item>
                   </el-col>
                   <el-col :span="24">
                     <el-form-item label="MIS工单编码">{{ detailData.misNo || '-' }}</el-form-item>
@@ -577,7 +577,7 @@ function handleView(row) {
     detailData.value = response.data;
     // 从工单详情中获取流转记录
     flowList.value = response.data.workOrderFlowList || response.data.repairOrderFlowList || [];
-    
+
     if (row.orderType === 1) {
       // 维修工单
       repairDetailDialogVisible.value = true;
@@ -703,4 +703,4 @@ function handleResize() {
   word-break: break-word;
   line-height: 1.5;
 }
-</style>
+</style>

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

@@ -692,10 +692,10 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="检修人员" prop="workGroupMemberName">
+              <el-form-item label="工作班成员" prop="workGroupMemberName">
                 <el-input
                     v-model="finalizeRepairForm.workGroupMemberName"
-                    placeholder="请输入检修人员"
+                    placeholder="请输入工作班成员"
                     maxlength="200"
                     show-word-limit
                     :readonly="finalizeRepairForm.infoEntry == 1"
@@ -846,7 +846,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="检修人员">
+            <el-form-item label="工作班成员">
               <el-input v-model="finalizeWorkForm.workGroupMemberName" readonly />
             </el-form-item>
           </el-col>
@@ -1545,7 +1545,7 @@ const finalizeRepairRules = ref({
     }
   ],
   workGroupMemberName: [
-    { required: false, message: "请输入检修人员", trigger: "blur" },
+    { required: false, message: "请输入工作班成员", trigger: "blur" },
     {
       validator: async (rule, value, callback) => {
         // 如果值为空、关联MIS，直接通过验证
@@ -1553,24 +1553,24 @@ const finalizeRepairRules = ref({
           return callback();
         }
         try {
-          // 将输入的检修人员姓名按逗号分割
+          // 将输入的工作班成员姓名按逗号分割
           const names = value.split(',').map(name => name.trim());
 
-          // 验证每个检修人员是否存在于组织架构中
+          // 验证每个工作班成员是否存在于组织架构中
           for (const name of names) {
             debugger
             if (name.length > 0) {
               const response = await listUserData({nickName: name});
               if (!response.rows || response.rows.length === 0) {
-                return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
               }
             } else {
-              return callback(new Error(`请正确输入检修人员名单`));
+              return callback(new Error(`请正确输入工作班成员名单`));
             }
           }
           callback();
         } catch (error) {
-          callback(new Error('验证检修人员时发生错误'));
+          callback(new Error('验证工作班成员时发生错误'));
         }
       },
       trigger: 'blur'
@@ -1848,7 +1848,7 @@ function handleAccept(row) {
 function submitAcceptRepair() {
   proxy.$refs["acceptRepairFormRef"].validate(valid => {
     if (valid) {
-      // 更新检修人员列表
+      // 更新工作班成员列表
       //handleMembersChange('acceptForm');
       acceptRepairOrder(acceptRepairForm.value).then(response => {
         proxy.$modal.msgSuccess("接单成功");

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

@@ -295,13 +295,13 @@
               @click="handleSuspend(scope.row)"
               v-hasPermi="['gxt:repairOrder:suspend']"
           ><i class="fa fa-stop"></i>挂起</el-button>
-<!--          <el-button-->
-<!--              v-if="scope.row.workOrderStatus === 'to_finish'&& (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin'))"-->
-<!--              type="warning"-->
-<!--              link-->
-<!--              @click="handleReturn(scope.row)"-->
-<!--              v-hasPermi="['gxt:repairOrder:return']"-->
-<!--          ><i class="fa fa-sign-in"></i>退回</el-button> &lt;!&ndash;结单退回，负责人退回至班长 &ndash;&gt;-->
+          <el-button
+              v-if="scope.row.workOrderStatus === 'to_finish'&& (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin'))"
+              type="warning"
+              link
+              @click="handleReturn(scope.row)"
+              v-hasPermi="['gxt:repairOrder:return']"
+          ><i class="fa fa-sign-in"></i>退回</el-button> <!--结单退回，负责人退回至班长 -->
           <el-button
               v-if="scope.row.workOrderStatus === 'return'|| scope.row.workOrderStatus === 'assigned'"
               type="warning"
@@ -460,7 +460,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="故障代码" prop="faultCode">
+            <el-form-item label="故障代码">
               <el-input
                   v-model="form.faultCode"
                   placeholder="请输入故障代码或点击选择"
@@ -480,7 +480,7 @@
                     class="quick-select-item"
                     @click="handleFaultCodeQuickSelect(item)">
                   <span class="user-name">{{ item.faultCode }}</span>
-                  <span class="user-name">{{ item.faultBarcode }} | {{ item.faultDescription }}</span>
+                  <span class="user-name">{{ item.faultBarcode }}</span>
                 </div>
               </div>
               <div class="quick-select-dropdown no-data" v-show="showFaultCodeQuickSelect && quickFaultInfoList.length === 0 && form.faultCode && !faultInfoLoading">
@@ -497,7 +497,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="故障条纹" prop="faultBarcode">
+            <el-form-item label="故障条文" prop="faultBarcode">
               <el-input
                   v-model="form.faultBarcode"
                   placeholder="请输入故障条纹或点击选择"
@@ -516,7 +516,7 @@
                     class="quick-select-item"
                     @click="handleFaultBarcodeQuickSelect(item)">
                   <span class="user-name">{{ item.faultBarcode }}</span>
-                  <span class="user-name">{{ item.faultCode }} | {{ item.faultDescription }}</span>
+                  <span class="user-name">{{ item.faultCode }}</span>
                 </div>
               </div>
               <div class="quick-select-dropdown no-data" v-show="showFaultBarcodeQuickSelect && quickFaultBarcodeList.length === 0 && form.faultBarcode && !faultBarcodeLoading">
@@ -554,8 +554,8 @@
                     :key="item.id"
                     class="quick-select-item"
                     @click="handleFaultDescQuickSelect(item)">
-                  <span class="user-name">{{ item.faultDescription }}</span>
-                  <span class="user-name">{{ item.faultCode }} | {{ item.faultBarcode }}</span>
+                  <span class="user-name">{{ item.faultCode }}</span>
+                  <span class="user-name">{{ item.faultBarcode }}</span>
                 </div>
               </div>
               <div class="quick-select-dropdown no-data" v-show="showFaultDescQuickSelect && quickFaultDescList.length === 0 && form.faultDesc && !faultDescLoading">
@@ -647,7 +647,7 @@
             <el-form-item label="故障代码"><el-input v-model="assignForm.faultCode" disabled /></el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="故障条纹">
+            <el-form-item label="故障条文">
               <el-input
                 v-model="assignForm.faultBarcode"
                 type="textarea"
@@ -767,7 +767,7 @@
             <el-form-item label="故障代码"><el-input v-model="acceptForm.faultCode" disabled /></el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="故障条纹"><el-input v-model="acceptForm.faultBarcode" disabled /></el-form-item>
+            <el-form-item label="故障条文"><el-input v-model="acceptForm.faultBarcode" disabled /></el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="故障描述">
@@ -775,7 +775,7 @@
                   v-model="acceptForm.faultDesc"
                   type="textarea"
                   :rows="3"
-                  disabled
+                  :disabled="isFaultDesc"
               />
             </el-form-item>
           </el-col>
@@ -867,7 +867,8 @@
         v-model="returnDialogVisible"
         :data="returnForm"
         :work-order-status-options="gxt_work_order_status"
-        :return-type-options="returnForm.workOrderStatus == 'to_finish' ?gxt_return_type : gxt_accept_return_type "
+        :return-type-options="gxt_return_type"
+        :accept-return-type-options="gxt_accept_return_type"
         :on-submit="submitReturnFromParent"
         @success="handleReturnSuccess"
     />
@@ -916,7 +917,7 @@
             <el-form-item label="故障代码"><el-input v-model="ratingForm.faultCode" disabled /> </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="故障条纹">
+            <el-form-item label="故障条文">
               <el-input
                 v-model="ratingForm.faultBarcode"
                 type="textarea"
@@ -980,7 +981,7 @@
 <!--            </el-form-item>-->
 <!--          </el-col>-->
           <el-col :span="12">
-            <el-form-item label="检修人员"><el-input v-model="ratingForm.workGroupMemberName" disabled /></el-form-item>
+            <el-form-item label="工作班成员"><el-input v-model="ratingForm.workGroupMemberName" disabled /></el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item label="附件">
@@ -1154,7 +1155,7 @@
             <el-form-item label="故障代码"><el-input v-model="invalidateForm.faultCode" disabled /></el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="故障条纹">
+            <el-form-item label="故障条文">
               <el-input
                 v-model="invalidateForm.faultBarcode"
                 type="textarea"
@@ -2120,7 +2121,7 @@ const acceptRules = ref({
   //   { required: true, message: "请选择工作负责人", trigger: "change" }
   // ],
   /*selectedMembers: [
-    { required: true, message: "请至少选择一名检修人员", trigger: "change" }
+    { required: true, message: "请至少选择一名工作班成员", trigger: "change" }
   ]*/
 })
 
@@ -2196,7 +2197,7 @@ const finalizeRules = ref({
     }
   ],
   workGroupMemberName: [
-    { required: false, message: "请输入检修人员", trigger: "blur" },
+    { required: false, message: "请输入工作班成员", trigger: "blur" },
     {
       validator: async (rule, value, callback) => {
         // 如果值为空、关联MIS，直接通过验证
@@ -2204,24 +2205,24 @@ const finalizeRules = ref({
           return callback();
         }
         try {
-          // 将输入的检修人员姓名按逗号分割
+          // 将输入的工作班成员姓名按逗号分割
           const names = value.split(',').map(name => name.trim());
 
-          // 验证每个检修人员是否存在于组织架构中
+          // 验证每个工作班成员是否存在于组织架构中
           for (const name of names) {
             debugger
             if (name.length > 0) {
               const response = await listUserData({nickName: name});
               if (!response.rows || response.rows.length === 0) {
-                return callback(new Error(`检修人员"${name}"非系统内人员，请重新输入`));
+                return callback(new Error(`工作班成员"${name}"非系统内人员，请重新输入`));
               }
             } else {
-              return callback(new Error(`请正确输入检修人员名单`));
+              return callback(new Error(`请正确输入工作班成员名单`));
             }
           }
           callback();
         } catch (error) {
-          callback(new Error('验证检修人员时发生错误'));
+          callback(new Error('验证工作班成员时发生错误'));
         }
       },
       trigger: 'blur'
@@ -2758,17 +2759,6 @@ function handleEdit(row) {
     openDialog.value = true
     dialogTitle.value = "下发"
     optType.value = "edit"
-    
-    // 当打开下发页面时，确保故障信息已填充
-    if (response.data.faultCode) {
-      form.value.faultCode = response.data.faultCode;
-    }
-    if (response.data.faultBarcode) {
-      form.value.faultBarcode = response.data.faultBarcode;
-    }
-    if (response.data.faultDesc) {
-      form.value.faultDesc = response.data.faultDesc;
-    }
   })
 }
 
@@ -2917,8 +2907,8 @@ function handleAssign(row) {
     // 初始化维保工单选项为空
     workOrderOptions.value = []
     assignDialogVisible.value = true
-    
-    // 自动回填故障代码、故障条纹、故障描述
+
+    // 自动回填故障代码、故障条文、故障描述
     if (response.data.faultCode) {
       assignForm.value.faultCode = response.data.faultCode;
     }
@@ -2991,6 +2981,7 @@ async function submitAssign() {
   })
 }
 
+const isFaultDesc = ref(true)
 /** 接单操作 */
 function handleAccept(row) {
   getRepairOrder(row.id).then(response => {
@@ -3001,7 +2992,11 @@ function handleAccept(row) {
     if (lastLoadedCenterId.value !== acceptForm.value.gxtCenterId) {
       allUserList.value = [];
     }
-
+    if (acceptForm.value.faultDesc == '') {
+      isFaultDesc.value = false
+    } else {
+      isFaultDesc.value = true
+    }
     // 预加载工作负责人列表
     loadQuickTeamLeaderList()
     acceptDialogVisible.value = true
@@ -3013,7 +3008,7 @@ async function submitAccept() {
   proxy.$refs["acceptFormRef"].validate(async valid => {
     if (valid) {
       try {
-        // 更新检修人员列表
+        // 更新工作班成员列表
         //handleMembersChange('acceptForm');
         await acceptRepairOrder(acceptForm.value)
 
@@ -3163,7 +3158,7 @@ function handleMisOrderNoBlur() {
           finalizeForm.value.realEndTime = data.realEndTime;
         }
 
-        // 填充检修人员列表
+        // 填充工作班成员列表
         if (data.workGroupMemberName) {
           finalizeForm.value.workGroupMemberName = data.workGroupMemberName;
         }
@@ -3319,12 +3314,11 @@ function handleReturn(row) {
     returnForm.value = response.data
     if (row.workOrderStatus == 'to_finish') {
       returnForm.value.returnType = '1'
+      returnForm.value.returnReason = undefined
     } else {
-      returnForm.value.returnType = undefined
+      returnForm.value.acceptReturnType = undefined
+      returnForm.value.acceptReturnReason = undefined
     }
-    returnForm.value.returnReason = undefined
-    returnForm.value.acceptReturnType = undefined
-    returnForm.value.acceptReturnReason = undefined
     // }
     returnDialogVisible.value = true
     // proxy.resetForm("returnFormRef")
@@ -3593,7 +3587,7 @@ function handleApproveSuccess() {
   resetTimeOutOrder()
   getList()
 }
-/** 检修人员选择变化 */
+/** 工作班成员选择变化 */
 function handleMembersChange(formName) {
   // 默认使用 acceptForm，但也支持其他表单
   const targetForm = formName === 'finalizeForm' ? finalizeForm : acceptForm;