维保已完成可停机、结单提示修改

ygtx-gxt/src/main/resources/mapper/gxt/source/GxtMisInfoMapper.xml

@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             work_order_device is not null
             <if test="misNo != null  and misNo != ''"> and work_order_project_code like concat('%', #{misNo}, '%')</if>
             <if test="pcsStationName != null  and pcsStationName != ''"> and pcs_station_name like concat('%', #{pcsStationName}, '%')</if>
-            <if test="pcsDeviceName != null  and pcsDeviceName != ''"> and work_order_device like concat('%', #{pcsDeviceName}, '%')</if>
+            <if test="pcsDeviceName != null  and pcsDeviceName != ''"> and work_order_device = #{pcsDeviceName}</if>
             <if test="workOrderStatus != null  and workOrderStatus != ''"> and work_order_status in
                 <foreach collection="workOrderStatus.split(',')" item="status" open="(" separator="," close=")">
                     #{status}

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

@@ -1093,11 +1093,11 @@ const onMisInfoSelected = (row) => {
       debugger
       if (gxtOrders.length > 0) {
         if (formData.value.id == null) {
-          proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
+          proxy.$modal.msgWarning('该MIS工单已被其他工单关联！请重新选择！')
           return
         } else {
           if (gxtOrders[0].id != formData.value.id) {
-            proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
+            proxy.$modal.msgWarning('该MIS工单已被其他工单关联！请重新选择！')
             return
           }
         }

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

@@ -1139,7 +1139,7 @@ const onMisInfoSelected = (row) => {
     getOrderList(row.misNo ).then(response => {
       const  gxtOrders= response.rows
       if (gxtOrders.length > 0) {
-        proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
+        proxy.$modal.msgWarning('该MIS工单已被其他工单关联！请重新选择！')
         return
       }
       // 使用展开运算符创建新对象以确保响应式更新

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

@@ -305,7 +305,7 @@
           </el-button>
 
           <el-button link type="danger" @click="handleShutdown(scope.row)"
-                     v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend' && scope.row.workOrderStatus != 'completed' && scope.row.workOrderStatus != 'archived' && scope.row.workOrderStatus != 'invalid'"
+                     v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
                      v-hasPermi="['gxt:maintenance:order:shutdown']">
             <i class="fa fa-stop"></i>停机
           </el-button>
@@ -2296,7 +2296,7 @@ function handleFinish(row) {
                   }
                 })
               } else {
-                ElMessageBox.confirm('该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
+                ElMessageBox.confirm('已匹配到' + misInfo[0].misNo + '工单，但该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
                   confirmButtonText: '确定',
                   showCancelButton: false,
                   type: 'warning'

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

@@ -167,6 +167,13 @@
                 @click="handleAccept(scope.row)"
                 v-hasPermi="['gxt:repairOrder:accept']"
             ><i class="fa fa-check"></i>接单</el-button>
+            <el-button
+                v-if="scope.row.workOrderStatus === 'to_finish'"
+                type="success"
+                link
+                @click="handleRepairOrderFinalize(scope.row)"
+                v-hasPermi="['gxt:repairOrder:finalize']"
+            ><i class="fa fa-check"></i>结单</el-button>
             <el-button
                 v-if="(scope.row.workOrderStatus === 'to_finish') && (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin'))"
                 type="danger"
@@ -188,13 +195,6 @@
                 @click="handleReturn(scope.row)"
                 v-hasPermi="['gxt:repairOrder:acceptReturn']"
             ><i class="fa fa-sign-in"></i>退回</el-button> <!--接单退回，班长退回至下发环节 -->
-            <el-button
-                v-if="scope.row.workOrderStatus === 'to_finish'"
-                type="success"
-                link
-                @click="handleRepairOrderFinalize(scope.row)"
-                v-hasPermi="['gxt:repairOrder:finalize']"
-            ><i class="fa fa-check"></i>结单</el-button>
             <el-button
                 v-if="scope.row.workOrderStatus === 'to_finish'"
                 type="primary"
@@ -235,15 +235,6 @@
                 @click="handleAccept(scope.row)"
                 v-hasPermi="['gxt:maintenance:order:accept']"
             ><i class="fa fa-check"></i>接单</el-button>
-
-            <el-button
-                v-if="(scope.row.workOrderStatus === 'to_finish') && (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin')) "
-                type="danger"
-                link
-                @click="handleSuspend(scope.row)"
-                v-hasPermi="['gxt:maintenance:order: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="success"-->
@@ -260,6 +251,13 @@
             <el-button link type="success" @click="handleBackfillingFinish(scope.row)" v-if="(scope.row.workOrderStatus === 'processing' || scope.row.workOrderStatus === 'to_finish') && scope.row.orderEntryType == '2'" v-hasPermi="['gxt:maintenance:order:complete']">
               <i class="fa fa-check"></i>结单
             </el-button>
+            <el-button
+                v-if="(scope.row.workOrderStatus === 'to_finish') && (scope.row.teamLeaderId == userStore.id || userStore.roles.includes('admin')) "
+                type="danger"
+                link
+                @click="handleSuspend(scope.row)"
+                v-hasPermi="['gxt:maintenance:order:suspend']"
+            ><i class="fa fa-stop"></i>挂起</el-button>
 
             <el-button
                 v-if="scope.row.workOrderStatus === 'to_approve'"
@@ -269,7 +267,7 @@
                 v-hasPermi="['gxt:maintenance:order:approve']"
             ><i class="fa fa-check-circle"></i>审批</el-button>
             <el-button link type="danger" @click="handleShutdown(scope.row)"
-                       v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend' && scope.row.workOrderStatus != 'completed' && scope.row.workOrderStatus != 'archived' && scope.row.workOrderStatus != 'invalid'"
+                       v-if="scope.row.pauseTime == null && scope.row.workOrderStatus != 'to_issue' && scope.row.workOrderStatus != 'auto_suspend'"
                        v-hasPermi="['gxt:maintenance:order:shutdown']">
               <i class="fa fa-stop"></i>停机
             </el-button>
@@ -2831,7 +2829,7 @@ function handleRepairOrderFinalize(row) {
                 }
               })
             } else {
-              ElMessageBox.confirm('该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
+              ElMessageBox.confirm('已匹配到' + misInfo[0].misNo + '工单，但该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
                 confirmButtonText: '确定',
                 showCancelButton: false,
                 type: 'warning'
@@ -3000,7 +2998,7 @@ function handleFinish(row) {
                 }
               })
             } else {
-              ElMessageBox.confirm('该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
+              ElMessageBox.confirm('已匹配到' + misInfo[0].misNo + '工单，但该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
                 confirmButtonText: '确定',
                 showCancelButton: false,
                 type: 'warning'

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

@@ -3511,7 +3511,7 @@ function handleFinalize(row, method) {
                 }
               })
             } else {
-              ElMessageBox.confirm('该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
+              ElMessageBox.confirm('已匹配到' + misInfo[0].misNo + '工单，但该MIS工单已被其他工单关联，请检查是否重复操作。', '提示', {
                 confirmButtonText: '确定',
                 showCancelButton: false,
                 type: 'warning'