MIS查询修改

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

@@ -32,8 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectGxtMisInfoVo"/>
         <where>
             <if test="misNo != null  and misNo != ''"> and work_order_project_no like concat('%', #{misNo}, '%')</if>
-            <if test="pcsStationName != null  and pcsStationName != ''"> and pcs_station_name = #{pcsStationName}</if>
-            <if test="pcsDeviceName != null  and pcsDeviceName != ''"> and pcs_device_name = #{pcsDeviceName}</if>
+            <if test="pcsStationName != null  and pcsStationName != ''"> and pcs_station_name like concat('%', #{pcsStationName}, '%')</if>
+            <if test="pcsDeviceName != null  and pcsDeviceName != ''"> and pcs_device_name like concat('%', #{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/misInfoSelect/single.vue

@@ -44,7 +44,7 @@
         <el-table v-loading="loading" :data="misNoList" @current-change="handleCurrent" @row-dblclick="handleRowDbClick" ref="tableRef">
             <el-table-column  width="55" align="center" >
                 <template #default="scope">
-                    <el-radio v-model="selectedId" :label="scope.row.equipmentId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
+                    <el-radio v-model="selectedId" :label="scope.row.misNo" @change="handleRowChange(scope.row)">{{""}}</el-radio>
                 </template>
             </el-table-column>
           <el-table-column label="MIS系统编码" align="center" key="misNo" prop="misNo" :show-overflow-tooltip="true" />
@@ -52,6 +52,8 @@
           <el-table-column label="场站" align="center" key="pcsStationName" prop="pcsStationName" :show-overflow-tooltip="true" />
           <el-table-column label="维修内容" align="center" key="content" prop="content" :show-overflow-tooltip="true" />
           <el-table-column label="状态" align="center" key="workOrderStatus" prop="workOrderStatus" :show-overflow-tooltip="true" />
+          <el-table-column label="开始时间" align="center" key="realStartTime" prop="realStartTime" :show-overflow-tooltip="true" />
+          <el-table-column label="结束时间" align="center" key="realEndTime" prop="realEndTime" :show-overflow-tooltip="true" />
         </el-table>
 
         <pagination
@@ -126,7 +128,7 @@ const queryParams = reactive({
   misNo: undefined,
   pcsDeviceName: undefined,
   pcsStationName: undefined,
-  workOrderStatus: "编辑,作业中"
+  workOrderStatus: undefined
 })
 
 // 组件挂载时查询数据
@@ -136,7 +138,8 @@ onMounted(() => {
 
 /** 查询设备列表 */
 function getList() {
-  loading.value = true;
+  loading.value = true
+  debugger
   listMisInfo(queryParams).then(response => {
       misNoList.value = response.rows;
       total.value = response.total;

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

@@ -277,7 +277,7 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="工单编码" prop="workOrderProjectNo">
-                <el-input v-model="form.workOrderProjectNo" maxlength="50" show-word-limit v-chinese-limit/>
+                <el-input v-model="form.workOrderProjectNo" maxlength="50" show-word-limit v-chinese-limit readonly/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -290,7 +290,7 @@
               </el-form-item>
             </el-col>
             <!-- MIS选择组件 -->
-            <MisInfoSelectSingle v-model="misInfoSelectVisible" @onSelected="onMisInfoSelected"></MisInfoSelectSingle>
+            <MisInfoSelectSingle :key="commonKey" v-model="misInfoSelectVisible" @onSelected="onMisInfoSelected"></MisInfoSelectSingle>
           </el-row>
           <el-row :gutter="20">
             <el-col :span="12">
@@ -1400,6 +1400,7 @@ const fileUploadRef = ref(null)
 
 const tableHeight = ref(window.innerHeight - 300)
 const misInfoSelectVisible = ref(false)
+let commonKey = 0
 
 const upload = reactive({
   // 是否显示弹出层（设备导入）
@@ -1719,6 +1720,7 @@ function handleAdd() {
   });
   open.value = true
   title.value = "添加维保工单"
+  commonKey++
 }
 
 /** 修改按钮操作 */
@@ -1729,6 +1731,7 @@ function handleUpdate(row) {
     form.value = response.data
     open.value = true
     title.value = "修改维保工单"
+    commonKey++
   })
 }