lipenghui 2 сар өмнө
parent
commit
ee571e0ada

+ 1 - 1
src/views/pms/failure/DeviceList.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-  <Dialog v-model="dialogVisible" title="选择品牌" style="width: 1100px; max-height: 800px">
+  <Dialog v-model="dialogVisible" title="选择设备" style="width: 1100px; max-height: 800px">
     <ContentWrap>
     <ContentWrap>
       <el-form
       <el-form
         class="-mb-15px"
         class="-mb-15px"

+ 28 - 28
src/views/pms/inspect/order/index.vue

@@ -24,15 +24,15 @@
               class="!w-240px"
               class="!w-240px"
             />
             />
           </el-form-item>
           </el-form-item>
-          <el-form-item label="工单编码" prop="inspectOrderCode">
-            <el-input
-              v-model="queryParams.inspectOrderCode"
-              placeholder="请输入工单编码"
-              clearable
-              @keyup.enter="handleQuery"
-              class="!w-240px"
-            />
-          </el-form-item>
+<!--          <el-form-item label="工单编码" prop="inspectOrderCode">-->
+<!--            <el-input-->
+<!--              v-model="queryParams.inspectOrderCode"-->
+<!--              placeholder="请输入工单编码"-->
+<!--              clearable-->
+<!--              @keyup.enter="handleQuery"-->
+<!--              class="!w-240px"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item label="工单状态" prop="status">
           <el-form-item label="工单状态" prop="status">
             <el-select
             <el-select
               v-model="queryParams.status"
               v-model="queryParams.status"
@@ -48,17 +48,17 @@
               />
               />
             </el-select>
             </el-select>
           </el-form-item>
           </el-form-item>
-          <el-form-item label="创建时间" prop="createTime">
-            <el-date-picker
-              v-model="queryParams.createTime"
-              value-format="YYYY-MM-DD HH:mm:ss"
-              type="daterange"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-              class="!w-220px"
-            />
-          </el-form-item>
+<!--          <el-form-item label="创建时间" prop="createTime">-->
+<!--            <el-date-picker-->
+<!--              v-model="queryParams.createTime"-->
+<!--              value-format="YYYY-MM-DD HH:mm:ss"-->
+<!--              type="daterange"-->
+<!--              start-placeholder="开始日期"-->
+<!--              end-placeholder="结束日期"-->
+<!--              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"-->
+<!--              class="!w-220px"-->
+<!--            />-->
+<!--          </el-form-item>-->
           <el-form-item>
           <el-form-item>
             <el-button @click="handleQuery"
             <el-button @click="handleQuery"
               ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
               ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
@@ -96,7 +96,7 @@
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column label="工单名称" align="center" prop="inspectOrderTitle" />
           <el-table-column label="工单名称" align="center" prop="inspectOrderTitle" />
-          <el-table-column label="工单编码" align="center" prop="inspectOrderCode" />
+<!--          <el-table-column label="工单编码" align="center" prop="inspectOrderCode" />-->
           <el-table-column label="工单类型" align="center" prop="type" />
           <el-table-column label="工单类型" align="center" prop="type" />
           <el-table-column label="工单状态" align="center" prop="status">
           <el-table-column label="工单状态" align="center" prop="status">
             <template #default="scope">
             <template #default="scope">
@@ -105,13 +105,13 @@
           </el-table-column>
           </el-table-column>
           <el-table-column label="负责人" align="center" prop="chargeName" />
           <el-table-column label="负责人" align="center" prop="chargeName" />
           <el-table-column label="备注" align="center" prop="remark" />
           <el-table-column label="备注" align="center" prop="remark" />
-          <el-table-column
-            label="创建时间"
-            align="center"
-            prop="createTime"
-            :formatter="dateFormatter"
-            width="180px"
-          />
+<!--          <el-table-column-->
+<!--            label="创建时间"-->
+<!--            align="center"-->
+<!--            prop="createTime"-->
+<!--            :formatter="dateFormatter"-->
+<!--            width="180px"-->
+<!--          />-->
           <el-table-column label="操作" align="center" min-width="120px">
           <el-table-column label="操作" align="center" min-width="120px">
             <template #default="scope">
             <template #default="scope">
               <!--          <el-button-->
               <!--          <el-button-->

+ 3 - 2
src/views/pms/maintain/IotMaintain.vue

@@ -78,7 +78,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="8">
             <el-col :span="8">
-              <el-form-item label="故障时间" prop="failureTime">
+              <el-form-item label="故障时间" prop="failureTime" :rules="formData.type==='out'?failureTimeRule:[]" >
                 <el-date-picker
                 <el-date-picker
                   style="width: 150%"
                   style="width: 150%"
                   v-model="formData.failureTime"
                   v-model="formData.failureTime"
@@ -333,6 +333,7 @@ const formData = ref({
   maintainFee: undefined,
   maintainFee: undefined,
   outFile: undefined
   outFile: undefined
 })
 })
+const failureTimeRule = [{ required: true, message: '故障时间不能为空', trigger: 'blur' }]
 const startRule = [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]
 const startRule = [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }]
 const descriptionRule = [{required: true, message:'维修描述不能为空', trigger: 'blur' }]
 const descriptionRule = [{required: true, message:'维修描述不能为空', trigger: 'blur' }]
 const endRule = [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]
 const endRule = [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }]
@@ -342,7 +343,7 @@ const formRules = reactive({
   type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
   type: [{ required: true, message: '维修类型不能为空', trigger: 'blur' }],
   ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
   ifStop: [{ required: true, message: '是否停机不能为空', trigger: 'blur' }],
   failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
   failureName: [{ required: true, message: '故障名称不能为空', trigger: 'blur' }],
-  failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
+  // failureTime: [{ required: true, message: '故障时间不能为空', trigger: 'blur' }],
   // maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
   // maintainStartTime: [{ required: true, message: '维修开始时间不能为空', trigger: 'blur' }],
   // maintainEndTime: [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }],
   // maintainEndTime: [{ required: true, message: '维修结束时间不能为空', trigger: 'blur' }],
   // maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],
   // maintainDescription: [{ required: true, message: '维修描述不能为空', trigger: 'blur' }],