diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
index e8ac7ea5..a164736a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/pda/st/out/service/impl/HandPFOutIvtServiceImpl.java
@@ -460,7 +460,7 @@ public class HandPFOutIvtServiceImpl implements HandPFOutIvtService {
         }
         String area_type = pointObj.getString("area_type");
         String bucketunique = jsonObject.get("bucketunique");
-        String out_qty = jsonObject.get("out_qty");
+        String out_qty =  NumberUtil.round(MapUtil.getStr(jsonObject,"out_qty"), 2).toString();
         //根据桶查询物料批次信息
         JSONObject bucketObj = WQLObject.getWQLObject("md_pb_bucketrecord").query("bucketunique='" + bucketunique + "'").uniqueResult(0);
         String material_id = bucketObj.getString("material_id");
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
index 0d7cfd39..801e7d4a 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/pf/service/impl/FlourworkServiceImpl.java
@@ -180,7 +180,8 @@ public class FlourworkServiceImpl implements FlourworkService {
         WQLObject devicePointTab = WQLObject.getWQLObject("SCH_BASE_DevicePointPara"); // 设备点位参数表
         WQLObject strucTab = WQLObject.getWQLObject("st_ivt_structattr"); // 仓位表
 
-        JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "'").uniqueResult(0);
+        JSONObject jsonFormMst = formTabMst.query("formula_id = '" + formula_id + "' and status <> '99'").uniqueResult(0);
+        if (ObjectUtil.isEmpty(jsonFormMst)) throw new BadRequestException("配方已完成");
         /*
          *  查询需要移库的物料（配方明细表）条件：
          *  1.状态等于10生成、20生产中
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java
index 5a3b0590..1eb11e5d 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/rest/DevicerepairrequestController.java
@@ -82,4 +82,11 @@ public class DevicerepairrequestController {
         devicerepairrequestService.notRepair(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);
     }
+
+    @GetMapping("/localStorage")
+    @Log("查看图片")
+    @ApiOperation("查看图片")
+    public ResponseEntity<Object> localStorage(@RequestParam Map whereJson, Pageable page) {
+        return new ResponseEntity<>(devicerepairrequestService.localStorage(whereJson, page), HttpStatus.OK);
+    }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java
index 22d0eef6..698b2941 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/DevicerepairrequestService.java
@@ -85,4 +85,7 @@ public interface DevicerepairrequestService {
      * @param whereJson /
      */
     void notRepair(JSONObject whereJson);
+
+    Map<String,Object> localStorage(Map whereJson, Pageable page);
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
index 70922453..eb76a5b3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/service/impl/DevicerepairrequestServiceImpl.java
@@ -221,4 +221,18 @@ public class DevicerepairrequestServiceImpl implements DevicerepairrequestServic
         requestTab.update(jsonRequest);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Map<String, Object> localStorage(Map whereJson, Pageable page) {
+        HashMap<String, String> map = new HashMap<>(whereJson);
+        map.put("flag", "2");
+        String request_code = MapUtil.getStr(whereJson, "request_code");
+        if (ObjectUtil.isNotEmpty(request_code)) {
+            map.put("inspection_code","%"+request_code+"%" );
+        }
+        JSONObject json = WQL.getWO("EM_BI_DEVICEREPAIRREQUEST001").addParamMap(map).pageQuery(WqlUtil.getHttpContext(page), "");
+        return json;
+
+    }
+
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
index 26a465f1..6faa5013 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/repair/wql/EM_BI_DEVICEREPAIRREQUEST001.wql
@@ -91,5 +91,20 @@
 		ENDPAGEQUERY
 	ENDIF
 
+    IF 输入.flag = "2"
+            PAGEQUERY
+                SELECT
+                    mst.*
+                FROM
+                    tool_local_storage mst
+                WHERE
+                    1=1
+                    OPTION 输入.request_code <> ""
+                            mst.source_bill_code like 输入.request_code
+                    ENDOPTION
+                ENDSELECT
+            ENDPAGEQUERY
+        ENDIF
+
 
 
diff --git a/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue b/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
index e2400792..f9d98067 100644
--- a/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
+++ b/mes/qd/src/views/wms/pf/flourwork/WorkDialog.vue
@@ -365,9 +365,6 @@ export default {
           'device_id': this.form.device_id,
           'formula_id': this.form.formula_id
         }
-        if (this.form.status !== '30') {
-          return this.crud.notify('配方状态必须为生产中', CRUD.NOTIFICATION_TYPE.INFO)
-        }
         this.fla = true
         crudFlourwork.autoCalledMater(data).then(res => {
           const num = res.task
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/PicDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/PicDialog.vue
new file mode 100644
index 00000000..146241f4
--- /dev/null
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/PicDialog.vue
@@ -0,0 +1,177 @@
+<template>
+  <el-dialog
+    title="报修单图片"
+    append-to-body
+    :visible.sync="dialogVisible"
+    destroy-on-close
+    :show-close="true"
+    fullscreen
+    @close="close"
+    @open="open"
+  >
+    <div class="head-container">
+      <div v-if="crud.props.searchToggle">
+        <!-- 搜索 -->
+        <el-input v-model="query.request_code" disabled clearable size="mini" placeholder="报修单单号" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+   <!--     <el-date-picker
+          v-model="query.createTime"
+          type="daterange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']"
+          @change="crud.toQuery"
+        />-->
+<!--        <rrOperation />-->
+      </div>
+      <crudOperation :permission="permission" />
+    </div>
+    <!--表格渲染-->
+    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
+      <el-table-column type="selection" width="55" />
+      <el-table-column prop="name" label="文件名（点击查看照片）" width="280">
+        <template slot-scope="scope">
+          <el-popover
+            :content="'file/' + scope.row.type + '/' + scope.row.real_name"
+            placement="top-start"
+            title="路径"
+            width="200"
+            trigger="hover"
+          >
+            <a
+              slot="reference"
+              :href="baseApi + '/file/' + scope.row.type + '/' + scope.row.real_name"
+              class="el-link--primary"
+              style="word-break:keep-all;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color: #1890ff;font-size: 13px;"
+              target="_blank"
+            >
+              {{ scope.row.name }}
+            </a>
+          </el-popover>
+        </template>
+      </el-table-column>
+      <el-table-column prop="path" label="预览图">
+        <template slot-scope="scope">
+          <el-image
+            :src=" baseApi + '/file/' + scope.row.type + '/' + scope.row.real_name"
+            :preview-src-list="[baseApi + '/file/' + scope.row.type + '/' + scope.row.real_name]"
+            fit="contain"
+            lazy
+            class="el-avatar"
+          >
+            <div slot="error">
+              <i class="el-icon-document" />
+            </div>
+          </el-image>
+        </template>
+      </el-table-column>
+      <el-table-column prop="suffix" label="文件类型" />
+      <el-table-column prop="type" label="类别" />
+      <el-table-column prop="size" label="大小" />
+      <el-table-column prop="source_bill_code" label="来源单号" />
+      <el-table-column prop="create_name" label="创建人" />
+      <el-table-column prop="create_time" label="创建日期" width="180"/>
+    </el-table>
+    <!--分页组件-->
+    <pagination />
+  </el-dialog>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import crudFile from '@/api/tools/localStorage'
+import CRUD, { presenter, header, form, crud } from '@crud/crud'
+import rrOperation from '@crud/RR.operation'
+import crudOperation from '@crud/CRUD.operation'
+import pagination from '@crud/Pagination'
+
+export default {
+  components: { pagination, crudOperation, rrOperation },
+  cruds() {
+    return CRUD({ title: '文件',idField: 'storage_id', url: 'api/devicerepairrequest/localStorage', crudMethod: { ...crudFile },
+      optShow: {
+        add: false,
+        edit: false,
+        del: true,
+        download: false,
+        reset: true
+      },
+      query:{request_code:''}
+    })
+  },
+  mixins: [presenter(), header(), crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      loading: false,
+      permission: {
+        edit: ['admin', 'storage:edit'],
+        del: ['admin', 'storage:del']
+      },
+      request_code: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'baseApi',
+      'fileUploadApi'
+    ])
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.crud.query.request_code = this.request_code
+      this.crud.toQuery()
+    },
+    /**
+     * 接受父组件传值
+     * @param msg
+     */
+    setForm(msg) {
+      this.request_code = msg
+    },
+    close() {
+      this.crud.resetQuery(false)
+      this.$emit('update:dialogShow', false)
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
index d1157f6e..8d627728 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairrequest/index.vue
@@ -90,6 +90,11 @@
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="request_id" label="报修标识" />
         <el-table-column prop="request_code" width="120px" label="报修单号" show-overflow-tooltip />
+        <el-table-column prop="path" label="故障图片" width="80px">
+          <template slot-scope="scope">
+            <el-button type="primary" icon="el-icon-folder-opened" circle @click="Picconfirm(scope.$index, scope.row)" />
+          </template>
+        </el-table-column>
         <el-table-column prop="device_code" label="设备编码" show-overflow-tooltip />
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="device_faultclass_name" label="故障分类" />
@@ -107,6 +112,7 @@
       <!--分页组件-->
       <pagination />
     </div>
+    <PicDialog ref="child" :dialog-show.sync="PicDialog" />
   </div>
 </template>
 
@@ -122,11 +128,12 @@ import crudClassstandard from '@/api/wms/basedata/master/classstandard'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
+import PicDialog from '@/views/wms/sb/repair/devicerepairrequest/PicDialog'
 
 const defaultForm = { request_id: null, request_code: null, devicerecord_id: null, fault_time: null, device_faultclass_id: null, fault_desc: null, fault_level: null, remark: null, status: null, create_id: null, create_name: null, create_time: null, is_passed: null, process_id: null, process_name: null, process_time: null, finish_id: null, finish_name: null, finish_time: null, is_delete: null, sysdeptid: null, syscompanyid: null }
 export default {
   name: 'Devicerepairrequest',
-  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect },
+  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, PicDialog },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
@@ -154,6 +161,7 @@ export default {
         { 'label': '维修中', 'value': '02' },
         { 'label': '完毕', 'value': '03' }
       ],
+      PicDialog: false,
       permission: {
       }
     }
@@ -251,6 +259,11 @@ export default {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
+    },
+    Picconfirm(index, row) {
+      debugger
+      this.$refs.child.setForm(row.request_code)
+      this.PicDialog = true
     }
   }
 }
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairudit/ReceiveDialog.vue b/mes/qd/src/views/wms/sb/repair/devicerepairudit/ReceiveDialog.vue
new file mode 100644
index 00000000..7e6bdff4
--- /dev/null
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairudit/ReceiveDialog.vue
@@ -0,0 +1,289 @@
+<template>
+  <el-dialog
+    title="维修领用"
+    append-to-body
+    :visible.sync="dialogVisible"
+    fullscreen
+    :before-close="handleClose"
+    destroy-on-close
+    @close="close"
+  >
+    <el-row :gutter="20">
+      <el-col :span="20" style="border: 1px solid white">
+        <span />
+      </el-col>
+      <el-col :span="4">
+        <span>
+          <el-button icon="el-icon-check" size="mini" disabled type="primary" @click="submitReceive">保存</el-button>
+          <el-button icon="el-icon-close" size="mini" type="info" @click="close">关闭</el-button>
+        </span>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form3" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;" :inline="true" :model="form3" size="mini" label-width="120px" label-suffix=":">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="单据号" prop="repair_code">
+            <el-input v-model="form3.repair_code" style="width: 200px;" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="计划维修日期" prop="plan_start_date">
+            <el-date-picker v-model="form3.plan_start_date" type="date" placeholder="选择日期" style="width: 200px" value-format="yyyy-MM-dd" disabled />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="维修类型" prop="maintenancecycle">
+            <el-select
+              v-model="form3.maintenancecycle"
+              disabled
+              size="mini"
+              placeholder="请选择"
+              class="filter-item"
+            >
+              <el-option
+                v-for="item in dict.EM_DEVICE_WX_INVTYPE"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="设备" prop="device_code">
+            <el-input v-model="form3.device_code" :disabled="true" style="width: 200px;" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="16">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="form3.remark" style="width: 580px;" rows="2" type="textarea" disabled />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <div class="crud-opts2">
+      <span class="role-span">项目明细</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+      </span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="form3.itemData"
+        style="width: 100%;"
+        max-height="500"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+        @current-change="changeItem"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="repair_item_code" label="维修项目编号" align="center" />
+        <el-table-column show-overflow-tooltip prop="repair_item_name" label="维修项目名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="requirement" label="要求" align="center" />
+        <el-table-column show-overflow-tooltip prop="isfinish" label="是否完成" align="center" :formatter="isFinName" />
+        <el-table-column prop="dtl_remark" label="备注" align="center" />
+      </el-table>
+    </el-card>
+
+    <div class="crud-opts2">
+      <span class="role-span">设备bom</span>
+      <span class="crud-opts-right2">
+        <!--左侧插槽-->
+        <slot name="left" />
+        <el-button
+          slot="left"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-check"
+          size="mini"
+          disabled
+          @click="addChange"
+        >
+          添加更换件
+        </el-button>
+      </span>
+    </div>
+
+    <el-card class="box-card" shadow="never" :body-style="{padding:'0'}">
+      <!--表格渲染-->
+      <el-table
+        ref="table2"
+        :data="tableData"
+        style="width: 100%;"
+        max-height="500"
+        border
+        :highlight-current-row="true"
+        :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
+      >
+        <el-table-column type="index" label="序号" width="55" align="center" />
+        <el-table-column show-overflow-tooltip prop="repair_item_code" label="维修项目编号" align="center" />
+        <el-table-column show-overflow-tooltip prop="device_code" label="设备编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
+        <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
+        <el-table-column show-overflow-tooltip prop="sparepart_only_id" label="备件唯一标识" align="center" />
+        <el-table-column show-overflow-tooltip prop="change_only_id" label="更换备件唯一标识" align="center" />
+
+        <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="danger" disabled class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="delRow(scope.$index, tableData)" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+
+    <AddChangeDialog :dialog-show.sync="addChangeDialog" :open-param="openParam" @tableChanged="tableChanged"/>
+
+  </el-dialog>
+</template>
+
+<script>
+
+import crudDevicerepairmst from '@/api/wms/sb/devicerepairmst'
+import CRUD, { crud } from '@crud/crud'
+import AddChangeDialog from '@/views/wms/sb/repair/devicerepairpa/AddChangeDialog'
+
+export default {
+  name: 'ReceiveDialog',
+  dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_FAULT_LEVEL'],
+  components: { AddChangeDialog },
+  mixins: [crud()],
+  props: {
+    dialogShow: {
+      type: Boolean,
+      default: false
+    },
+    openParam: {
+      type: Object
+    }
+  },
+  data() {
+    return {
+      form3: {
+        itemData: []
+      },
+      tableData: [],
+      itemJson: null,
+      addChangeDialog: false,
+      dialogVisible: false
+    }
+  },
+  watch: {
+    dialogShow: {
+      handler(newValue, oldValue) {
+        this.dialogVisible = newValue
+        this.form3 = this.openParam.form3
+        this.form3.itemData = this.openParam.itemData
+      }
+    }
+  },
+  methods: {
+    handleClose(done) {
+      this.$confirm('确认关闭？')
+        .then(_ => {
+          done()
+        })
+        .catch(_ => {
+        })
+    },
+    close() {
+      this.$emit('update:dialogShow', false)
+    },
+    delRow(index, rows) {
+      rows.splice(index, 1)
+    },
+    isFinName(row, cloum) {
+      if (row.isfinish === '0') {
+        return '否'
+      } else if (row.isfinish === '1') {
+        return '是'
+      }
+    },
+    addChange() {
+      if (this.form3.device_code === '') {
+        return this.crud.notify('设备不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      if (this.form3.repair_code === '') {
+        return this.crud.notify('维修单号不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      if (this.itemJson === null) {
+        return this.crud.notify('请选择项目', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      const data = {
+        'device_code': this.form3.device_code
+      }
+      crudDevicerepairmst.getNormBom(data).then(res => {
+        this.openParam = {
+          'form4': this.form3,
+          'normBom': res
+        }
+        this.addChangeDialog = true
+      })
+    },
+    changeItem(row) {
+      this.itemJson = row
+      this.form3.repair_item_code = row.repair_item_code
+      this.form3.repair_item_id = row.repair_item_id
+      this.form3.repair_item_name = row.repair_item_name
+      this.form3.repair_dtl_id = row.repair_dtl_id
+      this.form3.device_id = row.device_id
+    },
+    tableChanged(rows) {
+      debugger
+      const arr = rows
+      arr.forEach((item) => {
+        this.tableData.push(item)
+      })
+    },
+    submitReceive() {
+      const data = {
+        'tableData': this.tableData,
+        'mst': this.form3
+      }
+      if (this.tableData.length === 0) {
+        return this.crud.notify('设备bom不能为空', CRUD.NOTIFICATION_TYPE.INFO)
+      }
+      crudDevicerepairmst.submitReceive(data).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.crud-opts2 {
+  padding: 0;
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+
+.crud-opts2 .el-dialog__title2 {
+  line-height: 24px;
+  font-size:20px;
+  color:#303133;
+}
+
+.crud-opts2 .role-span {
+  padding: 10px 0px 10px 0px;
+}
+.crud-opts2 .crud-opts-form {
+  padding: 10px 0px 0px 20px;
+}
+
+.input-with-select  {
+  background-color: #fff;
+}
+</style>
diff --git a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
index 9f3cba66..2e905e24 100644
--- a/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
+++ b/mes/qd/src/views/wms/sb/repair/devicerepairudit/index.vue
@@ -105,7 +105,11 @@
       <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="repair_id" label="设备维修单标识" />
-        <el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip />
+        <el-table-column prop="repair_code" label="维修单号" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-link type="warning" @click="openReceive(scope.row)">{{ scope.row.repair_code }}</el-link>
+          </template>
+        </el-table-column>
         <el-table-column prop="device_code" label="设备编码" width="120px" show-overflow-tooltip />
         <el-table-column prop="device_name" label="设备名称" show-overflow-tooltip />
         <el-table-column prop="invstatus" label="单据状态" :formatter="formatStatusName"/>
@@ -130,6 +134,7 @@
       <pagination />
     </div>
     <resuftDialog :dialog-show.sync="resuftDialog" :open-param="openParam" />
+    <ReceiveDialog :dialog-show.sync="receiveDialog" :open-param="openParam" />
   </div>
 </template>
 
@@ -146,11 +151,12 @@ import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import crudMaterialbase from '@/api/wms/basedata/master/materialbase'
 import resuftDialog from '@/views/wms/sb/repair/devicerepairudit/resuftDialog'
+import ReceiveDialog from '@/views/wms/sb/repair/devicerepairudit/ReceiveDialog'
 
 export default {
   name: 'Devicerepairudit',
   dicts: ['EM_DEVICE_WX_INVTYPE', 'EM_DEVICE_WX_INVSTATUS', 'EM_FAULT_LEVEL'],
-  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, resuftDialog },
+  components: { pagination, crudOperation, rrOperation, udOperation, DateRangePicker, Treeselect, resuftDialog, ReceiveDialog },
   mixins: [presenter(), header(), crud()],
   cruds() {
     return CRUD({
@@ -175,6 +181,7 @@ export default {
       materOpt_code: '23',
       openParam: null,
       resuftDialog: false,
+      receiveDialog: false,
       permission: {
       }
     }
@@ -253,6 +260,16 @@ export default {
         this.openParam = res
         this.resuftDialog = true
       })
+    },
+    openReceive(row) {
+      const data = row
+      crudDevicerepairmst.getDtl(data).then(res => {
+        this.openParam = {
+          'form3': data,
+          'itemData': res
+        }
+        this.receiveDialog = true
+      })
     }
   }
 }