Merge remote-tracking branch 'origin/master'

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -142,8 +142,26 @@ const { tableObject, tableMethods } = useTable({
   }
   fromInventoryStatus.value = 'SCRAP'
   toInventoryStatus.value = "HOLD"
+} else {
+  console.log(146 , fromInventoryStatus.value)
+  fromInventoryStatus.value = null
 }
 
+// 修改 tableform 属性
+InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
+  if(item.field == 'fromPackingNumber') {
+    if (fromInventoryStatus.value) {
+      item.tableForm.searchCondition = [{
+        key: 'inventoryStatus',
+        value: fromInventoryStatus.value,
+        isMainValue: false
+      }]
+    } else {
+      delete item.tableForm.searchCondition
+    }
+  }
+})
+
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val