Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/purchase-order/add/index.vue

@@ -106,6 +106,11 @@ export default {
 
         // let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
         let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10', '21-Cxx-14'];
+
+        this.params.warehouse = '';
+        this.params.warehouseName = '';
+        this.params.goodsAllocation = '';
+        this.params.goodsAllocationName = '';
         
         if(billList.find(item => item === nVal)){
           this.rules.warehouseName = [
@@ -114,6 +119,7 @@ export default {
         }else{
           this.rules.warehouseName = null;
         }
+        this.rules.goodsAllocationName = null;
 
         this.count++;
       }

src/views/purchase/purchase-order/edit/index.vue

@@ -86,7 +86,7 @@ export default {
 
         // let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
         let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10', '21-Cxx-14'];
-        
+
         if(billList.find(item => item === nVal)){
           this.rules.warehouseName = [
             { required: true, message: "WMS入库仓库不能为空", trigger: "change" },
@@ -518,13 +518,17 @@ export default {
 
     },
 
-    // 子表Select改变之后
+    // Select改变之后
      handleSelectChange(val,typeName){
 
       if(val === 'billType'){
 
-       this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
-      
+        this.params['billTypeName'] = this.dict.type[typeName].find(item => item.value == this.params[val]).label;
+        this.params.warehouse = '';
+        this.params.warehouseName = '';
+        this.params.goodsAllocation = '';
+        this.params.goodsAllocationName = '';
+        this.rules.goodsAllocationName = null;
       }
 
     },