diff --git a/src/views/basic/BussinessTypeLoclModify.vue b/src/views/basic/BussinessTypeLoclModify.vue
index bf3e71b..972fbb3 100644
--- a/src/views/basic/BussinessTypeLoclModify.vue
+++ b/src/views/basic/BussinessTypeLoclModify.vue
@@ -455,6 +455,7 @@ export default {
             this.editQuery = JSON.parse(JSON.stringify(row));
             this.editChangeTypeVisible = true;
             this.getBusTypes();
+            this.findDefaultSubInv();
         }
         ,
         hideForm() {
@@ -527,6 +528,7 @@ export default {
                 });
         },
         findDefaultSubInv() {
+
             this.subInvList = [];
             let query = {
                 pcode: this.editQuery.defaultInv
@@ -539,8 +541,7 @@ export default {
                 });
         },
         invChange() {
-            if (this.$isNotBlank(this.inputQuery.defaultSubInv))
-                this.inputQuery.defaultSubInv = null;
+            this.editQuery.defaultSubInv = null;
             this.findDefaultSubInv();
         },
     },
@@ -549,6 +550,7 @@ export default {
         this.getTypes();
         this.getList();
         this.getStorage();
+
     }
 }
 ;
diff --git a/src/views/basic/UdiRlDetailDialog.vue b/src/views/basic/UdiRlDetailDialog.vue
index c554957..24ebe4e 100644
--- a/src/views/basic/UdiRlDetailDialog.vue
+++ b/src/views/basic/UdiRlDetailDialog.vue
@@ -421,6 +421,9 @@ export default {
     },
 
     created() {
+        if(this.editQuery.isUseDy==1){
+            this.checked=true
+        }
         let ttquery = {
             uuid: this.editQuery.uuid,
             page: 1,
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 549ba37..8821544 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -1214,10 +1214,10 @@ export default {
         //         });
         // },
         getBusType() {
-          
-           if( this.formData.id==null){
-            this.formData.billType=null;
-           }
+
+            if(this.$isBlank(this.idQuery.id)){
+                this.formData.billType=null;
+            }
             let query = {
                 code: this.formData.invWarehouseCode,
                 enabled: true,
@@ -1383,6 +1383,13 @@ export default {
         if(this.formData.invWarehouseCode!=null){
         this.getBusType();
        }
+
+        //判断有没有仓库再执行
+        if(this.formData.locStorageCode!=null){
+            this.findStorageMethod();
+        }
+
+
         this.getStorage();
         this.findSubInvByInv();
         this.findSubStorageMethod();
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index 0104b77..98ddb8e 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -289,6 +289,10 @@ export default {
         getList() {
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
+            if( this.data.companyName!=undefined && this.data.companyName!=null ){
+                this.listQuery.companyName = this.data.companyName;
+            }
+
 
             if (this.filterType != null && this.filterType === 2) {
                 filterAllProduct(this.listQuery)
@@ -340,7 +344,7 @@ export default {
                 this.$message.error('未选择产品');
                 return;
             }
-            
+
             if(this.ids.length>0){
                 for(var i=0;i<this.ids.length;i++){
                    if(this.ids[i]==this.multipleSelection.rlId){
@@ -397,7 +401,7 @@ export default {
                this.multipleSelection.zczbhhzbapzbh = this.currentCert;
                this.combine();
             }
-           
+
         },
     },
     components: {udiRlDetailDialog},
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 3540f50..c8cfc8a 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -1075,10 +1075,11 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                let param = {billNo: row.billNo};
+                let param = {billNo: row.billNo,contrastStatus:2};
                 rollbackOrder(param).then((res) => {
                     if (res.code === 20000) {
                         this.$message.success("回退成功");
+                        this.getList();
                     }
                 })
             }).catch(() => {
diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 350e704..fd786bd 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -834,14 +834,10 @@ export default {
 
 
                     } else {
-                        this.$alert(response.message, '提示', {
-                            confirmButtonText: '确定',
-                            type: 'warning',
-                            closeOnClickModal: true,
-                            callback: action => {
-                                this.$refs.inputRef.focus();
-                                this.$refs.inputRef.select();
-                            }
+                        this.$message({
+                            type: 'error',
+                            message: "提交失败！" + this.editTitle,
+                            customClass: 'messageIndex'
                         });
                     }
                 }
diff --git a/src/views/inventory/InvPreInProductsDetail.vue b/src/views/inventory/InvPreInProductsDetail.vue
index 707241a..a74b5da 100644
--- a/src/views/inventory/InvPreInProductsDetail.vue
+++ b/src/views/inventory/InvPreInProductsDetail.vue
@@ -185,12 +185,12 @@ export default {
         getCodeList() {
             this.loading = true;
             this.query.orderIdFk = this.idQuery.orderIdFk;
-            debugger
-            let query = {
-                orderIdFk: this.idQuery.orderIdFk,
-                code:this.query.code
-            }
-            filterDetailProducts(query) //查找该单号下的所有条码
+
+            // let query = {
+            //     orderIdFk: this.idQuery.orderIdFk,
+            //     code:this.query.code
+            // }
+            filterDetailProducts(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;
                     this.codeArry = response.data.list || [];
diff --git a/src/views/inventory/invPreInProducts.vue b/src/views/inventory/invPreInProducts.vue
index a9bbe73..3a594e3 100644
--- a/src/views/inventory/invPreInProducts.vue
+++ b/src/views/inventory/invPreInProducts.vue
@@ -34,7 +34,9 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
-
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.orderIdFk" placeholder="所属单号"></el-input>
+                    </el-form-item>
 
                 </el-row>
                 <el-row style="width: 100%">