Browse Source

配置

hella_online_20240829
王宇飞 7 months ago
parent
commit
f992358ad3
  1. 2
      README.md
  2. 17
      src/components/BasicForm/src/BasicForm.vue
  3. 4
      src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

2
README.md

@ -21,6 +21,8 @@ form: {
value:'prodLine', // 指主表某字段 value:'prodLine', // 指主表某字段
message: '请选择生产线信息!', // 当前置条件为空时 弹出信息提示 message: '请选择生产线信息!', // 当前置条件为空时 弹出信息提示
isMainValue: true // 表示查询条件是主表的字段的值 isMainValue: true // 表示查询条件是主表的字段的值
isFilterValue:true // 字段拼到filters里,值取主表数据
action: '==', // 查询拼接条件
}, },
{ {
key: 'customerCode', // 查询列表中字段 key: 'customerCode', // 查询列表中字段

17
src/components/BasicForm/src/BasicForm.vue

@ -410,6 +410,21 @@ const opensearchTable = (
// searchCondition.forEach((item) => { // searchCondition.forEach((item) => {
// row // row
if (searchCondition[i].isMainValue) { if (searchCondition[i].isMainValue) {
if(searchCondition[i].isFilterValue){
//filters
filters.push({
action: searchCondition[i].action,
column: searchCondition[i].key,
value: formRef.value.formModel[searchCondition[i].value]
? formRef.value.formModel[searchCondition[i].value]
: props.detailData
? props.detailData[searchCondition[i].value]
: row
? row[searchCondition[i].value]
: ''
})
}else{
_searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value] _searchCondition[searchCondition[i].key] = formRef.value.formModel[searchCondition[i].value]
? formRef.value.formModel[searchCondition[i].value] ? formRef.value.formModel[searchCondition[i].value]
: props.detailData : props.detailData
@ -431,6 +446,8 @@ const opensearchTable = (
) )
return return
} }
}
} else if (searchCondition[i].isTableRowValue) { } else if (searchCondition[i].isTableRowValue) {
if (searchCondition[i].required) { if (searchCondition[i].required) {
if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) { if (row[searchCondition[i].value] == '' || row[searchCondition[i].value] == undefined) {

4
src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@ -526,7 +526,9 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
key: 'warehouseCode', key: 'warehouseCode',
value: 'fromWarehouseCode', value: 'fromWarehouseCode',
message: '请填写从仓库代码!', message: '请填写从仓库代码!',
isMainValue: true isMainValue: true,
action: '==',
isFilterValue:true
},{ },{
key: 'businessType', key: 'businessType',
value: 'Scrap', value: 'Scrap',

Loading…
Cancel
Save