diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 01fb227d..5ded8398 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -1,5 +1,39 @@
 import request from '@/utils/request'
 
+// 初始化人员
+export function initPickPerson() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '3',
+      name: 'select 姓名,人员编号 from 人事档案管理_人员名单 where 是否离职 = 0'
+    }
+  })
+}
+// 初始化机床项目
+export function initMachineProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// 组件查询
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
 // 领料单查询
 export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
   return request({
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 22fd780a..6026c909 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -144,11 +144,72 @@
         </el-table-column>
       </el-table>
     </el-card>
+
+    <el-dialog :visible.sync="dialogFormVisible1" title="物料出库" center width="380px">
+      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left">
+        <el-form-item label="机床" prop="machineValue" label-width="100px">
+          <el-select v-model="form1.machineValue" filterable size="small" placeholder="机床" style="width: 200px;margin-right:10px" @change="searchGroup()">
+            <el-option
+              v-for="item in machine"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+              <div style="float: left">{{ item.label }}</div>
+              <div style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.name }}</div>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="分组" prop="groupNumValue" label-width="100px">
+          <el-select v-model="form1.groupNumValue" filterable size="small" placeholder="分组" style="width: 200px;margin-right:10px">
+            <el-option
+              v-for="item in group"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
+          <el-input-number v-model="form1.outNumber" :min="0.01" :precision="2" size="small" placeholder="出库数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="出库人" prop="personValue" label-width="100px">
+          <el-select v-model="form1.personValue" :disabled="true" size="small" style="width: 200px;margin-right:10px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="领料人" prop="DirectNote" label-width="100px">-->
+        <!--<el-input v-model="form1.DirectNote" size="small" placeholder="请输入领料人" style="width: 200px"/>-->
+        <!--</el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible1=false">取消</el-button>
+        <el-button type="primary" @click="submitOutStore()">确定</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :visible.sync="dialogFormVisible2" title="异常记录" center width="380px">
+      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left">
+        <el-form-item label="异常数量" prop="errorNumber" label-width="100px" size="small">
+          <el-input v-model="form2.errorNumber" size="small" placeholder="异常数量" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="异常原因" prop="reason" label-width="100px">
+          <el-input v-model="form2.reason" size="small" placeholder="异常原因" style="width: 200px"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible2=false">取消</el-button>
+        <el-button type="primary" @click="submitErrorRecord()">确 定</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { searchList, searchListDetail, searchStockNumber } from '@/api/Inventory/MaterialOut'
+import { initPickPerson, initMachineProject, searchgroup, searchList, searchListDetail, searchStockNumber } from '@/api/Inventory/MaterialOut'
+import { mapGetters } from 'vuex'
 export default {
   name: 'MaterialOut',
   data() {
@@ -160,13 +221,68 @@ export default {
       pageSize3: 20,
       total3: 0,
       pickListTable2: [],
-      StockNumberTable: []
+      StockNumberTable: [],
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      form1: {
+        machineValue: '',
+        groupNumValue: '',
+        outNumber: '',
+        personValue: '',
+        DirectNote: ''
+      },
+      form2: {
+        errorNumber: '',
+        reason: ''
+      },
+      rules1: {
+        machineValue: [{ required: true, message: '请选择' }],
+        groupNumValue: [{ required: true, message: '请选择' }],
+        outNumber: [{ required: true, message: '请输入' }],
+        personValue: [{ required: true, message: '请输入' }],
+        DirectNote: [{ required: true, message: '请输入' }]
+      },
+      rules2: {
+        errorNumber: [{ required: true, message: '请输入' }],
+        reason: [{ required: true, message: '请输入' }]
+      },
+      machine: [],
+      group: [],
+      person: []
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
   mounted() {
+    this.fetchData()
     this.searchList()
   },
   methods: {
+    // 初始化数据
+    fetchData() {
+      this.person = []
+      initPickPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+      this.machine = []
+      initMachineProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machine.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
     // 查询领料单列表
     searchList() {
       let check
@@ -204,13 +320,63 @@ export default {
         console.log(row.基本件流水号)
       }
     },
+    // 查询组号
+    searchGroup() {
+      this.group = []
+      this.form1.GroupNumValue = ''
+      searchgroup(this.form1.MachineValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.group.push({
+            label: response.data[i].组号,
+            value: Number(response.data[i].组件流水号)
+          })
+        }
+      })
+    },
     // 出库
     outStore(row) {
-      console.log(row)
+      console.log(row, this.id)
+      if (this.$refs['form1'] !== undefined) {
+        this.$refs['form1'].resetFields()
+      }
+      row.机床流水号 ? this.form1.machineValue = row.机床流水号 : this.form1.machineValue = null
+      row.组件流水号 ? this.form1.groupNumValue = row.组件流水号 : this.form1.groupNumValue = null
+      this.form1.outNumber = 0
+      this.form1.personValue = Number(this.id)
+      this.dialogFormVisible1 = true
+    },
+    // 提交出库
+    submitOutStore() {
+      this.$refs['form1'].validate((valid) => {
+        if (valid) {
+          console.log(this.form1.machineValue, this.form1.groupNumValue, this.form1.outNumber, this.form1.personValue)
+          this.dialogFormVisible1 = false
+          this.$message.success('出库成功')
+        } else {
+          return false
+        }
+      })
     },
     // 异常记录
-    errorRecord(row) {
-      console.log(row)
+    errorRecord() {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
+      this.form2.errorNumber = ''
+      this.form2.reason = ''
+      this.dialogFormVisible2 = true
+    },
+    // 提交异常记录
+    submitErrorRecord() {
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          console.log(this.form2.errorNumber, this.form2.reason)
+          this.dialogFormVisible2 = false
+          this.$message.success('记录成功')
+        } else {
+          return false
+        }
+      })
     }
   }
 }