lilei 2 lat temu
rodzic
commit
6f4542df1b

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1675306916034
+  "version": 1675325476007
 }

+ 2 - 2
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -747,8 +747,8 @@ export default {
               item.warehouseLocationList.filter(subItem => {
                 if (subItem.defaultFlag == 1 && subItem.wasteFlag == 0) {
                   _this.defaultWarehouseCascade[1] = subItem.warehouseLocationSn
-                  _this.$refs.table.refresh(true)
-                  _this.$refs.chooseTable.refresh(true)
+                  // _this.$refs.table.refresh(true)
+                  // _this.$refs.chooseTable.refresh(true)
                 }
               })
             }

+ 6 - 2
src/views/common/warehouse.js

@@ -37,6 +37,10 @@ const Warehouse = {
       type: Boolean,
       default: false
     },
+    showDefault:{
+      type: Boolean,
+      default: true
+    }
   },
   data () {
     return {
@@ -85,7 +89,7 @@ const Warehouse = {
             }
           })
           this.warehouseCascadeData = res.data
-          if(this.defaultVal&&this.defaultVal.length==0){
+          if(this.defaultVal&&this.defaultVal.length==0&&this.showDefault){
             this.handleChange(_this.defaultWarehouseCascade)
           }
         } else {
@@ -94,7 +98,7 @@ const Warehouse = {
       })
     },
     setDefaultVal(){
-      if(this.defaultVal&&this.defaultVal.length==0){
+      if(this.defaultVal&&this.defaultVal.length==0&&this.showDefault){
         this.handleChange(this.defaultWarehouseCascade)
       }
     }

+ 1 - 6
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -32,7 +32,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="仓库仓位">
-                <Warehouse id="inventoryQueryList-warehouse" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
+                <Warehouse id="inventoryQueryList-warehouse" :showDefault="false" :changeOnSelect="true" ref="warehouse" v-model="queryParam.warehouse"></Warehouse>
               </a-form-model-item>
             </a-col>
             <template v-if="advanced">
@@ -444,11 +444,6 @@ export default {
       })
       // 是否默认包括禁用产品
       this.queryParam.enableFlag = localStorage.getItem('productEnabledFlag-' + this.$store.state.user.info.orgId) != 'false'
-      
-      this.$nextTick(() => {
-        this.queryParam.warehouse = []
-        this.$refs.warehouse.setDefaultVal()
-      })
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight