diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index e589c27dd..d62b8be0f 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -519,12 +519,20 @@ const opensearchTable = ( // searchCondition.forEach((item) => { // 查询条件为主表某字段,需要赋值主表数据,数据来源是详情的,赋值需要从row中获取 if (searchCondition[i].isMainValue) { + console.log(99,searchCondition[i].paramsFrom) if (searchCondition[i].isFilterValue) { //后端接口需要拼入到filters中 filters.push({ action: searchCondition[i].action, column: searchCondition[i].key, - value: formRef.value.formModel[searchCondition[i].value] + value: + searchCondition[i].paramsFrom == 'form' + ? formRef.value.formModel[searchCondition[i].value] + : searchCondition[i].paramsFrom == 'detailData' + ? props.detailData[searchCondition[i].value] + : searchCondition[i].paramsFrom == 'tableForm' + ? row[searchCondition[i].value] + : formRef.value.formModel[searchCondition[i].value] ? formRef.value.formModel[searchCondition[i].value] : props.detailData ? props.detailData[searchCondition[i].value] @@ -533,9 +541,14 @@ const opensearchTable = ( : '' }) } else { - _searchCondition[searchCondition[i].key] = formRef.value.formModel[ - searchCondition[i].value - ] + _searchCondition[searchCondition[i].key] = + searchCondition[i].paramsFrom == 'form' + ? formRef.value.formModel[searchCondition[i].value] + : searchCondition[i].paramsFrom == 'detailData' + ? props.detailData[searchCondition[i].value] + : searchCondition[i].paramsFrom == 'tableForm' + ? row[searchCondition[i].value] + :formRef.value.formModel[ searchCondition[i].value] ? formRef.value.formModel[searchCondition[i].value] : props.detailData ? props.detailData[searchCondition[i].value] diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts index e883644bc..97d8f40a5 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts @@ -1836,7 +1836,8 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( key: 'itemCode', value: 'itemCode', message: '请先选择品番!', - isMainValue: true + isMainValue: true, + paramsFrom:'tableForm' } ], verificationParams: [