Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts

@@ -59,6 +59,11 @@ export const InspectRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
   },
   {
     label: '单据号',

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

@@ -143,10 +143,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       row['supplierQty'] = val[0]['supplierQty']
       row['supplierUom'] = val[0]['supplierUom']
       row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['fromLocationCode']
+      row['fromLocationCode'] = val[0]['locationCode']
-      row['toLocationCode'] = ''
+      row['toLocationCode'] = null
-      row['fromLocationGroupCode'] = val[0]['fromLocationGroupCode']
+      row['fromLocationGroupCode'] = val[0]['locationGroupCode']
-      row['toLocationGroupCode'] = ''
+      row['toLocationGroupCode'] = null
+      row['toWarehouseCode'] = null
+      row['toLocationTypes'] = null
       row['fromAreaCode'] = val[0]['areaCode']
       row['toAreaCode'] = val[0]['toAreaCode']
       row['fromQwnerCode'] = val[0]['fromQwnerCode']
@@ -177,8 +179,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             item.batch = item.toBatch
             item.packingNumber = item.toPackingNumber
             item.containerNumber = item.toContainerNumber
+            item.toLocationGroupCode = null
+            item.toWarehouseCode = null
+            item.toLocationTypes = null
+            item.toLocationCode = null
+            // item.fromLocationCode = item.fromLocationCode
+            // item.fromLocationGroupCode = item.fromLocationGroupCode
           })
           isShowButton.value = false
+          console.log('formSchema', PurchasereturnRequestMain.allSchemas.formSchema)
+
+          PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+            if (item.field == 'supplierCode') {
+              item.componentProps.disabled = true
+            }
+          })
           PurchasereturnRequestDetail.allSchemas.tableFormColumns.map((item) => {
             item.tableForm.disabled = true
             if (item.field == 'remark') {
@@ -331,6 +346,11 @@ const formRef = ref()
 const openForm = async (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   isShowButton.value = true
+  PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+    if (item.field == 'supplierCode') {
+      item.componentProps.disabled = false
+    }
+  })
   formRef.value.open(type, row)
 }
 
@@ -449,8 +469,12 @@ const handleDeleteTable = (item, index,formRef) => {
   tableData.value.splice(index, 1)
   if (tableData.value.length == 0) {
     isShowButton.value = true
+    PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => {
+      if (item.field == 'supplierCode') {
+        item.componentProps.disabled = false
+      }
+    })
     nextTick(() => {
-      
       const setV = {}
 
       setV['purchaseReceiptRecordNumber'] = ''
@@ -458,7 +482,6 @@ const handleDeleteTable = (item, index,formRef) => {
       formRef.setValues(setV)
     })
   }
- 
 }
 
 // 主子数据 提交

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

@@ -75,6 +75,11 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isSearch: true,
+    form:{
+      componentProps:{
+        disabled:false
+      }
+    }
   },
   {
     label: '承运商',
@@ -118,6 +123,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm: false,
   },
   {
@@ -142,6 +148,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTableForm:false,
     isForm: false,
   },
   {
@@ -161,6 +168,7 @@ export const PurchasereturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     isForm: false,
+    isTableForm:false,
   },
   {
     label: '从月台代码',
@@ -735,7 +743,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     }, 
-    isTableForm:false,
     tableForm:{
       disabled:true
     }