diff --git a/.vscode/settings.json b/.vscode/settings.json
index c47d1d2..9d4b60a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -57,7 +57,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
   },
   "editor.quickSuggestions": {
     "strings": true
diff --git a/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue b/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue
index b489bb5..ce0bb1c 100644
--- a/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue
+++ b/src/pages/raw/ingoods/SpareInbound/pickOrder/index.vue
@@ -123,12 +123,15 @@ export default class productCheckReceipt extends BasePage {
     await this.model.queryOrderNo(this.orderNumber);
     this.productCodeList = this.model.productCodeList[0];
     this.histroyItem = this.model.orderNoItemList[0];
+    this.boxjilu = this.histroyItem.boxOrder + '/' + this.histroyItem.boxNumber;
+    this.supplierCode = this.histroyItem.supplierCode;
   }
   histroyItem: any = {};
   selectProductCode(e: any) {
     this.model.productCodeList.forEach((item: any) => {
       if (item.rowItem == e.pickerName.value) {
         this.histroyItem = item;
+        this.boxjilu = this.histroyItem.boxOrder + '/' + this.histroyItem.boxNumber;
         this.productCodeList = item;
       }
     });
@@ -155,6 +158,14 @@ export default class productCheckReceipt extends BasePage {
       rowItem: this.productCodeList.value,
       boxCode: this.boxCode,
       materialCode: this.histroyItem.materialCode,
+      materialDesc: this.histroyItem.materialDesc,
+      supplierCode: this.supplierCode,
+      createDate: this.histroyItem.createDate,
+      supplierName: this.histroyItem.supplierName,
+      reqDate: this.histroyItem.reqDate,
+      createBy: this.histroyItem.createBy,
+      // boxNumber: this.histroyItem.boxNumber,
+      // boxOrder: this.histroyItem.boxOrder,
     };
     await this.model.OnSubmit(params);
     if (this.model.SubmitCode == '1') {
@@ -171,6 +182,8 @@ export default class productCheckReceipt extends BasePage {
       });
       console.log('456', findvalue);
       this.boxjilu = findvalue[0].boxOrder + '/' + findvalue[0].boxNumber;
+      this.histroyItem.boxOrder = findvalue[0].boxOrder;
+      this.histroyItem.boxNumber = findvalue[0].boxNumber;
       this.barCodeNumber = findvalue[0].barCodeNumber;
       this.supplierCode = findvalue[0].supplierCode;
       //this.boxjilu = this.boxreturndata.boxOrder + '/' + this.boxreturndata.boxNumber;
diff --git a/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts b/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts
index fc083d7..d41d86d 100644
--- a/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts
+++ b/src/pages/raw/ingoods/SpareInbound/pickOrder/model.ts
@@ -25,6 +25,14 @@ export class wholeTransfer extends VuexModule {
   }
   orderNoItemList: any = [];
   productCodeList: any = [];
+  noReapet5(array) {
+    const arr = [];
+    for (let i = 0, l = array.length; i < l; i++) {
+      for (let j = i + 1; j < l; j++) if (array[i].rowItem === array[j].rowItem) j = ++i;
+      arr.push(array[i]);
+    }
+    return arr;
+  }
   //查单号
   @MutationAction
   async queryOrderNo(orderNo: any) {
@@ -34,11 +42,17 @@ export class wholeTransfer extends VuexModule {
       orderNumber: orderNo,
     });
     const orderNoItemList = result.data;
-    const productCodeList = result.data.map((_: any) => ({
+    const productCodeListold = result.data.map((_: any) => ({
       label: _.rowItem,
       value: _.rowItem,
       ..._,
     }));
+    const arr = [];
+    for (let i = 0, l = productCodeListold.length; i < l; i++) {
+      for (let j = i + 1; j < l; j++) if (productCodeListold[i].rowItem === productCodeListold[j].rowItem) j = ++i;
+      arr.push(productCodeListold[i]);
+    }
+    const productCodeList = arr;
     return { orderNoItemList, productCodeList };
   }
   SubmitCode: any = '';