diff --git a/hw-ui/src/views/dms/activity/index.vue b/hw-ui/src/views/dms/activity/index.vue
index 40c2e1d8..ce774c4e 100644
--- a/hw-ui/src/views/dms/activity/index.vue
+++ b/hw-ui/src/views/dms/activity/index.vue
@@ -42,6 +42,13 @@
 
       </el-row>
     </el-form>
+    <h4 class="form-header h4">零部件信息</h4>
+    <el-table v-loading="loading" :data="dmsPartsList" @selection-change="handleSelectionChange">
+      <el-table-column label="报修工单编号" align="center" prop="billsFaultCode" />
+      <el-table-column label="零部件名称" align="center" prop="partName" />
+      <el-table-column label="零部件规格" align="center" prop="partSpecifications" />
+      <el-table-column label="数量" align="center" prop="amount" />
+    </el-table>
     <!--  第一步-->
 
     <el-form  ref="form" :model="form"  label-width="120px">
@@ -218,6 +225,12 @@
           </el-input>
         </el-form-item>
       </el-col>
+        <div>
+          <el-button type="primary" @click="handleViewFile(activityList[1].dmsInstanceFileList)">故障图片</el-button>
+        </div>
+        <div id="viewFile1">
+          <ViewFile :showFileDialog.sync="showFileDialog" :fileListData="fileListData" :thisTitle="thisTitle"></ViewFile>
+        </div>
       </row>
     </el-form-item>
     </el-form>
@@ -308,6 +321,7 @@
             </el-input>
           </el-form-item>
         </el-col>
+
 <!--        <div>-->
 <!--          <el-button type="primary" @click="submitForm">提 交</el-button>-->
 <!--        </div>-->
@@ -325,7 +339,7 @@
 
 <script>
 import { listActivity, getActivity, delActivity, addActivity, updateActivity,selectUserIdByInspectInstanceId  } from "@/api/dms/activity";
-import { listDmsBillsFaultInstance } from '@/api/dms/dmsBillsFaultInstance'
+import {getDmsPartsList, listDmsBillsFaultInstance} from '@/api/dms/dmsBillsFaultInstance'
 import { listWfprocessactivity } from '@/api/system/common/wfprocessactivity'
 import { listAllLedger } from '@/api/dms/ledger'
 import { listDmsInfo } from '@/api/dms/dmsInfo'
@@ -347,6 +361,7 @@ export default {
       wfProcessActivityList:[],
       //报修工单
       dmsBillsFaultInstanceList:[],
+      dmsPartsList:[],
       stepsNum:"",
       ListLength:"",
       isUpdate:false,
@@ -430,6 +445,7 @@ export default {
     this.getList();
     // this.getWfprocessActivity();
     this.getBillsFaultInstance();
+    this.getDmsPartsList();
     this.getDeviveLedger();
     this.getoutsrcId();
   },
@@ -500,6 +516,15 @@ export default {
         this.loading = false;
       });
     },
+    /** 查询报修工单列表 */
+    getDmsPartsList() {
+      this.loading = true;
+      getDmsPartsList(this.queryParams).then(response => {
+        this.dmsPartsList = response.rows;
+        console.log(this.dmsBillsFaultInstanceList)
+        this.loading = false;
+      });
+    },
     /** 查询故障报修工单实例节点列表 */
     getList() {
       this.loading = true;
diff --git a/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue
index bc34d5b1..43aa2bd7 100644
--- a/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue
+++ b/hw-ui/src/views/dms/dmsBillsFaultInstance/index.vue
@@ -125,11 +125,11 @@
             @click="getJump(scope.row)"
             v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
           >详情</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleFaultExport(scope.row.repairInstanceId)"
-          >导出</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            @click="handleFaultExport(scope.row.repairInstanceId)"-->
+<!--          >导出</el-button>-->
           <!--el-button
             size="mini"
             type="text"
diff --git a/hw-ui/src/views/dms/dmsBillsFaultInstanceRecord/index.vue b/hw-ui/src/views/dms/dmsBillsFaultInstanceRecord/index.vue
new file mode 100644
index 00000000..7adf1130
--- /dev/null
+++ b/hw-ui/src/views/dms/dmsBillsFaultInstanceRecord/index.vue
@@ -0,0 +1,784 @@
+<template>
+  <div class="app-container">
+<!--    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
+<!--      <el-form-item label="报修来源" prop="faultSourceId">-->
+<!--        <el-select @change="change"  v-model="queryParams.faultSourceType" placeholder="报修来源类型" >-->
+<!--          <el-option-->
+<!--            v-for="item in dict.type.dms_fault_source_type"-->
+<!--            :key="item.value"-->
+<!--            :label="item.label"-->
+<!--            :value="item.value"-->
+<!--          >-->
+<!--          </el-option>-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
+
+<!--      <el-form-item>-->
+<!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
+<!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
+<!--      </el-form-item>-->
+<!--    </el-form>-->
+
+    <!--el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['dms:dmsBillsFaultInstance:add']"
+        >新增</el-button>
+      </el-col>
+     <el-col :span="1.5">
+       <el-button>
+          type="success"
+          icon="el-icon-edit"
+         size="mini"
+        :disabled="single"
+         @click="handleUpdate"
+          v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
+       >修改</el-button>
+     </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['dms:dmsBillsFaultInstance:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['dms:dmsBillsFaultInstance:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row-->
+
+    <el-table v-loading="loading" :data="dmsBillsFaultInstanceList" @selection-change="handleSelectionChange">
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="主键标识;此表不会长期保存" align="center" prop="repairInstanceId" />-->
+<!--      <el-table-column label="报修来源类型(1检修，2点检，3巡检，9其他)" align="center" prop="faultSourceType" />-->
+<!--      <el-table-column label="报修来源类型" align="center" prop="faultSourceType">-->
+<!--        <template slot-scope="scope">-->
+<!--          <dict-tag :options="dict.type.dms_fault_source_type" :value="scope.row.faultSourceType"/>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+<!--      <el-table-column label="报修来源ID" align="center" prop="faultSourceId" />-->
+
+<!--      <el-table-column label="工单流程ID，关联wf_process的wf_process_id" align="center" prop="wfProcessId" />-->
+      <el-table-column label="工单编号" align="center" prop="billsFaultCode" />
+<!--      <el-table-column label="工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成" align="center" prop="billsStatus" />-->
+      <el-table-column label="工单状态" align="center" prop="billsStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.bills_status" :value="scope.row.billsStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="审批状态" align="center" prop="approveStatus">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.approve_status" :value="scope.row.approveStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="确认状态" align="center" prop="repairConfirm">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.confirm_status" :value="scope.row.repairConfirm"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请人" align="center" prop="applyUser" />
+      <el-table-column label="申请时间" align="center" prop="applyTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.applyTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="实际开始时间" align="center" prop="realBeginTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.realBeginTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="实际完成时间" align="center" prop="realEndTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.realEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="要求完成时间" align="center" prop="requireEndTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.requireEndTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="工单类型" align="center" prop="instanceType" />-->
+      <el-table-column label="工单类型" align="center" prop="instanceType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.dms_instance_type" :value="scope.row.instanceType"/>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="getJump(scope.row)"
+            v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
+          >详情</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleFaultExport(scope.row.repairInstanceId)"
+          >导出</el-button>
+          <!--el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['dms:dmsBillsFaultInstance:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['dms:dmsBillsFaultInstance:remove']"
+          >删除</el-button-->
+        </template>
+      </el-table-column>
+      <el-table-column label="确认" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            @click="handleUpadateApprove(scope.row.repairInstanceId,'1')"
+          >主任确认</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改检修工单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="96px">
+        <el-form-item label="设备名称" prop="deviceId">
+          <el-select   v-model="form.deviceId" placeholder="设备名称" >
+            <el-option
+              v-for="item in ledgerList"
+              :key="item.deviceId"
+              :label="item.deviceName"
+              :value="item.deviceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="报修来源类型" prop="faultSourceType">
+          <el-select @change="change"  v-model="form.faultSourceType" placeholder="报修来源类型" >
+            <el-option
+              v-for="item in dict.type.dms_fault_source_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检修工单编码" prop="faultSourceId" v-if="isShow1">
+          <el-select v-model="form.faultSourceId" placeholder="检修工单编码" >
+            <el-option
+              v-for="item in this.dmsRepairInstanceList"
+              :key="item.repairInstanceId"
+              :label="item.billsRepairCode"
+              :value="item.repairInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="点检工单编码" prop="faultSourceId" v-if="isShow2">
+          <el-select v-model="form.faultSourceId" placeholder="点检工单编码" >
+            <el-option
+              v-for="item in this.pointList"
+              :key="item.inspectInstanceId"
+              :label="item.billsInspectCode"
+              :value="item.inspectInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="巡检工单编码" prop="faultSourceId" v-if="isShow3">
+          <el-select v-model="form.faultSourceId" placeholder="巡检工单编码" >
+            <el-option
+              v-for="item in this.inspectInstanceList"
+              :key="item.inspectInstanceId"
+              :label="item.billsInspectCode"
+              :value="item.inspectInstanceId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+<!--        <el-form-item label="报修来源id" prop="faultSourceId">-->
+<!--          <el-input v-model="form.faultSourceId" placeholder="请输入报修来源ID" />-->
+<!--        </el-form-item>-->
+        <el-form-item label="报修工单编号" prop="faultSourceId" v-if="isShow9">
+          <el-input v-model="form.faultSourceId" placeholder="请输入报修工单编号" />
+        </el-form-item>
+<!--        <el-form-item label="工单状态" prop="billsStatus">-->
+<!--          <el-select v-model="form.billsStatus" placeholder="工单状态" >-->
+<!--            <el-option-->
+<!--              v-for="item in dict.type.bills_status"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--&lt;!&ndash;          <el-radio-group v-model="form.billsStatus">&ndash;&gt;-->
+<!--&lt;!&ndash;            <el-radio&ndash;&gt;-->
+<!--&lt;!&ndash;              v-for="dict in dict.type.bills_status"&ndash;&gt;-->
+<!--&lt;!&ndash;              :key="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;              :label="dict.value"&ndash;&gt;-->
+<!--&lt;!&ndash;            >{{dict.label}}</el-radio>&ndash;&gt;-->
+<!--&lt;!&ndash;          </el-radio-group>&ndash;&gt;-->
+<!--        </el-form-item>-->
+
+<!--        <el-form-item label="工单流程ID，关联wf_process的wf_process_id" prop="wfProcessId">-->
+<!--          <el-input v-model="form.wfProcessId" placeholder="请输入工单流程ID，关联wf_process的wf_process_id" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单编号" prop="billsFaultCode">-->
+<!--          <el-input v-model="form.billsFaultCode" placeholder="请输入工单编号" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="申请人" prop="applyUser">-->
+<!--        <el-input v-model="form.applyUser" placeholder="请输入申请人" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="申请时间" prop="applyTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.applyTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择申请时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="工单类型" prop="instanceType">-->
+<!--          <el-select v-model="form.instanceType" placeholder="工单类型" >-->
+<!--            <el-option-->
+<!--              v-for="item in dict.type.dms_instance_type"-->
+<!--              :key="item.value"-->
+<!--              :label="item.label"-->
+<!--              :value="item.value"-->
+<!--            >-->
+<!--            </el-option>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="实际开始时间" prop="realBeginTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.realBeginTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择实际开始时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="实际完成时间" prop="realEndTime">-->
+<!--          <el-date-picker clearable-->
+<!--            v-model="form.realEndTime"-->
+<!--            type="date"-->
+<!--            value-format="yyyy-MM-dd"-->
+<!--            placeholder="请选择实际完成时间">-->
+<!--          </el-date-picker>-->
+<!--        </el-form-item>-->
+        <el-form-item label="要求完成时间" prop="requireEndTime">
+          <el-date-picker clearable
+            v-model="form.requireEndTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择要求完成时间">
+          </el-date-picker>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+
+
+        <el-divider content-position="center">故障报修工单信息</el-divider>
+
+
+
+        <el-form-item label="故障类别" prop="faultType">
+          <el-select   v-model="form.faultType" placeholder="故障类别" >
+            <el-option
+              v-for="item in dict.type.dms_fault_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障描述" prop="faultDescription">
+          <el-input v-model="form.faultDescription" placeholder="故障描述" />
+        </el-form-item>
+        <el-form-item label="涉及操作" prop="designOperations">
+          <el-input v-model="form.designOperations" placeholder="涉及操作" />
+        </el-form-item>
+
+        <el-form-item label="维修类型" prop="repairType">
+          <el-radio-group v-model="form.repairType">
+            <el-radio
+              @change="changeOut"
+              v-for="dict in dict.type.dms_fault_repair_type"
+              :key="dict.value"
+              :label="dict.value"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="外协单位" prop="outsrcId" v-if="isShowOut">
+          <el-select   v-model="form.outsrcId" placeholder="外协单位" >
+            <el-option
+              v-for="item in dmsInfoList"
+              :key="item.outsrcId"
+              :label="item.outsrcName"
+              :value="item.outsrcId"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item   prop="pictureUrl">
+          <el-upload
+            :action="imgUpload.url"
+            :headers="imgUpload.headers"
+            :on-success="handlePictureSuccess"
+            :before-upload="beforePictureUpload"
+            list-type="picture-card"
+            :file-list="fileListShow"
+            :on-preview="handlePictureCardPreview"
+            :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <!--图片预览的dialog-->
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl">
+          </el-dialog>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDmsBillsFaultInstance,
+  getDmsBillsFaultInstance,
+  delDmsBillsFaultInstance,
+  addDmsBillsFaultInstance,
+  updateDmsBillsFaultInstance,
+  listDmsBillsFaultInstancecompleted,
+  handleFaultExport,
+} from "@/api/dms/dmsBillsFaultInstance";
+import { listDmsRepair } from '@/api/dms/dmsRepair'
+import { listDmsRepairInstance } from '@/api/dms/dmsRepairInstance'
+import {  listPoint,listSelectInspection } from '@/api/dms/dmsBillsInstance'
+import { listLedger } from '@/api/dms/ledger'
+import { listDmsInfo } from '@/api/dms/dmsInfo'
+import { getToken } from '@/utils/auth'
+import app from "@/store/modules/app";
+
+
+export default {
+  name: "DmsBillsFaultInstance",
+  dicts:['bills_status','approve_status','confirm_status','dms_instance_type','dms_fault_source_type','dms_fault_type','dms_repair_type','dms_fault_repair_type'],
+  data() {
+    return {
+      //图片上传判断是否有相同图片
+      isCommonName: true,
+      //修改时此属性用于接收数据库中图片存储list，图片才能正常显示
+      fileListShow: [],
+      //页面上存的暂时图片地址List
+      fileListPut: [],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      imgUpload: {
+        // 设置上传的请求头部
+        headers: {
+          Authorization: "Bearer " + getToken()
+        },
+        // 图片上传的方法地址:
+        url: process.env.VUE_APP_BASE_API + "/file/upload",
+        url2: process.env.VUE_APP_BASE_API,
+      },
+
+
+
+      isShow1:false,
+      isShow2:false,
+      isShow3:false,
+      isShow9:false,
+      isShowOut:false,
+      imgAddress:[],
+      //外协
+      dmsInfoList:[],
+      //设备
+      ledgerList:[],
+      //巡检工单列表
+      inspectInstanceList:[],
+      //点检工单列表
+      pointList:[],
+      //点巡检工单列表
+      dmsBillsInstanceList:[],
+      //检修工单列表
+      dmsRepairInstanceList:[],
+      dmsRepairList:[],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 检修工单表格数据
+      dmsBillsFaultInstanceList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        faultSourceType: null,
+        faultSourceId: null,
+        wfProcessId: null,
+        billsFaultCode: null,
+        billsStatus: null,
+        applyUser: null,
+        applyTime: null,
+        realBeginTime: null,
+        realEndTime: null,
+        requireEndTime: null,
+        instanceType: null,
+        isFlag: null,
+      },
+      // 表单参数
+      form: {},
+      approve: {},
+      // 表单校验
+      rules: {
+        wfProcessId: [
+          { required: true, message: "工单流程ID，关联wf_process的wf_process_id不能为空", trigger: "blur" }
+        ],
+        billsFaultCode: [
+          { required: true, message: "工单编号不能为空", trigger: "blur" }
+        ],
+        billsStatus: [
+          { required: true, message: "工单状态：0-待维修，1-维修中，2-维修完成，3-待检修，4-检修中，5-检修完成不能为空", trigger: "change" }
+        ],
+        instanceType: [
+          { required: true, message: "工单类型不能为空", trigger: "change" }
+        ],
+        isFlag: [
+          { required: true, message: "是否标识：1-是；0-否不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getdmsRepair();
+    this.getBillsFaultInstance();
+    this.getDmsBillsInstancePoint();
+    this.getDmsBillsInstanceInspection();
+    this.getDeviveLedger();
+    this.getoutsrcId();
+  },
+  methods: {
+    //图片上传前的相关判断
+    beforePictureUpload(file){
+      //每次进来初始化 isCommonName 为true
+      this.isCommonName = true;
+      const isJPG = file.type === 'image/jpeg';
+      const isLt2M = file.size / 1024 / 1024 < 2;
+      //判断是否有相同的图片，如何有即提示并添加失败
+      if(this.fileListPut.length > 0){
+        this.fileListPut.forEach((item,index)=>{
+          if(item.name == file.name){
+            this.$message.error('已存在相同的图片！');
+            this.isCommonName = false;
+          }
+        })
+      }
+      if (!isJPG) {
+        this.$message.error('请上传图片格式的文件！');
+      }
+      if (!isLt2M) {
+        this.$message.error('上传的图片不能超过2MB!');
+      }
+      return isJPG && isLt2M && this.isCommonName;
+    },
+    //图片上传删除
+    handleRemove(file, fileList) {
+      //根据传进来删除的file里图片，同时删除保存在fileListPut的相同图片
+      if(this.fileListPut.length > 0){
+        this.fileListPut = this.fileListPut.filter((item, index)=>{
+          return item.name != file.name;
+        })
+      }
+    },
+    //图片预览
+    handlePictureCardPreview(file) {
+      this.dialogImageUrl = file.url;
+      this.dialogVisible = true;
+    },
+    //图片上传成功后的回调
+    handlePictureSuccess(res, file) {
+      //设置图片访问路径
+      const imgObjectUrl = this.imgUpload.url2 + file.response.imgUrl;
+      //这是每个成功上传图片，以对象的形式保存在一个数组中，进而以JSON格式保存在数据库中某个字段里
+      let currentFile = { name: '', url: '' };
+      currentFile.name = file.name;
+      currentFile.url = imgObjectUrl;
+      this.imgAddress.push(res.data.url);
+      //往此数组中保存当前图片对象
+      this.fileListPut.push(currentFile);
+      console.log(this.fileListPut)
+    },
+
+
+    getJump(row){
+      this.$router.push('/dms/activity/index/'+row.repairInstanceId)
+    },
+    getJumpSelect(row){
+      this.$router.push('/dms/activity/index/'+row.repairInstanceId)
+    },
+    getoutsrcId() {
+      listDmsInfo().then(response => {
+        this.dmsInfoList = response.rows;
+      });
+    },
+    /** 查询设备台账信息列表 */
+    getDeviveLedger() {
+      listLedger().then(response => {
+        this.ledgerList = response.rows;
+      });
+    },
+    changeOut(){
+      if (this.form.repairType==2){
+        this.isShowOut=true;}
+      else{
+        this.isShowOut = false;
+      }
+    },
+    change(){
+      if (this.form.faultSourceType == 1)
+      {
+        this.isShow1=true
+        this.isShow2=false
+        this.isShow3=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+      }else if (this.form.faultSourceType==2){
+        this.isShow2=true
+        this.isShow1=false
+        this.isShow3=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+
+      }else if (this.form.faultSourceType==3){
+        this.isShow3=true
+        this.isShow1=false
+        this.isShow2=false
+        this.isShow9=false
+        this.form.faultSourceId=null
+
+      }else if (this.form.faultSourceType==9){
+        this.isShow1=false
+        this.isShow2=false
+        this.isShow3=false
+        this.form.faultSourceId=null
+        this.isShow9=true
+      }
+
+    },
+
+    /** 查询检修计划信息列表 */
+    getdmsRepair() {
+      listDmsRepair(this.queryParams).then(response => {
+        this.dmsRepairList = response.rows;
+      });
+    },
+    /** 查询检修工单列表*/
+    getBillsFaultInstance() {
+      listDmsRepairInstance().then(response => {
+        this.dmsRepairInstanceList = response.rows;
+        console.log(this.dmsRepairInstanceList);
+      })},
+    /** 查询点检工单列表*/
+    getDmsBillsInstancePoint(){
+        listPoint().then(response => {
+          this.pointList = response.rows;
+        })
+        },
+    getDmsBillsInstanceInspection(){
+      listSelectInspection().then(response => {
+        this.inspectInstanceList = response.rows;
+        console.log(this.inspectInstanceList)
+      })
+
+    },
+    /** 查询报修工单列表 */
+    getList() {
+      this.loading = true;
+      listDmsBillsFaultInstancecompleted(this.queryParams).then(response => {
+        this.dmsBillsFaultInstanceList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        repairInstanceId: null,
+        faultSourceType: null,
+        faultSourceId: null,
+        wfProcessId: null,
+        billsFaultCode: null,
+        billsStatus: null,
+        applyUser: null,
+        applyTime: null,
+        realBeginTime: null,
+        realEndTime: null,
+        requireEndTime: null,
+        instanceType: null,
+        isFlag: null,
+        remark: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.queryParams.faultSourceType = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.repairInstanceId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.fileListShow = [];
+      this.isShowOut = false;
+      this.open = true;
+      this.title = "添加报修工单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const repairInstanceId = row.repairInstanceId || this.ids
+      getDmsBillsFaultInstance(repairInstanceId).then(response => {
+        this.form = response.data;
+        this.fileListShow = response.data.dmsInstanceFiles
+        // this.fileListShow = response.data.sysFiles
+        console.log(this.fileListShow)
+        this.open = true;
+        this.title = "修改报修工单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.repairInstanceId != null) {
+            updateDmsBillsFaultInstance(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.wfProcessId = 102;
+            this.form.isFlag = 1;
+            this.form.fileUrls = this.imgAddress;
+            alert(this.imgAddress)
+            addDmsBillsFaultInstance(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const repairInstanceIds = row.repairInstanceId || this.ids;
+      this.$modal.confirm('是否确认删除检修工单编号为"' + repairInstanceIds + '"的数据项？').then(function() {
+        return delDmsBillsFaultInstance(repairInstanceIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 删除按钮操作 */
+    handleUpadateApprove(repairInstanceId,repairConfirm) {
+      console.log(repairConfirm);
+      this.approve.repairInstanceId = repairInstanceId;
+      this.approve.repairConfirm = repairConfirm;
+      console.log(this.approve);
+        updateDmsBillsFaultInstance(this.approve).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("确认成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('dms/dmsBillsFaultInstance/export', {
+        ...this.queryParams
+      }, `dmsBillsFaultInstance_${new Date().getTime()}.xlsx`)
+    },
+    /** 导出报修按钮操作 */
+    handleFaultExport(repairInstanceId) {
+      this.download('dms/dmsBillsFaultInstance/faultRecordExport', {
+        repairInstanceId
+      }, `dmsBillsFaultInstance_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/hw-ui/src/views/mes/qualifiedProduction/index.vue b/hw-ui/src/views/mes/qualifiedProduction/index.vue
new file mode 100644
index 00000000..53b9966f
--- /dev/null
+++ b/hw-ui/src/views/mes/qualifiedProduction/index.vue
@@ -0,0 +1,313 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+<!--      <el-form-item label="父级标识" prop="parentId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.parentId"-->
+<!--          placeholder="请输入父级标识"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="姓名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入姓名"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合格率" prop="passRate">
+        <el-input
+          v-model="queryParams.passRate"
+          placeholder="请输入合格率"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+<!--      <el-form-item label="是否标识：1-是；2-否" prop="isFlag">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.isFlag"-->
+<!--          placeholder="请输入是否标识：1-是；2-否"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+<!--      <el-form-item label="祖级列表" prop="ancestors">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.ancestors"-->
+<!--          placeholder="请输入祖级列表"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['dms:devicetype:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="qualificationList"
+      row-key="qualifiedId"
+      :default-expand-all="isExpandAll"
+    >
+<!--      <el-table-column label="父级标识" prop="parentId" />-->
+      <el-table-column label="姓名" align="center" prop="name" />
+      <el-table-column label="合格率" align="center" prop="passRate" />
+      <el-table-column label="填写时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="是否标识：1-是；2-否" align="center" prop="isFlag" />-->
+<!--      <el-table-column label="祖级列表" align="center" prop="ancestors" />-->
+<!--      <el-table-column label="备注" align="center" prop="remark" />-->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-plus"-->
+<!--            @click="handleAdd(scope.row)"-->
+<!--            v-hasPermi="['dms:devicetype:add']"-->
+<!--          >新增</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['dms:devicetype:remove']"-->
+<!--          >删除</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改设备类型信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="生产者" prop="name">
+          <el-input v-model="form.name" placeholder="请输入姓名" />
+        </el-form-item>
+        <el-form-item label="合格率" prop="passRate">
+          <el-input v-model="form.passRate" placeholder="请输入合格率" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listDevicetype,
+  getDevicetype,
+  delDevicetype,
+  addDevicetype,
+  updateDevicetype,
+  listQualification, updateQualification, addQualification, getQualifiedById
+} from "@/api/dms/devicetype";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Devicetype",
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 设备类型信息表格数据
+      devicetypeList: [],
+      qualificationList: [],
+      // 设备类型信息树选项
+      devicetypeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        name: null,
+        createTime: null,
+        passRate: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          { required: true, message: "名字不能为空", trigger: "blur" }
+        ],
+        passRate: [
+          { required: true, message: "合格率不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询设备类型信息列表 */
+    getList() {
+      this.loading = true;
+      listQualification(this.queryParams).then(response => {
+        this.qualificationList = response.rows;
+        this.loading = false;
+      });
+    },
+    /** 转换设备类型信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.deviceTypeId,
+        label: node.typeName,
+        children: node.children
+      };
+    },
+	/** 查询设备类型信息下拉树结构 */
+    getTreeselect() {
+      listDevicetype().then(response => {
+        this.devicetypeOptions = [];
+        const data = { deviceTypeId: 0, typeName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "deviceTypeId", "parentId");
+        this.devicetypeOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        name: null,
+        passRate: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.deviceTypeId) {
+        this.form.parentId = row.deviceTypeId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加设备类型信息";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      console.log(row.qualifiedId)
+      // this.getTreeselect();
+      // if (row != null) {
+      //   this.form.parentId = row.deviceTypeId;
+      // }
+      getQualifiedById(row.qualifiedId).then(response => {
+        console.log(response)
+        this.form = response;
+        this.open = true;
+        this.title = "修改合格率信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.qualifiedId != null) {
+            console.log(this.form.qualifiedId)
+            updateQualification(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addQualification(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除设备类型编号为"' + row.typeCode + '"的数据项？').then(function() {
+        return delDevicetype(row.deviceTypeId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>