添加工单MIS编号验证是否已存在、维修去掉检修类型

ygtx-gxt/src/main/resources/mapper/gxt/GxtWorkOrderMapper.xml

@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="itemCompletionFactorSum != null"> and item_completion_factor_sum = #{itemCompletionFactorSum}</if>
             <if test="reviewScoreNum != null"> and review_score_num = #{reviewScoreNum}</if>
             <if test="finalCoefficient != null"> and final_coefficient = #{finalCoefficient}</if>
+            <if test="misNo != null"> and mis_no = #{misNo}</if>
             <!-- 业务特定数据权限过滤条件 -->
             <if test="params.businessDataScope != null and params.businessDataScope != ''">
                 ${params.businessDataScope}

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

@@ -138,7 +138,7 @@
     </el-row>
 
     <el-table v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
-      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" min-width="150">
+      <el-table-column label="工单编码" align="center" prop="workOrderProjectNo" min-width="150" fixed>
         <template #default="scope">
           <el-button link type="primary" @click="handleDetail(scope.row)">
             {{ scope.row.workOrderProjectNo }}
@@ -2482,29 +2482,28 @@ function handleSelectMisInfo() {
 function onMisInfoSelected(row) {
   debugger
   if (row) {
-    // listGxtOrder({pageNum: 1, pageSize: 10, misNo: row.misNo }).then(response => {
-    //   const  gxtOrders= response.rows
-    //   debugger
-    //   if (gxtOrders) {
-    //     proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
-    //     return
-    //   }
-    // })
-    form.value.misNo = row.misNo
-    form.value.pcsDeviceName = row.pcsDeviceName
-    form.value.pcsStationName = row.pcsStationName
-    form.value.content = row.content
-    listEquipment({ station: row.pcsStationName, equipmentCode: row.pcsDeviceName }).then(response => {
-      const equipments = response.rows
-      if (equipments) {
-        form.value.pcsDeviceId = equipments[0].equipmentId
-        form.value.gxtCenter = equipments[0].maintenanceCenter
-        form.value.brand = equipments[0].brand
-        form.value.model = equipments[0].model
+    listGxtOrder({pageNum: 1, pageSize: 10, misNo: row.misNo }).then(response => {
+      const  gxtOrders= response.rows
+      if (gxtOrders.length > 0) {
+        proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
+        return
       }
-    });
+      form.value.misNo = row.misNo
+      form.value.pcsDeviceName = row.pcsDeviceName
+      form.value.pcsStationName = row.pcsStationName
+      form.value.content = row.content
+      listEquipment({ station: row.pcsStationName, equipmentCode: row.pcsDeviceName }).then(response => {
+        const equipments = response.rows
+        if (equipments) {
+          form.value.pcsDeviceId = equipments[0].equipmentId
+          form.value.gxtCenter = equipments[0].maintenanceCenter
+          form.value.brand = equipments[0].brand
+          form.value.model = equipments[0].model
+        }
+      });
+      misInfoSelectVisible.value = false
+    })
   }
-  misInfoSelectVisible.value = false
 }
 
 //自动编码生成

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

@@ -18,16 +18,16 @@
             @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="检修类型" prop="maintenanceType" label-position="top">
-        <el-select v-model="queryParams.maintenanceType" placeholder="请选择检修类型" clearable>
-          <el-option
-              v-for="dict in gxt_maintenance_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item label="检修类型" prop="maintenanceType" label-position="top">-->
+<!--        <el-select v-model="queryParams.maintenanceType" placeholder="请选择检修类型" clearable>-->
+<!--          <el-option-->
+<!--              v-for="dict in gxt_maintenance_type"-->
+<!--              :key="dict.value"-->
+<!--              :label="dict.label"-->
+<!--              :value="dict.value"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="维保中心" prop="gxtCenter" label-position="top">
         <el-select
             v-model="queryParams.gxtCenter"
@@ -136,11 +136,11 @@
         </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="maintenanceType" min-width="100">
-        <template #default="scope">
-          <dict-tag :options="gxt_maintenance_type" :value="scope.row.maintenanceType" />
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="检修类型" align="center" prop="maintenanceType" min-width="100">-->
+<!--        <template #default="scope">-->
+<!--          <dict-tag :options="gxt_maintenance_type" :value="scope.row.maintenanceType" />-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <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" />
@@ -874,18 +874,18 @@
             <el-form-item label="故障描述">{{ finalizeForm.faultDesc || '无' }}</el-form-item>
           </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="检修类型" prop="maintenanceType">
-              <el-select v-model="finalizeForm.maintenanceType" placeholder="请选择检修类型" style="width: 100%">
-                <el-option
-                    v-for="dict in gxt_maintenance_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="检修类型" prop="maintenanceType">-->
+<!--              <el-select v-model="finalizeForm.maintenanceType" placeholder="请选择检修类型" style="width: 100%">-->
+<!--                <el-option-->
+<!--                    v-for="dict in gxt_maintenance_type"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 <!--          <el-col :span="24">
             <el-form-item label="检修人员" prop="selectedMembers">
               <el-checkbox-group v-model="finalizeForm.selectedMembers" style="width: 100%"  @change="() => handleMembersChange('finalizeForm')">
@@ -1043,18 +1043,18 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="检修类型">
-              <el-select v-model="ratingForm.maintenanceType" style="width: 100%" disabled>
-                <el-option
-                    v-for="dict in gxt_maintenance_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="检修类型">-->
+<!--              <el-select v-model="ratingForm.maintenanceType" style="width: 100%" disabled>-->
+<!--                <el-option-->
+<!--                    v-for="dict in gxt_maintenance_type"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="检修人员"><el-input v-model="ratingForm.workGroupMemberName" disabled /></el-form-item>
           </el-col>
@@ -1130,18 +1130,18 @@
           <el-col :span="12">
             <el-form-item label="风机编号"><el-input v-model="restartForm.pcsDeviceName" disabled /> </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="检修类型">
-              <el-select v-model="restartForm.maintenanceType" style="width: 100%" disabled>
-                <el-option
-                    v-for="dict in gxt_maintenance_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                    :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="检修类型">-->
+<!--              <el-select v-model="restartForm.maintenanceType" style="width: 100%" disabled>-->
+<!--                <el-option-->
+<!--                    v-for="dict in gxt_maintenance_type"-->
+<!--                    :key="dict.value"-->
+<!--                    :label="dict.label"-->
+<!--                    :value="dict.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="24">
             <el-form-item label="维修总结">
               <el-input
@@ -1258,11 +1258,11 @@
                   <el-col :span="24">
                     <el-form-item label="检修人员">{{ viewForm.workGroupMemberName }}</el-form-item>
                   </el-col>
-                  <el-col :span="24">
-                    <el-form-item label="检修类型">
-                      <dict-tag :options="gxt_maintenance_type" :value="viewForm.maintenanceType" />
-                    </el-form-item>
-                  </el-col>
+<!--                  <el-col :span="24">-->
+<!--                    <el-form-item label="检修类型">-->
+<!--                      <dict-tag :options="gxt_maintenance_type" :value="viewForm.maintenanceType" />-->
+<!--                    </el-form-item>-->
+<!--                  </el-col>-->
                   <el-col :span="24">
                     <el-form-item label="维修总结">{{ viewForm.content }}</el-form-item>
                   </el-col>
@@ -1408,6 +1408,7 @@ import { getConfigKey } from "@/api/system/config"
 import {genCode} from "@/api/system/autocode/rule.js";
 import MisInfoSelectSingle from "@/components/misInfoSelect/single.vue";
 import {listMisInfo, listWorkPerson} from "@/api/gxt/misInfo.js";
+import {listGxtOrder} from "@/api/gxt/gxtOrder.js";
 
 
 const { proxy } = getCurrentInstance()
@@ -1670,9 +1671,9 @@ const rules = ref({
   occurTime: [
     { required: true, message: "请选择发生时间", trigger: "change" }
   ],
-  maintenanceType: [
-    { required: true, message: "请选择检修类型", trigger: "change" }
-  ],
+  // maintenanceType: [
+  //   { required: true, message: "请选择检修类型", trigger: "change" }
+  // ],
   /* priorityType: [
      { required: true, message: "请选择优先级", trigger: "change" }
    ],*/
@@ -1713,9 +1714,9 @@ const approveRules = ref({
 
 // 结单表单验证规则
 const finalizeRules = ref({
-  maintenanceType: [
-    { required: true, message: "请选择检修类型", trigger: "change" }
-  ],
+  // maintenanceType: [
+  //   { required: true, message: "请选择检修类型", trigger: "change" }
+  // ],
   /*selectedMembers: [
     { required: true, message: "请至少选择一名检修人员", trigger: "change" }
   ],*/
@@ -2814,22 +2815,29 @@ function handleSelectMisInfo() {
 /** 设备MIS信息回调 */
 function onMisInfoSelected(row) {
   if (row) {
-    finalizeForm.value.misOrderNo = row.misNo
-    finalizeForm.value.realStartTime = row.realStartTime
-    finalizeForm.value.realEndTime = row.realEndTime
-    // finalizeForm.value.content = row.content
-    listWorkPerson({ misNo: row.misNo }).then(response => {
-      debugger
-      finalizeForm.value.repairOrderPersonList = response.rows;
-      if (finalizeForm.value.repairOrderPersonList) {
-        const nickNames = finalizeForm.value.repairOrderPersonList
-            .map(person => person.nickName)
-            .join(',');
-        finalizeForm.value.workGroupMemberName = nickNames
+    listRepairOrder({pageNum: 1, pageSize: 10, misOrderNo: row.misNo }).then(response => {
+      const  gxtOrders= response.rows
+      if (gxtOrders.length > 0) {
+        proxy.$modal.msgWarning('选择工单已存在！请重新选择！')
+        return
       }
+      finalizeForm.value.misOrderNo = row.misNo
+      finalizeForm.value.realStartTime = row.realStartTime
+      finalizeForm.value.realEndTime = row.realEndTime
+      // finalizeForm.value.content = row.content
+      listWorkPerson({ misNo: row.misNo }).then(response => {
+        debugger
+        finalizeForm.value.repairOrderPersonList = response.rows;
+        if (finalizeForm.value.repairOrderPersonList) {
+          const nickNames = finalizeForm.value.repairOrderPersonList
+              .map(person => person.nickName)
+              .join(',');
+          finalizeForm.value.workGroupMemberName = nickNames
+        }
+      })
+      misInfoSelectVisible.value = false
     })
   }
-  misInfoSelectVisible.value = false
 }
 </script>