Merge branch 'feature/Feature-return' into develop

src/views/supply/apply/components/apply_form.vue

@@ -395,9 +395,9 @@ export default {
       if(!this.screenForm.warehouse) {
         return this.$errorMsg('请选择仓库');
       }
-      // if(!this.screenForm.type) {
-      //   return this.$errorMsg('请选择存货类别');
-      // }
+      if(!this.screenForm.type) {
+        return this.$errorMsg('请选择存货类别');
+      }
       this.currentPage = 1;
       this.getGoodsList();
     },

src/views/supply/apply/components/apply_return_form.vue

@@ -387,9 +387,9 @@ export default {
       // if(!this.screenForm.warehouse) {
       //   return this.$errorMsg('请选择仓库');
       // }
-      // if(!this.screenForm.type) {
-      //   return this.$errorMsg('请选择存货类别');
-      // }
+      if(!this.screenForm.type) {
+        return this.$errorMsg('请选择存货类别');
+      }
       this.currentPage = 1;
       this.getSalesGoodsList();
     },