Merge remote-tracking branch 'origin/master'

src/views/system/param/BasicEntrutsReceModify.vue

@@ -6,6 +6,7 @@
           <el-form-item label="当前仓库" prop="curInv">
             <el-select v-model="inputQuery.curInv" placeholder="当前仓库"
                        @change="curInvChange"
+                       @clear="clear"
                        filterable
                        style="width: 90%"
                        clearable>
@@ -42,6 +43,7 @@
           <el-form-item label="委托仓库" prop="entrustInv">
             <el-select v-model="inputQuery.entrustInv" placeholder="委托仓库"
                        @change="entrustInvChange"
+                       @clear="clear1"
                        filterable
                        style="width: 90%"
                        clearable>
@@ -170,12 +172,15 @@ export default {
 
     //切换当前仓库
     curInvChange() {
+
+      this.getOrderType();
+      this.findEntrustInv();
+    },
+    clear(){
       this.inputQuery.action = null;
       this.inputQuery.entrustInv = null;
       this.inputQuery.entrustUser = null;
       this.inputQuery.entrustAction = null;
-      this.getOrderType();
-      this.findEntrustInv();
     },
 
     //获取当前单据类型
@@ -204,9 +209,11 @@ export default {
 
     //切换委托仓库
     entrustInvChange() {
+      this.getUserBus();
+    },
+    clear1(){
       this.inputQuery.entrustUser = null;
       this.inputQuery.entrustAction = null;
-      this.getUserBus();
     },