Merge remote-tracking branch 'origin/master'

src/components/BasicForm/src/BasicForm.vue

@@ -68,6 +68,7 @@
         :tableData="tableData"
         :tableFormRules="tableFormRules"
         :isShowButton="isShowButton"
+        :isShowReduceButton="isShowReduceButton"
         @handleAddTable="handleAddTable"
         @handleDeleteTable="handleDeleteTable"
         @tableSelectionChange="tableSelectionChange"
@@ -113,6 +114,11 @@ const props = defineProps({
     type: Boolean,
     default: true
   },
+  // 是否显示tableForm 删除按钮
+  isShowReduceButton: {
+    type: Boolean,
+    default: true
+  },
   // 校验rules
   rules: {
     type: Object,

src/components/TableForm/src/TableForm.vue

@@ -269,7 +269,7 @@
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 const props = defineProps({
-  // 是否显示删除按钮
+  // 是否显示添加按钮
   isShowButton: {
     type: Boolean,
     default: true,
@@ -284,6 +284,7 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  // 是否显示删除按钮
   isShowReduceButton:{
     type: Boolean,
     default: true,

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts

@@ -460,14 +460,14 @@ export const CustomerreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  {
+  // {
-    label: '包装号',
+  //   label: '包装号',
-    field: 'packingNumber',
+  //   field: 'packingNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

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

@@ -167,6 +167,38 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
       item.tableForm.disabled = false
     }
   }
+  if(item.field == "toLocationCode"){
+    if (toInventoryStatus.value == 'HOLD') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'HOLD',
+        isMainValue: false
+      }]
+    }
+    if (toInventoryStatus.value == 'SCRAP') {
+      item.tableForm.searchCondition = [{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      },
+      {
+        key: 'type',
+        value: 'SCRAP',
+        isMainValue: false
+      }]
+    }else {
+      item.tableForm.searchCondition = {
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }
+    }
+  }
 })
 
 // 字段设置 更新主列表字段

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -839,9 +839,9 @@ export const InventorymoveRequestDetailRules = reactive({
   // toBatch: [
   //   { required: true, message: '请输入到批次', trigger: 'blur' }
   // ],
-  // toLocationCode: [
+  toLocationCode: [
-  //   { required: true, message: '请选择到库位代码', trigger: 'change' }
+    { required: true, message: '请选择到库位代码', trigger: 'change' }
-  // ],
+  ],
   // toInventoryStatus: [
   //   { required: true, message: '请选择到库存状态', trigger: 'change' }
   // ],

src/views/wms/productionManage/productdismantle/productdismantleRequestMain/productdismantleRequestMain.data.ts

@@ -440,7 +440,7 @@ export const ProductdismantleRequestMainRules = reactive({
  */
 export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '生产线代码',
+    label: '拆解生产线代码',
     field: 'productionLineCode',
     sort: 'custom',
     table: {
@@ -485,7 +485,7 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     }
   },
   {
-    label: '工位代码',
+    label: '拆解工位代码',
     field: 'workStationCode',
     sort: 'custom',
     table: {
@@ -610,6 +610,22 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
       disabled: true
     }
   },
+  {
+    label: '成品库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps:{
+        disabled: true
+      }
+    },
+    tableForm: {
+      disabled: true
+    }
+  },
   {
     label: '数量',
     field: 'qty',
@@ -769,22 +785,6 @@ export const ProductdismantleRequestDetaila = useCrudSchemas(reactive<CrudSchema
     isTableForm: false,
     isForm: false,
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      componentProps:{
-        disabled: true
-      }
-    },
-    tableForm: {
-      disabled: true
-    }
-  },
   {
     label: '单据号',
     field: 'number',

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue

@@ -187,6 +187,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (item.field == 'remark') {
               item.tableForm.disabled = false
             }
+            if (item.field == 'qty') {
+              item.tableForm.disabled = false
+            }
             if (item.field == 'reason') {
               item.tableForm.disabled = false
             }
@@ -330,6 +333,7 @@ const buttonTableClick = async (val, row) => {
 const formRef = ref()
 const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
+  isShowButton.value = true
   formRef.value.open(type, row)
 }
 

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts

@@ -735,6 +735,7 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     }, 
+    isTableForm:false,
     tableForm:{
       disabled:true
     }