diff --git a/src/views/device/faultReport/index.vue b/src/views/device/faultReport/index.vue
index 43b8f250..4ab5447f 100644
--- a/src/views/device/faultReport/index.vue
+++ b/src/views/device/faultReport/index.vue
@@ -308,164 +308,62 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-tabs type="border-card">
-          <el-tab-pane label="查看报修信息">
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="8">
-                <el-form-item label="设备编码" prop="equipmentCode">
-                  <el-input
-                    v-model="form.equipmentCode"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                  <ItemSelect
-                    ref="itemSelect"
-                    @onSelected="onItemSelectedEquipment"
-                  >
-                  </ItemSelect>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="设备名称" prop="equipmentName">
-                  <el-input
-                    v-model="form.equipmentName"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="设备类型" prop="equipmentTypeName">
-                  <el-input
-                    v-model="form.equipmentTypeName"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="8">
-                <el-form-item label="规格型号" prop="equipmentSpec">
-                  <el-input
-                    v-model="form.equipmentSpec"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                  <ItemSelect
-                    ref="itemSelect"
-                    @onSelected="onItemSelectedEquipment"
-                  >
-                  </ItemSelect>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="所在部门" prop="department">
-                  <el-input
-                    v-model="form.department"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="所在位置" prop="equipmentLocation">
-                  <el-input
-                    v-model="form.equipmentLocation"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="8">
-                <el-form-item label="故障时间" prop="orderBreakdownTime">
-                  <el-date-picker
-                    clearable
-                    v-model="form.orderBreakdownTime"
-                    type="datetime"
-                    placeholder="选择日期时间"
-                    disabled
-                    style="width: 195px"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="报修来源" prop="orderSource">
-                  <el-select
-                    v-model="form.orderSource"
-                    style="width: 195px"
-                    disabled
-                  >
-                    <el-option
-                      v-for="dict in dict.type.device_order_source"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="报修时间" prop="orderTime">
-                  <el-date-picker
-                    clearable
-                    v-model="form.orderTime"
-                    type="datetime"
-                    disabled
-                    style="width: 195px"
-                    placeholder="报修时间"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="10" class="mb8">
-              <el-col :span="8">
-                <el-form-item label="报修人编号" prop="orderRepairmanCode">
-                  <el-input
-                    v-model="form.orderRepairmanCode"
-                    placeholder="请输入报修人编号"
-                    disabled
-                    style="width: 195px"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item label="联系方式" prop="orderConnection">
-                  <el-input
-                    v-model="form.orderConnection"
-                    placeholder="请输入联系方式"
-                    disabled
-                    style="width: 195px"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row>
-              <el-form-item label="故障描述" prop="orderDesc">
-                <el-input
-                  v-model="form.orderDesc"
-                  placeholder="请输入故障描述"
-                  type="textarea"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                  disabled
-                />
-              </el-form-item>
-            </el-row>
-            <el-form-item label="故障图片" prop="orderPicture">
-              <FileUpload v-model="form.fileList" />
-            </el-form-item>
-          </el-tab-pane>
+          <el-tab-pane label="基本信息">
+                      <el-descriptions :column="3" border>
+                        <el-descriptions-item label="设备编码">{{
+                          form.equipmentCode
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="故障时间">{{
+                          form.orderBreakdownTime
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="报修来源">{{
+                          form.orderSource
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="报修时间">{{
+                          form.orderTime
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="报修人名字">{{
+                          form.orderRepairmanName
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="联系方式">{{
+                          form.orderConnection
+                        }}</el-descriptions-item>
+                        <el-descriptions-item label="故障描述">{{
+                          form.orderDesc
+                        }}</el-descriptions-item>
+                      </el-descriptions>
+                      <el-descriptions :column="1" border>
+                        <el-descriptions-item label="故障图片">
+                          <el-image
+                            v-for="(item, index) in urlLists"
+                            :key="index"
+                            :src="item"
+                          ></el-image
+                        ></el-descriptions-item>
+                      </el-descriptions>
+                    </el-tab-pane>
+                    <el-tab-pane label="检查项信息">
+                      <el-table :data="checkList" border style="width: 100%">
+                        <el-table-column prop="itemName" label="检查项名称" width="150">
+                        </el-table-column>
+                        <el-table-column prop="standardName" label="标准名称" width="180">
+                        </el-table-column>
+                        <el-table-column prop="standardType" label="标准类型" width="100">
+                        </el-table-column>
+                        <el-table-column prop="detailReach" label="是否达标" width="50">
+                        </el-table-column>
+                        <el-table-column prop="actualValue" label="实际值" width="50">
+                        </el-table-column>
+                        <el-table-column prop="detailUpLimit" label="上限" width="50">
+                        </el-table-column>
+                        <el-table-column prop="detailDownLimit" label="下限" width="50">
+                        </el-table-column>
+                        <el-table-column prop="detailUnit" label="单位" width="50">
+                        </el-table-column>
+                        <el-table-column prop="detailUnit" label="故障图片">
+                        </el-table-column>
+                      </el-table>
+                    </el-tab-pane>
           <el-tab-pane label="审核">
             <el-row>
               <el-col :span="24">
@@ -474,7 +372,7 @@
                     <el-radio label="计划性维修">计划性维修</el-radio>
                     <el-radio label="不维修">不维修</el-radio>
                     <el-radio label="委外维修">委外维修</el-radio>
-                    <el-radio label="立即维修" @click="timeBackFilling"
+                    <el-radio label="立即维修" @click.native ="timeBackFilling"
                       >立即维修</el-radio
                     >
                   </el-radio-group>
@@ -484,10 +382,21 @@
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
                 <el-form-item prop="workTeam" label="维修组">
-                  <el-input
-                    v-model="form.workTeam"
-                    placeholder="请选择维修组"
-                  />
+          <el-select
+            v-model="form.workTeam"
+            placeholder="请选择维修组"
+            @change="$forceUpdate()"
+            clearable
+            filterable
+            style="width: 200px"
+          >
+            <el-option
+              v-for="item in teamOption"
+              :key="item.teamCode"
+              :label="item.teamName"
+              :value="item.teamCode"
+            ></el-option>
+          </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
@@ -552,10 +461,21 @@
             <el-row>
               <el-col :span="8" v-if="form.repairDestination == '立即维修'">
                 <el-form-item prop="workTeam" label="维修组">
-                  <el-input
-                    v-model="form.workTeam"
-                    placeholder="请选择维修组"
-                  />
+          <el-select
+            v-model="form.workTeam"
+            placeholder="请选择维修组"
+            @change="$forceUpdate()"
+            clearable
+            filterable
+            style="width: 200px"
+          >
+            <el-option
+              v-for="item in teamOption"
+              :key="item.teamCode"
+              :label="item.teamName"
+              :value="item.teamCode"
+            ></el-option>
+          </el-select>
                 </el-form-item>
               </el-col>
               <el-col :span="8" v-if="form.repairDestination == '立即维修'">
@@ -564,7 +484,7 @@
                     clearable
                     v-model="form.workPlanTime"
                     type="datetime"
-                    placeholder=""
+                    disabled
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -670,330 +590,162 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="8">
-            <el-form-item label="设备编码" prop="equipmentCode">
-              <el-input
-                v-model="form.equipmentCode"
-                disabled
-                style="width: 195px"
-              >
-              </el-input>
-              <ItemSelect
-                ref="itemSelect"
-                @onSelected="onItemSelectedEquipment"
-              >
-              </ItemSelect>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备名称" prop="equipmentName">
-              <el-input
-                v-model="form.equipmentName"
-                disabled
-                style="width: 195px"
-              >
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="设备类型" prop="equipmentTypeName">
-              <el-input
-                v-model="form.equipmentTypeName"
-                disabled
-                style="width: 195px"
-              >
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+        <el-tabs type="border-card">
+          <el-tab-pane label="基本信息">
+            <el-descriptions :column="3" border>
+              <el-descriptions-item label="设备编码">{{
+                form.equipmentCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备名称">{{
+                form.equipmentName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备类型">{{
+                form.equipmentTypeName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="规格型号">{{
+                form.equipmentSpec
+              }}</el-descriptions-item>
+              <el-descriptions-item label="所在部门">{{
+                form.department
+              }}</el-descriptions-item>
+              <el-descriptions-item label="所在位置">{{
+                form.equipmentLocation
+              }}</el-descriptions-item>
+              <el-descriptions-item label="故障时间">{{
+                form.orderBreakdownTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修来源">{{
+                form.orderSource
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修时间">{{
+                form.orderTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修人名字">{{
+                form.orderRepairmanName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系方式">{{
+                form.orderConnection
+              }}</el-descriptions-item>
+              <el-descriptions-item label="故障描述">{{
+                form.orderDesc
+              }}</el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="故障图片">
+                <el-image
+                  v-for="(item, index) in urlLists"
+                  :key="index"
+                  :src="item"
+                ></el-image
+              ></el-descriptions-item>
+            </el-descriptions>
+          </el-tab-pane>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="8">
-            <el-form-item label="规格型号" prop="equipmentSpec">
-              <el-input
-                v-model="form.equipmentSpec"
-                disabled
-                style="width: 195px"
-              >
-              </el-input>
-              <ItemSelect
-                ref="itemSelect"
-                @onSelected="onItemSelectedEquipment"
-              >
-              </ItemSelect>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="所在部门" prop="department">
-              <el-input v-model="form.department" disabled style="width: 195px">
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="所在位置" prop="equipmentLocation">
-              <el-input
-                v-model="form.equipmentLocation"
-                disabled
-                style="width: 195px"
-              >
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
+          <el-tab-pane label="报修信息审核结果">
+            <el-descriptions
+              :column="2"
+              border
+              v-if="form.repairDestination == '计划性维修'"
+            >
+              <el-descriptions-item label="报修去向">{{
+                form.repairDestination
+              }}</el-descriptions-item>
+              <el-descriptions-item label="维修组">{{
+                form.workTeam
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划维修时间">{{
+                form.workPlanTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="是否停机维修">{{
+                form.workDownMachine
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划停机时间">{{
+                form.workPlanDownTime
+              }}</el-descriptions-item>
+            </el-descriptions>
 
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="8">
-            <el-form-item label="故障时间" prop="orderBreakdownTime">
-              <el-date-picker
-                clearable
-                v-model="form.orderBreakdownTime"
-                type="datetime"
-                placeholder="选择日期时间"
-                disabled
-                style="width: 195px"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="报修来源" prop="orderSource">
-              <el-select
-                v-model="form.orderSource"
-                style="width: 195px"
-                disabled
-              >
-                <el-option
-                  v-for="dict in dict.type.device_order_source"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="报修时间" prop="orderTime">
-              <el-date-picker
-                clearable
-                v-model="form.orderTime"
-                type="datetime"
-                disabled
-                style="width: 195px"
-                placeholder="报修时间"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="8">
-            <el-form-item label="报修人编号" prop="orderRepairmanCode">
-              <el-input
-                v-model="form.orderRepairmanCode"
-                placeholder="请输入报修人编号"
-                disabled
-                style="width: 195px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="联系方式" prop="orderConnection">
-              <el-input
-                v-model="form.orderConnection"
-                placeholder="请输入联系方式"
-                disabled
-                style="width: 195px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-form-item label="故障描述" prop="orderDesc">
-            <el-input
-              v-model="form.orderDesc"
-              placeholder="请输入故障描述"
-              type="textarea"
-              :autosize="{ minRows: 2, maxRows: 4 }"
-              disabled
-            />
-          </el-form-item>
-        </el-row>
-        <el-form-item label="故障图片" prop="orderPicture">
-          <el-input v-model="form.orderPicture" placeholder="请输入故障图片" />
-        </el-form-item>
-        <el-divider>报修信息审核</el-divider>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="报修去向" prop="repairDestination">
-              <el-radio-group v-model="form.repairDestination">
-                <el-radio label="计划性维修">计划性维修</el-radio>
-                <el-radio label="不维修">不维修</el-radio>
-                <el-radio label="委外维修">委外维修</el-radio>
-                <el-radio label="立即维修" @click="timeBackFilling"
-                  >立即维修</el-radio
-                >
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
-            <el-form-item prop="workTeam" label="维修组">
-              <el-input v-model="form.workTeam" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
-            <el-form-item prop="workPlanTime" label="计划维修时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" v-if="form.repairDestination == '计划性维修'">
-            <el-form-item label="是否停机维修" prop="workDownMachine">
-              <el-radio-group v-model="form.workDownMachine">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="8"
-            v-if="
-              form.repairDestination == '计划性维修' &&
-              form.workDownMachine == '1'
-            "
-          >
-            <el-form-item prop="workPlanDownTime" label="计划停机时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanDownTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="8"
-            v-if="
-              form.repairDestination == '计划性维修' &&
-              form.workDownMachine == '0'
-            "
-          >
-            <el-form-item prop="workPlanDownTime" label="计划停机时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanDownTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
-            <el-form-item prop="workTeam" label="维修组">
-              <el-input v-model="form.workTeam" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
-            <el-form-item prop="workPlanTime" label="计划维修时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanTime"
-                type="datetime"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" v-if="form.repairDestination == '立即维修'">
-            <el-form-item label="是否停机维修" prop="workDownMachine">
-              <el-radio-group v-model="form.workDownMachine">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="8"
-            v-if="
-              form.repairDestination == '立即维修' &&
-              form.workDownMachine == '1'
-            "
-          >
-            <el-form-item prop="workPlanDownTime" label="计划停机时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanDownTime"
-                type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col
-            :span="8"
-            v-if="
-              form.repairDestination == '立即维修' &&
-              form.workDownMachine == '0'
-            "
-          >
-            <el-form-item prop="workPlanDownTime" label="计划停机时间">
-              <el-date-picker
-                clearable
-                v-model="form.workPlanDownTime"
-                type="datetime"
-                disabled
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8" v-if="form.repairDestination == '委外维修'">
-            <el-form-item prop="workOutsourcingUnit" label="委外单位">
-              <el-input v-model="form.workOutsourcingUnit" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="form.repairDestination == '委外维修'">
-            <el-form-item prop="outSourcePerson" label="委外维修人员">
-              <el-input v-model="form.outSourcePerson" disabled />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" v-if="form.repairDestination == '委外维修'">
-            <el-form-item prop="workConnection" label="联系方式">
-              <el-input v-model="form.workConnection" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24" v-if="form.repairDestination == '委外维修'">
-            <el-form-item prop="outSourceReason" label="委外原因">
-              <el-input
-                v-model="form.outSourceReason"
-                disabled
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4 }"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-descriptions
+              :column="2"
+              border
+              v-if="form.repairDestination == '立即维修'"
+            >
+              <el-descriptions-item label="报修去向">{{
+                form.repairDestination
+              }}</el-descriptions-item>
+              <el-descriptions-item label="维修组">{{
+                form.workTeam
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划维修时间">{{
+                form.workPlanTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="是否停机维修">{{
+                form.workDownMachine
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划停机时间">{{
+                form.workPlanDownTime
+              }}</el-descriptions-item>
+            </el-descriptions>
+
+            <el-descriptions
+              :column="1"
+              border
+              v-if="form.repairDestination == '不维修'"
+            >
+              <el-descriptions-item label="报修去向">{{
+                form.repairDestination
+              }}</el-descriptions-item>
+            </el-descriptions>
+
+            <el-descriptions
+              :column="2"
+              border
+              v-if="form.repairDestination == '委外维修'"
+            >
+              <el-descriptions-item label="报修去向">{{
+                form.repairDestination
+              }}</el-descriptions-item>
+              <el-descriptions-item label="委外单位">{{
+                form.workOutsourcingUnit
+              }}</el-descriptions-item>
+              <el-descriptions-item label="委外人员">{{
+                form.outSourcePerson
+              }}</el-descriptions-item>
+              <el-descriptions-item label="委外联系方式">{{
+                form.workConnection
+              }}</el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="2"
+                                           border
+                                           v-if="form.repairDestination == '委外维修'">
+                          <el-descriptions-item label="委外原因">{{
+                            form.outSourceReason
+                          }}</el-descriptions-item>
+                        </el-descriptions>
+          </el-tab-pane>
+
+          <el-tab-pane label="检查项信息">
+            <el-table :data="checkList" border style="width: 100%">
+              <el-table-column prop="itemName" label="检查项名称" width="150">
+              </el-table-column>
+              <el-table-column prop="standardName" label="标准名称" width="180">
+              </el-table-column>
+              <el-table-column prop="standardType" label="标准类型" width="100">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="50">
+              </el-table-column>
+              <el-table-column prop="actualValue" label="实际值" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUpLimit" label="上限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailDownLimit" label="下限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="单位" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="故障图片">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancelCheckForm">返 回</el-button>
@@ -1167,40 +919,36 @@
               }}</el-descriptions-item>
             </el-descriptions>
             <el-descriptions :column="1" border>
-            <el-descriptions-item label="故障图片">
-               <el-image v-for="(item, index) in urlLists" :key="index":src="item"></el-image></el-descriptions-item>
+              <el-descriptions-item label="故障图片">
+                <el-image
+                  v-for="(item, index) in urlLists"
+                  :key="index"
+                  :src="item"
+                ></el-image
+              ></el-descriptions-item>
             </el-descriptions>
           </el-tab-pane>
           <el-tab-pane label="检查项信息">
-              <el-table :data="checkList" border style="width: 100%">
-                <el-table-column prop="itemName" label="检查项名称" width="150">
-                </el-table-column>
-                <el-table-column
-                  prop="standardName"
-                  label="标准名称"
-                  width="180"
-                >
-                </el-table-column>
-                <el-table-column
-                  prop="standardType"
-                  label="标准类型"
-                  width="100"
-                >
-                </el-table-column>
-                <el-table-column prop="detailReach" label="是否达标" width="50">
-                </el-table-column>
-                <el-table-column prop="actualValue" label="实际值" width="50">
-                </el-table-column>
-                <el-table-column prop="detailUpLimit" label="上限" width="50">
-                </el-table-column>
-                <el-table-column prop="detailDownLimit" label="下限" width="50">
-                </el-table-column>
-                <el-table-column prop="detailUnit" label="单位" width="50">
-                </el-table-column>
-                <el-table-column prop="detailUnit" label="故障图片">
-                </el-table-column>
-              </el-table>
-
+            <el-table :data="checkList" border style="width: 100%">
+              <el-table-column prop="itemName" label="检查项名称" width="150">
+              </el-table-column>
+              <el-table-column prop="standardName" label="标准名称" width="180">
+              </el-table-column>
+              <el-table-column prop="standardType" label="标准类型" width="100">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="50">
+              </el-table-column>
+              <el-table-column prop="actualValue" label="实际值" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUpLimit" label="上限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailDownLimit" label="下限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="单位" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="故障图片">
+              </el-table-column>
+            </el-table>
           </el-tab-pane>
         </el-tabs>
       </el-form>
@@ -1224,6 +972,7 @@ import {
 import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
+import { getMaintenanceTeamList } from "@/api/device/equTeam";
 
 export default {
   name: "FaultReport",
@@ -1231,6 +980,8 @@ export default {
   dicts: ["device_order_source"],
   data() {
     return {
+      //选择设备维修班组
+      teamOption: [],
       //图片存储
       fileList: [],
       //设备选择
@@ -1252,7 +1003,7 @@ export default {
       //检查项表格数据
       checkList: [],
       //url表
-      urlLists:[],
+      urlLists: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -1363,9 +1114,6 @@ export default {
         orderTime: [
           { required: true, message: "报修时间不能为空", trigger: "blur" },
         ],
-        orderRepairmanCode: [
-          { required: true, message: "报修人编号不能为空", trigger: "blur" },
-        ],
         orderDesc: [
           { required: true, message: "故障描述不能为空", trigger: "blur" },
         ],
@@ -1379,9 +1127,26 @@ export default {
     this.getList();
   },
   methods: {
+
+
+
     timeBackFilling() {
-      this.form.workPlanTime = new Date();
-      log("时间时间", new Date());
+var getTime = new Date().getTime(); //获取到当前时间戳
+  var time = new Date(getTime); //创建一个日期对象
+  function nowDate(time) {
+    var year = time.getFullYear(); // 年
+    var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月
+    var date = time.getDate().toString().padStart(2, '0'); // 日
+    var hour = time.getHours().toString().padStart(2, '0'); // 时
+    var minute = time.getMinutes().toString().padStart(2, '0'); // 分
+    var second = time.getSeconds().toString().padStart(2, '0'); // 秒
+    return (
+      year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second
+    )
+  }
+  console.log(time);
+  console.log(nowDate(time));
+      this.form.workPlanTime = nowDate(time);
     },
     //设备选择
     handleSelectEquipment() {
@@ -1393,7 +1158,7 @@ export default {
     },
     //人员选择
     onItemSelectedPerson(obj) {
-      console.log("接收参数", obj);
+      console.log("111111111111", obj);
       this.form.orderRepairmanCode = obj[0].userName;
       this.form.orderRepairmanName = obj[0].nickName;
     },
@@ -1507,10 +1272,10 @@ export default {
           this.form.fileList = newFiles;
           var urlLists = [];
           this.form.fileList.forEach((item) => {
-                      urlLists.push(item.url);
+            urlLists.push(item.url);
           });
-          this.urlLists = urlLists ;
-          console.log("2222222222",this.urlLists)
+          this.urlLists = urlLists;
+          console.log("2222222222", this.urlLists);
         }
         this.checkList = response.data.checkList;
         //检查项遍历
@@ -1540,6 +1305,10 @@ export default {
     handleCheck(row) {
       this.reset();
       const orderId = row.orderId || this.ids;
+      getMaintenanceTeamList(this.queryParams).then((response) => {
+        console.log(response.rows);
+        this.teamOption = response.rows;
+      });
       getFaultReport(orderId).then((response) => {
         if (response.data.files != null) {
           var newFiles = [];
diff --git a/src/views/device/repairOrder/index.vue b/src/views/device/repairOrder/index.vue
index 002bb415..d3877619 100644
--- a/src/views/device/repairOrder/index.vue
+++ b/src/views/device/repairOrder/index.vue
@@ -88,12 +88,12 @@
           style="width: 200px"
           @keyup.enter.native="handleQuery"
         >
-                 <el-option
-                   v-for="dict in dict.type.device_repair_status"
-                   :key="dict.value"
-                   :label="dict.label"
-                   :value="dict.value"
-                 ></el-option>
+          <el-option
+            v-for="dict in dict.type.device_repair_status"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          ></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="是否委外" prop="workOutsource">
@@ -132,22 +132,24 @@
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           value-format="yyyy-MM-dd HH:mm:ss"
-          :picker-options="pickerOptions">
+          :picker-options="pickerOptions"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="计划停机时间" prop="workPlanDownTime">
-                <el-date-picker
-                  clearable
-                  v-model="queryParams.workPlanDownTimeArray"
-                  type="daterange"
-                  align="right"
-                  unlink-panels
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  :picker-options="pickerOptions">
-                </el-date-picker>
+        <el-date-picker
+          clearable
+          v-model="queryParams.workPlanDownTimeArray"
+          type="daterange"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -296,9 +298,24 @@
         </template>
       </el-table-column>
       <el-table-column label="维修人员" align="center" prop="workPerson" />
-      <el-table-column label="维修组编码" align="center" prop="workTeam" width="100"/>
-      <el-table-column label="维修组名称" align="center" prop="teamName" width="100"/>
-      <el-table-column label="维修组人员" align="center" prop="teamPerson" width="300"/>
+      <el-table-column
+        label="维修组编码"
+        align="center"
+        prop="workTeam"
+        width="100"
+      />
+      <el-table-column
+        label="维修组名称"
+        align="center"
+        prop="teamName"
+        width="100"
+      />
+      <el-table-column
+        label="维修组人员"
+        align="center"
+        prop="teamPerson"
+        width="300"
+      />
       <el-table-column label="是否委外" align="center" prop="workOutsource">
         <template slot-scope="scope">
           {{ scope.row.workOutsource == "1" ? "转委外" : "不委外" }}
@@ -340,20 +357,22 @@
         label="维修用时"
         align="center"
         prop="workCostTime"
-        width="180"
+        width="200"
       >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.workCostTime) }}</span>
-        </template>
       </el-table-column>
       <el-table-column label="维修费用" align="center" prop="workCost" />
-      <el-table-column label="维修状态" align="center" prop="workStatus" width="150">
-              <template slot-scope="scope">
-                <dict-tag
-                  :options="dict.type.device_repair_status"
-                  :value="scope.row.workStatus"
-                />
-              </template>
+      <el-table-column
+        label="维修状态"
+        align="center"
+        prop="workStatus"
+        width="150"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.device_repair_status"
+            :value="scope.row.workStatus"
+          />
+        </template>
       </el-table-column>
       <el-table-column label="工厂编码" align="center" prop="factoryCode" />
       <el-table-column
@@ -431,7 +450,11 @@
             <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="计划停机时间" prop="workPlanDownTime" v-if="form.workDownMachine == '1' ">
+        <el-form-item
+          label="计划停机时间"
+          prop="workPlanDownTime"
+          v-if="form.workDownMachine == '1'"
+        >
           <el-date-picker
             clearable
             v-model="form.workPlanDownTime"
@@ -535,7 +558,11 @@
             <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="计划停机时间" prop="workPlanDownTime" v-if="form.workDownMachine == '1' ">
+        <el-form-item
+          label="计划停机时间"
+          prop="workPlanDownTime"
+          v-if="form.workDownMachine == '1'"
+        >
           <el-date-picker
             clearable
             v-model="form.workPlanDownTime"
@@ -659,86 +686,40 @@
         </el-row>
         <el-row>
           <el-col :span="8">
-            <el-form-item prop="workOutsourcingUnit" label="委外单位" v-if="form.outWorkCode == null">
-              <el-input
-                v-model="form.workOutsourcingUnit"
-                placeholder="请填写委外单位"
-                style="width: 195px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="outSourcePerson" label="委外维修人员" v-if="form.outWorkCode == null">
-              <el-input
-                v-model="form.outSourcePerson"
-                placeholder="请填写委外维修人员"
-                style="width: 195px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item prop="workConnection" label="联系方式" v-if="form.outWorkCode == null">
-              <el-input
-                v-model="form.workConnection"
-                placeholder="请填写委外联系方式"
-                style="width: 195px"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item prop="outSourceReason" label="委外原因" v-if="form.outWorkCode == null">
-              <el-input
-                v-model="form.outSourceReason"
-                placeholder="请输入委外原因"
-                type="textarea"
-                style="width: 840px"
-                :autosize="{ minRows: 2, maxRows: 4 }"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item prop="workOutsourcingUnit" label="委外单位" v-if="form.outWorkCode != null">
+            <el-form-item prop="workOutsourcingUnit" label="委外单位">
               <el-input
                 v-model="form.workOutsourcingUnit"
                 placeholder="请填写委外单位"
                 style="width: 195px"
-                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="outSourcePerson" label="委外维修人员" v-if="form.outWorkCode != null">
+            <el-form-item prop="outSourcePerson" label="委外维修人员">
               <el-input
                 v-model="form.outSourcePerson"
                 placeholder="请填写委外维修人员"
                 style="width: 195px"
-                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item prop="workConnection" label="联系方式" v-if="form.outWorkCode != null">
+            <el-form-item prop="workConnection" label="联系方式">
               <el-input
                 v-model="form.workConnection"
                 placeholder="请填写委外联系方式"
                 style="width: 195px"
-                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item prop="outSourceReason" label="委外原因" v-if="form.outWorkCode != null">
+            <el-form-item prop="outSourceReason" label="委外原因">
               <el-input
                 v-model="form.outSourceReason"
                 placeholder="请输入委外原因"
                 type="textarea"
-                disabled
                 style="width: 840px"
                 :autosize="{ minRows: 2, maxRows: 4 }"
               />
@@ -760,292 +741,236 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="90px">
-        <div class="step-margin">
-          <el-steps
-            :active="repairRecordSteps"
-            finish-status="success"
-            align-center
-          >
-            <el-step title="维修基本信息"></el-step>
-            <el-step title="填写处理结果"></el-step>
-            <el-step title="填写备件领用记录"></el-step>
-          </el-steps>
-        </div>
-        <!-- 维修基本信息 -->
-        <div v-if="this.repairRecordSteps == 0">
-          <div class="classification"><h3>基本信息</h3></div>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="设备编码" prop="equipmentCode">
-                <el-input
-                  v-model="form.equipmentCode"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="设备名称" prop="equipmentName">
-                <el-input
-                  v-model="form.equipmentName"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="设备类型" prop="equipmentTypeName">
-                <el-input
-                  v-model="form.equipmentTypeName"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="规格型号" prop="equipmentSpec">
-                <el-input
-                  v-model="form.equipmentSpec"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="所在部门" prop="department">
-                <el-input
-                  v-model="form.department"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="所在位置" prop="equipmentLocation">
-                <el-input
-                  v-model="form.equipmentLocation"
-                  style="width: 195px"
-                  disabled
-                >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <div class="classification"><h3>故障信息</h3></div>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="报修单号" prop="orderCode">
-                <el-input
-                  v-model="form.orderCode"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="维修单号" prop="orderCode">
-                <el-input
-                  v-model="form.workCode"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="故障时间" prop="orderBreakdownTime">
-                <el-input
-                  v-model="form.orderBreakdownTime"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="报修时间" prop="orderTime">
-                <el-input
-                  v-model="form.orderTime"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="报修人" prop="orderRepairman">
-                <el-input
-                  v-model="form.orderRepairman"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="联系方式" prop="orderConnection">
-                <el-input
-                  v-model="form.orderConnection"
-                  style="width: 195px"
-                  disabled
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-col :span="23">
-            <el-form-item label="故障描述" prop="orderDesc">
-              <el-input
-                v-model="form.orderDesc"
-                placeholder="请输入故障描述"
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4 }"
-                style="width: 840px"
-                disabled
-              />
-            </el-form-item>
-          </el-col>
-        </div>
-        <!-- 处理结果 -->
-        <div v-if="this.repairRecordSteps == 1" class="step-body" @mousemove = "handleMouseout">
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="24">
-              <el-form-item label="原因分析" prop="workReason">
-                <el-input
-                  v-model="form.workReason"
-                  placeholder="请输入故障原因分析"
-                  type="textarea"
-                  :autosize="{ minRows: 2, maxRows: 4 }"
-                  style="width: 840px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-        <el-form-item label="维修人" prop="workPerson">
-          <el-input
-            v-model="form.workPerson"
-            placeholder="请选择维修人"
-            style="width: 195px"
-          >
-            <el-button
-              slot="append"
-              @click="handleSelectPerson"
-              icon="el-icon-search"
-            ></el-button>
-          </el-input>
-          <ItemSelectPerson
-            ref="itemSelectPerson"
-            @onSelected="onItemSelectedPerson"
-          >
-          </ItemSelectPerson>
-        </el-form-item>
-            </el-col>
-            <el-col :span="8">
-      <el-form-item label="维修状态" prop="workStatus">
-        <el-select
-          v-model="queryParams.workStatus"
-          placeholder="请选择维修状态"
-          @change="$forceUpdate()"
-          clearable
-          style="width: 195px"
-          @keyup.enter.native="handleQuery"
-        >
-                <el-option
-                  v-for="dict in dict.type.device_repair_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-        </el-select>
-      </el-form-item>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="维修费用" prop="workCost">
-                <el-input-number
-                  :min="0"
-                  :step="1"
-                  v-model="form.workCost"
-                  style="width: 175px"
-                />
-                <span> 元</span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="开始时间" prop="workStartTime">
-                <el-date-picker
-                  clearable
-                  v-model="form.workStartTime"
-                  type="datetime"
-                  style="width: 195px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择开始维修时间"
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="结束时间" prop="workEndTime">
-                <el-date-picker
-                  clearable
-                  v-model="form.workEndTime"
-                  type="datetime"
-                  style="width: 195px"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="请选择结束维修时间"
+        <el-tabs type="border-card">
+          <el-tab-pane label="维修基本信息">
+            <el-descriptions :column="2" border>
+              <el-descriptions-item label="维修工单号">{{
+                form.workCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修单号">{{
+                form.workCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备编号">{{
+                form.equipmentCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备名称">{{
+                form.equipmentName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备类型">{{
+                form.equipmentTypeName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="设备位置">{{
+                form.equipmentLocation
+              }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心编码">{{
+                form.workshopCode
+              }}</el-descriptions-item>
+              <el-descriptions-item label="工作中心名称">{{
+                form.workshopName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修来源">{{
+                form.orderSource
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修时间">{{
+                form.orderTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="报修人名字">{{
+                form.orderRepairmanName
+              }}</el-descriptions-item>
+              <el-descriptions-item label="联系方式">{{
+                form.orderConnection
+              }}</el-descriptions-item>
+              <el-descriptions-item label="是否立即处理">{{
+                form.workHandle ? "否" : "是"
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划维修时间">{{
+                form.workPlanTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="是否停机维修">{{
+                form.workDownMachine ? "否" : "是"
+              }}</el-descriptions-item>
+              <el-descriptions-item label="计划停机时间">{{
+                form.workPlanDownTime
+              }}</el-descriptions-item>
+              <el-descriptions-item label="是否委外">{{
+                form.workOutsource ? "否" : "是"
+              }}</el-descriptions-item>
+              <el-descriptions-item label="维修班组">{{
+                form.workTeam
+              }}</el-descriptions-item>
+              <el-descriptions-item label="维修班组人员">{{
+                form.workTeamPerson
+              }}</el-descriptions-item>
+              <el-descriptions-item label="故障描述">{{
+                form.orderDesc
+              }}</el-descriptions-item>
+            </el-descriptions>
+            <el-descriptions :column="1" border>
+              <el-descriptions-item label="维修前故障图片">
+                <el-image
+                  v-for="(item, index) in urlBeforeLists"
+                  :key="index"
+                  :src="item"
+                ></el-image
+              ></el-descriptions-item>
+
+            </el-descriptions>
+          </el-tab-pane>
+          <el-tab-pane label="检查项信息">
+            <el-table :data="detailList" border style="width: 100%">
+              <el-table-column prop="itemName" label="检查项名称" width="150">
+              </el-table-column>
+              <el-table-column prop="standardName" label="标准名称" width="180">
+              </el-table-column>
+              <el-table-column prop="standardType" label="标准类型" width="100">
+              </el-table-column>
+              <el-table-column prop="detailReach" label="是否达标" width="50">
+              </el-table-column>
+              <el-table-column prop="actualValue" label="实际值" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUpLimit" label="上限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailDownLimit" label="下限" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="单位" width="50">
+              </el-table-column>
+              <el-table-column prop="detailUnit" label="故障图片">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
 
-                ></el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="维修用时" prop="workCostTime">
-                <el-input v-model="form.workCostTime" style="width: 195px" >
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="8">
-              <el-form-item label="是否停机" prop="workDownMachine">
-                <el-radio-group v-model="form.workDownMachine">
-                  <el-radio label="1">是</el-radio>
-                  <el-radio label="0">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="停机时长" prop="orderBreakdownTime">
-                <el-input
-                  v-model="form.orderBreakdownTime"
-                  style="width: 195px"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        <!-- 使用备件领用记录 -->
-        <div v-if="this.repairRecordSteps == 2" class="step-body">
-          <ItemSelectSpareParts :optType="optType" :workCode="form.workCode" :equipmentCode="form.equipmentCode" v-if="form.workCode !=null"></ItemSelectSpareParts>
-        </div>
+          <el-tab-pane label="填写维修记录" >
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="8">
+                <el-form-item label="维修人" prop="workPerson">
+                  <el-input
+                    v-model="form.workPerson"
+                    placeholder="请选择维修人"
+                    style="width: 195px"
+                  >
+                    <el-button
+                      slot="append"
+                      @click="handleSelectPerson"
+                      icon="el-icon-search"
+                    ></el-button>
+                  </el-input>
+                  <ItemSelectPerson
+                    ref="itemSelectPerson"
+                    @onSelected="onItemSelectedPerson"
+                  >
+                  </ItemSelectPerson>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修状态" prop="workStatus">
+                  <el-select
+                    v-model="queryParams.workStatus"
+                    placeholder="请选择维修状态"
+                    style="width: 195px"
+                  >
+                    <el-option
+                      v-for="dict in dict.type.device_repair_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修费用" prop="workCost">
+                  <el-input-number
+                    :min="0"
+                    :step="1"
+                    v-model="form.workCost"
+                    style="width: 175px"
+                  />
+                  <span> 元</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="8">
+                <el-form-item label="开始时间" prop="workStartTime">
+                  <el-date-picker
+                    clearable
+                    v-model="form.workStartTime"
+                    type="datetime"
+                    style="width: 195px"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    @change="listening"
+                    placeholder="请选择开始维修时间"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="结束时间" prop="workEndTime" >
+                  <el-date-picker
+                    clearable
+                    v-model="form.workEndTime"
+                    type="datetime"
+                    style="width: 195px"
+                    @change="listening"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="请选择结束维修时间"
+                  ></el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="维修用时" prop="workCostTime">
+                  <el-input v-model="form.workCostTime" style="width: 195px">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="10" class="mb8">
+              <el-col :span="8">
+                <el-form-item label="是否停机" prop="workDownMachine">
+                  <el-radio-group v-model="form.workDownMachine">
+                    <el-radio label="1">是</el-radio>
+                    <el-radio label="0">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="停机时长" prop="orderBreakdownTime">
+                  <el-input
+                    v-model="form.orderBreakdownTime"
+                    style="width: 195px"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+<el-row :gutter="10" class="mb8">
+              <el-col :span="24">
+                <el-form-item label="原因分析" prop="workReason">
+                  <el-input
+                    v-model="form.workReason"
+                    placeholder="请输入故障原因分析"
+                    type="textarea"
+                    :autosize="{ minRows: 2, maxRows: 4 }"
+                    style="width: 840px"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-tab-pane>
+          <el-tab-pane label="填写备件申领记录">
+            <!-- 使用备件领用记录 -->
+            <ItemSelectSpareParts
+              :optType="optType"
+              :workCode="form.workCode"
+              :equipmentCode="form.equipmentCode"
+              v-if="form.workCode != null"
+            ></ItemSelectSpareParts>
+          </el-tab-pane>
+        </el-tabs>
       </el-form>
+
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="this.repairRecordSteps > 0" @click="stepLast"
-          >上一步</el-button
-        >
-        <el-button v-if="this.repairRecordSteps < 2" @click="stepNext"
-          >下一步</el-button
-        >
         <el-button
-          v-if="this.repairRecordSteps == 2"
           type="primary"
-          @click="submitForm"
+          @click="submitWriteForm"
           >提 交</el-button
         >
         <el-button @click="cancelWriteForm">取 消</el-button>
@@ -1069,6 +994,7 @@ import ItemSelect from "./selectSingleEquipment.vue";
 import ItemSelectPerson from "./selectSinglePerson.vue";
 import { Message } from "element-ui";
 import ItemSelectSpareParts from "./selectSpareParts.vue";
+import moment from 'moment';
 
 export default {
   name: " RepairOrder",
@@ -1079,8 +1005,6 @@ export default {
       //选择设备维修班组
       teamOption: [],
       optType: undefined,
-      // 步骤
-      repairRecordSteps: 0,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1201,20 +1125,17 @@ export default {
   },
   methods: {
     //计算时间 结束维修时间-开始维修时间
-    handleMouseout(){
-      console.log("打印维修时间")
-      if(this.form.workEndTime != null && this.form.workStartTime != null){
-        this.form.workCostTime = this.form.workEndTime - this.form.workStartTime;
+    listening() {
+      if (this.form.workEndTime != null && this.form.workStartTime != null) {
+            var time1 = moment(this.form.workStartTime);
+            var time2 = moment(this.form.workEndTime);
+            let duration = moment.duration(time2.diff(time1));
+            let { _data } = duration;
+            console.log("打印维修时间",_data);
+            //拼接
+            this.form.workCostTime = _data.years + "年" + _data.months + "月" + _data.days + "日" + _data.hours + "小时" + _data.minutes + "分" + _data.seconds + "秒";
       }
     },
-    // 填写维修记录步骤上一步
-    stepLast() {
-      this.repairRecordSteps--;
-    },
-    // 填写维修记录步骤下一步
-    stepNext() {
-      this.repairRecordSteps++;
-    },
     /** 查询维修工单列表 */
     getList() {
       this.loading = true;
@@ -1382,8 +1303,9 @@ export default {
         if (valid) {
           if (this.form.workId != null) {
             writeRepairOrder(this.form).then((response) => {
-              this.$modal.msgSuccess("填写维修记录成功！");
               this.openWrite = false;
+              this.$modal.msgSuccess("填写维修记录成功！");
+              this.queryParams.workStatus = null;
               this.getList();
             });
           }
@@ -1400,7 +1322,8 @@ export default {
     },
     //人员选择
     onItemSelectedPerson(obj) {
-      this.form.workPerson = obj;
+      console.log(obj);
+      this.form.workPerson = obj[0].userName;
     },
     //设备选择
     onItemSelectedEquipment(obj) {
diff --git a/src/views/device/repairOrder/selectSinglePerson.vue b/src/views/device/repairOrder/selectSinglePerson.vue
index ed38ef1b..a12f2ad4 100644
--- a/src/views/device/repairOrder/selectSinglePerson.vue
+++ b/src/views/device/repairOrder/selectSinglePerson.vue
@@ -5,7 +5,7 @@
     :modal= false
     width="800px"
     center
-    :before-close="cancelEquipmentForm"
+    :before-close="cancel"
   >
     <el-row :gutter="20">
       <!--人员数据-->
@@ -34,14 +34,13 @@
             <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
+        <el-table v-loading="loading" :data="itemList" @selection-change="handleSelectionChange" ref="multipleTable">
           <el-table-column width="50" align="center" type="selection"></el-table-column>
           <!-- 序号 -->
           <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
-          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" ></el-table-column>
+          <el-table-column label="人员编码" align="center" key="itemCode" prop="userName" v-if="columns[0].visible" >
+          </el-table-column>
           <el-table-column label="人员名称"  align="left" key="itemName" prop="nickName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门编码" align="center"  prop="postCode" v-if="columns[2].visible" ></el-table-column>
-          <el-table-column label="部门名称" align="center" prop="postName" v-if="columns[3].visible" ></el-table-column>
         </el-table>
 
         <pagination
@@ -54,14 +53,14 @@
       </el-col>
     </el-row>
     <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitPersonForm">确 定</el-button>
-        <el-button @click="cancelEquipmentForm">取 消</el-button>
+        <el-button type="primary" @click="submitForm" :disabled="multiple">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
     </div>
   </el-dialog>
 </template>
 
 <script>
-import { getMaintenancePersonList} from "@/api/device/repairOrder";
+import { getRepairPersonList} from "@/api/device/faultReport";
 import { Message } from 'element-ui'
 
 export default {
@@ -95,8 +94,6 @@ export default {
       columns: [
         { key: 0, label: `人员编码`, visible: true },
         { key: 1, label: `人员名称`, visible: true },
-        { key: 2, label: `部门编码`, visible: true },
-        { key: 3, label: `部门名称`, visible: true },
       ]
     };
   },
@@ -115,7 +112,7 @@ export default {
         this.resetForm("form");
       },
 
-    handleEquipmentSelectionChange (val) {
+    handleSelectionChange (val) {
        this.itemList = val;
     },
 
@@ -128,7 +125,7 @@ export default {
     /** 查询设备编码列表*/
     getList() {
       this.loading = true;
-      getMaintenancePersonList(this.queryParams).then(response => {
+      getRepairPersonList(this.queryParams).then(response => {
           this.itemList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -136,14 +133,6 @@ export default {
       );
     },
 
-    // 节点单击事件
-    handleNodeClick(data) {
-      console.log('id',data.id);
-      this.queryParams.equipmentTypeCode = data.equipmentTypeCode;
-      console.log(this.equipmentTypeCode);
-      this.handleQuery();
-    },
-
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -158,27 +147,21 @@ export default {
     },
 
     // 多选框选中数据
-		handleEquipmentSelectionChange(selection) {
+		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.userId);
-			this.userCodes = selection.map(item => item.userNames);
+			this.userCodes = selection.map(item => item.userName);
 			this.single = selection.length!==1;
 			this.multiple = !selection.length;
 		},
 
-    submitPersonForm() {
-      const data = this.userNames;
-      const userCodes = data.toString();
-      if(data.length >1){
+    submitForm() {
+      if(this.$refs.multipleTable.selection.length > 1){
         Message.warning("只能选择一个维修人,请勿选择多个！");
       }else{
-        if(this.queryParams.itemCodeGet == ""){
-            this.queryParams.itemCodeGet = userCodes;
-        }
-           this.selectedRows = this.queryParams.itemCodeGet;
-           this.$emit('onSelected', this.selectedRows);
-           this.getList();
+           console.log(this.$refs.multipleTable.selection);
+           this.$emit('onSelected', this.$refs.multipleTable.selection);
            this.showFlag = false;
-           this.queryParams.itemCodeGet = "";
+           this.getList();
       }
     }
   }
diff --git a/src/views/device/repairOrderReport/index.vue b/src/views/device/repairOrderReport/index.vue
index 0b419c2b..363fef9b 100644
--- a/src/views/device/repairOrderReport/index.vue
+++ b/src/views/device/repairOrderReport/index.vue
@@ -185,6 +185,15 @@
 
     <el-table v-loading="loading" :data="repairOrderList">
       <el-table-column width="55" align="center" border />
+      <!-- 序号 -->
+      <el-table-column
+        type="index"
+        width="90"
+        align="center"
+        :index="indexMethod"
+        label="序号"
+      >
+      </el-table-column>
       <el-table-column
         label="维修单号"
         align="center"
@@ -335,7 +344,7 @@
       @pagination="getList"
     />
 
-    <!-- 修改维修工单对话框 -->
+    <!-- 查看维修工单详情对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="openView"
@@ -639,6 +648,10 @@ export default {
     this.getList();
   },
   methods: {
+    // 生成表头序号
+    indexMethod(index) {
+      return index + 1;
+    },
     /** 查询维修工单列表 */
     getList() {
       this.loading = true;