diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
index de9cb6d3..3e63550c 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairmstServiceImpl.java
@@ -219,6 +219,7 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
         jsonMst.put("fault_level", whereJson.getString("fault_level"));
         jsonMst.put("remark", whereJson.getString("remark"));
         jsonMst.put("plan_start_date", whereJson.getString("plan_start_date"));
+        jsonMst.put("estimaterepair_times", whereJson.getString("estimaterepair_times"));
         jsonMst.put("detail_count", tableData.size());
         mstTab.update(jsonMst);
 
@@ -480,9 +481,11 @@ public class DevicerepairmstServiceImpl implements DevicerepairmstService {
             }
             // 3.更新维修单主表
             jsonRemst.put("invstatus",invstatus);
-            jsonRemst.put("confirm_optid",currentUserId);
-            jsonRemst.put("confirm_optname",nickName);
-            jsonRemst.put("confirm_time",DateUtil.now());
+            if("07".equals(invstatus)){
+                jsonRemst.put("confirm_optid",currentUserId);
+                jsonRemst.put("confirm_optname",nickName);
+                jsonRemst.put("confirm_time",DateUtil.now());
+            }
             reMstTab.update(jsonRemst);
         }
     }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
index 8d5920e8..038836fc 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIR001.wql
@@ -286,7 +286,7 @@
             WHERE
                 mst.is_delete = '0'
                 AND file.is_delete = '0'
-                AND mst.invstatus not in ('04','06','99')
+                AND mst.invstatus not in ('04','06','07','99')
                 OPTION 输入.device_code <> ""
                     (file.device_code like 输入.device_code or
                     file.device_name like 输入.device_code)
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue
index f7d03597..fff391c6 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepair/AddDialog.vue
@@ -18,78 +18,59 @@
       </el-col>
     </el-row>
 
-    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="120px" label-suffix=":">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="单据号" prop="repair_code">
-            <el-input v-model="form.repair_code" style="width: 200px;" disabled placeholder="系统自动生成" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="计划维修日期" prop="plan_start_date">
-            <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="维修类型" prop="maintenancecycle">
-            <el-select
-              v-model="form.maintenancecycle"
-              disabled
-              size="mini"
-              placeholder="请选择"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in dict.EM_DEVICE_WX_INVTYPE"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="设备" prop="devicerecord_id">
-            <el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
-              <el-button slot="append" icon="el-icon-plus" :disabled="crud.status.view > 0" @click="putDevice" />
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="故障等级" prop="fault_level">
-            <el-select
-              v-model="form.fault_level"
-              size="mini"
-              placeholder="请选择"
-              :disabled="crud.status.view > 0"
-              class="filter-item"
-            >
-              <el-option
-                v-for="item in dict.EM_FAULT_LEVEL"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="故障描述" prop="fault_desc">
-            <el-input v-model="form.fault_desc" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+    <el-form ref="form" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form" :rules="rules" size="mini" label-width="150px" label-suffix=":">
+        <el-form-item label="单据号" prop="repair_code">
+          <el-input v-model="form.repair_code" style="width: 200px;" disabled placeholder="系统自动生成" />
+        </el-form-item>
+        <el-form-item label="计划维修日期" prop="plan_start_date">
+          <el-date-picker v-model="form.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" :disabled="crud.status.view > 0" />
+        </el-form-item>
+        <el-form-item label="维修类型" prop="maintenancecycle">
+          <el-select
+            v-model="form.maintenancecycle"
+            disabled
+            size="mini"
+            style="width: 200px"
+            placeholder="请选择"
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in dict.EM_DEVICE_WX_INVTYPE"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备" prop="devicerecord_id">
+          <el-input v-model="form.device_code" :disabled="true" style="width: 200px;">
+            <el-button slot="append" icon="el-icon-plus" :disabled="crud.status.view > 0" @click="putDevice" />
+          </el-input>
+        </el-form-item>
+        <el-form-item label="故障等级" prop="fault_level">
+          <el-select
+            v-model="form.fault_level"
+            size="mini"
+            placeholder="请选择"
+            style="width: 200px"
+            :disabled="crud.status.view > 0"
+            class="filter-item"
+          >
+            <el-option
+              v-for="item in dict.EM_FAULT_LEVEL"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="预计修复时间(小时)" prop="estimaterepair_times" v-show="crud.status.edit  === 1">
+          <el-input-number v-model="form.estimaterepair_times" :disabled="crud.status.view > 0" v-show="crud.status.edit  === 1" :precision="1" :min="0" :max="999" style="width: 200px" :controls="false"/>
+        </el-form-item>
+        <el-form-item label="故障描述" prop="fault_desc">
+          <el-input v-model="form.fault_desc" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" style="width: 580px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
+        </el-form-item>
     </el-form>
 
     <div class="crud-opts2">
@@ -123,9 +104,9 @@
         :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
       >
         <el-table-column type="index" label="序号" width="55" align="center" />
-        <el-table-column show-overflow-tooltip prop="repair_item_code" label="维修项目编号" align="center" />
-        <el-table-column show-overflow-tooltip prop="repair_item_name" label="维修项目名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
+        <el-table-column  prop="repair_item_code" label="维修项目编号" align="center" />
+        <el-table-column  prop="repair_item_name" label="维修项目名称" align="center" />
+        <el-table-column  prop="requirement" label="要求" align="center" />
         <el-table-column prop="dtl_remark" label="备注" align="center">
           <template slot-scope="scope">
             <el-input v-show="!scope.row.edit" v-model="scope.row.dtl_remark" :disabled="crud.status.view > 0" class="input-with-select"/>
@@ -153,6 +134,7 @@ const defaultForm = {
   repair_code: null,
   devicerecord_id: null,
   maintenancecycle: '02',
+  estimaterepair_times: 0,
   fault_desc: null,
   fault_level: null,
   remark: null,
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
index c10254f3..589ae0c4 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/StartDialog.vue
@@ -8,7 +8,7 @@
     destroy-on-close
     @close="close"
   >
-    <el-form ref="form" :inline="true" :model="form4" size="mini" label-width="150px" label-suffix=":">
+    <el-form ref="form" :inline="true" :model="form4" :rules="rules" size="mini" label-width="150px" label-suffix=":">
       <el-row>
         <el-col :span="24">
           <el-form-item label="维修人" prop="update_optname">
@@ -60,6 +60,11 @@ export default {
     return {
       form4: {
       },
+      rules: {
+        estimaterepair_times: [
+          { required: true, message: '预计修复时间不能为空', trigger: 'blur' }
+        ]
+      },
       dialogVisible: false
     }
   },
@@ -79,6 +84,9 @@ export default {
       if (!this.form4.update_optname) {
         return this.crud.notify('维修人不能为空', CRUD.NOTIFICATION_TYPE.INFO)
       }
+      if (!this.form4.estimaterepair_times) {
+        return this.crud.notify('预计修复时间不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
       const data = this.form4
       crudDevicerepairmst.startRepair(data).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
index b36fa21f..ecb179b6 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairpa/index.vue
@@ -149,13 +149,13 @@
         <el-table-column fixed="left" prop="plan_start_date" label="计划维修日期" width="95"  />
         <el-table-column prop="fault_desc" label="故障描述" min-width="150"  />
         <el-table-column prop="request_name" label="报修人" min-width="90" />
-        <el-table-column prop="remark" label="备注"  min-width="200" />
+        <el-table-column prop="estimaterepair_times" label="预计修复时间H" min-width="130"  />
         <el-table-column prop="input_optname" label="制单人" min-width="90" />
         <el-table-column prop="input_time" label="制单时间" min-width="140"  />
         <el-table-column prop="update_optname" label="维修人"  min-width="150" />
         <el-table-column prop="real_start_date" label="开始时间" min-width="140"  />
         <el-table-column prop="real_end_date" label="结束时间" min-width="140"  />
-        <el-table-column prop="estimaterepair_times" label="预计修复时间H" min-width="130"  />
+        <el-table-column prop="remark" label="备注"  min-width="200" />
         <el-table-column prop="confirm_optname" label="验收人" min-width="90" />
         <el-table-column prop="confirm_time" label="验收时间" min-width="140"  />
         <el-table-column prop="audit_optname" label="审核人" min-width="90" />