diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index ad97ba53..86c3d2a3 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -229,27 +229,6 @@ export default {
           // })
           this.tableData = response.data.rows
           this.total = response.data.total
-<<<<<<< HEAD
-=======
-        }
-      }).then(() => {
-        for (let i = 0; i < this.Data.length; i++) {
-          searchtable2(this.Data[i].工艺计划流水号).then(response => {
-            this.tableData.push({
-              工艺计划流水号: this.Data[i].工艺计划流水号,
-              零件名称: this.Data[i].零件名称,
-              零件图号: this.Data[i].零件图号,
-              备料打印: this.Data[i].备料打印,
-              是否外购备料: this.Data[i].是否外购备料,
-              工艺要求: response.data[0].工艺要求,
-              材料: this.Data[i].材料,
-              重量: this.Data[i].重量,
-              批次数量: this.Data[i].批次数量,
-              备料任务接受时间: this.Data[i].备料任务接受时间,
-              备料任务分配时间: this.Data[i].备料任务分配时间
-            })
-          })
->>>>>>> 0b6cb6f55ad7cb26c02017b256ea0ec59eca150f
           this.loading = false
         }
       })