diff --git a/src/App.vue b/src/App.vue index 5f8ec4e..a1ba601 100644 --- a/src/App.vue +++ b/src/App.vue @@ -49,12 +49,12 @@ body, .el-dialog__header{ padding: 13px 16px !important; border-bottom: 1px solid #0c2556 !important; - + background: #284c89; .el-dialog__title{ - font-size: 14px !important; + font-size: 16px !important; font-weight: bold; font-stretch: normal; - color: #0c2556 !important; + color: #fff !important; } } @@ -88,5 +88,19 @@ body, background-color: #fff; text-align: right; } + .avue-crud__dialog__menu{ + i{ + color: #fff; + display: none; + } + } + .el-dialog__close{ + color: #fff; + font-size: 20px; + &:hover{ + color: #fff; + } + } } + diff --git a/src/option/job/jobinfo.js b/src/option/job/jobinfo.js index b4de472..5d079ee 100644 --- a/src/option/job/jobinfo.js +++ b/src/option/job/jobinfo.js @@ -131,6 +131,14 @@ export default { dialogWidth: 1200, dialogClickModal: false, tabs: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '任务应用', diff --git a/src/option/job/jobserver.js b/src/option/job/jobserver.js index 27914be..7d445ba 100644 --- a/src/option/job/jobserver.js +++ b/src/option/job/jobserver.js @@ -12,6 +12,14 @@ export default { labelWidth: 100, menuWidth: 350, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '服务名称', diff --git a/src/option/system/dict.js b/src/option/system/dict.js index aac2d8a..f2e5873 100644 --- a/src/option/system/dict.js +++ b/src/option/system/dict.js @@ -11,6 +11,13 @@ export const optionParent = { menuWidth: 250, dialogWidth: 880, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '字典编号', @@ -101,6 +108,13 @@ export const optionChild = { menuWidth: 300, dialogWidth: 880, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '字典编号', diff --git a/src/option/system/dictbiz.js b/src/option/system/dictbiz.js index 18a884b..c12ed75 100644 --- a/src/option/system/dictbiz.js +++ b/src/option/system/dictbiz.js @@ -11,6 +11,13 @@ export const optionParent = { menuWidth: 250, dialogWidth: 880, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '字典编号', @@ -102,6 +109,13 @@ export const optionChild = { menuWidth: 300, dialogWidth: 880, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '字典编号', diff --git a/src/option/system/user.js b/src/option/system/user.js index f579bd2..2c0964f 100644 --- a/src/option/system/user.js +++ b/src/option/system/user.js @@ -361,6 +361,13 @@ export const platformOption = { dialogClickModal: false, menuWidth: 120, editBtnText: '配置', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '登录账号', diff --git a/src/option/tool/code.js b/src/option/tool/code.js index 2447102..c733373 100644 --- a/src/option/tool/code.js +++ b/src/option/tool/code.js @@ -15,6 +15,13 @@ export const codeOption = { viewBtn: true, dialogClickModal: false, tabs: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '模块名', diff --git a/src/option/tool/codesetting.js b/src/option/tool/codesetting.js index 2d53d2c..0b61895 100644 --- a/src/option/tool/codesetting.js +++ b/src/option/tool/codesetting.js @@ -13,6 +13,13 @@ export default { searchLabelWidth: 100, menuWidth: 320, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '配置名称', diff --git a/src/option/tool/formsetting.js b/src/option/tool/formsetting.js index 9fb0b62..5b40c6f 100644 --- a/src/option/tool/formsetting.js +++ b/src/option/tool/formsetting.js @@ -14,6 +14,13 @@ export default { menuWidth: 320, dialogWidth: 500, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '数据源', diff --git a/src/styles/common.scss b/src/styles/common.scss index 0054ea2..3c32a16 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -133,3 +133,7 @@ a { top: 0; bottom: 0; } + +.avue-form__menu--right{ + padding-right:12px !important +} \ No newline at end of file diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index be21628..179a7e5 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -86,4 +86,4 @@ .priority-6-row { background: #c8a4f8 !important; -} \ No newline at end of file +} diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue index 66fe087..9811f06 100644 --- a/src/views/authority/apiscope.vue +++ b/src/views/authority/apiscope.vue @@ -131,6 +131,13 @@ export default { delBtn: false, menuWidth: 150, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '菜单名称', @@ -319,6 +326,13 @@ export default { menuWidth: 200, dialogWidth: 900, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '权限名称', diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue index 14d0b9a..8738e65 100644 --- a/src/views/authority/datascope.vue +++ b/src/views/authority/datascope.vue @@ -135,6 +135,13 @@ export default { delBtn: false, menuWidth: 150, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '菜单名称', @@ -323,6 +330,13 @@ export default { menuWidth: 200, dialogWidth: 900, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '权限名称', diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index 38d2699..19037ab 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -152,6 +152,13 @@ export default { dialogWidth: 600, dialogClickModal: false, filterBtn: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '上级角色', diff --git a/src/views/basicData/calculationFormula/tankDosing.vue b/src/views/basicData/calculationFormula/tankDosing.vue index 7163910..71a879e 100644 --- a/src/views/basicData/calculationFormula/tankDosing.vue +++ b/src/views/basicData/calculationFormula/tankDosing.vue @@ -74,6 +74,13 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '公式名称', diff --git a/src/views/basicData/calculationFormula/theoreticalValue.vue b/src/views/basicData/calculationFormula/theoreticalValue.vue index 193bb01..1f13a3d 100644 --- a/src/views/basicData/calculationFormula/theoreticalValue.vue +++ b/src/views/basicData/calculationFormula/theoreticalValue.vue @@ -74,6 +74,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '公式名称', diff --git a/src/views/basicData/jobTransferManagement - 副本.vue b/src/views/basicData/jobTransferManagement - 副本.vue index 1834ef7..6d6ee4f 100644 --- a/src/views/basicData/jobTransferManagement - 副本.vue +++ b/src/views/basicData/jobTransferManagement - 副本.vue @@ -84,6 +84,13 @@ export default { excelBtn: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '姓名', diff --git a/src/views/basicData/jobTransferManagement.vue b/src/views/basicData/jobTransferManagement.vue index e024355..791e539 100644 --- a/src/views/basicData/jobTransferManagement.vue +++ b/src/views/basicData/jobTransferManagement.vue @@ -240,6 +240,13 @@ export default { excelBtn: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '所属班组', diff --git a/src/views/basicData/localPlateParts/index.vue b/src/views/basicData/localPlateParts/index.vue index 56b0ca0..b26d812 100644 --- a/src/views/basicData/localPlateParts/index.vue +++ b/src/views/basicData/localPlateParts/index.vue @@ -62,6 +62,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '零件编号', diff --git a/src/views/basicData/materialQuota/components/KAu.vue b/src/views/basicData/materialQuota/components/KAu.vue index b6b56ad..3c1d785 100644 --- a/src/views/basicData/materialQuota/components/KAu.vue +++ b/src/views/basicData/materialQuota/components/KAu.vue @@ -72,6 +72,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '镀层厚度', diff --git a/src/views/basicData/materialQuota/components/silverAnode.vue b/src/views/basicData/materialQuota/components/silverAnode.vue index b6b56ad..3c1d785 100644 --- a/src/views/basicData/materialQuota/components/silverAnode.vue +++ b/src/views/basicData/materialQuota/components/silverAnode.vue @@ -72,6 +72,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '镀层厚度', diff --git a/src/views/basicData/moldRelationshipTable.vue b/src/views/basicData/moldRelationshipTable.vue index 59d1330..b16b3d8 100644 --- a/src/views/basicData/moldRelationshipTable.vue +++ b/src/views/basicData/moldRelationshipTable.vue @@ -62,6 +62,13 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '物料编号', diff --git a/src/views/basicData/platThicknessRelation/index.vue b/src/views/basicData/platThicknessRelation/index.vue index 662ddbd..39e9722 100644 --- a/src/views/basicData/platThicknessRelation/index.vue +++ b/src/views/basicData/platThicknessRelation/index.vue @@ -65,6 +65,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '镀层代号', diff --git a/src/views/basicData/shiftManagement.vue b/src/views/basicData/shiftManagement.vue index 0febbe2..b418992 100644 --- a/src/views/basicData/shiftManagement.vue +++ b/src/views/basicData/shiftManagement.vue @@ -64,7 +64,13 @@ export default { searchShowBtn: false, excelBtn: true, showOverflowTooltip: true, - align:'center', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column:[ { label: '班次', diff --git a/src/views/basicData/teamManagement.vue b/src/views/basicData/teamManagement.vue index 29ae96d..02af1f5 100644 --- a/src/views/basicData/teamManagement.vue +++ b/src/views/basicData/teamManagement.vue @@ -225,6 +225,13 @@ export default { searchShowBtn: false, excelBtn: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column:[ { label: '编码', diff --git a/src/views/basicData/warehouseMaintenance.vue b/src/views/basicData/warehouseMaintenance.vue index 0f03051..c3767cf 100644 --- a/src/views/basicData/warehouseMaintenance.vue +++ b/src/views/basicData/warehouseMaintenance.vue @@ -79,6 +79,13 @@ gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [] } } diff --git a/src/views/basicData/workCenter.vue b/src/views/basicData/workCenter.vue index 27c6d74..d04d189 100644 --- a/src/views/basicData/workCenter.vue +++ b/src/views/basicData/workCenter.vue @@ -164,6 +164,13 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '编码', diff --git a/src/views/changeJobManagement/trainingPlan.vue b/src/views/changeJobManagement/trainingPlan.vue index 7c69f09..1fb34a1 100644 --- a/src/views/changeJobManagement/trainingPlan.vue +++ b/src/views/changeJobManagement/trainingPlan.vue @@ -58,6 +58,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '培训计划名称', diff --git a/src/views/changeJobManagement/trainingRecordManagement.vue b/src/views/changeJobManagement/trainingRecordManagement.vue index d5e6fba..1e6166a 100644 --- a/src/views/changeJobManagement/trainingRecordManagement.vue +++ b/src/views/changeJobManagement/trainingRecordManagement.vue @@ -120,6 +120,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '姓名', diff --git a/src/views/costManagement/costConfiguration.vue b/src/views/costManagement/costConfiguration.vue index 522d3f8..c86f377 100644 --- a/src/views/costManagement/costConfiguration.vue +++ b/src/views/costManagement/costConfiguration.vue @@ -145,7 +145,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, - align: 'center', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [] } } diff --git a/src/views/costManagement/subjectFeeMaintenance.vue b/src/views/costManagement/subjectFeeMaintenance.vue index a75a2aa..6421990 100644 --- a/src/views/costManagement/subjectFeeMaintenance.vue +++ b/src/views/costManagement/subjectFeeMaintenance.vue @@ -129,7 +129,15 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, - align:'center', + + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '费用科目', diff --git a/src/views/costStatistics/index.vue b/src/views/costStatistics/index.vue index 6a475f2..3c32a7b 100644 --- a/src/views/costStatistics/index.vue +++ b/src/views/costStatistics/index.vue @@ -81,7 +81,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, - align: 'center', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '作业中心编码', diff --git a/src/views/data/record.vue b/src/views/data/record.vue index f7f312b..b6ed9db 100644 --- a/src/views/data/record.vue +++ b/src/views/data/record.vue @@ -101,6 +101,14 @@ export default { menuWidth: 120, labelWidth: 120, dialogType: 'drawer', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '服务ID', diff --git a/src/views/desk/notice-composition.vue b/src/views/desk/notice-composition.vue index 6c7a7f2..84ae858 100644 --- a/src/views/desk/notice-composition.vue +++ b/src/views/desk/notice-composition.vue @@ -67,6 +67,14 @@ const option = reactive({ excelBtn: true, dialogClickModal: false, grid: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '通知标题', diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue index 4ae2ccf..bdfc9bf 100644 --- a/src/views/desk/notice.vue +++ b/src/views/desk/notice.vue @@ -67,6 +67,14 @@ export default { excelBtn: true, dialogClickModal: false, grid: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '通知标题', diff --git a/src/views/energyManagement/components/electricityQuota.vue b/src/views/energyManagement/components/electricityQuota.vue index b6722b5..e83c34f 100644 --- a/src/views/energyManagement/components/electricityQuota.vue +++ b/src/views/energyManagement/components/electricityQuota.vue @@ -56,6 +56,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '作业中心', diff --git a/src/views/energyManagement/components/electricityTarget.vue b/src/views/energyManagement/components/electricityTarget.vue index b586ad2..428ea65 100644 --- a/src/views/energyManagement/components/electricityTarget.vue +++ b/src/views/energyManagement/components/electricityTarget.vue @@ -56,6 +56,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { diff --git a/src/views/energyManagement/components/waterQuota.vue b/src/views/energyManagement/components/waterQuota.vue index 73f64ae..dfe43ca 100644 --- a/src/views/energyManagement/components/waterQuota.vue +++ b/src/views/energyManagement/components/waterQuota.vue @@ -56,6 +56,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '作业中心', diff --git a/src/views/energyManagement/components/waterTarget.vue b/src/views/energyManagement/components/waterTarget.vue index 4e317d6..bb52066 100644 --- a/src/views/energyManagement/components/waterTarget.vue +++ b/src/views/energyManagement/components/waterTarget.vue @@ -56,6 +56,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { diff --git a/src/views/energyManagement/electricityManagement.vue b/src/views/energyManagement/electricityManagement.vue index 55178cf..e0d8d33 100644 --- a/src/views/energyManagement/electricityManagement.vue +++ b/src/views/energyManagement/electricityManagement.vue @@ -52,6 +52,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '作业中心', diff --git a/src/views/energyManagement/energyMonitoring.vue b/src/views/energyManagement/energyMonitoring.vue index 03a6bb6..80ad007 100644 --- a/src/views/energyManagement/energyMonitoring.vue +++ b/src/views/energyManagement/energyMonitoring.vue @@ -59,6 +59,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '日期', diff --git a/src/views/energyManagement/peakFlatValley.vue b/src/views/energyManagement/peakFlatValley.vue index 96f5d6d..6712e72 100644 --- a/src/views/energyManagement/peakFlatValley.vue +++ b/src/views/energyManagement/peakFlatValley.vue @@ -60,6 +60,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '月份', diff --git a/src/views/energyManagement/waterManagement.vue b/src/views/energyManagement/waterManagement.vue index 47fac1e..a50a872 100644 --- a/src/views/energyManagement/waterManagement.vue +++ b/src/views/energyManagement/waterManagement.vue @@ -52,6 +52,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '作业中心', diff --git a/src/views/equiptManagement/equipmentLedger/index.vue b/src/views/equiptManagement/equipmentLedger/index.vue index 361a7c4..bcd54da 100644 --- a/src/views/equiptManagement/equipmentLedger/index.vue +++ b/src/views/equiptManagement/equipmentLedger/index.vue @@ -87,6 +87,14 @@ export default { gridBtn: false, searchIndex: 3, searchIcon: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '设备编码', @@ -238,6 +246,7 @@ export default { limit: 1, fileSize: 10000, action:'', + hide:true, tip: '只能上传 image/gif,image/jpeg,image/jpg,image/png 附件，且不超过 10M', }, ], diff --git a/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue b/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue index c9681fd..475f925 100644 --- a/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue +++ b/src/views/equiptManagement/equipmentMaintenanceRecord/index.vue @@ -82,6 +82,14 @@ export default { searchIndex: 3, searchIcon: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '设备编号', diff --git a/src/views/equiptManagement/measurementRecords/index.vue b/src/views/equiptManagement/measurementRecords/index.vue index d0ea471..4f93875 100644 --- a/src/views/equiptManagement/measurementRecords/index.vue +++ b/src/views/equiptManagement/measurementRecords/index.vue @@ -83,6 +83,14 @@ export default { searchIndex: 3, searchIcon: true, menu:false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '编号', diff --git a/src/views/equiptManagement/workwearManagement/index.vue b/src/views/equiptManagement/workwearManagement/index.vue index 89b436b..a24337e 100644 --- a/src/views/equiptManagement/workwearManagement/index.vue +++ b/src/views/equiptManagement/workwearManagement/index.vue @@ -61,6 +61,14 @@ export default { gridBtn: false, index: false, searchShowBtn: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [] }, data: [] @@ -207,6 +215,6 @@ export default { \ No newline at end of file diff --git a/src/views/flow/follow.vue b/src/views/flow/follow.vue index 3c9938b..a30e8f7 100644 --- a/src/views/flow/follow.vue +++ b/src/views/flow/follow.vue @@ -72,6 +72,14 @@ export default { dialogWidth: 900, menuWidth: 100, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '执行id', diff --git a/src/views/flow/manager.vue b/src/views/flow/manager.vue index 6658cef..56d9564 100644 --- a/src/views/flow/manager.vue +++ b/src/views/flow/manager.vue @@ -161,6 +161,14 @@ export default { dialogWidth: 900, menuWidth: 250, dialogClickModal: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '租户编号', diff --git a/src/views/flow/model.vue b/src/views/flow/model.vue index 33b3518..fdf213b 100644 --- a/src/views/flow/model.vue +++ b/src/views/flow/model.vue @@ -220,6 +220,14 @@ export default { dialogClickModal: false, size: 'default', searchSize: 'default', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '模型主键', diff --git a/src/views/flowManagement/managementOfKeyTasks.vue b/src/views/flowManagement/managementOfKeyTasks.vue index 53c72f4..7a7f8da 100644 --- a/src/views/flowManagement/managementOfKeyTasks.vue +++ b/src/views/flowManagement/managementOfKeyTasks.vue @@ -382,6 +382,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '单据号', diff --git a/src/views/inboundOutboundManagement/binTransfer/index.vue b/src/views/inboundOutboundManagement/binTransfer/index.vue index 1bd6e13..96415f1 100644 --- a/src/views/inboundOutboundManagement/binTransfer/index.vue +++ b/src/views/inboundOutboundManagement/binTransfer/index.vue @@ -58,6 +58,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '物料编号', diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue index 002d502..91177c9 100644 --- a/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue +++ b/src/views/inboundOutboundManagement/glassCakeOutbound/components/addDialog.vue @@ -76,6 +76,14 @@ export default { searchShowBtn: false, showOverflowTooltip: true, header: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '车间订单号', diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue index 580181a..29cb997 100644 --- a/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue +++ b/src/views/inboundOutboundManagement/glassCakeOutbound/components/outboundDialog.vue @@ -69,6 +69,14 @@ export default { searchShowBtn: false, showOverflowTooltip: true, header: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '车间订单号', diff --git a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue index d7b4d07..f86bb41 100644 --- a/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue +++ b/src/views/inboundOutboundManagement/glassCakeOutbound/index.vue @@ -82,6 +82,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '出库单号', diff --git a/src/views/inboundOutboundManagement/materialIssuing.vue b/src/views/inboundOutboundManagement/materialIssuing.vue index b75f240..33fd83b 100644 --- a/src/views/inboundOutboundManagement/materialIssuing.vue +++ b/src/views/inboundOutboundManagement/materialIssuing.vue @@ -62,6 +62,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '提请物料', diff --git a/src/views/inboundOutboundManagement/otherIssuing/index.vue b/src/views/inboundOutboundManagement/otherIssuing/index.vue index 5b9312c..f862712 100644 --- a/src/views/inboundOutboundManagement/otherIssuing/index.vue +++ b/src/views/inboundOutboundManagement/otherIssuing/index.vue @@ -75,6 +75,14 @@ export default { excelBtn: true, columnSort: true, index: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '出库单号', diff --git a/src/views/inboundOutboundManagement/otherReceiving.vue b/src/views/inboundOutboundManagement/otherReceiving.vue index a3ff6ad..69acede 100644 --- a/src/views/inboundOutboundManagement/otherReceiving.vue +++ b/src/views/inboundOutboundManagement/otherReceiving.vue @@ -64,6 +64,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '入库单号', diff --git a/src/views/inboundOutboundManagement/pickListPrinting.vue b/src/views/inboundOutboundManagement/pickListPrinting.vue index 82753d6..5001dae 100644 --- a/src/views/inboundOutboundManagement/pickListPrinting.vue +++ b/src/views/inboundOutboundManagement/pickListPrinting.vue @@ -84,6 +84,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '出库单号', diff --git a/src/views/inboundOutboundManagement/returnReceiving.vue b/src/views/inboundOutboundManagement/returnReceiving.vue index d4c1dd8..1d671e9 100644 --- a/src/views/inboundOutboundManagement/returnReceiving.vue +++ b/src/views/inboundOutboundManagement/returnReceiving.vue @@ -104,6 +104,14 @@ export default { gridBtn: false, searchShowBtn: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '物料编号', diff --git a/src/views/inboundOutboundManagement/warehouseTransfer/index.vue b/src/views/inboundOutboundManagement/warehouseTransfer/index.vue index c581e7b..767a22f 100644 --- a/src/views/inboundOutboundManagement/warehouseTransfer/index.vue +++ b/src/views/inboundOutboundManagement/warehouseTransfer/index.vue @@ -65,6 +65,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '出库单号', diff --git a/src/views/loanManagement/loanHistory.vue b/src/views/loanManagement/loanHistory.vue index 736867b..3b2f8cc 100644 --- a/src/views/loanManagement/loanHistory.vue +++ b/src/views/loanManagement/loanHistory.vue @@ -79,6 +79,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '单据号', diff --git a/src/views/meteringManagement/measureUseList.vue b/src/views/meteringManagement/measureUseList.vue index 88d544c..f86da18 100644 --- a/src/views/meteringManagement/measureUseList.vue +++ b/src/views/meteringManagement/measureUseList.vue @@ -58,6 +58,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '材料名称', diff --git a/src/views/monitor/log/api.vue b/src/views/monitor/log/api.vue index be4fbb8..9f461d4 100644 --- a/src/views/monitor/log/api.vue +++ b/src/views/monitor/log/api.vue @@ -50,6 +50,14 @@ export default { delBtn: false, menuWidth: 120, dialogType: 'drawer', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '服务id', diff --git a/src/views/monitor/log/error.vue b/src/views/monitor/log/error.vue index a94c6ca..5bbdf00 100644 --- a/src/views/monitor/log/error.vue +++ b/src/views/monitor/log/error.vue @@ -50,6 +50,14 @@ export default { delBtn: false, menuWidth: 120, dialogType: 'drawer', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '服务id', diff --git a/src/views/monitor/log/usual.vue b/src/views/monitor/log/usual.vue index 2b6d1fa..b871446 100644 --- a/src/views/monitor/log/usual.vue +++ b/src/views/monitor/log/usual.vue @@ -50,6 +50,14 @@ export default { delBtn: false, menuWidth: 120, dialogType: 'drawer', + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '服务id', diff --git a/src/views/oem/facInnerApproval/index.vue b/src/views/oem/facInnerApproval/index.vue index abbd0b7..3f061c7 100644 --- a/src/views/oem/facInnerApproval/index.vue +++ b/src/views/oem/facInnerApproval/index.vue @@ -64,6 +64,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '车间订单号', diff --git a/src/views/oem/oemApproval/index.vue b/src/views/oem/oemApproval/index.vue index abbd0b7..3f061c7 100644 --- a/src/views/oem/oemApproval/index.vue +++ b/src/views/oem/oemApproval/index.vue @@ -64,6 +64,14 @@ export default { excelBtn: true, columnSort: true, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '车间订单号', diff --git a/src/views/oem/oemCustomer/index.vue b/src/views/oem/oemCustomer/index.vue index 827ab7f..d309b9d 100644 --- a/src/views/oem/oemCustomer/index.vue +++ b/src/views/oem/oemCustomer/index.vue @@ -98,6 +98,14 @@ export default { gridBtn: false, searchIndex: 3, searchIcon: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '外协代码', diff --git a/src/views/oem/oemCustomer/setCraftAbility.vue b/src/views/oem/oemCustomer/setCraftAbility.vue index 6658474..6e7289a 100644 --- a/src/views/oem/oemCustomer/setCraftAbility.vue +++ b/src/views/oem/oemCustomer/setCraftAbility.vue @@ -60,6 +60,14 @@ export default { addRowBtn: true, cellBtn: false, cancelBtn: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '工艺能力', diff --git a/src/views/oem/oemOrder/index.vue b/src/views/oem/oemOrder/index.vue index d85170c..97c4768 100644 --- a/src/views/oem/oemOrder/index.vue +++ b/src/views/oem/oemOrder/index.vue @@ -127,6 +127,14 @@ export default { gridBtn: false, searchIndex: 3, searchIcon: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '计划单号', diff --git a/src/views/oem/oemOrder/turnFacInner.vue b/src/views/oem/oemOrder/turnFacInner.vue index 00d5435..3e49225 100644 --- a/src/views/oem/oemOrder/turnFacInner.vue +++ b/src/views/oem/oemOrder/turnFacInner.vue @@ -57,6 +57,14 @@ export default { header:false, index:true, menu:false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '工序号', diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue index c04b6f4..47276e0 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue @@ -72,6 +72,14 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '外协单号', diff --git a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue index 5f539bc..e1518ab 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue @@ -61,6 +61,14 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '外协单号', diff --git a/src/views/oem/oemOrderSettlement/components/settlementIn.vue b/src/views/oem/oemOrderSettlement/components/settlementIn.vue index 4e9127f..faa1958 100644 --- a/src/views/oem/oemOrderSettlement/components/settlementIn.vue +++ b/src/views/oem/oemOrderSettlement/components/settlementIn.vue @@ -64,6 +64,14 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '外协单号', diff --git a/src/views/oem/oemOrderSettlement/components/unsettled.vue b/src/views/oem/oemOrderSettlement/components/unsettled.vue index a677ad7..ed7cbce 100644 --- a/src/views/oem/oemOrderSettlement/components/unsettled.vue +++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue @@ -74,6 +74,14 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '外协单号', diff --git a/src/views/oem/oemProcess/index.vue b/src/views/oem/oemProcess/index.vue index 050e5a3..08fadc9 100644 --- a/src/views/oem/oemProcess/index.vue +++ b/src/views/oem/oemProcess/index.vue @@ -58,6 +58,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '编码', diff --git a/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue b/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue index 276dfac..73ce9ca 100644 --- a/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue +++ b/src/views/oem/outsourceBiddingRatio/components/tenderRatio.vue @@ -75,6 +75,14 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [ { label: '工艺能力', diff --git a/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue b/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue index 4764863..79bc662 100644 --- a/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue +++ b/src/views/oem/outsourceBiddingRatio/components/unTenderRatio.vue @@ -75,6 +75,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '工艺能力', diff --git a/src/views/oem/outsourcingAssignmentControl/index.vue b/src/views/oem/outsourcingAssignmentControl/index.vue index 59adf16..6ea9d85 100644 --- a/src/views/oem/outsourcingAssignmentControl/index.vue +++ b/src/views/oem/outsourcingAssignmentControl/index.vue @@ -76,6 +76,13 @@ export default { columnSort: true, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '供应商', diff --git a/src/views/oem/performanceApplication/components/addQuality.vue b/src/views/oem/performanceApplication/components/addQuality.vue index c23739c..fecad49 100644 --- a/src/views/oem/performanceApplication/components/addQuality.vue +++ b/src/views/oem/performanceApplication/components/addQuality.vue @@ -70,6 +70,13 @@ export default { showOverflowTooltip: true, menu: false, header: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/performanceApplication/index.vue b/src/views/oem/performanceApplication/index.vue index 2914660..44dfceb 100644 --- a/src/views/oem/performanceApplication/index.vue +++ b/src/views/oem/performanceApplication/index.vue @@ -65,6 +65,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue index b1564cf..6f0fdc1 100644 --- a/src/views/oem/performanceCalculate/components/millMeritsProduce.vue +++ b/src/views/oem/performanceCalculate/components/millMeritsProduce.vue @@ -62,6 +62,13 @@ export default { columnSort: true, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue index 0a678f8..238b88f 100644 --- a/src/views/oem/performanceCalculate/components/millMeritsQuality.vue +++ b/src/views/oem/performanceCalculate/components/millMeritsQuality.vue @@ -69,6 +69,13 @@ export default { columnSort: true, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/performanceCheck/index.vue b/src/views/oem/performanceCheck/index.vue index 658f19a..1c36bc6 100644 --- a/src/views/oem/performanceCheck/index.vue +++ b/src/views/oem/performanceCheck/index.vue @@ -64,6 +64,13 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/performanceReview/index.vue b/src/views/oem/performanceReview/index.vue index 528302c..42e14e5 100644 --- a/src/views/oem/performanceReview/index.vue +++ b/src/views/oem/performanceReview/index.vue @@ -65,6 +65,13 @@ export default { index: false, showOverflowTooltip: true, menu: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/priceQuery/index.vue b/src/views/oem/priceQuery/index.vue index bc87c7d..a1d732a 100644 --- a/src/views/oem/priceQuery/index.vue +++ b/src/views/oem/priceQuery/index.vue @@ -60,6 +60,13 @@ export default { columnSort: true, showOverflowTooltip: true, menu:false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '厂家代码', diff --git a/src/views/oem/proTask/index.vue b/src/views/oem/proTask/index.vue index 3e381cc..0770e6c 100644 --- a/src/views/oem/proTask/index.vue +++ b/src/views/oem/proTask/index.vue @@ -60,6 +60,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '任务号', diff --git a/src/views/oem/settlementRules/components/addDialog.vue b/src/views/oem/settlementRules/components/addDialog.vue index 72e7999..69b309d 100644 --- a/src/views/oem/settlementRules/components/addDialog.vue +++ b/src/views/oem/settlementRules/components/addDialog.vue @@ -27,6 +27,13 @@ export default { cellBtn: true, menu: false, addBtn: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '规则名称', diff --git a/src/views/oem/settlementRules/components/batchDialog.vue b/src/views/oem/settlementRules/components/batchDialog.vue index 43f79ca..d5c9867 100644 --- a/src/views/oem/settlementRules/components/batchDialog.vue +++ b/src/views/oem/settlementRules/components/batchDialog.vue @@ -29,6 +29,13 @@ export default { addBtn: false, index:true, select:false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/settlementRules/components/plate.vue b/src/views/oem/settlementRules/components/plate.vue index 01762d5..4fd907d 100644 --- a/src/views/oem/settlementRules/components/plate.vue +++ b/src/views/oem/settlementRules/components/plate.vue @@ -66,6 +66,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '镀种', diff --git a/src/views/oem/settlementRules/components/process.vue b/src/views/oem/settlementRules/components/process.vue index 65a49f6..2918800 100644 --- a/src/views/oem/settlementRules/components/process.vue +++ b/src/views/oem/settlementRules/components/process.vue @@ -66,6 +66,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '工序编号', diff --git a/src/views/oem/settlementRules/components/processDialog.vue b/src/views/oem/settlementRules/components/processDialog.vue index cebefb6..6d1835c 100644 --- a/src/views/oem/settlementRules/components/processDialog.vue +++ b/src/views/oem/settlementRules/components/processDialog.vue @@ -29,6 +29,13 @@ export default { addBtn: false, index: true, select: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '工序', diff --git a/src/views/oem/settlementRules/components/settlement.vue b/src/views/oem/settlementRules/components/settlement.vue index 86dace8..5cc5fad 100644 --- a/src/views/oem/settlementRules/components/settlement.vue +++ b/src/views/oem/settlementRules/components/settlement.vue @@ -76,6 +76,13 @@ export default { columnSort: true, index: false, showOverflowTooltip: true, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', column: [ { label: '规则名称', diff --git a/src/views/orderManagement/components/moldRecord.vue b/src/views/orderManagement/components/moldRecord.vue new file mode 100644 index 0000000..5c5b3ed --- /dev/null +++ b/src/views/orderManagement/components/moldRecord.vue @@ -0,0 +1,534 @@ + + diff --git a/src/views/orderManagement/components/moldRequire.vue b/src/views/orderManagement/components/moldRequire.vue new file mode 100644 index 0000000..14bd160 --- /dev/null +++ b/src/views/orderManagement/components/moldRequire.vue @@ -0,0 +1,534 @@ + + diff --git a/src/views/orderManagement/exceptionOrder.vue b/src/views/orderManagement/exceptionOrder.vue index 04be3c0..867d4e1 100644 --- a/src/views/orderManagement/exceptionOrder.vue +++ b/src/views/orderManagement/exceptionOrder.vue @@ -25,17 +25,17 @@ {{ row.curStatusText }} {{ row.curStatusText - }} + }} {{ row.curStatusText - }} + }} {{ row.curStatusText - }} + }} {{ row.curStatusText - }} + }} @@ -100,13 +100,13 @@ export default { calcHeight: 32, simplePage: false, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, border: true, index: true, - selection: true, + selection: false, viewBtn: false, delBtn: false, addBtn: false, @@ -122,8 +122,21 @@ export default { filterBtn: true, searchShowBtn: false, excelBtn: true, - index: false, showOverflowTooltip: true, + addBtnIcon: ' ', + viewBtnIcon: ' ', + delBtnIcon: ' ', + editBtnIcon: ' ', + menuAlign: 'left', + gridBtn: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [], }, diff --git a/src/views/orderManagement/moldPlan.vue b/src/views/orderManagement/moldPlan.vue index 10e2bcc..1144693 100644 --- a/src/views/orderManagement/moldPlan.vue +++ b/src/views/orderManagement/moldPlan.vue @@ -1,3 +1,38 @@ \ No newline at end of file + + + + + + + + + + + diff --git a/src/views/orderManagement/orderCol.js b/src/views/orderManagement/orderCol.js index df76656..cefeaf2 100644 --- a/src/views/orderManagement/orderCol.js +++ b/src/views/orderManagement/orderCol.js @@ -1,705 +1,792 @@ export default { - plannedOrder:[ - { - label: '计划单号', - prop: 'poCode', - search: false, - sortable: true, - width: 150, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '零件号', - prop: 'partCode', - search: false, - sortable: true, - width: 150, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '产品型号', - prop: 'productType', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '名称', - prop: 'partName', - search: false, - sortable: true, - disabled: true, - span: 12, - width: 100, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '镀种', - prop: 'plate', - search: false, - sortable: true, - disabled: true, - span: 12, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '镀种小类', - prop: 'plate', - search: false, - sortable: true, - width: 120, - display: false, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '生产标识', - prop: 'prodIdent', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '使用部门', - prop: 'useDept', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '生产数量', - prop: 'poQty', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '面积(d㎡)', - prop: 'poArea', - search: false, - sortable: true, - width: 120, - span: 12, - disabled: true, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '需求交期', - prop: 'demandDate', - search: false, - sortable: true, - width: 150, - span: 12, + plannedOrder: [ + { + label: '计划单号', + prop: 'poCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '零件号', + prop: 'partCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品型号', + prop: 'productType', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '名称', + prop: 'partName', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 150, + headerAlign: 'center', + align: 'left', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种', + prop: 'plate', + search: false, + sortable: true, + disabled: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种小类', + prop: 'plate', + search: false, + sortable: true, + width: 120, + display: false, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产标识', + prop: 'prodIdent', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '使用部门', + prop: 'useDept', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产数量', + prop: 'poQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '面积(d㎡)', + prop: 'poArea', + search: false, + sortable: true, + width: 120, + span: 12, + disabled: true, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '需求交期', + prop: 'demandDate', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划员', - prop: 'planUser', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划下达时间', - prop: 'releaseDate', - search: true, - sortable: true, - searchLabelWidth:120, - width: 150, - span: 12, - type: "date", - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '优先级', - prop: 'createName', - search: false, - sortable: true, - hide: true, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划类型', - prop: 'createName', - search: false, - sortable: true, - hide: true, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '工艺路线', - prop: 'createName', - search: false, - sortable: true, - disabled: true, - hide: true, - span: 24, - type: 'textarea', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '备注', - prop: 'memo', - search: false, - sortable: true, - span: 24, - type: 'textarea', - width: 150, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '产品系列', - prop: 'prodLine', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '已交付数量', - prop: 'deliveryQty', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '未交付数量', - prop: 'undeliveredQty', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '状态', - prop: 'curStatusText', - search: true, - sortable: true, - searchLabelWidth:80, - span: 12, - display: false, - type: 'select', - width: '100', - dicData: [{ - value: 2, - label: '已退回' - }, { - value: 4, - label: '已派工' - }, { - value: 5, - label: '加工中' - }, { - value: 15, - label: '已完工' - }, - { - value: 21, - label: '已关闭' - }] - }, - ], - exceptionOrder:[ - { - label: '描述', - prop: 'roamNo', - search: false, - sortable: true, - width: 150, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划单号', - prop: 'poCode', - search: false, - sortable: true, - width: 150, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '零件号', - prop: 'partCode', - search: false, - sortable: true, - width: 150, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '产品型号', - prop: 'productType', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '名称', - prop: 'partName', - search: false, - sortable: true, - disabled: true, - span: 12, - width: 100, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '镀种', - prop: 'plate', - search: false, - sortable: true, - disabled: true, - span: 12, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '镀种小类', - prop: 'plate', - search: false, - sortable: true, - width: 120, - display: false, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '生产标识', - prop: 'prodIdent', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '使用部门', - prop: 'useDept', - search: false, - sortable: true, - disabled: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '生产数量', - prop: 'poQty', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '面积(d㎡)', - prop: 'poArea', - search: false, - sortable: true, - width: 120, - span: 12, - disabled: true, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '需求交期', - prop: 'demandDate', - search: false, - sortable: true, - width: 150, - span: 12, + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划员', + prop: 'planUser', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划下达时间', + prop: 'releaseDate', + search: true, + sortable: true, + searchLabelWidth: 100, + width: 150, + span: 12, + type: "date", + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '优先级', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划类型', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '工艺路线', + prop: 'createName', + search: false, + sortable: true, + disabled: true, + hide: true, + span: 24, + type: 'textarea', + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '备注', + prop: 'memo', + search: false, + sortable: true, + span: 24, + type: 'textarea', + width: 150, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品系列', + prop: 'prodLine', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '已交付数量', + prop: 'deliveryQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '未交付数量', + prop: 'undeliveredQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '状态', + prop: 'curStatusText', + search: true, + sortable: true, + searchLabelWidth: 50, + span: 12, + display: false, + type: 'select', + width: '100', + headerAlign: 'center', + align: 'center', + dicData: [{ + value: 2, + label: '已退回' + }, { + value: 4, + label: '已派工' + }, { + value: 5, + label: '加工中' + }, { + value: 15, + label: '已完工' + }, + { + value: 21, + label: '已关闭' + }] + }, + ], + exceptionOrder: [ + { + label: '描述', + prop: 'roamNo', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'left', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划单号', + prop: 'poCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '零件号', + prop: 'partCode', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品型号', + prop: 'productType', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '名称', + prop: 'partName', + search: false, + sortable: true, + disabled: true, + span: 12, + width: 100, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种', + prop: 'plate', + search: false, + sortable: true, + disabled: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '镀种小类', + prop: 'plate', + search: false, + sortable: true, + width: 120, + display: false, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产标识', + prop: 'prodIdent', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '使用部门', + prop: 'useDept', + search: false, + sortable: true, + disabled: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '生产数量', + prop: 'poQty', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '面积(d㎡)', + prop: 'poArea', + search: false, + sortable: true, + width: 120, + span: 12, + disabled: true, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '需求交期', + prop: 'demandDate', + search: false, + sortable: true, + width: 150, + span: 12, + headerAlign: 'center', + align: 'center', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划员', - prop: 'planUser', - search: false, - sortable: true, - width: 120, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划下达时间', - prop: 'releaseDate', - search: true, - sortable: true, - searchLabelWidth:120, - width: 150, - span: 12, - type: "date", - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '优先级', - prop: 'createName', - search: false, - sortable: true, - hide: true, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '计划类型', - prop: 'createName', - search: false, - sortable: true, - hide: true, - span: 12, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '工艺路线', - prop: 'createName', - search: false, - sortable: true, - disabled: true, - hide: true, - span: 24, - type: 'textarea', - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '备注', - prop: 'memo', - search: false, - sortable: true, - span: 24, - type: 'textarea', - width: 150, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '产品系列', - prop: 'prodLine', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: false, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '已交付数量', - prop: 'deliveryQty', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '未交付数量', - prop: 'undeliveredQty', - search: false, - sortable: true, - width: 120, - span: 12, - display: false, - rules: [ - { - required: true, - message: '请输入角色名称', - trigger: 'blur', - }, - ], - }, - { - label: '状态', - prop: 'curStatusText', - search: true, - sortable: true, - searchLabelWidth:80, - span: 12, - display: false, - type: 'select', - width: '100', - dicData: [{ - value: 2, - label: '已退回' - }, { - value: 4, - label: '已派工' - }, { - value: 5, - label: '加工中' - }, { - value: 15, - label: '已完工' - }, - { - value: 21, - label: '已关闭' - }] - }, - ] + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划员', + prop: 'planUser', + search: false, + sortable: true, + width: 120, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划下达时间', + prop: 'releaseDate', + search: true, + sortable: true, + searchLabelWidth: 100, + width: 150, + span: 12, + type: "date", + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '优先级', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '计划类型', + prop: 'createName', + search: false, + sortable: true, + hide: true, + span: 12, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '工艺路线', + prop: 'createName', + search: false, + sortable: true, + disabled: true, + hide: true, + span: 24, + headerAlign: 'center', + align: 'center', + type: 'textarea', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '备注', + prop: 'memo', + search: false, + sortable: true, + span: 24, + type: 'textarea', + width: 150, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '产品系列', + prop: 'prodLine', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: false, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '已交付数量', + prop: 'deliveryQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '未交付数量', + prop: 'undeliveredQty', + search: false, + sortable: true, + width: 120, + span: 12, + display: false, + headerAlign: 'center', + align: 'center', + rules: [ + { + required: true, + message: '请输入角色名称', + trigger: 'blur', + }, + ], + }, + { + label: '状态', + prop: 'curStatusText', + search: true, + sortable: true, + searchLabelWidth: 50, + span: 12, + display: false, + type: 'select', + width: '100', + headerAlign: 'center', + align: 'center', + dicData: [{ + value: 2, + label: '已退回' + }, { + value: 4, + label: '已派工' + }, { + value: 5, + label: '加工中' + }, { + value: 15, + label: '已完工' + }, + { + value: 21, + label: '已关闭' + }] + }, + ] } \ No newline at end of file diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue index c915190..f341da4 100644 --- a/src/views/orderManagement/plannedOrder.vue +++ b/src/views/orderManagement/plannedOrder.vue @@ -37,13 +37,13 @@ @@ -56,7 +56,8 @@ - + + @@ -120,11 +121,11 @@ export default { option: { columnSort: true, tip: false, - height:'auto', -calcHeight: 32, -simplePage:false, + height: 'auto', + calcHeight: 32, + simplePage: false, searchShow: true, - searchMenuSpan: 6, + searchMenuSpan: 12, searchIcon: true, searchIndex: 3, tree: false, @@ -136,7 +137,7 @@ simplePage:false, editBtnText: '修改', labelWidth: 120, // searchLabelWidth: 120, - menuWidth: 330, + menuWidth: 250, dialogWidth: 900, dialogClickModal: false, searchEnter: true, @@ -146,6 +147,20 @@ simplePage:false, excelBtn: true, index: false, showOverflowTooltip: true, + addBtnIcon: ' ', + viewBtnIcon: ' ', + delBtnIcon: ' ', + editBtnIcon: ' ', + menuAlign: 'left', + gridBtn: false, + searchLabelPosition:'left', +searchLabelPosition:'left', + searchGutter:24, + searchSpan:6, +menuAlign: 'left', +gridBtn:false, +searchMenuPosition:'right', + column: [], }, diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue index 891cdf4..7fae1d4 100644 --- a/src/views/orderManagement/sinTerPlanOrder.vue +++ b/src/views/orderManagement/sinTerPlanOrder.vue @@ -1,6 +1,6 @@