添加导入

ygtx-gxt/src/main/java/com/ygtx/gxt/controller/GxtWorkOrderController.java

@@ -42,7 +42,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 查询维保工单列表
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:list')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:list')")
     @GetMapping("/list")
     public TableDataInfo list(GxtWorkOrder gxtWorkOrder)
     {
@@ -54,7 +54,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 导出维保工单列表
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:export')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:export')")
     @Log(title = "维保工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, GxtWorkOrder gxtWorkOrder)
@@ -67,7 +67,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 导入维保工单数据
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:import')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:import')")
     @Log(title = "维保工单", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
@@ -92,7 +92,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 获取维保工单详细信息
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:query')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -102,7 +102,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 新增维保工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:add')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:add')")
     @Log(title = "维保工单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody GxtWorkOrder gxtWorkOrder)
@@ -113,7 +113,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 修改维保工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:edit')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:edit')")
     @Log(title = "维保工单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody GxtWorkOrder gxtWorkOrder)
@@ -124,7 +124,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 删除维保工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:remove')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:remove')")
     @Log(title = "维保工单", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -135,7 +135,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 派单给班组组长
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:assign')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:assign')")
     @Log(title = "派单给班组组长", businessType = BusinessType.UPDATE)
     @PutMapping("/assignToTeamLeader/{id}")
     public AjaxResult assignToTeamLeader(
@@ -149,7 +149,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 班组组长接单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:accept')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:accept')")
     @Log(title = "班组组长接单", businessType = BusinessType.UPDATE)
     @PutMapping("/acceptByTeamLeader/{id}")
     public AjaxResult acceptByTeamLeader(@PathVariable("id") Long id)
@@ -160,7 +160,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 班组组长派单给工作组成员
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:assign')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:assign')")
     @Log(title = "派单给工作组成员", businessType = BusinessType.UPDATE)
     @PutMapping("/assignToWorkGroupMember/{id}")
     public AjaxResult assignToWorkGroupMember(
@@ -174,7 +174,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 工作组成员接单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:accept')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:accept')")
     @Log(title = "工作组成员接单", businessType = BusinessType.UPDATE)
     @PutMapping("/acceptByWorkGroupMember/{id}")
     public AjaxResult acceptByWorkGroupMember(@PathVariable("id") Long id)
@@ -198,7 +198,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 重启工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:restart')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:restart')")
     @Log(title = "重启工单", businessType = BusinessType.UPDATE)
     @PutMapping("/restart/{id}")
     public AjaxResult restart(@PathVariable("id") Long id)
@@ -209,7 +209,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 完成工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:complete')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:complete')")
     @Log(title = "完成工单", businessType = BusinessType.UPDATE)
     @PostMapping("/complete/{id}")
     public AjaxResult complete(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -221,7 +221,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 查询工单流转记录
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:query')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:query')")
     @GetMapping("/flow/{orderId}")
     public AjaxResult getFlowList(@PathVariable("orderId") Long orderId)
     {
@@ -232,7 +232,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 接单（支持一次性选择处理人员和检修人员）
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:accept')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:accept')")
     @Log(title = "接单", businessType = BusinessType.UPDATE)
     @PostMapping("/accept/{id}")
     public AjaxResult accept(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -244,7 +244,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 开始处理工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:start')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:start')")
     @Log(title = "开始处理", businessType = BusinessType.UPDATE)
     @PostMapping("/start/{id}")
     public AjaxResult start(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -256,7 +256,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 暂停工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:pause')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:pause')")
     @Log(title = "暂停工单", businessType = BusinessType.UPDATE)
     @PostMapping("/pause/{id}")
     public AjaxResult pause(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -268,7 +268,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 继续处理工单
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:resume')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:resume')")
     @Log(title = "继续处理", businessType = BusinessType.UPDATE)
     @PostMapping("/resume/{id}")
     public AjaxResult resume(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -280,7 +280,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 挂起工单申请
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:suspend')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:suspend')")
     @Log(title = "申请挂起", businessType = BusinessType.UPDATE)
     @PostMapping("/suspend/{id}")
     public AjaxResult suspend(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -292,7 +292,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 审批挂起申请
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:approve')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:approve')")
     @Log(title = "审批挂起", businessType = BusinessType.UPDATE)
     @PostMapping("/approve/{id}")
     public AjaxResult approve(@PathVariable("id") Long id, @RequestBody GxtWorkOrder gxtWorkOrder)
@@ -304,7 +304,7 @@ public class GxtWorkOrderController extends BaseController
     /**
      * 上传工单附件
      */
-    @PreAuthorize("@ss.hasPermi('gxt:order:complete')")
+    @PreAuthorize("@ss.hasPermi('gxt:maintenance:order:complete')")
     @Log(title = "上传附件", businessType = BusinessType.UPDATE)
     @PostMapping("/uploadAttachments")
     public AjaxResult uploadAttachments(

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

@@ -1270,7 +1270,7 @@ public class GxtWorkOrderServiceImpl implements IGxtWorkOrderService
         int maxRetries = 100; // 最多重试100次
         int retryCount = 0;
         // 获取当前日期
-        String dateStr = DateUtils.dateTime(DateUtils.getNowDate()).substring(0, 8); // YYYYMMDD
+        String dateStr = DateUtils.dateTime(DateUtils.getNowDate()).substring(0, 10).replace("-", ""); // YYYYMMDD
         do {
             int randomNum = (int)(Math.random() * 900); // 生成0-999之间的随机数
             workOrderProjectNo = "WB" + dateStr + randomNum;

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

@@ -49,7 +49,7 @@
           icon="Edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['worklog:Gxt:order:edit']"
+          v-hasPermi="['worklog:gxt:maintenance:order:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -58,7 +58,7 @@
           icon="Delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['worklog:Gxt:order:remove']"
+          v-hasPermi="['worklog:gxt:maintenance:order:remove']"
         >删除</el-button>
       </el-col> -->
       <el-col :span="1.5">
@@ -66,7 +66,7 @@
           type="info"
           icon="Upload"
           @click="handleImport"
-          v-hasPermi="['gxt:order:import']"
+          v-hasPermi="['gxt:maintenance:order:import']"
         >导入</el-button>
       </el-col>
 <!--      <el-col :span="1.5">-->
@@ -74,14 +74,14 @@
 <!--          type="warning"-->
 <!--          icon="Download"-->
 <!--          @click="handleExport"-->
-<!--          v-hasPermi="['gxt:order:export']"-->
+<!--          v-hasPermi="['gxt:maintenance:order:export']"-->
 <!--        >导出</el-button>-->
 <!--      </el-col>-->
       <!-- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" min-width="140">
+      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" min-width="150">
         <template #default="scope">
           <el-button link type="primary" @click="handleDetail(scope.row)">
             {{ scope.row.workOrderProjectNo }}
@@ -93,43 +93,43 @@
           {{ scope.row.pcsDeviceName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="维保类型" align="center" prop="inspectionType" width="100">
+      <el-table-column label="维保类型" align="center" prop="inspectionType" min-width="100">
         <template #default="scope">
           <dict-tag v-if="scope.row.inspectionType" :options="gxt_inspection_type" :value="scope.row.inspectionType"/>
           <span v-else>-</span>
         </template>
       </el-table-column>
-      <el-table-column label="工单状态" align="center" prop="workOrderStatus" width="100">
+      <el-table-column label="工单状态" align="center" prop="workOrderStatus" min-width="100">
         <template #default="scope">
           <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="gxtCenter" min-width="140" :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">
+      <el-table-column label="场站" align="center" prop="pcsStationName" min-width="140" :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">
+      <el-table-column label="品牌" align="center" prop="brand" min-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">
+      <el-table-column label="机型" align="center" prop="model" min-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">
+      <el-table-column label="MIS系统工单编码" align="center" prop="misNo" min-width="150">
         <template #default="scope">
           {{ scope.row.misNo || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="接单人" align="center" prop="acceptUserName" width="100">
+      <el-table-column label="接单人" align="center" prop="acceptUserName">
         <template #default="scope">
           {{ scope.row.acceptUserName || '-' }}
         </template>
@@ -144,54 +144,54 @@
           {{ scope.row.teamLeaderName || '-' }}
         </template>
       </el-table-column>
-      <el-table-column label="开始时间" align="center" prop="realStartTime" width="100">
+      <el-table-column label="开始时间" align="center" prop="realStartTime" min-width="140">
         <template #default="scope">
           <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">
+      <el-table-column label="结束时间" align="center" prop="realEndTime" min-width="140">
         <template #default="scope">
           <span>{{ scope.row.realEndTime ? parseTime(scope.row.realEndTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right" >
+      <el-table-column label="操作" align="center" min-width="200" class-name="small-padding fixed-width" fixed="right" >
         <template #default="scope">
           <!-- 已派单状态：只显示确认按钮 -->
-          <el-button link type="success" @click="handleAccept(scope.row)" v-if="scope.row.workOrderStatus === 'assigned'" v-hasPermi="['gxt:order:accept']">
+          <el-button link type="success" @click="handleAccept(scope.row)" v-if="scope.row.workOrderStatus === 'assigned'" v-hasPermi="['gxt:maintenance:order:accept']">
             <i class="fa fa-check"></i>接单
           </el-button>
 
-          <el-button link type="danger" @click="handleSuspend(scope.row)" v-if="scope.row.workOrderStatus === 'processing' || scope.row.workOrderStatus === 'to_finish'" v-hasPermi="['gxt:order:suspend']">
+          <el-button link type="danger" @click="handleSuspend(scope.row)" v-if="scope.row.workOrderStatus === 'processing' || scope.row.workOrderStatus === 'to_finish'" v-hasPermi="['gxt:maintenance:order:suspend']">
             <i class="fa fa-stop"></i>挂起
           </el-button>
 
           <!-- 暂停中状态：显示继续按钮 -->
-          <el-button link type="primary" @click="handleResume(scope.row)" v-if="scope.row.workOrderStatus === 'suspended'" v-hasPermi="['gxt:order:complete']">
+          <el-button link type="primary" @click="handleResume(scope.row)" v-if="scope.row.workOrderStatus === 'suspended'" v-hasPermi="['gxt:maintenance:order:complete']">
             <i class="fa fa-play"></i>恢复
           </el-button>
 
           <!-- 待审批状态：显示审批按钮 -->
-          <el-button link type="primary" @click="handleApprove(scope.row)" v-if="scope.row.workOrderStatus === 'to_approve'" v-hasPermi="['gxt:order:approve']">
+          <el-button link type="primary" @click="handleApprove(scope.row)" v-if="scope.row.workOrderStatus === 'to_approve'" v-hasPermi="['gxt:maintenance:order:approve']">
             <i class="fa fa-check-circle"></i>审批
           </el-button>
 
           <!-- 待结单状态：显示结单按钮 -->
-          <el-button link type="success" @click="handleFinish(scope.row)" v-if="scope.row.workOrderStatus === 'processing' || scope.row.workOrderStatus === 'to_finish'" v-hasPermi="['gxt:order:complete']">
+          <el-button link type="success" @click="handleFinish(scope.row)" v-if="scope.row.workOrderStatus === 'processing' || scope.row.workOrderStatus === 'to_finish'" v-hasPermi="['gxt:maintenance:order:complete']">
             <i class="fa fa-check"></i>结单
           </el-button>
 
           <!-- 已完成状态：显示评分按钮 -->
-          <el-button link type="warning" @click="handleRate(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.score === null" v-hasPermi="['gxt:order:complete']">
+          <el-button link type="warning" @click="handleRate(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.score === null" v-hasPermi="['gxt:maintenance:order:complete']">
             <i class="fa fa-star"></i>评分
           </el-button>
 
           <!-- 已完成状态：显示复运按钮 -->
-          <el-button link type="info" @click="handleRestart(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.restartTime === null" v-hasPermi="['gxt:order:complete']">
+          <el-button link type="info" @click="handleRestart(scope.row)" v-if="scope.row.workOrderStatus === 'completed' && scope.row.restartTime === null" v-hasPermi="['gxt:maintenance:order:complete']">
             <i class="fa fa-refresh"></i>复运
           </el-button>
 
           <!-- 查看按钮对所有状态都显示 -->
-          <el-button link type="info" @click="handleDetail(scope.row)" v-hasPermi="['gxt:order:query']">
+          <el-button link type="info" @click="handleDetail(scope.row)" v-hasPermi="['gxt:maintenance:order:query']">
             <i class="fa fa-eye"></i>查看
           </el-button>
         </template>