diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts index 364949095..899dff315 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts @@ -228,35 +228,35 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:9, }, - { - label: '责任', - field: 'duty', - dictType: DICT_TYPE.DUTY, - dictClass: 'string', - table: { - width: 150 - }, - sortTableDefault:9, - }, - { - label: '部门', - field: 'dutyDept', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:9, - }, - { - label: '责任明细', - field: 'dutyDetails', - dictType: DICT_TYPE.DUTY_DETAILS, - dictClass: 'string', - table: { - width: 150 - }, - sortTableDefault:9, - }, + // { + // label: '责任', + // field: 'duty', + // dictType: DICT_TYPE.DUTY, + // dictClass: 'string', + // table: { + // width: 150 + // }, + // sortTableDefault:9, + // }, + // { + // label: '部门', + // field: 'dutyDept', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:9, + // }, + // { + // label: '责任明细', + // field: 'dutyDetails', + // dictType: DICT_TYPE.DUTY_DETAILS, + // dictClass: 'string', + // table: { + // width: 150 + // }, + // sortTableDefault:9, + // }, // { // label: '部门', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index ca3a14192..ec15543fa 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -438,9 +438,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 + defaultButtons.defaultAddBtn({hasPermi:`wms:inventorymove-request-main:create`}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:`wms:inventorymove-request-main:import`}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:`wms:inventorymove-request-main:export`}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 5bd2afe24..68eccd896 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -71,52 +71,52 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ }, sortTableDefault:2, }, - { - label: '从仓库代码', - field: 'fromWarehouseCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - enterSearch: true, - isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择从仓库代码', - searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - }, - form: { - // labelMessage: '信息提示说明!!!', - componentProps: { - enterSearch: true, - isSearchList: true, - searchListPlaceholder: '请选择从仓库代码', - searchField: 'code', - searchTitle: '仓库基础信息', - searchAllSchemas: Warehouse.allSchemas, - searchPage: WarehouseApi.pageBusinessTypeToWarehouse, - verificationParams: [{ - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true, - }], // 失去焦点校验参数 - } - }, - sortTableDefault:3, - }, + // { + // label: '从仓库代码', + // field: 'fromWarehouseCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // tableForm: { + // enterSearch: true, + // isInpuFocusShow: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择从仓库代码', + // searchField: 'code', + // searchTitle: '仓库基础信息', + // searchAllSchemas: Warehouse.allSchemas, + // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // }, + // form: { + // // labelMessage: '信息提示说明!!!', + // componentProps: { + // enterSearch: true, + // isSearchList: true, + // searchListPlaceholder: '请选择从仓库代码', + // searchField: 'code', + // searchTitle: '仓库基础信息', + // searchAllSchemas: Warehouse.allSchemas, + // searchPage: WarehouseApi.pageBusinessTypeToWarehouse, + // verificationParams: [{ + // key: 'code', + // action: '==', + // value: '', + // isMainValue: false, + // isSearch: true, + // isFormModel: true, + // }], // 失去焦点校验参数 + // } + // }, + // sortTableDefault:3, + // }, { label: '到仓库代码', field: 'toWarehouseCode', @@ -159,6 +159,45 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ }, isForm: false, }, + + { + label: '到库位代码', // 子表数据--新增在form上展示 + field: 'toLocationCode', + sort: 'custom', + isForm:true, + isTable:false, + isDetail:false, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + searchCondition: [ + { + key: 'businessType', + value: 'OkToHold', + isMainValue: false + },{ + key: 'isIn', + value: 'in', + isMainValue: false + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } + } + }, { label: '到库位代码', // 子表数据--新增在form上展示 field: 'toLocationCode', @@ -1186,9 +1225,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择从批次', searchField: 'packingNumber', - searchTitle: '库存余额信息', + searchTitle: '库存余额信息1', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [ + { + key: 'aaa', + value: '123', + isMainValue: false + }], }, form: { // labelMessage: '信息提示说明!!!', @@ -1198,9 +1243,15 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择从批次', searchField: 'packingNumber', - searchTitle: '库存余额信息', + searchTitle: '库存余额信息1', searchAllSchemas: BalancePopWindow.allSchemas, searchPage: BalanceApi.selectLocationTypeToBalance, + searchCondition: [ + { + key: 'aaa', + value: '123', + isMainValue: false + }], } }, sortTableDefault:8, @@ -1316,23 +1367,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( // }, - { - label: '从库位代码', - field: 'fromLocationCode', - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true - }, - form: { - componentProps: { - disabled: true - } - }, - sortTableDefault:15, - }, + // { // label: '到库位代码', // field: 'toLocationCode',