From bd220d97c173a5e64eb9db53416af152a61b4388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=83=9C=E6=A5=A0?= <2792649152@qq.com> Date: Mon, 27 Nov 2023 14:24:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=B9=E5=B1=82=E9=99=90=E5=88=B6=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../locationgroup/locationgroup.data.ts | 7 +++- .../factoryModeling/process/process.data.ts | 7 +++- .../workstation/workstation.data.ts | 7 +++- .../configurationsetting.data.ts | 22 ------------ .../strategySetting/rule/index.vue | 2 +- .../strategySetting/rule/rule.data.ts | 36 ++++++------------- 6 files changed, 29 insertions(+), 52 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts index ce447bf1e..7a8880d72 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/locationgroup.data.ts @@ -67,7 +67,12 @@ export const Locationgroup = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '库区信息', // 查询弹窗标题 searchAllSchemas: Area.allSchemas, // 查询弹窗所需类 - searchPage: AreaApi.getAreaPage // 查询弹窗所需分页方法 + searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'warehouseCode', + value:'warehouseCode', + isMainValue: true + }] } } }, diff --git a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts index b3e1de3b8..1723daf5e 100644 --- a/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/process/process.data.ts @@ -78,7 +78,12 @@ export const Process = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '生产线信息', // 查询弹窗标题 searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法 + searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'workshopCode', + value:'workshopCode', + isMainValue: true + }] } } }, diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts index 292d68ba5..b651cccc8 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/workstation.data.ts @@ -82,7 +82,12 @@ export const Workstation = useCrudSchemas(reactive([ searchField: 'code', // 查询弹窗赋值字段 searchTitle: '生产线信息', // 查询弹窗标题 searchAllSchemas: Productionline.allSchemas, // 查询弹窗所需类 - searchPage: ProductionlineApi.getProductionlinePage // 查询弹窗所需分页方法 + searchPage: ProductionlineApi.getProductionlinePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'workshopCode', + value:'workshopCode', + isMainValue: true + }] } } }, diff --git a/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts index 8dc28f0c6..d4e801eb2 100644 --- a/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts +++ b/src/views/wms/basicDataManage/strategySetting/configurationsetting/configurationsetting.data.ts @@ -15,7 +15,6 @@ export const Configurationsetting = useCrudSchemas(reactive([ isTable: true, sort: 'custom', table: { - width: 150, fixed: 'left' }, }, @@ -24,18 +23,12 @@ export const Configurationsetting = useCrudSchemas(reactive([ field: 'configurationCode', sort: 'custom', isSearch: true, - table: { - width: 150 - }, }, { label: '配置名称', field: 'configurationName', sort: 'custom', isSearch: true, - table: { - width: 150 - }, }, { label: '数据类型', @@ -44,33 +37,21 @@ export const Configurationsetting = useCrudSchemas(reactive([ dictClass: 'string', isTable: true, sort: 'custom', - table: { - width: 150 - }, }, { label: '值范围', field: 'valueScope', sort: 'custom', - table: { - width: 150 - }, }, { label: '关联到', field: 'relatedTo', sort: 'custom', - table: { - width: 150 - }, }, { label: '描述', field: 'description', sort: 'custom', - table: { - width: 150 - }, }, { label: '必填', @@ -79,9 +60,6 @@ export const Configurationsetting = useCrudSchemas(reactive([ dictClass: 'string', isTable: true, sort: 'custom', - table: { - width: 150 - }, form: { component: 'Switch', value: 'TRUE', diff --git a/src/views/wms/basicDataManage/strategySetting/rule/index.vue b/src/views/wms/basicDataManage/strategySetting/rule/index.vue index 98898bb86..f733cd36f 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/rule/index.vue @@ -99,7 +99,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({ hasPermi: 'wms:rule:create' }), // 新增 + // defaultButtons.defaultAddBtn({ hasPermi: 'wms:rule:create' }), // 新增 defaultButtons.defaultImportBtn({ hasPermi: 'wms:rule:import' }), // 导入 defaultButtons.defaultExportBtn({ hasPermi: 'wms:rule:export' }), // 导出 defaultButtons.defaultFreshBtn(null), //刷新 diff --git a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts index f1e6fd953..83dac5474 100644 --- a/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts +++ b/src/views/wms/basicDataManage/strategySetting/rule/rule.data.ts @@ -11,7 +11,6 @@ export const Rule = useCrudSchemas(reactive([ field: 'strategyCode', sort: 'custom', table: { - width: 150, fixed: 'left' }, isSearch:true @@ -20,9 +19,6 @@ export const Rule = useCrudSchemas(reactive([ label: '优先级', field: 'priority', sort: 'custom', - table: { - width: 150 - }, form: { component: 'InputNumber', componentProps: { @@ -34,46 +30,34 @@ export const Rule = useCrudSchemas(reactive([ label: '代码', field: 'code', sort: 'custom', - table: { - width: 150 - }, isSearch:true }, { label: '名称', field: 'name', sort: 'custom', - table: { - width: 150 - }, isSearch:true }, { label: '条件', field: 'condition', sort: 'custom', - table: { - width: 150 - }, }, { label: '配置', field: 'configuration', sort: 'custom', - table: { - width: 150 - }, }, - { - label: '操作', - field: 'action', - isDetail: false, - isForm: false , - table: { - width: 150, - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isDetail: false, + // isForm: false , + // table: { + // width: 150, + // fixed: 'right' + // } + // } ])) //表单校验