Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wms into dev

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -252,6 +252,7 @@ import selectTree from '@/components/selectTree';
 import AssetsDialog from '../components/AssetsDialog.vue';
 import { deepClone } from '@/utils';
 export default {
+  name:'outgoingManagementAdd',
   components: {
     selectTree,
     AssetsDialog,
@@ -311,7 +312,7 @@ export default {
           message: '请选择出库场景',
           trigger: 'change'
         },
-        'extInfo[assetType]': {
+        'extInfo.assetType': {
           required: true,
           message: '请选择物品类型',
           trigger: ['change', 'blur']
@@ -321,7 +322,7 @@ export default {
           message: '请选择领料人',
           trigger: 'change'
         },
-        'extInfo[verifyDeptCode]': {
+        'extInfo.verifyDeptCode': {
           required: true,
           message: '请选择领料人部门',
           trigger: ['change', 'blur']
@@ -784,6 +785,13 @@ export default {
         );
       },
       deep: true
+    },'$route.query': {
+      handler(newQuery, oldQuery) {
+       if(newQuery?.detailId){
+        this._getInfo(newQuery.detailId)
+       }
+      },
+      deep: true, // 确保对象内部的属性变化也能被监听到
     }
   }
 };

src/views/warehouseManagement/stockManagement/add.vue

@@ -518,6 +518,7 @@ import { deepClone } from '@/utils';
 import BigNumber from 'bignumber.js';
 import { isBoolean } from 'mathjs';
 export default {
+  name:'stockManagementAdd',
   components: {
     selectType,
     WarehousingDialog,
@@ -607,7 +608,15 @@ export default {
         );
       },
       deep: true
+    } ,'$route.query': {
+      handler(newQuery, oldQuery) {
+       if(newQuery?.detailId){
+         this.viewInit()
+       }
+      },
+      deep: true, // 确保对象内部的属性变化也能被监听到
     }
+    
   },
   created() {
     if (this.$route.query.name == 'inboundRequests') {
@@ -663,6 +672,15 @@ export default {
         });
     }
     if (this.$route.query.detailId) {
+    this.viewInit()
+    }
+  },
+  methods: {
+    ...mapActions('dict', ['requestDict']),
+    changeCount(number) {
+      return new BigNumber(number).toString();
+    },
+    viewInit(){
       storageApi
         .getInboundDetailsById(this.$route.query.detailId)
         .then(async (data) => {
@@ -748,12 +766,6 @@ export default {
           });
           this.materialList = iArr;
         });
-    }
-  },
-  methods: {
-    ...mapActions('dict', ['requestDict']),
-    changeCount(number) {
-      return new BigNumber(number).toString();
     },
     selectSupplier(val, row) {
       row.supplierId = val;

src/views/warehouseManagement/warehouseDefinition/components/WarehouseEdit.vue

@@ -237,7 +237,7 @@ export default {
       // let data = org.factorys({ status: true });
       this.factoryList = res.list;
 
-      const res2 = await warehouseDefinition.getTreeByGroup({ type: 1 });
+      const res2 = await warehouseDefinition.getTreeByGroup({ type: 2 });
       this.inventoryTypeList = res2;
     },
     changeInventoryType(val) {