修改bug

src/views/inventory/DialogInvProduct.vue

@@ -152,6 +152,7 @@ export default {
     },
     methods: {
         onReset() {
+
             this.$router.push({
                 path: "",
             });
@@ -165,6 +166,8 @@ export default {
                 supId: null,
                 page: 1,
                 limit: 10,
+                invStorageCode:this.invQueryData.locStorageCode,
+                invWarehouseCode:this.invQueryData.invWarehouseCode
             };
             this.getList();
         },
@@ -333,6 +336,7 @@ export default {
         };
     },
     created() {
+
         this.getBusType();
         let query = this.$route.query;
 

src/views/purchase/purPlanEditDialog.vue

@@ -356,9 +356,6 @@ export default {
                         if (this.formData.billDate == "" || this.formData.billDate == null) {
                             return this.$message.error("单据日期不能为空！");
                         }
-                        if(this.formData.billType=="" || this.formData.billType==null){
-                            return this.$message.error("采购类型不能为空！");
-                        }
 
                         if(this.formData.invWarehouseCode=="" || this.formData.invWarehouseCode==null){
                             return this.$message.error("采购分库不能为空！");

src/views/thrsys/thrOrderNew.vue

@@ -499,7 +499,9 @@ export default {
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;
+                        this.formData.locStorageCode = this.subInvList[0].parentId;
                         this.getBusType();
+                        this.findSubStorageMethod();
                     }
                 })
                 .catch(() => {
@@ -514,30 +516,11 @@ export default {
             }
         },
 
-        //往来仓库
-        findStorageMethod() {
-            if (this.formData.locStorageCode == null)
-                return;
-            this.fromStorageOptions = [];
-            let cQuery = {
-                locInvCode: this.formData.locStorageCode,
-            };
-            filterAllByLoc(cQuery)
-                .then((response) => {
-                    let temp = response.data || [];
-                    for (let i = 0; i < temp.length; i++) {
-                        if (temp[i].code != this.formData.locStorageCode) {
-                            this.fromStorageOptions.push(temp[i]);
-                        }
-                    }
 
-                })
-                .catch(() => {
-                });
-        },
 
         //往来分库
         findSubStorageMethod() {
+            debugger
             let cQuery = {
                 code: this.formData.invWarehouseCode,
                 filter: 2,
@@ -918,7 +901,6 @@ export default {
             }
             this.formData.locStorageCode = item;
             this.$forceUpdate();
-            this.findStorageMethod();
             this.findSubInvs();
         },
 
@@ -960,7 +942,7 @@ export default {
 
         this.getBusType();
         this.findSubInvs();
-        this.findSubStorageMethod();
+
         // this.findSubInvByInv();
         this.codeArray = [];
         this.closeConfirmFunction(false);

src/views/warehouse/IONewOrder.vue

@@ -476,6 +476,7 @@ export default {
             this.idQuery.corpOrderId = '';
             this.idQuery.outChangeEnable = row.outChangeEnable;
             if (row.id !== null && row.id !== undefined && row.id !== '') {
+
                 this.idQuery.id = row.id;
                 this.idQuery.actDate = row.actDate;
                 this.idQuery.corpOrderId = row.corpOrderId;

src/views/warehouse/addHosOrder.vue

@@ -1005,7 +1005,6 @@ export default {
             };
             filterSubByInv(cQuery)
                 .then((response) => {
-
                     this.fromSubStorageOptions = response.data || [];
                     if (val == 1) {
 
@@ -1182,7 +1181,7 @@ export default {
 
     },
     created() {
-
+        debugger
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];
@@ -1221,9 +1220,9 @@ export default {
             if (this.$isNotBlank(this.formData.locStorageCode)) {
                 this.findStorageMethod();
             }
+            this.findSubStorageMethod();
         }
         this.findSubInvByInv();
-        this.findSubStorageMethod();
         this.getBusType();
 
         //查询是否启用多级仓库，判断是否启用部门

src/views/warehouse/selectReceiveOrderDialog.vue

@@ -80,7 +80,7 @@
                     <el-table-column label="单据号" prop="billNo"></el-table-column>
                     <el-table-column label="往来单位" prop="corpName" width="300"
                                      show-overflow-tooltip="true"></el-table-column>
-                    <el-table-column label="单据类型" prop="billType"></el-table-column>
+                    <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
                     <el-table-column label="单据状态" prop="billFlag" width="80"></el-table-column>
                     <el-table-column label="单据日期" prop="billdate"></el-table-column>
                 </el-table>

src/views/warehouse/stockHospOrderNew.vue

@@ -800,6 +800,7 @@ export default {
                     };
                     this.selectInvProductVisible = true;
                 } else {
+
                     this.selectProductVisible = true;
                 }
                 return;

src/views/warehouse/stockOrderNewSelectProduct.vue

@@ -302,10 +302,11 @@ export default {
             this.getList();
         },
         getList() {
+            debugger
 
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
-            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined){
+            if(this.listQuery.customerId==110 && this.data.formData!=null && this.data.formData!=undefined && this.data.formData.noInvOut==false){
                 this.listQuery.companyName=this.data.formData.corpName
             }
             if(this.listQuery.customerId!=110 && this.data!=null && this.data!=undefined){