diff --git a/src/views/inventory/DeviceRepairOrderAudit.vue b/src/views/inventory/DeviceRepairOrderAudit.vue
index 7fd04136..81b2e2c5 100644
--- a/src/views/inventory/DeviceRepairOrderAudit.vue
+++ b/src/views/inventory/DeviceRepairOrderAudit.vue
@@ -82,7 +82,7 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border>
+                border  @current-change="handleDetail">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="设备报修记录号" prop="orderId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="部门" prop="deptName" show-overflow-tooltip width="120"></el-table-column>
@@ -108,16 +108,16 @@
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="计划完成时间" prop="planTime" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="报修说明" prop="msg"  show-overflow-tooltip width="180"></el-table-column>
+        <!--<el-table-column label="计划完成时间" prop="planTime" show-overflow-tooltip width="140"></el-table-column>-->
+        <!--<el-table-column label="备注" prop="remark"  show-overflow-tooltip width="180"></el-table-column>-->
 
-        <el-table-column label="报修图片" prop="uploadImage"  show-overflow-tooltip  width="250">
-          <template slot-scope="scope">
-            <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.uploadImage }}</div>
-          </template>
+        <!--<el-table-column label="报修图片" prop="uploadImage"  show-overflow-tooltip  width="250">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    <div style="color: #1890ff;" @click="showImgViewer(scope.row)">{{ scope.row.uploadImage }}</div>-->
+        <!--  </template>-->
 
-        </el-table-column>
-        <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
+        <!--</el-table-column>-->
+        <el-table-column label="报修状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
             <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
           </template>
@@ -151,6 +151,26 @@
       ></pagination>
     </el-card>
 
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="项目内容" prop="content" width="300"></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="datailSelect(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+
     <el-dialog
       title="审核"
       :visible.sync="formVisible"
@@ -167,7 +187,20 @@
     </el-dialog>
 
     <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
-
+    <el-dialog
+      title="报修配置详情"
+      :visible.sync="deviceProjectSelectVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      v-if="deviceProjectSelectVisible"
+    >
+      <DeviceInspectPlanProjectSet
+        :detailQuery="detailQuery"
+        :closeDialog="detailCloseDialogc"
+      >
+      </DeviceInspectPlanProjectSet>
+    </el-dialog>
 
   </div>
 </template>
@@ -179,6 +212,10 @@ import {getRepairList, updateStatus, deleteRepairOrder} from "@/api/inventory/de
 import DeviceRepairOrderAduitModify from "@/views/inventory/DeviceRepairOrderAuditModify";
 import {previewImage} from "@/api/purchase/supCompany";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import {selectDeviceInspectPlanDelect} from "@/api/inventory/deviceInspectPlanDelect";
+import {filterByorderIdFk} from "@/api/inventory/deviceRepairOrderDetail";
+import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
+
 
 export default {
   name: "DeviceRepairOrderAudit",
@@ -198,6 +235,9 @@ export default {
       list: [],
       total: 0,
       deptList: [],
+      delectList:[],
+      detailQuery:{},
+      deviceProjectSelectVisible:false,
       invList: [],
       loading: false,
       formVisible: false,
@@ -242,6 +282,37 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+    handleDetail(row){
+      this.selectDeviceInspectPlanDelect({orderIdFk:row.orderId})
+    },
+    selectDeviceInspectPlanDelect(obj) {
+      filterByorderIdFk(obj).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.delectList = res.data || [];
+        } else {
+          this.$message.error(res.message);
+          this.delectList = [];
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.delectList = [];
+      })
+    },
+
+    datailSelect(row){
+      this.detailQuery = row
+      this.deviceProjectSelectVisible = true
+    },
+
+
+    detailCloseDialogc() {
+      this.formVisible = false;
+      this.deviceProjectSelectVisible = false
+      this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
+      this.getList()
+    },
     getList() {
       this.loading = true;
       getRepairList(this.filterQuery).then((res) => {
@@ -389,7 +460,7 @@ export default {
     },
 
   },
-  components: {DeviceRepairOrderAduitModify,ElImageViewer},
+  components: {DeviceRepairOrderAduitModify,ElImageViewer,DeviceInspectPlanProjectSet},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inventory/DeviceRepairOrderAuditModify.vue b/src/views/inventory/DeviceRepairOrderAuditModify.vue
index d2cfe852..4cf866d0 100644
--- a/src/views/inventory/DeviceRepairOrderAuditModify.vue
+++ b/src/views/inventory/DeviceRepairOrderAuditModify.vue
@@ -102,48 +102,48 @@
           </el-col>
         </el-row>
         <el-row>
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item label="计划完成日期:" prop="planTime">-->
+          <!--    <el-date-picker-->
+          <!--      v-model="repairOrder.planTime"-->
+          <!--      type="datetime"-->
+          <!--      placeholder="选择日期"-->
+          <!--      style="width: 90%"-->
+          <!--      clearable-->
+          <!--      disabled-->
+          <!--      value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--    >-->
+          <!--    </el-date-picker>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="10">
-            <el-form-item label="计划完成日期:" prop="planTime">
-              <el-date-picker
-                v-model="repairOrder.planTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                clearable
-                disabled
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="报修说明:">
-              <el-input v-model="repairOrder.msg" placeholder="请输入报修信息" style="width: 90%"
+            <el-form-item label="备注:">
+              <el-input v-model="repairOrder.remark" placeholder="请输入备注" style="width: 90%"
                     disabled    clearable></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="10">
-            <el-form-item class="query-form-item" label="维修人:" prop="repariName">
-            <el-select v-model="repairOrder.repariName"
-                       placeholder="请选择维修人"
-                       clearable="true"
-                       style="width: 90%"
+        <!--<el-row>-->
+        <!--  <el-col :span="10">-->
+        <!--    <el-form-item class="query-form-item" label="维修人:" prop="repariName">-->
+        <!--    <el-select v-model="repairOrder.repariName"-->
+        <!--               placeholder="请选择维修人"-->
+        <!--               clearable="true"-->
+        <!--               style="width: 90%"-->
 
-            >
-              <el-option
-                v-for="item in userList"
-                :key="item.id"
-                :label="item.employeeName"
-                :value="item.userid">
-                <span style="float: left">{{ item.employeeName }}</span>
-              </el-option>
-            </el-select>
-            </el-form-item>
-          </el-col>
+        <!--    >-->
+        <!--      <el-option-->
+        <!--        v-for="item in userList"-->
+        <!--        :key="item.id"-->
+        <!--        :label="item.employeeName"-->
+        <!--        :value="item.userid">-->
+        <!--        <span style="float: left">{{ item.employeeName }}</span>-->
+        <!--      </el-option>-->
+        <!--    </el-select>-->
+        <!--    </el-form-item>-->
+        <!--  </el-col>-->
 
-        </el-row>
+        <!--</el-row>-->
       <!--<el-row>-->
       <!--    <el-col :span="11">-->
       <!--      <el-form-item label="报修图片:">-->
@@ -179,6 +179,14 @@
       </el-form>
     </el-card>
 
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="项目内容" prop="content" width="300"></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+
 
     <!--<el-dialog-->
     <!--  title="选择巡检设备"-->
@@ -247,6 +255,7 @@ import {saveDeviceRepairOrder, updateStatus} from "@/api/inventory/deviceRepairO
 import {getDeptDeviceList} from "@/api/inventory/deptDevice";
 import store from "@/store";
 import {warehouseUserList} from "@/api/system/invWarehouse"
+import {filterByorderIdFk} from "@/api/inventory/deviceRepairOrderDetail";
 
 
 export default {
@@ -275,6 +284,7 @@ export default {
         limit: 10
       },
       deviceList: [],
+      detailList:[],
       deviceTotal: 0,
       deptName: null,
       invName: null,
@@ -285,9 +295,9 @@ export default {
       headers: {},
       fileList: [],
       userList:[],
-      formRules:{
-        repariName:[{required: true, message:"请选择维修人", trigger: 'blur'}]
-      }
+      // formRules:{
+      //   repariName:[{required: true, message:"请选择维修人", trigger: 'blur'}]
+      // }
     };
   },
   methods: {
@@ -402,10 +412,10 @@ export default {
     },
 
     approved(){
-      if(isBlank(this.repairOrder.repariName)){
-        this.$message.warning("请选择维修人!")
-        return;
-      }
+      // if(isBlank(this.repairOrder.repariName)){
+      //   this.$message.warning("请选择维修人!")
+      //   return;
+      // }
 
       this.$confirm('是否通过审核?', '提示', {
         confirmButtonText: '确定',
@@ -465,7 +475,21 @@ export default {
         });
       });
     },
-
+    selectDevicerepairOrderDelect(obj) {
+      filterByorderIdFk(obj).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.detailList = res.data || [];
+        } else {
+          this.$message.error(res.message);
+          this.detailList = [];
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.detailList = [];
+      })
+    },
 
     // uploadHandlePreview(file) {},
     // uploadHandleRemove(file, fileList) {
@@ -530,6 +554,9 @@ export default {
 
   },
   created() {
+    if(this.repairOrder.id !=null){
+      this.selectDevicerepairOrderDelect({orderIdFk: this.repairOrder.orderId})
+    }
     this.uploadUrl = this.BASE_URL + "/udiwms/upload/register/file";
     this.headers = {
       ADMIN_ID: store.getters.adminId,
diff --git a/src/views/inventory/DeviceRepairOrderCompleted.vue b/src/views/inventory/DeviceRepairOrderCompleted.vue
index 58f473c2..d672164b 100644
--- a/src/views/inventory/DeviceRepairOrderCompleted.vue
+++ b/src/views/inventory/DeviceRepairOrderCompleted.vue
@@ -99,7 +99,7 @@
       <el-divider style="margin: 15px"></el-divider>
 
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border>
+                border  @current-change="handleDetail">
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="设备报修记录号" prop="orderId" show-overflow-tooltip width="140"></el-table-column>
         <el-table-column label="部门" prop="deptName" show-overflow-tooltip width="120"></el-table-column>
@@ -111,15 +111,29 @@
         <!--<el-table-column label="创建日期" prop="createTime"></el-table-column>-->
         <el-table-column label="创建人" prop="createUserName" show-overflow-tooltip width="120"></el-table-column>
         <el-table-column label="审核人" prop="auditUserName" show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="维修人" prop="repName" show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="开始时间" prop="repariStartTime" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="结束时间" prop="repariEndTime" show-overflow-tooltip width="140"></el-table-column>
-        <el-table-column label="维修说明" prop="repariRemark" show-overflow-tooltip width="180"></el-table-column>
-        <el-table-column label="维修图片" prop="repariImage" show-overflow-tooltip width="250">
+        <el-table-column label="维修类型" prop="repairType" show-overflow-tooltip width="120">
           <template slot-scope="scope">
-            <div style="color: #1890ff;" @click="showImgViewer(scope.row.repariImage)">{{ scope.row.repariImage }}</div>
+            <el-tag >
+              {{ repairType[scope.row.repairType] }}
+            </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="紧急程度" prop="urgencyType" show-overflow-tooltip width="120">
+          <template slot-scope="scope">
+            <el-tag>
+              {{ urgencyType[scope.row.urgencyType] }}
+            </el-tag>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="维修人" prop="repName" show-overflow-tooltip width="120"></el-table-column>-->
+        <!--<el-table-column label="开始时间" prop="repariStartTime" show-overflow-tooltip width="140"></el-table-column>-->
+        <!--<el-table-column label="结束时间" prop="repariEndTime" show-overflow-tooltip width="140"></el-table-column>-->
+        <!--<el-table-column label="维修说明" prop="repariRemark" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--<el-table-column label="维修图片" prop="repariImage" show-overflow-tooltip width="250">-->
+        <!--  <template slot-scope="scope">-->
+        <!--    <div style="color: #1890ff;" @click="showImgViewer(scope.row.repariImage)">{{ scope.row.repariImage }}</div>-->
+        <!--  </template>-->
+        <!--</el-table-column>-->
         <!--<el-table-column label="审核日期" prop="auditTime"></el-table-column>-->
         <el-table-column label="状态" prop="status" show-overflow-tooltip width="120">
           <template slot-scope="scope">
@@ -147,6 +161,8 @@
         </el-table-column>
 
       </el-table>
+
+
       <pagination
         v-show="total>0"
         :total="total"
@@ -156,6 +172,25 @@
       ></pagination>
     </el-card>
 
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="delectList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="项目内容" prop="content" width="300"></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="操作" width="100">
+          <template slot-scope="scope">
+            <el-button
+              type="text"
+              size="small"
+              @click.native.stop="datailSelect(scope.row)"
+            >详情
+            </el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
     <el-dialog
       title="详情"
       :visible.sync="formVisible"
@@ -170,6 +205,20 @@
       ></DeviceRepairOrderDetails>
     </el-dialog>
 
+    <el-dialog
+      title="报修配置详情"
+      :visible.sync="deviceProjectSelectVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      v-if="deviceProjectSelectVisible"
+    >
+      <DeviceInspectPlanProjectSet
+        :detailQuery="detailQuery"
+        :closeDialog="detailCloseDialogc"
+      >
+      </DeviceInspectPlanProjectSet>
+    </el-dialog>
 
     <el-image-viewer v-if="imgViewerVisible" style="z-index:9999" :on-close="closeImgViewer" :url-list="imgList"/>
 
@@ -184,6 +233,9 @@ import {warehouseUserList} from "@/api/system/invWarehouse";
 import {previewImage} from "@/api/purchase/supCompany";
 import ElImageViewer from "element-ui/packages/image/src/image-viewer";
 import DeviceRepairOrderDetails from "@/views/inventory/DeviceRepairOrderDetails";
+import {filterByorderIdFk} from "@/api/inventory/deviceRepairOrderDetail";
+import DeviceInspectPlanProjectSet from "@/views/inventory/DeviceInspectProjectSelect";
+
 
 
 export default {
@@ -204,6 +256,9 @@ export default {
       list: [],
       total: 0,
       deptList: [],
+      delectList:[],
+      deviceProjectSelectVisible:false,
+      detailQuery:{},
       invList: [],
       loading: false,
       formVisible: false,
@@ -216,6 +271,15 @@ export default {
         4: "维修中",
         5: "已处理"
       },
+      repairType:{
+        1:"自行维修",
+        2:"外部维修"
+      },
+      urgencyType:{
+        1:"正常",
+        2:"较急",
+        3:"特急"
+      },
       formName: null,
       showSearch: true,
       userList: [],
@@ -243,6 +307,37 @@ export default {
       this.filterQuery.page = 1;
       this.getList();
     },
+
+    datailSelect(row){
+      this.detailQuery = row
+      this.deviceProjectSelectVisible = true
+    },
+
+    detailCloseDialogc() {
+      this.formVisible = false;
+      this.deviceProjectSelectVisible = false
+      this.selectDeviceInspectPlanDelect({orderIdFk:this.orderIds})
+      this.getList()
+    },
+    handleDetail(row){
+      this.selectDeviceInspectPlanDelect({orderIdFk:row.orderId})
+    },
+    selectDeviceInspectPlanDelect(obj) {
+      filterByorderIdFk(obj).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.delectList = res.data || [];
+        } else {
+          this.$message.error(res.message);
+          this.delectList = [];
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.delectList = [];
+      })
+    },
+
     getList() {
       this.loading = true;
       getRepairList(this.filterQuery).then((res) => {
@@ -357,7 +452,7 @@ export default {
 
 
   },
-  components: {DeviceRepairOrderDetails, ElImageViewer},
+  components: {DeviceRepairOrderDetails, ElImageViewer,DeviceInspectPlanProjectSet},
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inventory/DeviceRepairOrderDetails.vue b/src/views/inventory/DeviceRepairOrderDetails.vue
index fe5f283c..598170c1 100644
--- a/src/views/inventory/DeviceRepairOrderDetails.vue
+++ b/src/views/inventory/DeviceRepairOrderDetails.vue
@@ -96,91 +96,92 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
-            <el-form-item label="计划完成日期:" prop="planTime">
-              <el-date-picker
-                v-model="repairOrder.planTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                clearable
-                disabled
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-
-        </el-row>
-        <el-row>
-
-          <el-col :span="10">
-            <el-form-item class="query-form-item" label="维修人:">
-              <el-select v-model="repairOrder.repariName"
-                         placeholder="请选择维修人"
-                         clearable="true"
-                         style="width: 90%"
-                         disabled
-              >
-                <el-option
-                  v-for="item in userList"
-                  :key="item.id"
-                  :label="item.employeeName"
-                  :value="item.userid">
-                  <span style="float: left">{{ item.employeeName }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item label="计划完成日期:" prop="planTime">-->
+          <!--    <el-date-picker-->
+          <!--      v-model="repairOrder.planTime"-->
+          <!--      type="datetime"-->
+          <!--      placeholder="选择日期"-->
+          <!--      style="width: 90%"-->
+          <!--      clearable-->
+          <!--      disabled-->
+          <!--      value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--    >-->
+          <!--    </el-date-picker>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="10">
             <el-form-item class="query-form-item" label="审核人:">
               <el-input v-model="repairOrder.auditUserName" placeholder="请输入审核人" style="width: 90%"
                         disabled clearable></el-input>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row>
-          <el-col :span="10">
-            <el-form-item label="维修开始时间:" prop="repariStartTime">
-              <el-date-picker
-                v-model="repairOrder.repariStartTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                clearable
-                disabled
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="维修结束时间:" prop="repariEndTime">
-              <el-date-picker
-                v-model="repairOrder.repariEndTime"
-                type="datetime"
-                placeholder="选择日期"
-                style="width: 90%"
-                clearable
-                disabled
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item class="query-form-item" label="维修人:">-->
+          <!--    <el-select v-model="repairOrder.repariName"-->
+          <!--               placeholder="请选择维修人"-->
+          <!--               clearable="true"-->
+          <!--               style="width: 90%"-->
+          <!--               disabled-->
+          <!--    >-->
+          <!--      <el-option-->
+          <!--        v-for="item in userList"-->
+          <!--        :key="item.id"-->
+          <!--        :label="item.employeeName"-->
+          <!--        :value="item.userid">-->
+          <!--        <span style="float: left">{{ item.employeeName }}</span>-->
+          <!--      </el-option>-->
+          <!--    </el-select>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+
 
         </el-row>
+        <!--<el-row>-->
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item label="维修开始时间:" prop="repariStartTime">-->
+          <!--    <el-date-picker-->
+          <!--      v-model="repairOrder.repariStartTime"-->
+          <!--      type="datetime"-->
+          <!--      placeholder="选择日期"-->
+          <!--      style="width: 90%"-->
+          <!--      clearable-->
+          <!--      disabled-->
+          <!--      value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--    >-->
+          <!--    </el-date-picker>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item label="维修结束时间:" prop="repariEndTime">-->
+          <!--    <el-date-picker-->
+          <!--      v-model="repairOrder.repariEndTime"-->
+          <!--      type="datetime"-->
+          <!--      placeholder="选择日期"-->
+          <!--      style="width: 90%"-->
+          <!--      clearable-->
+          <!--      disabled-->
+          <!--      value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--    >-->
+          <!--    </el-date-picker>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
+
+        <!--</el-row>-->
         <el-row>
+          <!--<el-col :span="10">-->
+          <!--  <el-form-item label="报修说明:">-->
+          <!--    <el-input v-model="repairOrder.msg" placeholder="请输入报修信息" style="width: 90%"-->
+          <!--              disabled clearable></el-input>-->
+          <!--  </el-form-item>-->
+          <!--</el-col>-->
           <el-col :span="10">
-            <el-form-item label="报修说明:">
-              <el-input v-model="repairOrder.msg" placeholder="请输入报修信息" style="width: 90%"
-                        disabled clearable></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item label="维修说明:">
-              <el-input v-model="repairOrder.repariRemark" placeholder="请输入报修信息" style="width: 90%"
+            <el-form-item label="备注:">
+              <el-input v-model="repairOrder.remark" placeholder="请输入报修信息" style="width: 90%"
                         disabled clearable></el-input>
             </el-form-item>
           </el-col>
@@ -190,6 +191,29 @@
       </el-form>
     </el-card>
 
+    <el-card class="el-card">
+      <el-table v-loading="loading" :data="detailList" style="width: 100%" border highlight-current-row>
+        <el-table-column label="序号" type="index" width="60"></el-table-column>
+        <el-table-column label="项目内容" prop="content" width="300"></el-table-column>
+        <el-table-column label="备注" prop="remark" show-overflow-tooltip="true"></el-table-column>
+      </el-table>
+    </el-card>
+
+    <el-dialog
+      title="报修配置详情"
+      :visible.sync="deviceProjectSelectVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="40%"
+      v-if="deviceProjectSelectVisible"
+    >
+      <DeviceInspectPlanProjectSet
+        :detailQuery="detailQuery"
+        :closeDialog="detailCloseDialogc"
+      >
+      </DeviceInspectPlanProjectSet>
+    </el-dialog>
+
   </div>
 
 </template>
@@ -202,6 +226,7 @@ import {updateStatusAndTime, updateStatusAndImg} from "@/api/inventory/deviceRep
 import {getDeptDeviceList} from "@/api/inventory/deptDevice";
 import store from "@/store";
 import {warehouseUserList} from "@/api/system/invWarehouse"
+import {filterByorderIdFk} from "@/api/inventory/deviceRepairOrderDetail";
 
 
 export default {
@@ -232,6 +257,9 @@ export default {
         limit: 10
       },
       deviceList: [],
+      detailList:[],
+      detailQuery:{},
+      deviceProjectSelectVisible:false,
       deviceTotal: 0,
       deptName: null,
       invName: null,
@@ -378,11 +406,28 @@ export default {
       });
 
     },
+    selectDevicerepairOrderDelect(obj) {
+      filterByorderIdFk(obj).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.detailList = res.data || [];
+        } else {
+          this.$message.error(res.message);
+          this.detailList = [];
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.detailList = [];
+      })
+    },
 
 
   },
   created() {
-
+    if(this.repairOrder.id !=null){
+      this.selectDevicerepairOrderDelect({orderIdFk: this.repairOrder.orderId})
+    }
     this.getDeptList();
     this.getuserList();
   },