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

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/index.vue

@@ -122,10 +122,13 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
         row['containerNumber'] = val[0]['containerNumber']
         row['batch'] = val[0]['batch']
         row['inventoryStatus'] = val[0]['inventoryStatus']
-        row['fromLocationCode'] = val[0]['locationCode']
         row['itemCode'] = val[0]['itemCode']
         row['uom'] = val[0]['uom']
-      } else {
+      } else if(formField == 'toLocationCode'){
+        console.log(row,111);
+        
+        row['toLocationCode'] = val[0]['code']
+      }else{
         row[formField] = val[0][searchField]
       }
     } else {
@@ -297,7 +300,6 @@ const formRef = ref()
 const openForm = (type: string, row?: number) => {
   tableData.value = [] // 重置明细数据
   formRef.value.open(type, row)
-
 }
 
 /**
@@ -419,10 +421,10 @@ const submitForm = async (formType, data) => {
       formRef.value.formLoading = false
       return;
   }
-      await StockupDetailRequestApi.createStockupDetailRequest(data)
+      await StockupMainRequestApi.createStockupMainRequest(data)
       message.success(t('common.createSuccess'))
     } else {
-      await StockupDetailRequestApi.updateStockupDetailRequest(data)
+      await StockupMainRequestApi.updateStockupMainRequest(data)
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -458,7 +458,7 @@ export const StockupDetailRequestRules = reactive({
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],
   toLocationCode : [
-    { required: true, message: '请选择计量单位', trigger: 'change' }
+    { required: true, message: '请选择到库代码', trigger: 'change' }
   ]
 })
 
@@ -518,6 +518,14 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'batch',
     sort: 'custom',
     isSearch: true,
+    tableForm: {
+      disabled: true,
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '库存状态',