diff --git a/src/api/Inventory/ExchangeApproval.js b/src/api/Inventory/ExchangeApproval.js
index 0f6f1d73..21c190be 100644
--- a/src/api/Inventory/ExchangeApproval.js
+++ b/src/api/Inventory/ExchangeApproval.js
@@ -13,14 +13,14 @@ export function searchExchangePart(pageCurrent, pageSize) {
   })
 }
 // 通过交换件
-export function approvalExchangepart(data1, data2, data3, data4, data5, data6) {
+export function approvalExchangepart(data1, data2, data22, data3, data33, data4, data5, data55, data6) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_交换件_交换件审批通过',
-      param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&交换件组件零件流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&交换数量=' + data6
+      param: '交换单流水号=' + data1 + '&交换件物料流水号=' + data2 + '&被交换件物料流水号=' + data22 + '&交换件组件零件流水号=' + data3 + '&被交换件组件零件流水号=' + data33 + '&交换件采购合同明细流水号=' + data4 + '&货位流水号=' + data5 + '&被货位流水号=' + data55 + '&交换数量=' + data6
     }
   })
 }
diff --git a/src/api/Inventory/ExchangePart.js b/src/api/Inventory/ExchangePart.js
index 450b71ef..47028fdc 100644
--- a/src/api/Inventory/ExchangePart.js
+++ b/src/api/Inventory/ExchangePart.js
@@ -73,14 +73,14 @@ export function searchExchangePart(pageCurrent, pageSize) {
   })
 }
 // 增加交换件
-export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data9, data10, data11) {
+export function addExchangepart(data1, data2, data3, data4, data5, data6, data7, data8, data88, data9, data10, data11, data12, data13) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_交换件_交换件增加',
-      param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11
+      param: '交换单编号=' + data1 + '&交换件组件零件流水号=' + data2 + '&交换件物料流水号=' + data3 + '&交换件采购合同明细流水号=' + data4 + '&被交换件组件零件流水号=' + data5 + '&交换件名称=' + data6 + '&被交换件名称=' + data7 + '&货位流水号=' + data8 + '&被交换货位流水号=' + data88 + '&交换数量=' + data9 + '&申请人=' + data10 + '&备注=' + data11 + '&领料单流水号=' + data12 + '&被交换件物料流水号=' + data13
     }
   })
 }
@@ -108,3 +108,15 @@ export function editExchangeList(data1, data2, data3, data4) {
     }
   })
 }
+// 领料单查询
+export function searchList1(listNumber_check, listNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_领料单_领料单查询',
+      param: '领料单编号_check=' + 0 + '&领料单编号=' + listNumber
+    }
+  })
+}
diff --git a/src/views/Inventory/ExchangeApproval/index.vue b/src/views/Inventory/ExchangeApproval/index.vue
index 44b806c0..fd9d97ae 100644
--- a/src/views/Inventory/ExchangeApproval/index.vue
+++ b/src/views/Inventory/ExchangeApproval/index.vue
@@ -129,7 +129,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.交换数量).then(response => {
+        approvalExchangepart(row.交换单流水号, row.交换件物料流水号, row.被交换件物料流水号, row.交换件组件零件流水号, row.被交换件组件零件流水号, row.交换件采购合同明细流水号, row.货位流水号, row.被交换货位流水号, row.交换数量).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('执行成功')
             this.searchTable1()
diff --git a/src/views/Inventory/ExchangePart/index.vue b/src/views/Inventory/ExchangePart/index.vue
index 24a83bdc..fdf92e01 100644
--- a/src/views/Inventory/ExchangePart/index.vue
+++ b/src/views/Inventory/ExchangePart/index.vue
@@ -71,8 +71,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="120">
           <template slot-scope="scope" align="center">
-            <el-button size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
-            <el-button size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
+            <el-button :disabled="scope.row.是否禁用" size="small" type="warning" icon="el-icon-sort-up" style="margin: 0 0 0 0px" @click="selecting(scope.row)">交换</el-button>
+            <el-button :disabled="scope.row.是否禁用" size="small" type="primary" icon="el-icon-sort-down" style="margin: 0 0 0 0px" @click="selected(scope.row)">被交换</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -166,7 +166,7 @@
           </div>
         </el-col>
       </el-row>
-      <!--新增交换件对话框-->
+      <!--交换件表格-->
     </el-card>
     <el-card>
       <el-table
@@ -246,6 +246,15 @@
         <el-form-item label="交换数量" prop="ExchangeNumberx" label-width="100px">
           <el-input v-model="form.ExchangeNumberx" size="small" placeholder="请输入交换数量" style="width: 200px"/>
         </el-form-item>
+        <el-form-item label="领料单" prop="ExchangeNumberx" label-width="100px">
+          <el-select v-model="PickingListNumber" filterable clearable size="small" placeholder="领料单号" style="width: 200px;margin-right:10px" @change="searchGroupList()">
+            <el-option
+              v-for="item in PickingList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="ExchangeNote" label-width="100px">
           <el-input v-model="form.ExchangeNote" size="small" placeholder="请输入备注" style="width: 200px"/>
         </el-form-item>
@@ -260,7 +269,7 @@
 </template>
 
 <script>
-import { initProject, searchmachine, searchTeam, searchPurchasePart, addExchangepart, searchExchangePart, dropExchangeList, editExchangeList } from '@/api/Inventory/ExchangePart'
+import { initProject, searchmachine, searchTeam, searchPurchasePart, addExchangepart, searchExchangePart, dropExchangeList, editExchangeList, searchList1 } from '@/api/Inventory/ExchangePart'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -316,7 +325,9 @@ export default {
       listLoading1: '',
       exchangeListNumber: '',
       eTeamPartNumber: '',
-      title: ''
+      title: '',
+      PickingListNumber: '',
+      PickingList: []
     }
   },
   computed: {
@@ -328,6 +339,7 @@ export default {
     this.fetchData()
     this.getpeopleid()
     this.getExchangeTable()
+    this.searchPickingList()
   },
   methods: {
     fetchData() {
@@ -368,6 +380,16 @@ export default {
         }
       })
     },
+    searchPickingList() {
+      searchList1().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.PickingList.push({
+            label: response.data[i].领料单编号,
+            value: response.data[i].领料单流水号
+          })
+        }
+      })
+    },
     searchPartinfo() {
       this.tableDataPurchase = []
       this.tableDataBasic = []
@@ -382,8 +404,13 @@ export default {
       }
       this.listLoading = true
       searchPurchasePart(this.PageCurrent, this.PageSize, this.ProjectValue_check, this.ProjectValue, this.MachineValue_check, this.MachineValue, this.GroupNumValue_check, this.GroupNumValue).then(response => {
-        this.tableDataPurchase = response.data.rows
         this.total = response.data.total
+        const data = response.data.rows
+        console.log(data)
+        for (let i = 0; i < data.length; i++) {
+          data[i].是否交换 === '1' || data[i].是否交换 === '2' ? data[i].是否禁用 = true : data[i].是否禁用 = false
+        }
+        this.tableDataPurchase = data
       })
       this.listLoading = false
     },
@@ -428,7 +455,7 @@ export default {
     addListDetailinfor(form) {
       this.$refs[form].validate((valid) => {
         if (valid) {
-          addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote).then(response => {
+          addExchangepart(this.form.ExchangeNumber, this.tableData1[0].组件零件流水号, this.tableData1[0].物料流水号, this.tableData1[1].物料流水号, this.tableData1[0].采购合同明细流水号, this.tableData2[0].组件零件流水号, this.tableData1[0].物料名称, this.tableData2[0].物料名称, this.tableData1[0].货位流水号, this.tableData2[0].货位流水号, this.form.ExchangeNumberx, this.picikingPeople, this.form.ExchangeNote, this.PickingListNumber).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
             } else { this.$message.error('增加失败') }
@@ -436,6 +463,7 @@ export default {
             this.dialogFormVisible = false
             this.PageCurrent1 = 1
             this.getExchangeTable()
+            this.searchPartinfo()
           })
         }
       })
diff --git a/src/views/Inventory/SubstitutePart/index.vue b/src/views/Inventory/SubstitutePart/index.vue
index a3c908db..1bd744ac 100644
--- a/src/views/Inventory/SubstitutePart/index.vue
+++ b/src/views/Inventory/SubstitutePart/index.vue
@@ -349,18 +349,24 @@ export default {
       this.picikingPeople = this.id
       console.log(this.picikingPeople)
     },
-    searchMachine() { // 查询机床
-      if (this.ProjectValue === '') {
+    searchMachine() {
+      this.MachineValue = ''
+      this.Machine = []
+      this.GroupNumValue = ''
+      this.GroupNum = []
+      if (this.ProjectValue !== '') {
+        this.ProjectValue_check = 1
+        searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
+          for (let i = 0; i < response.data.length; i++) {
+            this.Machine.push({
+              label: response.data[i].机床图号,
+              value: response.data[i].机床流水号
+            })
+          }
+        })
+      } else {
         this.ProjectValue_check = 0
       }
-      searchmachine(this.ProjectValue_check, this.ProjectValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machine.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号
-          })
-        }
-      })
     },
     searchGroupList() { // 查询组号
       searchTeam(this.MachineValue).then(response => {