修改维保工单

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

@@ -638,22 +638,22 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
                         "工单完成，工单状态变为已完成");
             }
 
-//            List<GxtWorkOrderAttachment> attachments = gxtWorkOrder.getAttachments();
-//            for (GxtWorkOrderAttachment attachment : attachments) {
-//                attachment.setWorkOrderId(order.getId());
-//                attachment.setWorkOrderCode(order.getWorkOrderProjectNo());
-////                attachment.setFileName(file.getOriginalFilename());
-////                attachment.setFileSize(file.getSize());
-//                // 根据文件扩展名判断文件类型
-////                attachment.setFileType(getFileExtension(file.getOriginalFilename()));
-//                attachment.setUploadTime(DateUtils.getNowDate());
-//                attachment.setUploadUserId(SecurityUtils.getUserId());
-//                attachment.setUploadUserName(SecurityUtils.getUsername());
-//                attachment.setCreateBy(SecurityUtils.getUsername());
-//                attachment.setCreateTime(DateUtils.getNowDate());
-//                attachment.setRemark("上传时间：" + DateUtils.getNowDate());
-//                gxtWorkOrderAttachmentMapper.insertGxtWorkOrderAttachment(attachment);
-//            }
+            List<GxtWorkOrderAttachment> attachments = gxtWorkOrder.getAttachments();
+            for (GxtWorkOrderAttachment attachment : attachments) {
+                attachment.setWorkOrderId(order.getId());
+                attachment.setWorkOrderCode(order.getWorkOrderProjectNo());
+//                attachment.setFileName(file.getOriginalFilename());
+//                attachment.setFileSize(file.getSize());
+                // 根据文件扩展名判断文件类型
+//                attachment.setFileType(getFileExtension(file.getOriginalFilename()));
+                attachment.setUploadTime(DateUtils.getNowDate());
+                attachment.setUploadUserId(SecurityUtils.getUserId());
+                attachment.setUploadUserName(SecurityUtils.getUsername());
+                attachment.setCreateBy(SecurityUtils.getUsername());
+                attachment.setCreateTime(DateUtils.getNowDate());
+                attachment.setRemark("上传时间：" + DateUtils.getNowDate());
+                gxtWorkOrderAttachmentMapper.insertGxtWorkOrderAttachment(attachment);
+            }
 
             return result;
         }

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

@@ -1,15 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
-      <!-- <el-form-item label="工单编码" prop="workOrderProjectNo">
+      <el-form-item label="工单编号" prop="workOrderProjectNo" label-position="top">
         <el-input
           v-model="queryParams.workOrderProjectNo"
-          placeholder="请输入工单编码"
+          placeholder="请输入工单编号"
           clearable
-          style="width: 200px"
           @keyup.enter="handleQuery"
         />
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item label="风机编号" prop="pcsDeviceName" label-position="top">
+        <el-input
+            v-model="queryParams.pcsDeviceName"
+            placeholder="请输入风机编号"
+            clearable
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+
       <el-form-item label="维保类型" prop="inspectionTypeId" label-position="top">
         <el-select v-model="queryParams.inspectionTypeId" placeholder="请选择维保类型" clearable>
           <el-option
@@ -22,30 +30,22 @@
       </el-form-item>
       <el-form-item label="维保中心" prop="gxtCenter" label-position="top">
         <el-input
-          v-model="queryParams.gxtCenter"
-          placeholder="请输入维保中心"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="风电场" prop="pcsStationName" label-position="top">
-        <el-input
-          v-model="queryParams.pcsStationName"
-          placeholder="请输入风电场"
-          clearable
-          @keyup.enter="handleQuery"
+            v-model="queryParams.gxtCenter"
+            placeholder="请输入维保中心"
+            clearable
+            @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="工单状态" prop="workOrderStatus" label-position="top">
-        <el-select v-model="queryParams.workOrderStatus" placeholder="请选择工单状态" clearable>
-          <el-option
-              v-for="dict in gxt_work_order_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="工单状态" prop="workOrderStatus" label-position="top">-->
+<!--        <el-select v-model="queryParams.workOrderStatus" placeholder="请选择工单状态" clearable>-->
+<!--          <el-option-->
+<!--              v-for="dict in gxt_work_order_status"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
 <!--      <el-form-item label="工单来源" prop="orderSource">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.orderSource"-->
@@ -1840,7 +1840,8 @@ function submitFinish() {
       // 如果有附件，先上传附件
       if (fileList) {
         // uploadAttachmentsFn(fileList, finishForm.value.orderId)
-        finishForm.value.attachments = fileList;
+        // finishForm.value.attachments = fileList;
+        handleFileSelect(fileList)
         saveFinishWorkOrder()
       } else {
         // 没有附件直接保存工单
@@ -1906,7 +1907,8 @@ function saveFinishWorkOrder() {
     workOrderStatus: 'completed',
     workOrderPersonList: finishForm.value.workOrderPersonList,
     teamLeaderId: finishForm.value.teamLeaderId,
-    teamLeaderName: finishForm.value.teamLeaderName
+    teamLeaderName: finishForm.value.teamLeaderName,
+    attachments: finishForm.value.attachments
   }
 
   completeWorkOrder(finishForm.value.orderId, gxtWorkOrder).then(response => {
@@ -2287,9 +2289,8 @@ function handleFileSelect(files) {
   if (files && files.length > 0) {
     for (let i = 0; i < files.length; i++) {
       finishForm.value.attachments.push({
-        name: files[i].name,
-        size: files[i].size,
-        file: files[i]
+        fileName: files[i].name,
+        filePath: files[i].url,
       })
     }
   }