diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index cebcec288..89ec0cfe6 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -505,9 +505,12 @@ const getAnnexFileList = async (row) => { } const annexList = await FileApi.getFileList(requstData) const annexData = annexTableData.value.find(annex=>annex.label === item.label) + let subDetailTableData = null if(annexData){ annexData.annexList = annexList + subDetailTableData = annexData.subDetailTableData }else{ + subDetailTableData = item?.subDetailTableData annexTableData.value.push({ align:item.align, label: item.label, @@ -521,20 +524,19 @@ const getAnnexFileList = async (row) => { hiddenDelete:item.hiddenDelete || false, // 是否展示删除按钮 hiddenUpload:item.hiddenUpload || false, // 是否展示上传按钮 }) - if(item?.subDetailTableData){ + } + if(subDetailTableData){ const { tableObject:subTableObject, tableMethods:subTableMethods } = useTable({ - getListApi: item.subDetailTableData.getSubList // 分页接口 + getListApi: subDetailTableData.getSubList // 分页接口 }) const {getList:getSubList} = subTableMethods subTableObject.params= {} - item.subDetailTableData.queryParams.forEach(queryItem => { + subDetailTableData.queryParams.forEach(queryItem => { subTableObject.params[queryItem.queryField] = row[queryItem.rowField] }); await getSubList() - item.subDetailTableData.tableList = subTableObject.tableList - console.log('subTableObject',annexTableData.value) + subDetailTableData.tableList = subTableObject.tableList } - } }) } /** 添加附件 */ @@ -606,6 +608,7 @@ const titleNameRef = ref() const titleValueRef = ref() const count =ref(0) const openDetail = async (row: any, titleName: any, titleValue: any, tableName: any) => { + titleNameRef.value = titleName titleValueRef.value = titleValue remarksData.data = { @@ -829,21 +832,22 @@ const opensearchTable = ( const buttonTableClick = async (val, row) => { if (val == 'edit') { // 编辑 - if(props.isOpenSearchTable){ + if(props.isOpenSearchTable){ // 供应商发票申请--明细--子表编辑 searchTableFormType.value = 'update' if (row?.id || row?.masterId) { searchTableFormModel.value = Object.assign(unref(searchTableFormModel), row) } const item = props.detailAllSchemas.formSchema[0] - opensearchTable( - item.field, item?.componentProps?.searchField, - item?.componentProps?.searchTitle, - item?.componentProps?.searchAllSchemas, - item?.componentProps?.searchPage, - item?.componentProps?.searchCondition, - item?.componentProps?.multiple, - undefined,undefined - ) + debugger + // opensearchTable( + // item.field, item?.componentProps?.searchField, + // item?.componentProps?.searchTitle, + // item?.componentProps?.searchAllSchemas, + // item?.componentProps?.searchPage, + // item?.componentProps?.searchCondition, + // item?.componentProps?.multiple, + // undefined,undefined + // ) }else{ openForm('update', row) } diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 69c830156..66d3e644e 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -136,7 +136,9 @@ export default defineComponent({ if(isAll){ //全选 if(elTableRef.value?.getSelectionRows().length{ + elTableRef.value!.toggleRowSelection(row,true) + }) } } } diff --git a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts index a1a5a18b2..ac575491b 100644 --- a/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts +++ b/src/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data.ts @@ -10,6 +10,7 @@ const typeList = await QadProjectApi.getProjectType() export const SubjectAccountRules = reactive({ code: [required], accountingAccount: [required], + costcentreType:[required], accountingName: [required], usageDescription: [required], costecentreCode: [required], @@ -120,6 +121,7 @@ export const SubjectAccount = useCrudSchemas(reactive([ sort: 'custom', isSearch: false, isForm:false, + isTable:false, form: { // labelMessage: '信息提示说明！！！', componentProps: { diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index a2e6ee052..0bdb20cf5 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -117,7 +117,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => row['projectCode'] = val[0]['projectCode'] row['uom'] = val[0]['uom'] }else if(formField == 'fromLocationCode'){ - row['fromLocationCode'] = val[0]['code'] + row['fromLocationCode'] = val[0]['defaultLocationCode'] } }else { const setV = {} @@ -142,6 +142,8 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['itemCode'] = val[0]['itemCode'] setV['projectCode'] = val[0]['projectCode'] setV['uom'] = val[0]['uom'] + }else if(formField == 'fromLocationCode') { + setV['fromLocationCode'] = val[0]['defaultLocationCode'] }else { setV[formField] = val[0][searchField] } diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts index b61c881fe..fbf89bcc2 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts @@ -9,6 +9,9 @@ import { SaleDetailAndMain } from '@/views/wms/deliversettlementManage/deliverpl import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' +import * as CustomerdockApi from '@/api/wms/customerdock' +import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data' + import * as getRequestsettingApi from '@/api/wms/requestsetting/index' // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 const queryParams = { @@ -359,12 +362,18 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ searchListPlaceholder: '请选择客户库位代码', searchField: 'code', searchTitle: '库位基础信息', - searchAllSchemas: Location.allSchemas, - searchPage: LocationApi.selectConfigToLocation, + searchAllSchemas: Customerdock.allSchemas, + searchPage: CustomerdockApi.getCustomerdockPage, searchCondition: [{ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'customerCode', + value: 'customerCode', + message: '请填写客户代码！', + isMainValue: true }] }, form: { @@ -379,6 +388,12 @@ export const SaleShipmentDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'customerCode', + value: 'customerCode', + message: '请填写客户代码！', + isMainValue: true }] } }, diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 19a6435c6..ae2d1f3fb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1161,6 +1161,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive