From 63a753d7d6780c9d815df4395a95a78f7f77e049 Mon Sep 17 00:00:00 2001 From: helloDy <1615073571@qq.com> Date: Thu, 11 Apr 2024 16:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/base/coreCustomer/index.vue | 2 +- src/views/base/coreDepartment/index.vue | 2 +- src/views/base/coreEquipment/index.vue | 8 +- .../base/coreEquipmentLineBind/index.vue | 3 +- src/views/base/coreEquipmentType/index.vue | 5 +- src/views/base/coreHotMaterial/index.vue | 2 +- src/views/base/coreMajor/index.vue | 2 +- src/views/base/coreProduct/index.vue | 18 +- src/views/base/coreProductionLine/index.vue | 22 +-- src/views/base/coreSupplier/index.vue | 2 +- src/views/base/coreWorkOrder/detail.vue | 40 ++-- src/views/base/coreWorkOrder/index.vue | 175 ++++++++++-------- src/views/base/coreWorker/index.vue | 2 +- src/views/base/coreWorkshopSection/index.vue | 5 +- src/views/base/material/add-or-updata.vue | 53 ++++-- src/views/base/material/index.vue | 2 +- .../base/materialProductBom/add-or-updata.vue | 45 +++-- src/views/base/materialProductBom/index.vue | 2 +- src/views/core/base/factory/index.vue | 2 +- .../base/config/AlarmGroup/index.vue | 3 +- .../equipment/base/config/BindGroup/index.vue | 3 +- .../DataCollection/CollectionConfig.vue | 19 +- .../config/DataCollection/TableConfig.vue | 11 +- .../base/inspection/Confirm/index.vue | 5 +- .../base/inspection/Record/index.vue | 3 +- .../base/inspection/Settings/index.vue | 3 +- .../maintain/Confirm/WaitingListTable.vue | 14 +- .../equipment/base/maintain/Confirm/index.vue | 2 +- .../equipment/base/maintain/Monitor/index.vue | 5 +- .../base/maintain/PlanConfig/index.vue | 20 +- .../equipment/base/maintain/Record/index.vue | 21 ++- src/views/equipment/base/repair/index.vue | 2 +- 32 files changed, 284 insertions(+), 219 deletions(-) diff --git a/src/views/base/coreCustomer/index.vue b/src/views/base/coreCustomer/index.vue index 3b120cda..968eeccb 100644 --- a/src/views/base/coreCustomer/index.vue +++ b/src/views/base/coreCustomer/index.vue @@ -138,7 +138,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-customer:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-customer:create') ? 'button' : '', diff --git a/src/views/base/coreDepartment/index.vue b/src/views/base/coreDepartment/index.vue index fbff8627..7b4afd66 100644 --- a/src/views/base/coreDepartment/index.vue +++ b/src/views/base/coreDepartment/index.vue @@ -110,7 +110,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-department:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-department:create') ? 'button' : '', diff --git a/src/views/base/coreEquipment/index.vue b/src/views/base/coreEquipment/index.vue index 4f551b58..6a7f3c01 100644 --- a/src/views/base/coreEquipment/index.vue +++ b/src/views/base/coreEquipment/index.vue @@ -156,11 +156,11 @@ export default { prop: 'createTime', label: '添加时间', fixed: true, - width: 180, + minWidth: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, - { prop: 'name', label: '设备名称', width: 180, showOverflowtooltip: true }, - { width: 250, prop: 'code', label: '设备编码' }, + { prop: 'name', label: '设备名称', minWidth: 180, showOverflowtooltip: true }, + { minWidth: 250, prop: 'code', label: '设备编码' }, { prop: 'equipmentTypeName', label: '设备类型' }, { prop: 'enName', label: '英文名称' }, { prop: 'abbr', label: '缩写' }, @@ -211,7 +211,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: (this.$auth.hasPermi('base:core-equipment:export') || this.$auth.hasPermi('base:core-equipment:create')) ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-equipment:export') diff --git a/src/views/base/coreEquipmentLineBind/index.vue b/src/views/base/coreEquipmentLineBind/index.vue index 326b108b..fb729071 100644 --- a/src/views/base/coreEquipmentLineBind/index.vue +++ b/src/views/base/coreEquipmentLineBind/index.vue @@ -126,7 +126,8 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-equipment-bind-section:create') + ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-equipment-bind-section:create') diff --git a/src/views/base/coreEquipmentType/index.vue b/src/views/base/coreEquipmentType/index.vue index 8c8ce086..f698c2ff 100644 --- a/src/views/base/coreEquipmentType/index.vue +++ b/src/views/base/coreEquipmentType/index.vue @@ -90,7 +90,7 @@ export default { prop: 'createTime', label: '添加时间', fixed: true, - width: 180, + minWidth: 180, filter: (val) => moment(val).format('yyyy-MM-DD HH:mm:ss'), }, { prop: 'name', label: '类型名称' }, @@ -111,7 +111,8 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-equipment-type:create') + ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-equipment-type:create') diff --git a/src/views/base/coreHotMaterial/index.vue b/src/views/base/coreHotMaterial/index.vue index c0cee5d5..1634f815 100644 --- a/src/views/base/coreHotMaterial/index.vue +++ b/src/views/base/coreHotMaterial/index.vue @@ -137,7 +137,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-hot-material-check:create') ? 'button' : '', diff --git a/src/views/base/coreMajor/index.vue b/src/views/base/coreMajor/index.vue index 5597106c..42d19225 100644 --- a/src/views/base/coreMajor/index.vue +++ b/src/views/base/coreMajor/index.vue @@ -110,7 +110,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-major:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-major:create') ? 'button' : '', diff --git a/src/views/base/coreProduct/index.vue b/src/views/base/coreProduct/index.vue index 48876d0a..0b5a6d51 100644 --- a/src/views/base/coreProduct/index.vue +++ b/src/views/base/coreProduct/index.vue @@ -14,7 +14,7 @@ @@ -48,45 +48,45 @@ const tableProps = [ prop: 'createTime', label: '添加时间', filter: parseTime, - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'name', label: '产品名称', - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'code', label: '产品编码', - width: 190, + minWidth: 190, showOverflowtooltip: true }, { prop: 'productType', label: '产品类型', filter: publicFormatter('product_type'), - width: 180, + minWidth: 180, showOverflowtooltip: true }, { prop: 'specifications', label: '规格', - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'unit', label: '单位', filter: publicFormatter('unit_dict'), - width: 90, + minWidth: 90, showOverflowtooltip: true }, { prop: 'remark', label: '备注', - width: 120, + minWidth: 120, showOverflowtooltip: true }, ]; @@ -141,7 +141,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-product:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-product:create') ? 'button' : '', diff --git a/src/views/base/coreProductionLine/index.vue b/src/views/base/coreProductionLine/index.vue index 6e6fd194..c7d49b25 100644 --- a/src/views/base/coreProductionLine/index.vue +++ b/src/views/base/coreProductionLine/index.vue @@ -14,7 +14,7 @@ @@ -30,7 +30,7 @@ @cancel="handleCancel" @confirm="handleConfirm" :before-close="handleCancel" - width="50%"> + minWidth="50%"> @@ -56,39 +56,39 @@ const tableProps = [ prop: 'createTime', label: '添加时间', filter: parseTime, - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'factoryName', label: '工厂', - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'roomNameDict', label: '车间名称', filter: publicFormatter('workshop'), - width: 120, + minWidth: 120, showOverflowtooltip: true }, { prop: 'name', label: '产线名称', - width: 120, + minWidth: 120, showOverflowtooltip: true }, { prop: 'code', label: '产线编码', - width: 150, + minWidth: 150, showOverflowtooltip: true }, { prop: 'enabled', label: '当前状态', filter: codeFilter('lineStatus'), - width: 120, + minWidth: 120, showOverflowtooltip: true }, // { @@ -98,13 +98,13 @@ const tableProps = [ { prop: 'description', label: '描述', - width: 120, + minWidth: 120, showOverflowtooltip: true }, { prop: 'remark', label: '备注', - width: 120, + minWidth: 120, showOverflowtooltip: true } ]; @@ -147,7 +147,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-production-line:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-production-line:create') ? 'button' : '', diff --git a/src/views/base/coreSupplier/index.vue b/src/views/base/coreSupplier/index.vue index 1fb01338..ebaabc85 100644 --- a/src/views/base/coreSupplier/index.vue +++ b/src/views/base/coreSupplier/index.vue @@ -132,7 +132,7 @@ export default { color: 'primary', }, { - type: 'separate', + type: this.$auth.hasPermi('base:core-supplier:create') ? 'separate' : '', }, { type: this.$auth.hasPermi('base:core-supplier:create') ? 'button' : '', diff --git a/src/views/base/coreWorkOrder/detail.vue b/src/views/base/coreWorkOrder/detail.vue index 097d3fbc..600f0c6e 100644 --- a/src/views/base/coreWorkOrder/detail.vue +++ b/src/views/base/coreWorkOrder/detail.vue @@ -2,7 +2,7 @@ * @Author: zwq * @Date: 2021-11-18 14:16:25 * @LastEditors: DY - * @LastEditTime: 2024-04-08 14:27:29 + * @LastEditTime: 2024-04-10 16:16:31 * @Description: -->