diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
index 5d27c1d4..615372cc 100644
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -11,27 +11,38 @@ export function initProject() {
     }
   })
 }
-// PDM_机床名称_发货状态_查询数据
-export function selecttable(check2, machineNumberValue) {
+// 初始化质检类型
+export function QualityType() {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_发货状态_查询数据',
-      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+      name: '质量管理_质检类型_查询数据'
     }
   })
 }
-// PDM_机床名称_发货状态_编辑数据
-export function updatestate(machineNumberValue, state) {
+// 组件查询
+export function searchgroup(num) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_发货状态_编辑数据',
-      param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 组件查询
+export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '质量管理_质量情况_查询数据',
+      param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/CreateIntakeList.js b/src/api/ManufacturingCenter/CreateIntakeList.js
index 30f32faa..3df2e2fb 100644
--- a/src/api/ManufacturingCenter/CreateIntakeList.js
+++ b/src/api/ManufacturingCenter/CreateIntakeList.js
@@ -1,5 +1,42 @@
 import request from '@/utils/request'
 
+// 创建领料单
+export function addList(peopleNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料管理_领料单增加',
+      param: '领料人流水号=' + peopleNumber
+    }
+  })
+}
+// 领料单查询
+export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_备料管理_查询备料领料单',
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+// 删除领料单明细/基本件
+export function dropListDetailBasic(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料管理_备料领料单明细移除',
+      param: `备料领料单明细流水号=${params[0]}&是否外购=${params[1]}&工艺计划流水号=${params[2]}`
+    }
+  })
+}
 // 初始化项目
 export function initProject() {
   return request({
@@ -7,7 +44,7 @@ export function initProject() {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_项目名称_查询数据_按时间排序'
+      name: '车间生产管理工艺_项目查询'
     }
   })
 }
@@ -35,59 +72,56 @@ export function searchTeam(machineNumber) {
     }
   })
 }
-// 外购件、标准件查询
-export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '库存管理_外购件出库_零件查询',
-      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 基本件、通用件查询
+// 自家备料零件
 export function searchBasicPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_基本件出库_零件查询',
+      name: '车间生产管理工艺_备料管理_自家备料零件查询',
       param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 车间采购件查询
-export function searchHoursePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
+// 外购备料零件
+export function searchPurchasePart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '库存管理_车间采购出库_零件查询',
+      name: '车间生产管理工艺_备料管理_外购备料零件查询',
       param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+// 自家备料选入
+export function addBasicList(listNumber, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
-      type: '1',
-      name: '车间装配管理_领料单_领料单查询',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
-      Pagination: pageCurrent + '&' + pageSize
+      type: '2',
+      name: '车间生产管理工艺_备料管理_自家备料选入',
+      param: '备料领料单流水号=' + listNumber + '&工艺计划流水号=' + num1
+    }
+  })
+}
+// 外购备料选入
+export function addPurchaseList(listNumber, num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料管理_外购备料选入',
+      param: '备料领料单流水号=' + listNumber + '&工艺计划流水号=' + num1
     }
   })
 }
-
 // 领料单明细查询
 export function searchListDetail(listNumber) {
   return request({
@@ -95,20 +129,8 @@ export function searchListDetail(listNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间装配管理_领料单_领料单明细查询',
-      param: '领料单流水号=' + listNumber
-    }
-  })
-}
-// 创建领料单
-export function addList(peopleNumber) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间装配管理_领料单_领料单增加',
-      param: '领料人流水号=' + peopleNumber
+      name: '车间生产管理工艺_备料管理_备料领料单明细查询',
+      param: '备料领料单流水号=' + listNumber
     }
   })
 }
@@ -119,69 +141,8 @@ export function dropList(PickingListNumberx) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间装配管理_领料单_领料单删除',
-      param: '领料单流水号=' + PickingListNumberx
-    }
-  })
-}
-// 删除领料单明细
-export function dropListDetail(DetailNumberx, isBacklog) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间装配管理_领料单_领料单明细删除',
-      param: '领料单明细流水号=' + DetailNumberx + '&是否是滞货=' + isBacklog
-    }
-  })
-}
-// 删除领料单明细/基本件
-export function dropListDetailBasic(...params) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间装配管理_领料单_领料单明细删除_基本件',
-      param: `领料单明细流水号=${params[0]}&收件信息ID=${params[1]}&返还数量=${params[2]}`
-    }
-  })
-}
-// 增加领料单明细
-export function addListDetail(PickingListNumberx, projectnumber, machinenumber, teamNumber, outNumber, partType, Note, data1, data2, data4, data5, data6, data7, data8, data9, data10, data11, data12, data13) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间装配管理_领料单_领料单明细增加',
-      param: '领料单流水号=' + PickingListNumberx + '&项目流水号=' + projectnumber + '&机床流水号=' + machinenumber + '&组件流水号=' + teamNumber + '&出库数量=' + outNumber + '&零件类型=' + partType + '&备注\\=' + Note + '&工艺计划流水号=' + data1 + '&收件信息ID=' + data2 + '&采购合同明细流水号=' + data4 + '&请购单明细流水号=' + data5 + '&货位流水号=' + data6 + '&出库类型=' + data7 + '&物料与货位对照流水号=' + data8 + '&名称=' + data9 + '&物料规格\\=' + data10 + '&物料型号=' + data11 + '&零件图号=' + data12 + '&材料=' + data13
-    }
-  })
-}
-// 查询滞货件
-export function searchBacklogPart(pageCurrent, pageSize, project_check, project, machine_check, machine, group_check, group) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '采购管理_滞货件领料_查询数据',
-      param: '项目流水号_check=' + project_check + '&项目流水号=' + project + '&机床流水号_check=' + machine_check + '&机床流水号=' + machine + '&组件流水号_check=' + group_check + '&组件流水号=' + group,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 领料滞货件
-export function submitAddBacklogList(...params) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '采购管理_领料单明细_滞货件_增加数据',
-      param: `领料单流水号=${params[0]}&项目流水号=${params[1]}&机床流水号=${params[2]}&组件流水号=${params[3]}&出库数量=${params[4]}&备注\\=${params[5]}&货位流水号=${params[6]}&物料与货位对照流水号=${params[7]}&名称=${params[8]}&物料规格\\=${params[9]}&物料型号=${params[10]}`
+      name: '车间生产管理工艺_备料管理_备料领料单删除',
+      param: '备料领料单流水号=' + PickingListNumberx
     }
   })
 }
diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js
index 9892821f..aa1e8c88 100644
--- a/src/api/ManufacturingCenter/ProcessingStatus.js
+++ b/src/api/ManufacturingCenter/ProcessingStatus.js
@@ -66,7 +66,7 @@ export function getExport(num) {
     method: 'post',
     data: {
       type: '3',
-      name: `select 机床流水号,组件流水号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
+      name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料
 from (  select 工艺计划流水号,min(工序顺序) as 待加工工序顺序
 		from 车间生产管理工艺_零件工序_视图
 		where 完成日期_短 is null and 考核状态 = 6
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index 75eda729..a661d266 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange();searchTable1()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable1();searchTable2()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,20 +13,20 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>组号:</span>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">
-          <el-option
-            v-for="item in groupNumber"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>
+        <!--        <span>组号:</span>-->
+        <!--        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable @change="searchTable2()">-->
+        <!--          <el-option-->
+        <!--            v-for="item in groupNumber"-->
+        <!--            :key="item.value"-->
+        <!--            :label="item.label"-->
+        <!--            :value="item.value"/>-->
+        <!--        </el-select>-->
+        <!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable1();searchTable2()">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
       <h3 style="text-align: center;">总装调试</h3>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="100px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -61,7 +61,7 @@
     </el-card>
     <el-card>
       <h3 style="text-align: center;">部装</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
index 957016d1..8ed12e58 100644
--- a/src/views/Assembly/DeliveryApplication/index.vue
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -13,7 +13,7 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+<!--        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>-->
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index f1616531..c91260a6 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-row>
         <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,6 +13,24 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
+        <span>组号:</span>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
+          <el-option
+            v-for="item in groupNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>质检类型:</span>
+        <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" size="small" clearable>
+          <el-option
+            v-for="item in QualityTypeNumber"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"/>
+        </el-select>
+        <span>零件:</span>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px" size="small" clearable/>
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
       </el-row>
     </el-card>
@@ -23,7 +41,7 @@
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床编号" align="center">
+        <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -33,21 +51,49 @@
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床数量" align="center">
+        <el-table-column label="组号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.机床数量 }}
+            {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="注意事项" align="center">
+        <el-table-column label="零件图号" align="center">
           <template slot-scope="scope">
-            {{ scope.row.注意事项 }}
+            {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="250px" fixed="right">
+        <el-table-column label="零件名称" align="center">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
-            <el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待  审批</el-button>
-            <el-button v-else type="info" size="small" >已审批</el-button>
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检类型" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.质检类型 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格数量" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="不合格原因" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.不合格原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="处理结果" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.处理结果 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
           </template>
         </el-table-column>
       </el-table>
@@ -56,7 +102,7 @@
 </template>
 
 <script>
-import { initProject, selecttable, updatestate } from '@/api/Assembly/QualityInspectionInformationInquiry'
+import { initProject, searchgroup, selecttable, QualityType } from '@/api/Assembly/QualityInspectionInformationInquiry'
 // import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -65,8 +111,10 @@ export default {
       machineNumber: [],
       groupNumberValue: '',
       groupNumber: [],
+      QualityTypeNumber: [],
+      QualityTypeValue: '',
       tableData1: [],
-      tableData2: []
+      SpareParts: ''
     }
   },
   created() {
@@ -74,6 +122,7 @@ export default {
   },
   mounted() {
     this.initProject()
+    this.QualityType()
   },
   methods: {
     initProject() {
@@ -87,17 +136,38 @@ export default {
         }
       })
     },
-    selecttable() {
-      this.tableData1 = []
-      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
-      selecttable(this.check2, this.machineNumberValue).then(response => {
-        this.tableData1 = response.data
+    QualityType() {
+      QualityType().then(response => {
         console.log(response.data)
+        for (let i = 0; i < response.data.length; i++) {
+          this.QualityTypeNumber.push({
+            label: response.data[i].质检类型,
+            value: response.data[i].质检类型代码
+          })
+        }
       })
     },
-    handlconfirm(row) {
-      updatestate(row.机床流水号, 1).then(response => {
-        this.selecttable()
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 }
+      if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 }
+      if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
+      selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
       })
     }
   }
diff --git a/src/views/ManufacturingCenter/CreateIntakeList/index.vue b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
index b82b79d0..d197dce1 100644
--- a/src/views/ManufacturingCenter/CreateIntakeList/index.vue
+++ b/src/views/ManufacturingCenter/CreateIntakeList/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span style="margin: 5px">领料单编号</span>
-      <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
+      <el-input v-model="pickingListNumber" clearable size="small" style="width:200px"/>
       <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchListinfor()">查询</el-button>
       <el-button size="small" type="primary" icon="el-icon-plus" style="margin: 0 0 0 10px" @click="addListinfor()">创建</el-button>
     </el-card>
@@ -25,6 +25,11 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
+        <el-table-column v-if="true" label="操作" align="center" width="100">
+          <template slot-scope="scope">
+            <el-button size="mini" type="danger" icon="el-icon-delete" @click="dropListinfor(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin: 10px 0;">
         <el-pagination
@@ -38,19 +43,20 @@
       </div>
       <el-table :data="tableDataPicking" border style="width: 100%;" size="mini" height="300">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" min-width="100">
+        <el-table-column label="零件图号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.名称 }}
+            {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="100">
+        <el-table-column label="零件名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="100">
+        <el-table-column label="来源" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
+            <el-tag v-if="scope.row.是否外购===1">外购</el-tag>
+            <el-tag v-else>自家</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="项目名称" align="center" min-width="100">
@@ -68,37 +74,17 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="领用数量" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="50">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位" align="center" min-width="50">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="备注" align="center" min-width="130">
-          <template slot-scope="scope">
-            {{ scope.row.备注 }}
-          </template>
-        </el-table-column>
         <el-table-column v-if="true" label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="!!scope.row.是否出库" size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">删除</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-delete" @click="dropListdetail(scope.row)">移除</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
     <el-card>
-      <span>项目名称:</span>
-      <el-select v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
+      <!--<span>项目名称:</span>-->
+      <el-select v-show="false" v-model="ProjectValue" filterable clearable size="small" placeholder="请选择项目名称" style="width: 200px;margin-right:10px" @change="searchMachine()">
         <el-option
           v-for="item in Project"
           :key="item.value"
@@ -125,7 +111,7 @@
     </el-card>
 
     <el-card>
-      <h4>自制件</h4>
+      <h4>自家备料</h4>
       <el-table v-loading="listLoading1" :data="tableDataBasic" border style="width: 100%;" size="mini" height="440">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="项目名称" align="center" min-width="80">
@@ -148,49 +134,14 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划数量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="库存数量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.入库数量 - scope.row.出库总数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="待出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="可出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.可出库数量 = scope.row.入库数量 - scope.row.出库总数量 - scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="零件图号" align="center" min-width="80">
           <template slot-scope="scope" align="center">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" width="80">
-          <template slot-scope="scope" align="center">
-            {{ scope.row.零件类型名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicList(scope.row)">领料</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" style="margin: 0 0 0 10px" @click="addBasicList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -205,22 +156,12 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <hr>
-      <h4>采购部采购件</h4>
+      <h4>外购备料</h4>
       <el-table v-loading="listLoading2" :data="tableDataPurchase" border style="width: 100%;" size="mini" height="440">
         <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" min-width="80">
+        <el-table-column label="项目名称" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 || scope.row.零件图号 || '' }}
+            {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
         <el-table-column label="机床图号" align="center" min-width="80">
@@ -228,293 +169,44 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" width="80">
+        <el-table-column label="组号" align="center" width="70">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购数量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.数量 }}
+        <el-table-column label="物料编码" align="center" min-width="80">
+          <template slot-scope="scope" align="center">
+            {{ scope.row.物料编码 + scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库名称" align="center" width="100">
+        <el-table-column label="零件名称" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位名称" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位存量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="待出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="可出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.可出库数量 = scope.row.货位存量 - scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件类型" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
+            {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addPurchaseList(scope.row)">领料</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-edit" @click="addPurchaseList(scope.row)">领料</el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin: 10px 0;">
         <el-pagination
-          :current-page="PageCurrent1"
+          :current-page="PageCurrent2"
           :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize1"
-          :total="total1"
+          :page-size="PageSize2"
+          :total="total2"
           layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange1"
-          @current-change="handleCurrentChange1"/>
-      </div>
-      <hr>
-      <h4>可领滞货件</h4>
-      <el-table v-loading="listLoading3" :data="tableDataBacklog" border style="width: 100%;" size="mini" height="440">
-        <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="规格" align="center" min-width="150">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="120">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 || scope.row.零件图号 || '' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库名称" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位名称" align="center" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位存量" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.货位余量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="待出库数量" align="center" width="120">
-          <template slot-scope="scope">
-            {{ scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="可出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.可出库数量 = scope.row.货位余量 - scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
-          <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addBacklogList(scope.row)">领料</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin: 10px 0;">
-        <el-pagination
-          :current-page="PageCurrent3"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize3"
-          :total="total3"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange3"
-          @current-change="handleCurrentChange3"/>
-      </div>
-      <hr>
-      <h4>车间采购件</h4>
-      <el-table v-loading="listLoading4" :data="tableDataHouse" border size="mini" style="width: 100%;" height="440">
-        <el-table-column label="序号" align="center" type="index" width="50"/>
-        <el-table-column label="名称" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料规格" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料规格 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="物料型号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.物料型号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="机床图号" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.机床图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="组号" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.组号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="采购数量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.零件数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="仓库名称" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.仓库名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位名称" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="货位存量" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="待出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="可出库数量" align="center" width="90">
-          <template slot-scope="scope">
-            {{ scope.row.可出库数量 = scope.row.货位存量 - scope.row.待出库数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件类型" align="center" width="80">
-          <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
-          <template slot-scope="scope" align="center">
-            <el-button :disabled="scope.row.可出库数量===0" size="mini" type="primary" icon="el-icon-edit" @click="addWorkshopList(scope.row)">领料</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin: 10px 0;">
-        <el-pagination
-          :current-page="PageCurrent4"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize4"
-          :total="total4"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange4"
-          @current-change="handleCurrentChange4"/>
+          @size-change="handleSizeChange2"
+          @current-change="handleCurrentChange2"/>
       </div>
     </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="领料单号" label-width="100px" size="small">
-          <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
-          <el-input-number v-model="form1.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form1.outNote" 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="submitAddBasicList()">确 定</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" class="demo-ruleForm">
-        <el-form-item label="领料单号" label-width="100px" size="small">
-          <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
-          <el-input-number v-model="form2.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form2.outNote" 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="submitAddPurchaseList()">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--滞货件领料对话框-->
-    <el-dialog :visible.sync="dialogFormVisible3" title="滞货件领料" center width="380px">
-      <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" class="demo-ruleForm">
-        <el-form-item label="领料单号" label-width="100px" size="small">
-          <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
-          <el-input-number v-model="form3.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form3.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible3=false">取消</el-button>
-        <el-button type="primary" @click="submitAddBacklogList()">确 定</el-button>
-      </div>
-    </el-dialog>
-    <!--车间采购件领料对话框-->
-    <el-dialog :visible.sync="dialogFormVisible4" title="车间采购件领料" center width="380px">
-      <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" class="demo-ruleForm">
-        <el-form-item label="领料单号" label-width="100px" size="small">
-          <el-input v-model="pickingListNumber" size="small" placeholder="空" readonly style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库数量" prop="outNumber" label-width="100px" size="small">
-          <el-input-number v-model="form4.outNumber" :min="0" :max="enableOut" controls-position="right" style="width: 200px"/>
-        </el-form-item>
-        <el-form-item label="出库备注" prop="outNote" label-width="100px">
-          <el-input v-model="form4.outNote" size="small" placeholder="注明领料人姓名" style="width: 200px"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="dialogFormVisible4=false">取消</el-button>
-        <el-button type="primary" @click="submitAddWorkshopList()">确 定</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart, searchList, addList, dropList,
-  addListDetail, searchListDetail, dropListDetail, searchHoursePart, searchBacklogPart, submitAddBacklogList, dropListDetailBasic } from '@/api/ManufacturingCenter/CreateIntakeList'
-import request from '@/utils/request'
+import { initProject, searchmachine, searchTeam, searchPurchasePart, searchBasicPart,
+  searchList, addList, dropList, searchListDetail, dropListDetailBasic, addBasicList, addPurchaseList } from '@/api/ManufacturingCenter/CreateIntakeList'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -522,8 +214,6 @@ export default {
       listLoading0: false, // 领料单
       listLoading1: false, // 自制件
       listLoading2: false, // 采购部采购件
-      listLoading3: false, // 滞货件
-      listLoading4: false, // 车间采购件
       PageCurrent0: 1,
       PageSize0: 10,
       total0: 0,
@@ -533,12 +223,6 @@ export default {
       PageCurrent2: 1,
       PageSize2: 10,
       total2: 0,
-      PageCurrent3: 1,
-      PageSize3: 10,
-      total3: 0,
-      PageCurrent4: 1,
-      PageSize4: 10,
-      total4: 0,
       ProjectValue: '',
       Project: [],
       ProjectValue_check: 0,
@@ -554,42 +238,6 @@ export default {
       tableDataPurchase: [], // 采购部采购件
       tableDataBacklog: [], // 滞货件
       tableDataHouse: [], // 车间采购件
-      form1: { // 基本件出库
-        outNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules1: { // 表单验证规则
-        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form2: { // 外购件出库
-        outNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules2: { // 表单验证规则
-        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form3: { // 车间采购出库
-        outNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules3: { // 表单验证规则
-        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      form4: {
-        outNumber: '', // 出库数量
-        outNote: '' // 出库备注
-      },
-      rules4: { // 表单验证规则
-        outNumber: [{ required: true, message: '请输入出库数量', trigger: 'blur' }],
-        outNote: [{ required: true, message: '请输入出库备注', trigger: 'blur' }]
-      },
-      dialogFormVisible1: false, // 自制件
-      dialogFormVisible2: false, // 采购部采购件
-      dialogFormVisible3: false, // 滞货件
-      dialogFormVisible4: false, // 车间采购件
       enableOut: '', // 可出库数量
       partPiant: '', // 零件图号
       material: '', // 材料
@@ -621,12 +269,27 @@ export default {
     this.fetchData()
     this.searchListinfor()
     this.searchPartinfo()
+    this.searchMachine()
   },
   methods: {
-    // 初始化项目,获取人员编号
-    fetchData() {
-      this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
-      this.picikingPeople = this.id
+    // 创建领料单
+    addListinfor() {
+      this.$confirm('确认创建新的领料单?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        addList(this.picikingPeople).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.searchListinfor()
+          } else {
+            this.$message.error('增加失败')
+          }
+        })
+      }).catch(() => {
+        this.$message('已取消操作')
+      })
     },
     // 查询领料单
     searchListinfor() {
@@ -649,75 +312,34 @@ export default {
       this.PageCurrent0 = val
       this.searchListinfor()
     },
-    // 创建领料单
-    addListinfor() {
-      this.$confirm('确认创建新的领料单?', '提示', {
+    // 选择领料单
+    chooseListinfor(row) {
+      this.pickingListNumberx = row.备料领料单流水号
+      // this.pickingListNumber = row.领料单编号
+      this.searchListDetailt()
+    },
+    // 查询领料单明细
+    searchListDetailt() {
+      searchListDetail(this.pickingListNumberx).then(response => {
+        this.tableDataPicking = response.data
+      })
+    },
+    // 移除
+    dropListdetail(row) {
+      this.$confirm('确认移除该零件?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        addList(this.picikingPeople).then(response => {
+        dropListDetailBasic(row.备料领料单明细流水号, row.是否外购, row.工艺计划流水号).then(response => {
           if (response.data[0].result === '1') {
-            this.$message.success('增加成功')
-            this.searchListinfor()
+            this.$message.success('删除成功')
+            this.searchListDetailt()
+            this.searchPartinfo()
           } else {
-            this.$message.error('增加失败')
+            this.$message.error('数据占用')
           }
         })
-      }).catch(() => {
-        this.$message('已取消操作')
-      })
-    },
-    // 确认领料单
-    checkListinfor(row) {
-      this.$confirm('是否确认领回?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const param = {
-          url: '',
-          method: 'post',
-          data: {
-            type: '4',
-            name: `update 车间装配管理_领料单_领料单 set 是否启用 = 0 where 领料单流水号 = ${row.领料单流水号}`
-          }
-        }
-        request(param).then(res => {
-          if (res.data[0].result === '1') {
-            this.$message.success('操作成功')
-            this.pickingListNumber = ''
-            this.searchListinfor()
-          } else {
-            this.$message.error('操作失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
-        })
-      })
-    },
-    // 删除领料单
-    dropListinfor(row) {
-      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.tableDataPicking.length === 0) {
-          dropList(row.领料单流水号).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('删除成功')
-              this.searchListinfor()
-            } else {
-              this.$message.error('数据占用')
-            }
-          })
-        } else {
-          this.$message.error('数据占用')
-        }
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -725,54 +347,10 @@ export default {
         })
       })
     },
-    // 删除领料单明细
-    dropListdetail(row) {
-      console.log(row)
-      if (Number(row.零件类型) === 3) { // 基本件
-        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          dropListDetailBasic(row.领料单明细流水号, row.收件信息ID, row.出库数量).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('删除成功')
-              this.searchListDetailt()
-              this.searchPartinfo()
-            } else {
-              this.$message.error('数据占用')
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-      } else { // 采购部采购件、滞货件
-        let isBacklog
-        Number(row.出库类型) === 4 ? isBacklog = 1 : isBacklog = 0
-        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          dropListDetail(row.领料单明细流水号, isBacklog).then(response => {
-            if (response.data[0].result === '1') {
-              this.$message.success('删除成功')
-              this.searchListDetailt()
-              this.searchPartinfo()
-            } else {
-              this.$message.error('数据占用')
-            }
-          })
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-      }
+    // 初始化项目,获取人员编号
+    fetchData() {
+      this.getSelect(initProject, ['项目名称', '项目流水号'], 'Project') // 项目名称
+      this.picikingPeople = this.id
     },
     // 查询机床
     searchMachine() {
@@ -792,16 +370,21 @@ export default {
     },
     // 查询组号
     searchGroupList() {
-      this.GroupNumValue = ''
-      this.GroupNum = []
-      searchTeam(this.MachineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.GroupNum.push({
-            label: response.data[i].组号,
-            value: response.data[i].组件流水号
-          })
-        }
-      })
+      if (this.MachineValue) {
+        this.GroupNumValue = ''
+        this.GroupNum = []
+        searchTeam(this.MachineValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.GroupNum.push({
+              label: response.data[i].组号,
+              value: response.data[i].组件流水号
+            })
+          }
+        })
+      } else {
+        this.GroupNumValue = ''
+        this.GroupNum = []
+      }
     },
     // 根据项目机床分组查零件/物料
     searchPartinfo() {
@@ -810,19 +393,38 @@ export default {
       this.GroupNumValue ? this.GroupNumValue_check = 1 : this.GroupNumValue_check = 0
       this.searchOwnPart() // 自制件
       this.searchPurchasePart() // 采购部采购件
-      this.searchBacklogPart() // 滞货件
-      this.searchWorkshopPart() // 车间采购件
     },
-    // 查询自制件
+    // 删除领料单
+    dropListinfor(row) {
+      this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.tableDataPicking.length === 0) {
+          dropList(row.备料领料单流水号).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('删除成功')
+              this.searchListinfor()
+            } else {
+              this.$message.error('数据占用')
+            }
+          })
+        } else {
+          this.$message.error('数据占用')
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 查询自家备料
     searchOwnPart() {
       this.tableDataBasic = []
       this.listLoading1 = true
       searchBasicPart(this.PageCurrent1, this.PageSize1, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        const data = response.data.rows
-        console.log(response.data.rows)
-        for (let i = 0; i < data.length; i++) {
-          data[i].可出库数量 === '0' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-        }
         this.tableDataBasic = response.data.rows
         this.total1 = response.data.total
         this.listLoading1 = false
@@ -838,28 +440,11 @@ export default {
       this.PageCurrent1 = val
       this.searchOwnPart()
     },
-    // 查询采购部采购件
+    // 查询外购备料
     searchPurchasePart() {
       this.tableDataPurchase = []
       this.listLoading2 = true
       searchPurchasePart(this.PageCurrent2, this.PageSize2, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].组件零件基本件流水号 === '0') {
-            response.data.rows[i].零件类型 = response.data.rows[i].零件类型代码
-            response.data.rows[i].类型名称 = response.data.rows[i].外购件类型
-          }
-        }
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].组件零件流水号 === '0') {
-            response.data.rows[i].物料名称 = response.data.rows[i].零件名称
-            response.data.rows[i].项目名称 = response.data.rows[i].基本件项目名称
-            response.data.rows[i].机床图号 = response.data.rows[i].基本件机床图号
-            response.data.rows[i].组号 = response.data.rows[i].基本件组号
-            response.data.rows[i].项目流水号 = response.data.rows[i].基本件项目流水号
-            response.data.rows[i].机床流水号 = response.data.rows[i].基本件机床流水号
-            response.data.rows[i].组件流水号 = response.data.rows[i].基本件组件流水号
-          }
-        }
         this.tableDataPurchase = response.data.rows
         this.listLoading2 = false
         this.total2 = response.data.total
@@ -875,244 +460,27 @@ export default {
       this.PageCurrent2 = val
       this.searchPurchasePart()
     },
-    // 查询滞货件
-    searchBacklogPart() {
-      this.listLoading3 = true
-      this.tableDataBacklog = []
-      searchBacklogPart(this.PageCurrent3, this.PageSize3, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        console.log(response.data.rows, 123)
-        this.tableDataBacklog = response.data.rows
-        this.listLoading3 = false
-        this.total3 = response.data.total
-      })
-    },
-    // 滞货件分页
-    handleSizeChange3(val) {
-      this.PageCurrent3 = 1
-      this.PageSize3 = val
-      this.searchBacklogPart()
-    },
-    handleCurrentChange3(val) {
-      this.PageCurrent3 = val
-      this.searchBacklogPart()
-    },
-    // 查询车间采购件
-    searchWorkshopPart() {
-      this.tableDataHouse = []
-      this.listLoading4 = true
-      searchHoursePart(this.PageCurrent4, this.PageSize4, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        this.tableDataHouse = response.data.rows
-        this.total4 = response.data.total
-        this.listLoading4 = false
-      })
-    },
-    // 车间采购件分页
-    handleSizeChange4(val) {
-      this.PageCurrent4 = 1
-      this.PageSize4 = val
-      this.searchWorkshopPart()
-    },
-    handleCurrentChange4(val) {
-      this.PageCurrent4 = val
-      this.searchWorkshopPart()
-    },
-    // 查询领料单明细
-    searchListDetailt() {
-      searchListDetail(this.pickingListNumberx).then(response => {
-        const data = response.data
-        for (let i = 0; i < data.length; i++) {
-          data[i].是否出库 === '1' ? data[i].是否禁用 = true : data[i].是否禁用 = false
-        }
-        this.tableDataPicking = data
-      })
-    },
-    // 选择领料单
-    chooseListinfor(row) {
-      this.pickingListNumberx = row.领料单流水号
-      this.pickingListNumber = row.领料单编号
-      this.searchListDetailt()
-    },
-    // 增加基本件领料单明细
+    // 自家备料领料
     addBasicList(row) {
-      if (this.$refs['form1'] !== undefined) {
-        this.$refs['form1'].resetFields()
-      }
-      this.dialogFormVisible1 = true
-      this.form1.outNumber = ''
-      this.form1.outNote = ''
-      this.partProjectNumber = row.项目流水号
-      this.partMachineNumber = row.机床流水号
-      this.partGroupNumber = row.组件流水号
-      this.partType = row.零件类型
-      this.craftplannumber = row.工艺计划流水号
-      this.receive = row.收件信息id
-      this.purchaseDetailNum = ''
-      this.askPurchaseNumber = ''
-      this.locatenumber = row.货位流水号
-      this.outType = 1
-      this.materialLocate = ''
-      this.materialName = row.零件名称
-      this.materialType = row.零件类型名称
-      this.materialNumber = row.零件图号
-      this.material = ''
-      this.enableOut = Number(row.可出库数量)
-    },
-    // 提交增加基本件领料单明细
-    submitAddBasicList() {
-      if (this.pickingListNumberx === '') {
-        this.$message.error('请选择领料单')
-      } else {
-        this.$refs['form1'].validate((valid) => {
-          if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form1.outNumber, this.partType, this.form1.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.materialNumber, this.material).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('增加成功')
-                this.searchPartinfo()
-                this.searchListinfor()
-                this.searchListDetailt()
-                this.dialogFormVisible1 = false
-              } else {
-                this.$message.error('增加失败')
-              }
-            })
-          }
-        })
-      }
-    },
-    // 增加外购件领料单明细
-    addPurchaseList(row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.dialogFormVisible2 = true
-      this.form2.outNumber = ''
-      this.form2.outNote = ''
-      this.partProjectNumber = row.项目流水号
-      this.partMachineNumber = row.机床流水号
-      this.partGroupNumber = row.组件流水号
-      this.partType = row.零件类型代码
-      this.craftplannumber = row.工艺计划流水号
-      this.receive = row.收件信息ID
-      this.purchaseDetailNum = row.采购合同明细流水号
-      this.askPurchaseNumber = ''
-      this.locatenumber = row.货位流水号
-      this.outType = 2
-      this.materialLocate = row.物料与货位对照流水号
-      this.materialName = row.物料名称
-      this.materialType = row.物料规格
-      this.materialNumber = row.物料型号
-      this.partPiant = row.零件图号
-      this.material = row.材料
-      this.enableOut = Number(row.货位存量 - row.待出库数量)
-    },
-    // 提交增加外购件领料单明细
-    submitAddPurchaseList() {
-      if (this.pickingListNumberx === '') {
-        this.$message.error('请选择领料单')
-      } else {
-        this.$refs['form2'].validate((valid) => {
-          if (valid) {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form2.outNumber, this.partType, this.form2.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('增加成功')
-                this.searchPartinfo()
-                this.searchListinfor()
-                this.searchListDetailt()
-                this.dialogFormVisible2 = false
-              } else {
-                this.$message.error('增加失败')
-              }
-            })
-          }
-        })
-      }
-    },
-    // 增加滞货件领料单明细
-    addBacklogList(row) {
-      if (this.$refs['form3'] !== undefined) {
-        this.$refs['form3'].resetFields()
-      }
-      console.log(row)
-      this.dialogFormVisible3 = true
-      this.partProjectNumber = row.项目流水号
-      this.partMachineNumber = row.机床流水号
-      this.partGroupNumber = row.组件流水号
-      this.form3.outNumber = ''
-      this.form3.outNote = ''
-      this.locatenumber = row.货位流水号
-      this.materialLocate = row.物料与货位对照流水号
-      this.materialName = row.物料名称
-      this.materialType = row.物料规格
-      this.materialNumber = row.物料型号
-      this.enableOut = Number(row.可出库数量)
-    },
-    // 提交增加滞货件领料单明细
-    submitAddBacklogList() {
-      console.log(123)
-      this.$refs['form3'].validate((valid) => {
-        if (valid) {
-          if (this.pickingListNumberx === '') {
-            this.$message.error('请选择领料单')
-          } else {
-            submitAddBacklogList(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form3.outNumber, this.form3.outNote, this.locatenumber, this.materialLocate, this.materialName, this.materialType, this.materialNumber).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('增加成功')
-                this.searchPartinfo()
-                this.searchListinfor()
-                this.searchListDetailt()
-                this.dialogFormVisible3 = false
-              } else {
-                this.$message.error('增加失败')
-              }
-            })
-          }
+      addBasicList(this.pickingListNumberx, row.工艺计划流水号).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          this.searchListDetailt()
+          this.searchPartinfo()
+        } else {
+          this.$message.error('数据占用')
         }
       })
     },
-    // 增加车间采购领料单明细
-    addWorkshopList(row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.dialogFormVisible4 = true
-      this.form4.outNumber = ''
-      this.form4.outNote = ''
-      this.partProjectNumber = row.项目流水号
-      this.partMachineNumber = row.机床流水号
-      this.partGroupNumber = row.组件流水号
-      this.partType = row.零件类型
-      this.craftplannumber = ''
-      this.receive = ''
-      this.purchaseDetailNum = ''
-      this.askPurchaseNumber = row.请购单明细流水号
-      this.locatenumber = row.货位流水号
-      this.outType = 3
-      this.materialName = row.物料名称
-      this.materialType = row.物料规格
-      this.materialNumber = row.物料型号
-      this.partPiant = row.零件图号
-      this.material = row.材料
-      this.enableOut = Number(row.货位存量)
-    },
-    // 提交增加车间采购领料单明细
-    submitAddWorkshopList() {
-      this.$refs['form4'].validate((valid) => {
-        if (valid) {
-          if (this.pickingListNumberx === '') {
-            this.$message.error('请选择领料单')
-          } else {
-            addListDetail(this.pickingListNumberx, this.partProjectNumber, this.partMachineNumber, this.partGroupNumber, this.form4.outNumber, this.partType, this.form4.outNote, this.craftplannumber, this.receive, this.purchaseDetailNum, this.askPurchaseNumber, this.locatenumber, this.outType, this.materialLocate, this.materialName, this.materialType, this.materialNumber, this.partPiant, this.material).then(response => {
-              if (response.data[0].result === '1') {
-                this.$message.success('增加成功')
-                this.searchPartinfo()
-                this.searchListinfor()
-                this.searchListDetailt()
-                this.dialogFormVisible4 = false
-              } else {
-                this.$message.error('增加失败')
-              }
-            })
-          }
+    // 外购备料领料
+    addPurchaseList(row) {
+      addPurchaseList(this.pickingListNumberx, row.工艺计划流水号).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('删除成功')
+          this.searchListDetailt()
+          this.searchPartinfo()
+        } else {
+          this.$message.error('数据占用')
         }
       })
     }
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index c8271a02..73b88622 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -398,8 +398,8 @@ export default {
       getExport(this.Group).then(res => {
         console.log(res.data)
         import('@/vendor/Export2Excel').then(excel => {
-          const tHeader = ['图号及规格', '制品名称', '计划数', '材料', '当前工序名']
-          const filterVal = ['零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
+          const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名']
+          const filterVal = ['机床图号', '组号', '零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称']
           const list = res.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index f0b7c63c..e6b8c119 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -176,7 +176,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -216,7 +216,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -261,7 +261,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -306,7 +306,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>
@@ -351,7 +351,7 @@
             {{ scope.row.任务名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="开始时间" align="center" min-width="100px">
+        <el-table-column label="计划开始时间" align="center" min-width="100px">
           <template slot-scope="scope">
             {{ scope.row.任务开始时间 }}
           </template>