From fefa6790161792b78d684f4026a9b74a05993130 Mon Sep 17 00:00:00 2001 From: bjang03 <259278618@qq.com> Date: Wed, 24 Jul 2024 15:27:43 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20HL-4430,HL-4425?= =?UTF-8?q?=EF=BC=8CHL-4347?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../count/countPlanMain/countPlanMain.data.ts | 184 +++++++++--------- 1 file changed, 92 insertions(+), 92 deletions(-) diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 087d2cc37..abfb7dfea 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -49,34 +49,47 @@ export const CountPlanMain = useCrudSchemas(reactive([ isSearch: true }, { - label: '',//执行周期 - field: 'crontab', + label: '状态', + field: 'status', + dictType: DICT_TYPE.PLAN_STATUS, + dictClass: 'string', + isSearch: true, + isForm: false, + isTable: true, sort: 'custom', table: { width: 150 }, - isDetail:false, - isTable:false, - form:{ - componentProps:{ - disabled:true - } - } }, { - label: '执行周期',//执行周期 + label: '',//执行周期 field: 'crontab', sort: 'custom', table: { width: 150 }, - isForm:false, + isDetail:false, + isTable:false, form:{ componentProps:{ disabled:true } } }, + // { + // label: '执行周期',//执行周期 + // field: 'crontab', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isForm:false, + // form:{ + // componentProps:{ + // disabled:true + // } + // } + // }, { label: '任务拆分方式', field: 'countSplitType', @@ -121,75 +134,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ // } // } // }, - { - label: '物料忽略名单', - field: 'ignoreListOfItem', - sort: 'custom', - table: { - width: 150 - }, - isForm:false, - form: { - componentProps: { - isSearchList: true, // 开启查询弹窗 - multiple:true,//是否可以多选 - searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '物料信息', // 查询弹窗标题 - searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 - searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法 - } - } - }, - { - label: '库位忽略名单', - field: 'ignoreListOfLocation', - sort: 'custom', - table: { - width: 150 - }, - isForm: false, - form: { - componentProps: { - isSearchList: true, // 开启查询弹窗 - multiple:true,//是否可以多选 - searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '库位信息', // 查询弹窗标题 - searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 - } - } - }, - // { - // label: '盘点范围列表', - // field: 'scopeList', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - { - label: '快照盘点', - field: 'isSnapshot', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isTable: true, - isForm:false, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - }, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '冻结盘点', field: 'isFreeze', @@ -385,19 +330,6 @@ export const CountPlanMain = useCrudSchemas(reactive([ } }, }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.PLAN_STATUS, - dictClass: 'string', - isSearch: true, - isForm: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, { label: '是否可用', field: 'available', @@ -510,6 +442,74 @@ export const CountPlanMain = useCrudSchemas(reactive([ }, isTable:false, isForm: false, + },{ + label: '物料忽略名单', + field: 'ignoreListOfItem', + sort: 'custom', + table: { + width: 150 + }, + isForm:false, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + multiple:true,//是否可以多选 + searchListPlaceholder: '请选择物料忽略名单', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage // 查询弹窗所需分页方法 + } + } + }, + { + label: '库位忽略名单', + field: 'ignoreListOfLocation', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + multiple:true,//是否可以多选 + searchListPlaceholder: '请选择库位忽略名单', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 + + } + } + }, + // { + // label: '盘点范围列表', + // field: 'scopeList', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + { + label: '快照盘点', + field: 'isSnapshot', + dictType: DICT_TYPE.TRUE_FALSE, + dictClass: 'string', + isTable: true, + isForm:false, + form: { + component: 'Switch', + value: 'TRUE', + componentProps: { + inactiveValue: 'FALSE', + activeValue: 'TRUE' + } + }, + sort: 'custom', + table: { + width: 150 + }, }, { label: '操作',