备注

src/views/wms/output/inrequest/components/InRequestForm.vue

@@ -447,7 +447,6 @@ export default {
           }
           const {
             data: { list },
-<<<<<<< HEAD
           } = await InRequestApi.getMaterialPage(params);
 
           // 每次搜索都重新赋值，保证列表始终是最新数据
@@ -465,34 +464,6 @@ export default {
             this.materialNameList = [];
           }
         } finally {
-=======
-          } = await InRequestApi.getMaterialPage({
-            code: query,
-            pageSize: 999,
-          });
-          this.materialNoList = list || [];
-        }, 200);
-      } else {
-        this.materialNoList = [];
-      }
-    },
-    changeMaterialNo(value) {
-      const data = value.split("-");
-      this.materialNoList.map((v, i) => {
-        if (i == data[0]) {
-          v.materialNo = v.code;
-          v.materialName = v.name;
-          this.formData.list[data[1]] = v;
-          this.formData.list = [...this.formData.list];
-        }
-      });
-    },
-    remoteMaterialName(query) {
-      if (query !== "") {
-        const that = this;
-        this.loading = true;
-        setTimeout(async () => {
->>>>>>> 9e52fcef6409489c17ce7d5a2167c411be03d248
           this.loading = false;
         }
       } else {