diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue index 9a239983f..1ea1e02e2 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/index.vue +++ b/src/views/wms/basicDataManage/subject/subjectAccount/index.vue @@ -81,9 +81,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} if (formField === 'costecentreCode') { - setV['costecentreId'] = val[0]['costcentreId'] + setV['costcentreId'] = val[0]['costcentreId'] setV['costcentreCode'] = val[0]['costcentreCode'] - setV['costecentreType'] = val[0]['costcentreType'] + setV['costcentreType'] = val[0]['costcentreType'] } if( formField === 'projectCode'){ setV['projectId'] = val[0]['projectId'] diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index dd20a2146..ecbea2fd0 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -37,7 +37,7 @@ export const SubjectAccount = useCrudSchemas(reactive([ }, { label: '成本中心ID', - field: 'costecentreId', + field: 'costcentreId', sort: 'custom', isSearch: false, isTable:false, @@ -49,7 +49,7 @@ export const SubjectAccount = useCrudSchemas(reactive([ }, { label: '成本中心代码', - field: 'costecentreCode', + field: 'costcentreCode', sort: 'custom', isSearch: false, form: { @@ -71,7 +71,7 @@ export const SubjectAccount = useCrudSchemas(reactive([ }, { label: '成本中心类型', - field: 'costecentreType', + field: 'costcentreType', sort: 'custom', isSearch: false, form:{ diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index 16eb68241..a91464f67 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -111,16 +111,28 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => nextTick(() => { if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['packingNumber'] = val[0]['packingNumber'] - 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'] + if(formField === 'itemCode'){ + row[formField] = val[0][searchField] + row['packingNumber'] = val[0]['packingNumber'] + 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'] + } + if(formField === 'costcentreCode'){ + row['costcentreCode'] = val[0]['costcentreCode'] + } + if(formField === 'qadProjectCode'){ + row['qadProjectCode'] = val[0]['projectCode'] + } } else { const setV = {} + if(formField === 'usageDescription'){ + setV['usageDescription'] = val[0]['usageDescription'] + setV['usageCode'] = val[0]['code'] + } setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -130,14 +142,22 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] - setV['packingNumber'] = val[0]['packingNumber'] - setV['containerNumber'] = val[0]['containerNumber'] - setV['batch'] = val[0]['batch'] - setV['inventoryStatus'] = val[0]['inventoryStatus'] - setV['fromLocationCode'] = val[0]['locationCode'] - setV['itemCode'] = val[0]['itemCode'] - row['uom'] = val[0]['uom'] + if(formField === 'itemCode'){ + setV[formField] = val[0][searchField] + setV['packingNumber'] = val[0]['packingNumber'] + setV['containerNumber'] = val[0]['containerNumber'] + setV['batch'] = val[0]['batch'] + setV['inventoryStatus'] = val[0]['inventoryStatus'] + setV['fromLocationCode'] = val[0]['locationCode'] + setV['itemCode'] = val[0]['itemCode'] + setV['uom'] = val[0]['uom'] + } + if(formField === 'costcentreCode'){ + setV['costcentreCode'] = val[0]['costcentreCode'] + } + if(formField === 'qadProjectCode'){ + setV['qadProjectCode'] = val[0]['projectCode'] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index fa62e355b..0a397834e 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -424,6 +424,9 @@ export const UnplannedissueRequestMainRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + usageDescription:[ + { required: true, message: '请选择领用描述', trigger: 'blur' } + ], }) /** @@ -585,6 +588,94 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive width: 150 }, }, + { + label: '成本中心代码', + field: 'costcentreCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '选择成本中心', + searchField: 'costcentreCode', + searchTitle: '成本中心信息', + searchAllSchemas: SubjectAccount.allSchemas, + searchPage: SubjectAccountApi.getSubjectAccountPage, + searchCondition: [{ + key: 'code', // 查询列表中字段 + value: 'usageCode', // 指查询具体值 + message: '请选择领用描述!1111', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件不是主表的字段的值 + }] + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '选择成本中心', + searchField: 'costcentreCode', + searchTitle: '成本中心信息', + searchAllSchemas: SubjectAccount.allSchemas, + searchPage: SubjectAccountApi.getSubjectAccountPage, + searchCondition: [{ + key: 'code', // 查询列表中字段 + value: 'usageCode', // 指查询具体值 + message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件不是主表的字段的值 + }] + } + } + }, + { + label: '科目代码', + field: 'qadProjectCode', + sort: 'custom', + table: { + width: 150 + }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '选择科目代码', + searchField: 'projectCode', + searchTitle: '科目代码信息', + searchAllSchemas: SubjectAccount.allSchemas, + searchPage: SubjectAccountApi.getSubjectAccountPage, + searchCondition: [{ + key: 'code', // 查询列表中字段 + value: 'usageCode', // 指查询具体值 + message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件不是主表的字段的值 + },{ + key: 'costcentreCode', // 查询列表中字段 + value: 'costcentreCode', // 指查询具体值 + message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件不是主表的字段的值 + }] + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '选择成本中心', + searchField: 'projectCode', + searchTitle: '成本中心信息', + searchAllSchemas: SubjectAccount.allSchemas, + searchPage: SubjectAccountApi.getSubjectAccountPage, + searchCondition: [{ + key: 'code', // 查询列表中字段 + value: 'usageCode', // 指查询具体值 + message: '请选择领用描述!', // 当前置条件为空时 弹出信息提示 + isMainValue: true // 表示查询条件不是主表的字段的值 + },{ + key: 'costcentreCode', // 查询列表中字段 + value: 'costecentreCode', // 指查询具体值 + message: '请成本中心代码!', // 当前置条件为空时 弹出信息提示 + isMainValue: false // 表示查询条件不是主表的字段的值 + }] + } + } + }, { label: '项目代码', field: 'projectCode', @@ -594,6 +685,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive }, isTableForm: false, isForm: false, + isTable:false, }, { label: '从货主代码', @@ -603,7 +695,8 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive width: 150 }, isForm: false, - isTableForm: false + isTableForm: false, + isTable:false, }, { label: '备注', @@ -724,4 +817,10 @@ export const UnplannedissueRequestDetailRules = reactive({ remark: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], + costcentreCode:[ + { required: true, message: '请选择成本中心代码', trigger: 'change' } + ], + qadProjectCode:[ + { required: true, message: '请选择科目代码', trigger: 'change' } + ] }) \ No newline at end of file