fix:修复冲突

src/pages/raw/ingoods/dnReceipt/ImportDN.vue

@@ -98,10 +98,11 @@
   </view>
 </template>
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
+import { Component, Ref } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import jPicker from '@/components/J-Picker/jPicker.vue';
 import { session } from '@/store/modules/session';
+import { VForm, VFormRules } from 'vue/types/form';
 import model from './model';
 @Component({
   components: {
@@ -214,6 +215,14 @@ export default class dnReceiptDom extends BasePage {
         return true;
       }
     });
+    // this.material.forEach((item: any) => {
+    //   if (item.poNo == e.pickerName.value) {
+    //     let pickerName: any = {};
+    //     pickerName.label = item.materialCode;
+    //     pickerName.value = item.materialCode;
+    //     this.materialList.push(pickerName);
+    //   }
+    // });
   }
   //选择物料后触发的回调事件  本次数量：receiptAmount  需求数量：requestAmount  选择一条物料候every=这条物料对应的所有数据
   materialChoice(e: any) {