diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts index 246d19d25..b46b29549 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts @@ -1,8 +1,22 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' +import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' + +import * as SaleMainApi from '@/api/wms/saleMain' +import * as SaleDetailApi from '@/api/wms/saleDetail' +import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data' + +import * as BalanceApi from '@/api/wms/balance' +import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' + +import * as LocationApi from '@/api/wms/location' +import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -21,15 +35,6 @@ const userDept = userStore.userSelfInfo.dept * @returns {Array} 客户退货申请主表 */ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true, - }, { label: '发货记录单号', field: 'deliverRecordNumber', @@ -37,6 +42,17 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '发货记录信息', // 查询弹窗标题 + searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类 + searchPage: DeliverRecordMainApi.getDeliverRecordMainPage // 查询弹窗所需分页方法 + } + } }, { label: '发货计划单号', @@ -94,6 +110,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到仓库代码', @@ -102,6 +119,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到月台代码', @@ -110,6 +128,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库位类型范围', @@ -121,6 +140,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到库位类型范围', @@ -132,6 +152,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库区代码范围', @@ -140,6 +161,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到库区代码范围', @@ -148,6 +170,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '单据号', @@ -172,7 +195,8 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -197,6 +221,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -227,11 +252,13 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -247,6 +274,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -299,6 +327,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -409,33 +438,30 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive([ //表单校验 export const CustomerreturnRequestMainRules = reactive({ - requestNumber: [ - { required: true, message: '请选择申请单号', trigger: 'change' } - ], - customerCode: [ - { required: true, message: '请选择客户代码', trigger: 'change' } - ], - customerDockCode: [ - { required: true, message: '请选择客户月台代码', trigger: 'change' } - ], - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCodes: [ - { required: true, message: '请选择从库区代码范围', trigger: 'change' } - ], - toWarehouseCode: [ - { required: true, message: '请选择到仓库代码', trigger: 'change' } - ], - toLocationTypes: [ - { required: true, message: '请选择到库位类型范围', trigger: 'change' } - ], - toAreaCodes: [ - { required: true, message: '请选择到库区代码范围', trigger: 'change' } - ], + // customerCode: [ + // { required: true, message: '请选择客户代码', trigger: 'change' } + // ], + // customerDockCode: [ + // { required: true, message: '请选择客户月台代码', trigger: 'change' } + // ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], + // toWarehouseCode: [ + // { required: true, message: '请选择到仓库代码', trigger: 'change' } + // ], + // toLocationTypes: [ + // { required: true, message: '请选择到库位类型范围', trigger: 'change' } + // ], + // toAreaCodes: [ + // { required: true, message: '请选择到库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -451,9 +477,9 @@ export const CustomerreturnRequestMainRules = reactive({ directCreateRecord: [ { required: true, message: '请选择是否跳过任务直接生成记录', trigger: 'change' } ], - businessType: [ - { required: true, message: '请输入业务类型', trigger: 'blur' } - ], + // businessType: [ + // { required: true, message: '请输入业务类型', trigger: 'blur' } + // ], }) /** @@ -467,6 +493,25 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择销售订单号', + searchField: 'number', + searchTitle: '销售订单信息', + searchAllSchemas: SaleMain.allSchemas, + searchPage: SaleMainApi.getSaleMainPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择销售订单号', + searchField: 'number', + searchTitle: '销售订单信息', + searchAllSchemas: SaleMain.allSchemas, + searchPage: SaleMainApi.getSaleMainPage + } + } }, { label: '销售订单行', @@ -475,6 +520,25 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择销售订单行', + searchField: 'lineNumber', + searchTitle: '销售订单信息', + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择销售订单行', + searchField: 'lineNumber', + searchTitle: '销售订单信息', + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage + } + } }, { label: '包装号', @@ -483,6 +547,25 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择包装号', + searchField: 'packingNumber', + searchTitle: '库存余额信息', + searchAllSchemas: Balance.allSchemas, + searchPage: BalanceApi.getBalancePage + } + } }, { label: '器具号', @@ -491,6 +574,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '批次', @@ -499,6 +590,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '库存状态', @@ -510,6 +609,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '从库位代码', @@ -518,6 +626,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '到库位代码', @@ -526,6 +642,25 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库存余额信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库存余额信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationPage + } + } }, { label: '单据号', @@ -548,6 +683,14 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -556,6 +699,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false }, { label: '创建时间', @@ -571,6 +715,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -596,6 +741,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述1', @@ -604,6 +751,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '物品描述2', @@ -612,6 +761,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '项目代码', @@ -620,6 +771,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '数量', @@ -630,6 +783,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { @@ -642,6 +804,9 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '从货主代码', @@ -650,6 +815,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '到货主代码', @@ -658,6 +825,8 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false }, { label: '最后更新时间', @@ -673,6 +842,7 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -709,18 +879,18 @@ export const CustomerreturnRequestDetailRules = reactive({ soNumber: [ { required: true, message: '请选择销售订单号', trigger: 'change' } ], - packingNumber: [ - { required: true, message: '请选择包装号', trigger: 'change' } - ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], - inventoryStatus: [ - { required: true, message: '请选择库存状态', trigger: 'change' } - ], - fromLocationCode: [ - { required: true, message: '请选择从库位代码', trigger: 'change' } - ], + // packingNumber: [ + // { required: true, message: '请选择包装号', trigger: 'change' } + // ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], + // inventoryStatus: [ + // { required: true, message: '请选择库存状态', trigger: 'change' } + // ], + // fromLocationCode: [ + // { required: true, message: '请选择从库位代码', trigger: 'change' } + // ], itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue index 60b5b88e1..5813caef4 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="CustomerreturnRequestMainRules" :formAllSchemas="CustomerreturnRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="CustomerreturnRequestDetail.allSchemas" :tableFormRules="CustomerreturnRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="CustomerreturnRequestMain.allSchemas" :detailAllSchemas="CustomerreturnRequestDetail.allSchemas" :detailAllSchemasRules="CustomerreturnRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="CustomerreturnRequestDetailApi.createCustomerreturnRequestDetail" :apiUpdate="CustomerreturnRequestDetailApi.updateCustomerreturnRequestDetail" :apiPage="CustomerreturnRequestDetailApi.getCustomerreturnRequestDetailPage" :apiDelete="CustomerreturnRequestDetailApi.deleteCustomerreturnRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,54 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { - // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + if(formField == 'packingNumber') { + row['packingNumber'] = val[0]['packingNumber'] + row['poLine'] = 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'] + } else { + row[formField] = val[0][searchField] + } } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] + setV['deliverRecordNumber'] = val[0]['number'] + setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] + setV['customerCode'] = val[0]['customerCode'] + setV['customerDockCode'] = val[0]['customerDockCode'] + formRef.setValues(setV) + } + }) +} +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + if(formField == 'packingNumber') { + setV['packingNumber'] = val[0]['packingNumber'] + setV['poLine'] = 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'] + formRef.setValues(setV) + } else { + setV[formField] = val[0][searchField] formRef.setValues(setV) } }) } + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts index 9324f07f3..02d756bc2 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/customersettleRequestMain.data.ts @@ -1,8 +1,13 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain' +import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail' +import { DeliverRecordDetail, DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -28,6 +33,17 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货记录单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '发货记录信息', // 查询弹窗标题 + searchAllSchemas: DeliverRecordMain.allSchemas, // 查询弹窗所需类 + searchPage: DeliverRecordMainApi.getDeliverRecordMainPage // 查询弹窗所需分页方法 + } + } }, { label: '发货计划单号', @@ -53,6 +69,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库位类型范围', @@ -65,6 +82,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + isForm: false, }, { label: '从库区代码范围', @@ -73,6 +91,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '单据号', @@ -97,7 +116,8 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ componentProps:{ disabled: true } - } + }, + isForm: false, }, { label: '备注', @@ -122,6 +142,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -152,11 +173,13 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false, }, { label: '截止时间', @@ -172,6 +195,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -224,6 +248,7 @@ export const CustomersettleRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -337,15 +362,15 @@ export const CustomersettleRequestMainRules = reactive({ customerCode: [ { required: true, message: '请选择客户代码', trigger: 'change' } ], - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCodes: [ - { required: true, message: '请选择从库区代码范围', trigger: 'change' } - ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -380,6 +405,25 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择销售订单号', + searchField: 'soNumber', + searchTitle: '发货记录信息', + searchAllSchemas: DeliverRecordDetail.allSchemas, + searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择销售订单号', + searchField: 'soNumber', + searchTitle: '发货记录信息', + searchAllSchemas: DeliverRecordDetail.allSchemas, + searchPage: DeliverRecordDetailApi.getDeliverRecordDetailPage + } + } }, { label: '销售订单行', @@ -388,6 +432,14 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '从货主代码', @@ -396,6 +448,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '包装号', @@ -404,6 +458,14 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '批次', @@ -412,6 +474,14 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '库存状态', @@ -423,6 +493,11 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + }, + isTableForm: false, + isForm: false, }, { label: '从库位代码', @@ -431,6 +506,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '单据号', @@ -454,6 +531,14 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } }, { label: '备注', @@ -462,6 +547,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isTable: false, }, { label: '创建时间', @@ -477,6 +563,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -502,6 +589,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '物品描述1', @@ -510,6 +599,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '物品描述2', @@ -518,6 +609,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '项目代码', @@ -526,6 +619,8 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + isForm: false, + isTableForm: false, }, { label: '数量', @@ -536,7 +631,18 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive }, form: { component: 'InputNumber', - } + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 + }, + isTableForm: false, + isForm: false, }, { label: '计量单位', @@ -548,6 +654,11 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm: { + type: 'Select' + }, + isTableForm: false, + isForm: false, }, { label: '最后更新时间', @@ -563,6 +674,7 @@ export const CustomersettleRequestDetail = useCrudSchemas(reactive form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -599,18 +711,18 @@ export const CustomersettleRequestDetailRules = reactive({ soNumber: [ { required: true, message: '请选择销售订单号', trigger: 'change' } ], - packingNumber: [ - { required: true, message: '请选择包装号', trigger: 'change' } - ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], - inventoryStatus: [ - { required: true, message: '请选择库存状态', trigger: 'change' } - ], - fromLocationCode: [ - { required: true, message: '请选择从库位代码', trigger: 'change' } - ], + // packingNumber: [ + // { required: true, message: '请选择包装号', trigger: 'change' } + // ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], + // inventoryStatus: [ + // { required: true, message: '请选择库存状态', trigger: 'change' } + // ], + // fromLocationCode: [ + // { required: true, message: '请选择从库位代码', trigger: 'change' } + // ], itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue index c9a70391e..0142657d9 100644 --- a/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/customersettle/customersettleRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="CustomersettleRequestMainRules" :formAllSchemas="CustomersettleRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="CustomersettleRequestDetail.allSchemas" :tableFormRules="CustomersettleRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="CustomersettleRequestMain.allSchemas" :detailAllSchemas="CustomersettleRequestDetail.allSchemas" :detailAllSchemasRules="CustomersettleRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="CustomersettleRequestDetailApi.createCustomersettleRequestDetail" :apiUpdate="CustomersettleRequestDetailApi.updateCustomersettleRequestDetail" :apiPage="CustomersettleRequestDetailApi.getCustomersettleRequestDetailPage" :apiDelete="CustomersettleRequestDetailApi.deleteCustomersettleRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,39 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { - // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row['soNumber'] = val[0]['soNumber'] + row['soLine'] = val[0]['soLine'] + row['packingNumber'] = val[0]['packingNumber'] + row['batch'] = val[0]['batch'] + row['itemCode'] = val[0]['itemCode'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] + setV['deliverRecordNumber'] = val[0]['number'] + setV['deliverPlanNumber'] = val[0]['deliverPlanNumber'] + setV['customerCode'] = val[0]['customerCode'] formRef.setValues(setV) } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + setV['soNumber'] = val[0]['soNumber'] + setV['soLine'] = val[0]['soLine'] + setV['packingNumber'] = val[0]['packingNumber'] + setV['batch'] = val[0]['batch'] + setV['itemCode'] = val[0]['itemCode'] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = [] diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts index 5bc761ad0..a2aa452e3 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts @@ -1,8 +1,25 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' -const { t } = useI18n() // 国际化 import * as getRequestsettingApi from '@/api/wms/requestsetting/index' +import * as CustomerApi from '@/api/wms/customer' +import { Customer } from '@/views/wms/basicDataManage/customerManage/customer/customer.data' + +import * as SaleMainApi from '@/api/wms/saleMain' +import * as SaleDetailApi from '@/api/wms/saleDetail' +import { SaleDetail, SaleMain } from '../../deliverplan/saleMain/saleMain.data' + +import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain' +import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data' + +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + +import * as CustomerdockApi from '@/api/wms/customerdock' +import { Customerdock } from '@/views/wms/basicDataManage/customerManage/customerdock/customerdock.data' + +const { t } = useI18n() // 国际化 + // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 const queryParams = { pageSize:10, @@ -28,6 +45,17 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择发货计划单号', // 输入框占位文本 + searchField: 'number', // 查询弹窗赋值字段 + searchTitle: '发货计划信息', // 查询弹窗标题 + searchAllSchemas: DeliverPlanMain.allSchemas, // 查询弹窗所需类 + searchPage: DeliverPlanMainApi.getDeliverPlanMainPage // 查询弹窗所需分页方法 + } + } }, { label: '客户发货单号', @@ -36,6 +64,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '客户代码', @@ -45,6 +74,17 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户信息', // 查询弹窗标题 + searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 + searchPage: CustomerApi.getCustomerPage // 查询弹窗所需分页方法 + } + } }, { label: '客户月台代码', @@ -54,6 +94,17 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ width: 150 }, isSearch: true, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择客户月台代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '客户月台信息', // 查询弹窗标题 + searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类 + searchPage: CustomerdockApi.getCustomerdockPage // 查询弹窗所需分页方法 + } + } }, { label: '承运商', @@ -86,6 +137,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到仓库代码', @@ -94,6 +146,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库位类型范围', @@ -105,6 +158,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到库位类型范围', @@ -116,6 +170,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从库区代码范围', @@ -124,6 +179,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '到库区代码范围', @@ -132,6 +188,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '从月台代码', @@ -140,6 +197,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, }, { label: '单据号', @@ -164,7 +222,8 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ componentProps: { disabled: true, } - } + }, + isForm: false, }, { label: '备注', @@ -189,6 +248,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -219,11 +279,13 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', } }, + isForm: false }, { label: '截止时间', @@ -239,6 +301,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -291,6 +354,7 @@ export const DeliverRequestMain = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -404,24 +468,24 @@ export const DeliverRequestMainRules = reactive({ customerCode: [ { required: true, message: '请选择客户代码', trigger: 'change' } ], - customerDockCode: [ - { required: true, message: '请选择客户月台代码', trigger: 'change' } - ], - fromWarehouseCode: [ - { required: true, message: '请选择从仓库代码', trigger: 'change' } - ], - fromLocationTypes: [ - { required: true, message: '请选择从库位类型范围', trigger: 'change' } - ], - fromAreaCodes: [ - { required: true, message: '请选择从库区代码范围', trigger: 'change' } - ], - toWarehouseCode: [ - { required: true, message: '请选择到仓库代码', trigger: 'change' } - ], - toLocationTypes: [ - { required: true, message: '请选择到库位类型范围', trigger: 'change' } - ], + // customerDockCode: [ + // { required: true, message: '请选择客户月台代码', trigger: 'change' } + // ], + // fromWarehouseCode: [ + // { required: true, message: '请选择从仓库代码', trigger: 'change' } + // ], + // fromLocationTypes: [ + // { required: true, message: '请选择从库位类型范围', trigger: 'change' } + // ], + // fromAreaCodes: [ + // { required: true, message: '请选择从库区代码范围', trigger: 'change' } + // ], + // toWarehouseCode: [ + // { required: true, message: '请选择到仓库代码', trigger: 'change' } + // ], + // toLocationTypes: [ + // { required: true, message: '请选择到库位类型范围', trigger: 'change' } + // ], departmentCode: [ { required: true, message: '请输入部门', trigger: 'blur' } ], @@ -456,6 +520,25 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择销售订单号', + searchField: 'number', + searchTitle: '销售订单信息', + searchAllSchemas: SaleMain.allSchemas, + searchPage: SaleMainApi.getSaleMainPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择销售订单号', + searchField: 'number', + searchTitle: '销售订单信息', + searchAllSchemas: SaleMain.allSchemas, + searchPage: SaleMainApi.getSaleMainPage + } + } }, { label: '销售订单行', @@ -464,6 +547,25 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择销售订单行', + searchField: 'lineNumber', + searchTitle: '销售订单信息', + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择销售订单行', + searchField: 'lineNumber', + searchTitle: '销售订单信息', + searchAllSchemas: SaleDetail.allSchemas, + searchPage: SaleDetailApi.getSaleDetailPage + } + } }, { label: '包装号', @@ -472,6 +574,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '器具号', @@ -480,6 +584,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '批次', @@ -488,6 +594,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '库存状态', @@ -499,6 +607,11 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + type: 'Select' + }, + isTableForm: false, + isForm: false, }, { label: '到货主代码', @@ -507,6 +620,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '到库位代码', @@ -515,6 +630,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isTableForm: false, + isForm: false, }, { label: '单据号', @@ -537,6 +654,25 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, + searchListPlaceholder: '请选择物品代码', + searchField: 'code', + searchTitle: '物品基础信息', + searchAllSchemas: Itembasic.allSchemas, + searchPage: ItembasicApi.getItembasicPage + } + } }, { label: '备注', @@ -560,6 +696,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -585,6 +722,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '物品描述1', @@ -593,6 +732,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '物品描述2', @@ -601,6 +742,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '项目代码', @@ -609,6 +752,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '数量', @@ -619,6 +764,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ }, form: { component: 'InputNumber', + componentProps: { + min: 1, + precision: 6 + } + }, + tableForm: { + type: 'InputNumber', + min: 1, + precision: 6 } }, { @@ -631,6 +785,9 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + tableForm: { + type: 'Select' + } }, { label: '从货主代码', @@ -639,6 +796,8 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ table: { width: 150 }, + isForm: false, + isTableForm: false }, { label: '最后更新时间', @@ -654,6 +813,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([ form: { component: 'DatePicker', componentProps: { + style: {width:'100%'}, type: 'datetime', dateFormat: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'x', @@ -690,18 +850,18 @@ export const DeliverRequestDetailRules = reactive({ soNumber: [ { required: true, message: '请选择销售订单号', trigger: 'change' } ], - packingNumber: [ - { required: true, message: '请选择包装号', trigger: 'change' } - ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' } - ], - inventoryStatus: [ - { required: true, message: '请选择库存状态', trigger: 'change' } - ], - toLocationCode: [ - { required: true, message: '请选择到库位代码', trigger: 'change' } - ], + // packingNumber: [ + // { required: true, message: '请选择包装号', trigger: 'change' } + // ], + // batch: [ + // { required: true, message: '请输入批次', trigger: 'blur' } + // ], + // inventoryStatus: [ + // { required: true, message: '请选择库存状态', trigger: 'change' } + // ], + // toLocationCode: [ + // { required: true, message: '请选择到库位代码', trigger: 'change' } + // ], itemCode: [ { required: true, message: '请选择物品代码', trigger: 'change' } ], diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue index 6249fcbc1..71635e1bd 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue +++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue @@ -44,7 +44,6 @@ @success="getList" :rules="DeliverRequestMainRules" :formAllSchemas="DeliverRequestMain.allSchemas" - :searchTableParams="searchTableParams" :tableAllSchemas="DeliverRequestDetail.allSchemas" :tableFormRules="DeliverRequestDetailRules" :tableData="tableData" @@ -64,12 +63,12 @@ :allSchemas="DeliverRequestMain.allSchemas" :detailAllSchemas="DeliverRequestDetail.allSchemas" :detailAllSchemasRules="DeliverRequestDetailRules" - :searchTableParams="searchTableParams" :apiCreate="DeliverRequestDetailApi.createDeliverRequestDetail" :apiUpdate="DeliverRequestDetailApi.updateDeliverRequestDetail" :apiPage="DeliverRequestDetailApi.getDeliverRequestDetailPage" :apiDelete="DeliverRequestDetailApi.deleteDeliverRequestDetail" :Echo="Echo" + @searchTableSuccessDetail="searchTableSuccessDetail" /> @@ -99,41 +98,34 @@ const updataTableColumns = (val) => { tableColumns.value = val } -// 查询列表页面参数设置 -const searchTableParams = ref([ -//{ -// formField: 'productItemCode', -// searchTableTitle: '物料信息', -// searchTableAllSchemas: Itembasic.allSchemas, -// searchTablePage: ItembasicApi.getItembasicPage -//} -]) - // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => { nextTick(() => { if (type == 'tableForm') { - // 明细查询页赋值 - //row[formField] = val[0][searchField] - //row['poLine'] = val[0]['poLine'] - //row['batch'] = val[0]['toBatch'] - //row['altBatch'] = val[0]['altBatch'] - //row['itemCode'] = val[0]['itemCode'] - //row['itemName'] = val[0]['itemName'] - //row['itemDesc1'] = val[0]['itemDesc1'] - //row['itemDesc2'] = val[0]['itemDesc2'] - //row['projectCode'] = val[0]['projectCode'] - //row['qty'] = val[0]['qty'] - //row['uom'] = val[0]['uom'] + row[formField] = val[0][searchField] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] - //setV['supplierCode'] = val[0]['supplierCode'] - formRef.setValues(setV) + if(formField == 'deliverPlanNumber') { + setV['deliverPlanNumber'] = val[0]['number'] + setV['customerCode'] = val[0]['customerCode'] + formRef.setValues(setV) + } else { + setV[formField] = val[0][searchField] + formRef.setValues(setV) + } } }) } +// 查询页面返回——详情 +const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { + nextTick(() => { + const setV = {} + setV[formField] = val[0][searchField] + formRef.setValues(setV) + }) +} + // 子表新增的时候选择表格之后需要会显得字段 // const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom'] const Echo = []