diff --git a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/Detail.vue b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/Detail.vue
index 9ed96fc..85ba46b 100644
--- a/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/Detail.vue
+++ b/jnpf-java-boot/jnpf-web/src/views/yys/yysdevice/Detail.vue
@@ -1,137 +1,168 @@
 <template>
-<el-dialog title="详情"
-           :close-on-click-modal="false" append-to-body
-           :visible.sync="visible" class="JNPF-dialog JNPF-dialog_center" lock-scroll
-           width="600px">
-<el-row :gutter="15" class="">
-<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
-    <template v-if="!loading">
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="设备编号"  
- prop="deviceCode"  >
-                        <p>{{dataForm.deviceCode}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="设备名称"  
- prop="deviceName"  >
-                        <p>{{dataForm.deviceName}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="所属部门"  
- prop="deviceDept"  >
-                        <p>{{dataForm.deviceDept}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="8小时产量"  
- prop="eightOutput"  >
-                        <p>{{dataForm.eightOutput}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="12小时产量"  
- prop="twelveOutput"  >
-                        <p>{{dataForm.twelveOutput}}</p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="设备类型"  
- prop="deivceType"  >
-                         <p>{{ dataForm.deivceType }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-            <el-col :span="24"  >
-                <jnpf-form-tip-item  label="启用状态"  
- prop="enabledStatus"  >
-                         <p>{{ dataForm.enabledStatus }} </p>
-                </jnpf-form-tip-item>
-            </el-col>
-    </template>
-</el-form>
+  <el-dialog
+    title="详情"
+    :close-on-click-modal="false"
+    append-to-body
+    :visible.sync="visible"
+    class="JNPF-dialog JNPF-dialog_center"
+    lock-scroll
+    width="600px"
+  >
+    <el-row :gutter="15" class="">
+      <el-form
+        ref="formRef"
+        :model="dataForm"
+        size="small"
+        label-width="100px"
+        label-position="right"
+      >
+        <template v-if="!loading">
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备编号" prop="deviceCode">
+              <p>{{ dataForm.deviceCode }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备名称" prop="deviceName">
+              <p>{{ dataForm.deviceName }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="所属部门" prop="deviceDept">
+              <p>{{ dataForm.deviceDept }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="8小时产量" prop="eightOutput">
+              <p>{{ dataForm.eightOutput }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="12小时产量" prop="twelveOutput">
+              <p>{{ dataForm.twelveOutput }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="设备类型" prop="deivceType">
+              <p>{{ dataForm.deivceType }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label="启用状态" prop="enabledStatus">
+              <p>{{ dataForm.enabledStatus }}</p>
+            </jnpf-form-tip-item>
+          </el-col>
+          <el-col :span="24">
+            <jnpf-form-tip-item label-width="0">
+              <div class="JNPF-common-title">
+                <h2>绑定物料列表</h2>
+              </div>
+              <el-table :data="dataForm.data" size="mini">
+                <el-table-column label="设备编码">
+                  <template slot-scope="scope">
+                    {{ scope.row.deviceCode }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="母件编码">
+                  <template slot-scope="scope">
+                    {{ scope.row.materialId }}
+                  </template>
+                </el-table-column>
+                <el-table-column label="母件名称">
+                  <template slot-scope="scope">
+                    {{ scope.row.materialName }}
+                  </template>
+                </el-table-column>
+              </el-table>
+            </jnpf-form-tip-item>
+          </el-col>
+        </template>
+      </el-form>
     </el-row>
     <span slot="footer" class="dialog-footer">
-        <el-button @click="visible = false"> 取 消</el-button>
+      <el-button @click="visible = false"> 取 消</el-button>
     </span>
     <Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
-    </el-dialog>
+  </el-dialog>
 </template>
 <script>
-    import request from '@/utils/request'
+import request from "@/utils/request";
 
-    import { getConfigData } from '@/api/onlineDev/visualDev'
-    import jnpf from '@/utils/jnpf'
-    import Detail from '@/views/basic/dynamicModel/list/detail'
-    import { thousandsFormat } from "@/components/Generator/utils/index"
-    export default {
-        components: { Detail},
-        props: [],
-        data() {
-            return {
-                visible: false,
-                detailVisible: false,
-                loading: false,
+import { getConfigData } from "@/api/onlineDev/visualDev";
+import jnpf from "@/utils/jnpf";
+import Detail from "@/views/basic/dynamicModel/list/detail";
+import { thousandsFormat } from "@/components/Generator/utils/index";
+export default {
+  components: { Detail },
+  props: [],
+  data() {
+    return {
+      visible: false,
+      detailVisible: false,
+      loading: false,
 
-            dataForm: {
-                id :'',
-                            deviceCode : '',
-                            deviceName : '',
-                            deviceDept : "",
-                            eightOutput : '',
-                            twelveOutput : '',
-                            deivceType : "",
-                            enabledStatus : "",
-            },
-                            deivceTypeOptions:[{"fullName":"生产线","id":"1"},{"fullName":"包装线","id":"2"},{"fullName":"其它","id":"3"}],
-                        deivceTypeProps:{"label":"fullName","value":"id"  },
-                            enabledStatusOptions:[{"fullName":"启用","id":"1"},{"fullName":"未启用","id":"2"}],
-                        enabledStatusProps:{"label":"fullName","value":"id"  },
+      dataForm: {
+        id: "",
+        deviceCode: "",
+        deviceName: "",
+        deviceDept: "",
+        eightOutput: "",
+        twelveOutput: "",
+        deivceType: "",
+        enabledStatus: "",
+        data: []
+      },
+      deivceTypeOptions: [
+        { fullName: "生产线", id: "1" },
+        { fullName: "包装线", id: "2" },
+        { fullName: "其它", id: "3" }
+      ],
+      deivceTypeProps: { label: "fullName", value: "id" },
+      enabledStatusOptions: [
+        { fullName: "启用", id: "1" },
+        { fullName: "未启用", id: "2" }
+      ],
+      enabledStatusProps: { label: "fullName", value: "id" }
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    toDetail(defaultValue, modelId) {
+      if (!defaultValue) return;
+      getConfigData(modelId).then(res => {
+        if (!res.data || !res.data.formData) return;
+        let formData = JSON.parse(res.data.formData);
+        formData.popupType = "general";
+        this.detailVisible = true;
+        this.$nextTick(() => {
+          this.$refs.Detail.init(formData, modelId, defaultValue);
+        });
+      });
+    },
+    dataInfo(dataAll) {
+      let _dataAll = dataAll;
+      this.dataForm = _dataAll;
+    },
 
+    init(id) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.$nextTick(() => {
+        if (this.dataForm.id) {
+          this.loading = true;
+          request({
+            url: "/api/example/YysDevice/detail/" + this.dataForm.id,
+            method: "get"
+          }).then(res => {
+            this.dataInfo(res.data);
+            this.loading = false;
+          });
         }
-        },
-        computed: {},
-        watch: {},
-        created() {
-
-        },
-        mounted() {},
-        methods: {
-            toDetail(defaultValue, modelId) {
-                if (!defaultValue) return
-                getConfigData(modelId).then(res => {
-                    if (!res.data || !res.data.formData) return
-                    let formData = JSON.parse(res.data.formData)
-                    formData.popupType = 'general'
-                    this.detailVisible = true
-                    this.$nextTick(() => {
-                        this.$refs.Detail.init(formData, modelId, defaultValue)
-                    })
-                })
-            },
-            dataInfo(dataAll){
-                let _dataAll =dataAll
-                this.dataForm = _dataAll
-            },
-
-            init(id) {
-                this.dataForm.id = id || 0;
-                this.visible = true;
-                this.$nextTick(() => {
-                    if(this.dataForm.id){
-                        this.loading = true
-                        request({
-                            url: '/api/example/YysDevice/detail/'+this.dataForm.id,
-                            method: 'get'
-                        }).then(res => {
-                            this.dataInfo(res.data)
-                            this.loading = false
-                        })
-                    }
-
-                })
-            },
-        },
+      });
     }
-
+  }
+};
 </script>