Explorar el Código

修改维保工单

HD_wangm hace 7 meses
padre
commit
6e5b31e123

+ 21 - 15
ygtx-gxt/src/main/java/com/ygtx/gxt/domain/GxtWorkOrder.java

@@ -25,11 +25,11 @@ public class GxtWorkOrder extends BaseEntity
     private Long id;
 
     /** 工单编码 */
-    @Excel(name = "工单编码")
+//    @Excel(name = "工单编码")
     private String workOrderProjectNo;
 
     /** 工单状态:draft-草稿,to_assign-待派单,assigned-已派单,accepted-已接单,processing-处理中,paused-暂停中,to_approve-待审批,suspended-已挂起,completed-已完成 */
-    @Excel(name = "工单状态", readConverterExp = "draft=草稿,to_assign=待派单,assigned=已派单,accepted=已接单,processing=处理中,paused=暂停中,to_approve=待审批,suspended=已挂起,completed=已完成")
+//    @Excel(name = "工单状态", readConverterExp = "draft=草稿,to_assign=待派单,assigned=已派单,accepted=已接单,processing=处理中,paused=暂停中,to_approve=待审批,suspended=已挂起,completed=已完成")
     private String workOrderStatus;
 
     /** 维保中心ID */
@@ -43,7 +43,7 @@ public class GxtWorkOrder extends BaseEntity
     private Long pcsStationId;
 
     /** 风电场 */
-    @Excel(name = "风电场")
+    @Excel(name = "场")
     private String pcsStationName;
 
     /** 风机设备ID */
@@ -54,77 +54,80 @@ public class GxtWorkOrder extends BaseEntity
     private String pcsDeviceName;
 
     /** 风机品牌 */
-    @Excel(name = "风机品牌")
+//    @Excel(name = "风机品牌")
     private String brand;
 
     /** 风机型号 */
-    @Excel(name = "风机型号")
+//    @Excel(name = "风机型号")
     private String model;
 
     /** 检查类型(年检,半年检,螺栓检) */
     private String inspectionType;
 
     /** MIS系统编号 */
+    @Excel(name = "MIS系统工单编码")
     private String misNo;
 
     /** 计划开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "计划开始日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "计划开始日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date planStartTime;
 
     /** 计划结束日期 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "计划结束日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "计划结束日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date planEndTime;
 
     /** 工单来源 */
-    @Excel(name = "工单来源")
+//    @Excel(name = "工单来源")
     private String orderSource;
 
     /** 派单时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "派单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "派单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date assignTime;
 
     /** 派单人ID */
     private Long assignUserId;
 
     /** 派单人姓名 */
-    @Excel(name = "派单人")
+//    @Excel(name = "派单人")
     private String assignUserName;
 
     /** 接单时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "接单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date acceptTime;
 
     /** 接单人ID */
     private Long acceptUserId;
 
     /** 接单人姓名 */
-    @Excel(name = "接单人")
+//    @Excel(name = "接单人")
     private String acceptUserName;
 
     /** 实际开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "开始时间")
     private Date realStartTime;
 
     /** 实际结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "结束时间")
     private Date realEndTime;
 
     /** 班组组长ID */
     private Long teamLeaderId;
 
     /** 班组组长姓名 */
-    @Excel(name = "班组组长")
+//    @Excel(name = "班组组长")
     private String teamLeaderName;
 
     /** 工作组成员ID */
     private Long workGroupMemberId;
 
     /** 工作组成员姓名 */
-    @Excel(name = "工作组成员")
+//    @Excel(name = "工作组成员")
     private String workGroupMemberName;
 
     /** 挂起原因 */
@@ -153,13 +156,14 @@ public class GxtWorkOrder extends BaseEntity
 
     /** 完成时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date completeTime;
 
     /** 预计工时(小时) */
     private BigDecimal planHour;
 
     /** 维保内容 */
+    @Excel(name = "维保内容")
     private String content;
 
     /** 实际维保内容 */
@@ -184,9 +188,11 @@ public class GxtWorkOrder extends BaseEntity
     private String reviewContent;
 
     /** 签发人 */
+    @Excel(name = "签发人")
     private String issuerName;
 
     /** 许可人 */
+    @Excel(name = "许可人")
     private String permitterName;
 
     /** 工作组成员列表 */

+ 36 - 42
ygtx-gxt/src/main/java/com/ygtx/gxt/service/impl/GxtWorkOrderServiceImpl.java

@@ -721,7 +721,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
             if (result > 0)
             {
                 recordWorkOrderFlow(id, order.getWorkOrderProjectNo(), "restart", oldStatus, oldStatus,
-                        "工单复运成功,工单状态保持不变");
+                        null);
             }
 
             return result;
@@ -754,6 +754,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
     @Transactional
     public int acceptOrder(GxtWorkOrder gxtWorkOrder)
     {
+        String nickName = SecurityUtils.getLoginUser().getUser().getNickName();
         Long id = gxtWorkOrder.getId();
         GxtWorkOrder order = gxtWorkOrderMapper.selectGxtWorkOrderById(id);
         if (order == null)
@@ -768,11 +769,13 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         String oldStatus = order.getWorkOrderStatus();
         // 1. 更新工单信息
         order.setAcceptTime(DateUtils.getNowDate());
-        order.setAcceptUserId(gxtWorkOrder.getAcceptUserId());
-        order.setAcceptUserName(gxtWorkOrder.getAcceptUserName());
+        order.setAcceptUserId(SecurityUtils.getUserId());
+        order.setAcceptUserName(nickName);
         order.setRealStartTime(DateUtils.getNowDate());
         order.setWorkOrderStatus(gxtWorkOrder.getWorkOrderStatus());
         order.setUpdateTime(DateUtils.getNowDate());
+        order.setTeamLeaderId(gxtWorkOrder.getTeamLeaderId());
+        order.setTeamLeaderName(gxtWorkOrder.getTeamLeaderName());
 
         int result = gxtWorkOrderMapper.updateGxtWorkOrder(order);
         if (result > 0)
@@ -782,7 +785,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
 //                    .collect(java.util.stream.Collectors.joining(","));
             // 4. 记录流转
             recordWorkOrderFlow(id, order.getWorkOrderProjectNo(), "accept", oldStatus, "processing",
-                    "接单人: " + gxtWorkOrder.getAcceptUserName());
+                    null);
         }
 
         return result;
@@ -808,7 +811,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         flow.setFromStatus(fromStatus);
         flow.setToStatus(toStatus);
         flow.setOperatorId(SecurityUtils.getUserId());
-        flow.setOperatorName(SecurityUtils.getUsername());
+        flow.setOperatorName(SecurityUtils.getLoginUser().getUser().getNickName());
         flow.setActionTime(DateUtils.getNowDate());
         flow.setActionRemark(remark);
         flow.setCreateBy(SecurityUtils.getUsername());
@@ -933,7 +936,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         if (result > 0) {
             // 记录流转
             recordWorkOrderFlow(id, order.getWorkOrderProjectNo(), "suspended", oldStatus, "to_finish",
-                    "恢复");
+                    null);
         }
 
         return result;
@@ -1030,6 +1033,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
      * @return 结果
      */
     @Override
+    @Transactional
     public String importGxtWorkOrder(List<GxtWorkOrder> workOrderList, Boolean isUpdateSupport, String operName)
     {
         if (StringUtils.isNull(workOrderList) || workOrderList.size() == 0)
@@ -1040,57 +1044,47 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
+        
+        // 获取当前日期的序列序号
+        String dateStr = DateUtils.dateTime(DateUtils.getNowDate()).substring(0, 8); // YYYYMMDD
+        int sequenceNum = 1;
+        
         for (GxtWorkOrder workOrder : workOrderList)
         {
             try
             {
-                if (StringUtils.isEmpty(workOrder.getWorkOrderProjectNo())) {
-                    throw new ServiceException("工单编码不能为空!");
-                }
                 if (StringUtils.isEmpty(workOrder.getPcsDeviceName())) {
-                    throw new ServiceException("風機编号不能为空!");
+                    throw new ServiceException("风机编号不能为空!");
                 }
-                if (StringUtils.isEmpty(workOrder.getGxtCenter())) {
-                    throw new ServiceException("维保中心不能为空!");
+                if (StringUtils.isEmpty(workOrder.getPcsStationName())) {
+                    throw new ServiceException("场站不能为空!");
                 }
 
+                // 根据规则生成工单编码: WB+当前年月日+三位数序列号
+                String workOrderProjectNo = "WB" + dateStr + String.format("%03d", sequenceNum++);
+                
+                // 检查工单编码是否已经存在
+                GxtWorkOrder existingOrder = gxtWorkOrderMapper.selectGxtWorkOrderByCode(workOrderProjectNo);
+                while (existingOrder != null) {
+                    // 序列号自动递增直到找到一个不存在的编码
+                    workOrderProjectNo = "WB" + dateStr + String.format("%03d", sequenceNum++);
+                    existingOrder = gxtWorkOrderMapper.selectGxtWorkOrderByCode(workOrderProjectNo);
+                }
+                
+                // 设置工单编码
+                workOrder.setWorkOrderProjectNo(workOrderProjectNo);
+                
                 // 设置创建信息
                 workOrder.setCreateBy(operName);
                 workOrder.setCreateTime(DateUtils.getNowDate());
-//                workOrder.setDelFlag("0");
-                workOrder.setWorkOrderStatus("draft"); // 默认为草稿状态
-
-                // 检查工单是否已存在
-                GxtWorkOrder existingOrder = gxtWorkOrderMapper.selectGxtWorkOrderByCode(workOrder.getWorkOrderProjectNo());
-                if (existingOrder != null)
-                {
-                    if (isUpdateSupport)
-                    {
-                        // 更新现有工单
-                        workOrder.setId(existingOrder.getId());
-                        workOrder.setUpdateBy(operName);
-                        workOrder.setUpdateTime(DateUtils.getNowDate());
-                        gxtWorkOrderMapper.updateGxtWorkOrder(workOrder);
-                        successNum++;
-                    }
-                    else
-                    {
-                        failureNum++;
-                        failureMsg.append("<br/>" + failureNum + "、工单编码 " + workOrder.getWorkOrderProjectNo() 
-                            + " 已经存在");
-                    }
-                }
-                else
-                {
-                    // 新增工单
-                    gxtWorkOrderMapper.insertGxtWorkOrder(workOrder);
-                    successNum++;
-                }
+                workOrder.setWorkOrderStatus("assigned"); // 默认为待接单状态
+                gxtWorkOrderMapper.insertGxtWorkOrder(workOrder);
+                successNum++;
             }
             catch (Exception e)
             {
                 failureNum++;
-                String msg = "<br/>" + failureNum + "、工单编码 " + workOrder.getWorkOrderProjectNo() + " 导入失败:";
+                String msg = "<br/>" + failureNum + "、工单导入失败: ";
                 failureMsg.append(msg + e.getMessage());
             }
         }

+ 2 - 2
ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderFlowMapper.xml

@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="toStatus != null  and toStatus != ''"> and to_status = #{toStatus}</if>
             <if test="operatorId != null"> and operator_id = #{operatorId}</if>
         </where>
-        order by action_time desc
+        order by create_time asc
     </select>
 
     <select id="selectGxtWorkOrderFlowById" parameterType="Long" resultMap="GxtWorkOrderFlowResult">
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectGxtWorkOrderFlowByOrderId" parameterType="Long" resultMap="GxtWorkOrderFlowResult">
         <include refid="selectGxtWorkOrderFlowVo"/>
         where order_id = #{orderId}
-        order by action_time desc
+        order by action_time asc
     </select>
 
     <insert id="insertGxtWorkOrderFlow" parameterType="GxtWorkOrderFlow" useGeneratedKeys="true" keyProperty="id">

+ 6 - 3
ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -63,9 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                pcs_device_id, pcs_device_name, brand, model, inspection_type, mis_no, plan_start_time, plan_end_time, order_source, assign_time,
                assign_user_id, assign_user_name, accept_time, accept_user_id, accept_user_name, real_start_time, real_end_time,
                team_leader_id, team_leader_name, work_group_member_id, work_group_member_name, suspend_reason,
-               suspend_time,status_before_suspend, pause_reason, pause_time, restart_time, complete_time, plan_hour, content, real_content, fault_code, fault_desc, order_type, priority_type, score, review_content, issuer_name, permitter_name, create_by, create_time, update_by,
-               update_time, remark
-        from gxt_work_order
+               suspend_time,status_before_suspend, pause_reason, pause_time, restart_time, complete_time, plan_hour,
+               content, real_content, fault_code, fault_desc, order_type, priority_type, score, review_content, issuer_name,
+               permitter_name, t.create_by, t.create_time, t.update_by, t.update_time, t.remark
+        from gxt_work_order t
+         left join sys_user u on u.user_name = t.create_by
+         left join sys_dept d on u.dept_id = d.dept_id
     </sql>
 
     <select id="selectGxtWorkOrderList" parameterType="GxtWorkOrder" resultMap="GxtWorkOrderResult">

+ 99 - 106
ygtx-ui/src/views/gxt/gxtOrder/index.vue

@@ -107,14 +107,18 @@
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" width="140">
+      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" min-width="140">
         <template #default="scope">
           <el-button link type="primary" @click="handleDetail(scope.row)">
             {{ scope.row.workOrderProjectNo }}
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="风机编号" align="center" prop="pcsDeviceName" width="120" :show-overflow-tooltip="true" />
+      <el-table-column label="风机编号" align="center" prop="pcsDeviceName" min-width="120" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{ scope.row.pcsDeviceName || '-' }}
+        </template>
+      </el-table-column>
       <el-table-column label="维保类型" align="center" prop="inspectionType" width="100">
         <template #default="scope">
           <dict-tag :options="gxt_inspection_type" :value="scope.row.inspectionType"/>
@@ -125,11 +129,31 @@
           <dict-tag :options="gxt_work_order_status" :value="scope.row.workOrderStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="维保中心" align="center" prop="gxtCenter" width="120" :show-overflow-tooltip="true" />
-      <el-table-column label="场站" align="center" prop="pcsStationName" width="120" :show-overflow-tooltip="true" />
-      <el-table-column label="品牌" align="center" prop="brand" width="140" :show-overflow-tooltip="true" />
-      <el-table-column label="机型" align="center" prop="model" width="140" :show-overflow-tooltip="true" />
-      <el-table-column label="MIS系统工单编码" align="center" prop="misNo" width="140" />
+      <el-table-column label="维保中心" align="center" prop="gxtCenter" width="120" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{ scope.row.gxtCenter || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="场站" align="center" prop="pcsStationName" width="120" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{ scope.row.pcsStationName || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="品牌" align="center" prop="brand" width="140" :show-overflow-tooltip="true">
+        <template  #default="scope">
+          {{ scope.row.brand || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="机型" align="center" prop="model" width="140" :show-overflow-tooltip="true">
+        <template #default="scope">
+          {{ scope.row.model || '-' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="MIS系统工单编码" align="center" prop="misNo" width="150">
+        <template #default="scope">
+          {{ scope.row.misNo || '-' }}
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="计划检修日期" align="center" prop="planStartTime" width="160">-->
 <!--        <template #default="scope">-->
 <!--          <span>{{ parseTime(scope.row.planStartTime, '{y}-{m}-{d} {h}:{i}') }}</span>-->
@@ -147,26 +171,34 @@
 <!--          <span>{{ parseTime(scope.row.assignTime, '{y}-{m}-{d} {h}:{i}') }}</span>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="接单人" align="center" prop="acceptUserName" width="100" />
+      <el-table-column label="接单人" align="center" prop="acceptUserName" width="100">
+        <template #default="scope">
+          {{ scope.row.acceptUserName || '-' }}
+        </template>
+      </el-table-column>
       <el-table-column label="接单时间" align="center" prop="acceptTime" width="100">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.acceptTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ scope.row.acceptTime ? parseTime(scope.row.acceptTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="工作负责人" align="center" prop="team_leader_name" width="100">
+        <template #default="scope">
+          {{ scope.row.teamLeaderName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="工作负责人" align="center" prop="team_leader_name" width="100" />
       <el-table-column label="开始时间" align="center" prop="realStartTime" width="100">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.realStartTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ scope.row.realStartTime ? parseTime(scope.row.realStartTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="结束时间" align="center" prop="realEndTime" width="100">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}') }}</span>
+          <span>{{ scope.row.realEndTime ? parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
         </template>
       </el-table-column>
 <!--      <el-table-column label="班组组长" align="center" prop="teamLeaderName" width="100" />-->
 <!--      <el-table-column label="工作组成员" align="center" prop="workGroupMemberName" width="100" />-->
-      <el-table-column label="操作" align="left" width="200" class-name="small-padding fixed-width" fixed="right" >
+      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right" >
         <template #default="scope">
           <!-- 草稿状态:显示编辑和删除按钮 -->
           <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['gxt:maintenance:order:edit']" v-if="scope.row.workOrderStatus === 'draft'">
@@ -533,110 +565,71 @@
     <el-dialog :title="`接单 - ${acceptForm.workOrderProjectNo}`" v-model="acceptDialogVisible" width="800px" append-to-body>
       <div style="max-height: 500px; overflow-y: auto; padding-right: 10px;">
         <el-form ref="acceptRef" :model="acceptForm" :rules="acceptRules" label-width="120px" label-position="top">
-          <el-row>
+          <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="工单编码">
+                <el-input v-model="acceptForm.workOrderProjectNo" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="风机编号">
                 <el-input v-model="acceptForm.pcsDeviceName" disabled />
               </el-form-item>
             </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="12">
+              <el-form-item label="维保中心">
+                <el-input v-model="acceptForm.gxtCenter" disabled />
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
-              <el-form-item label="工单状态" prop="workOrderStatus">
-<!--                  <el-input v-model="acceptForm.workOrderStatus" />-->
-                <el-select v-model="acceptForm.workOrderStatus" disabled>
+              <el-form-item label="场站">
+                <el-input v-model="acceptForm.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="acceptForm.brand" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="机型">
+                <el-input v-model="acceptForm.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="acceptForm.misNo" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="维保内容" prop="content">
+                <el-input v-model="acceptForm.content" type="textarea" placeholder="请输入维保内容" :rows="3" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item label="工作负责人" prop="teamLeaderId">
+                <el-select v-model="acceptForm.teamLeaderId" placeholder="请选择工作负责人" style="width: 100%" @change="(userId) => acceptForm.teamLeaderName = userList.find(u => u.userId === userId)?.nickName">
                   <el-option
-                      v-for="dict in gxt_work_order_status"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
+                    v-for="user in userList"
+                    :key="user.userId"
+                    :label="user.nickName"
+                    :value="user.userId"
                   />
                 </el-select>
               </el-form-item>
             </el-col>
           </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="风机编号">
-              <el-input v-model="acceptForm.pcsDeviceName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="维保中心">
-              <el-input v-model="acceptForm.gxtCenter" disabled />
-            </el-form-item>
-          </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="维保类型" prop="inspectionType">-->
-<!--&lt;!&ndash;              <el-input v-model="acceptForm.orderType" />&ndash;&gt;-->
-<!--              <el-select v-model="acceptForm.inspectionType" placeholder="请选择维保类型">-->
-<!--                <el-option-->
-<!--                    v-for="dict in gxt_inspection_type"-->
-<!--                    :key="dict.value"-->
-<!--                    :label="dict.label"-->
-<!--                    :value="dict.value"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="场站">
-              <el-input v-model="acceptForm.pcsStationName" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="品牌">
-              <el-input v-model="acceptForm.brand" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="机型">
-              <el-input v-model="acceptForm.model" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="MIS系统编码">
-              <el-input v-model="acceptForm.misNo" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="维保内容" prop="content">
-              <el-input v-model="acceptForm.content" type="textarea" placeholder="请输入维保内容" :rows="3" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="工作负责人" prop="teamLeaderId">
-              <el-select v-model="acceptForm.teamLeaderId" placeholder="请选择工作负责人" style="width: 100%" @change="(userId) => acceptForm.teamLeaderName = userList.find(u => u.userId === userId)?.nickName">
-                <el-option
-                  v-for="user in userList"
-                  :key="user.userId"
-                  :label="user.nickName"
-                  :value="user.userId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-<!--        <el-row>-->
-<!--          <el-col :span="24">-->
-<!--            <el-form-item label="检修人员" prop="memberIds">-->
-<!--              <el-checkbox-group v-model="acceptForm.memberIds" style="width: 100%" @change="handleMembersChange">-->
-<!--                <el-row :gutter="10">-->
-<!--                  <el-col :span="8" v-for="user in userList" :key="user.userId">-->
-<!--                    <el-checkbox :label="user.userId">{{ user.nickName }}</el-checkbox>-->
-<!--                  </el-col>-->
-<!--                </el-row>-->
-<!--              </el-checkbox-group>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-      </el-form>
+        </el-form>
       </div>
       <template #footer>
         <div class="dialog-footer">
@@ -1708,7 +1701,7 @@ const upload = reactive({
   // 设置上传的请求头部
   headers: { Authorization: "Bearer " + getToken() },
   // 上传的地址
-  url: import.meta.env.VITE_APP_BASE_API + "/gxt/order/uploadAttachments"
+  url: import.meta.env.VITE_APP_BASE_API + "/gxt/order/importData"
 })
 
 const data = reactive({