linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整列表宽度及修改dictag组件

Browse Source
pull/1/head
liutao 2 months ago
parent 92fcd9b9e7
commit 98e08f1a23
10 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File

6
src/components/DictTag/src/DictTag.vue
Unescape Escape View File

@ -4,7 +4,8 @@ import { isHexColor } from '@/utils/color'
import { ElTag } from 'element-plus'
import { DictDataType, getDictOptions } from '@/utils/dict'
import { isArray, isBoolean, isNumber, isString } from '@/utils/is'
import {useLocaleStoreWithOut} from "@/store/modules/locale";
const localeStore = useLocaleStoreWithOut()
export default defineComponent({
name: 'DictTag',
props: {
@ -68,6 +69,7 @@ export default defineComponent({
if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') {
dict.colorType = ''
}
const label = localeStore.getCurrentLocale?.lang === 'en' ? (dict.labelEn || dict.label) : dict.label
return (
// 添加标签的文字颜色为白色，解决自定义背景颜色时标签文字看不清的问题
<ElTag
@ -76,7 +78,7 @@ export default defineComponent({
color={dict?.cssClass && isHexColor(dict?.cssClass) ? dict?.cssClass : ''}
disableTransitions={true}
>
{dict?.label}
{label}
</ElTag>
)
}

2
src/views/erp/component/product/index.vue
Unescape Escape View File

@ -55,7 +55,7 @@
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.code')" align="center" prop="barCode" width="240px" sortable />
<el-table-column :label="t('SparePartsManagement.SpareInfo.name')" align="left" prop="name" width="220px" sortable />
<el-table-column v-if="checkPermi(['erp:component:standard'])" :label="t('SparePartsManagement.SpareInfo.standard')" align="center" prop="standard" />
<el-table-column :label="t('SparePartsManagement.SpareInfo.category')" align="center" prop="categoryName" sortable />

2
src/views/erp/moldlist/index.vue
Unescape Escape View File

@ -54,7 +54,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
</ContentWrap>
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" sortable />
<el-table-column :label="t('MoldManagement.Mold.code')" align="center" prop="code" sortable width="200px"/>
<el-table-column :label="t('MoldManagement.Mold.name')" align="left" prop="name" sortable />
<el-table-column :label="t('MoldManagement.Mold.useTime')" align="center" prop="useTime" sortable />
<el-table-column :label="t('MoldManagement.Mold.status')" align="center" prop="status" sortable>

14
src/views/mes/dvrepair/index.vue
Unescape Escape View File

@ -111,11 +111,11 @@
:show-overflow-tooltip="true"
row-key="id"
@selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" fixed="left" reserve-selection />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairCode')" align="center" prop="repairCode" sortable />
<el-table-column type="selection" width="55px" fixed="left" reserve-selection />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairCode')" align="center" prop="repairCode" minWidth="180px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairName')" align="center" prop="repairName" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryName')" align="center" prop="machineryName" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryCode')" align="center" prop="machineryCode" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryName')" align="center" prop="machineryName" minWidth="180px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryCode')" align="center" prop="machineryCode" minWidth="180px" sortable />
<!-- <el-table-column label="品牌" align="center" prop="machineryBrand" /> -->
<el-table-column :label="t('EquipmentManagement.DvRepair.machinerySpec')" align="center" prop="machinerySpec" />
<el-table-column :label="t('EquipmentManagement.DvRepair.machineryType')" align="center" prop="machineryTypeId" width="100px" sortable>
@ -141,9 +141,9 @@
prop="confirmDate"
:formatter="dateFormatter2"
width="110px" sortable />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairResult')" align="center" prop="repairResult" />
<el-table-column :label="t('EquipmentManagement.DvRepair.acceptedBy')" align="center" prop="acceptedBy" />
<el-table-column :label="t('EquipmentManagement.DvRepair.confirmBy')" align="center" prop="confirmBy" />
<el-table-column :label="t('EquipmentManagement.DvRepair.repairResult')" align="center" prop="repairResult" minWidth="130px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.acceptedBy')" align="center" prop="acceptedBy" minWidth="150px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.confirmBy')" align="center" prop="confirmBy" minWidth="150px"/>
<el-table-column :label="t('EquipmentManagement.DvRepair.status')" align="center" prop="status" width="110px" sortable>
<template #default="scope">
<el-tag :type="getStatusTagType(scope.row.status)" effect="light">

2
src/views/mes/task/index.vue
Unescape Escape View File

@ -107,7 +107,7 @@
highlight-current-row
@current-change="handleCurrentChange"
>
<el-table-column :label="t('ProductionPlan.Task.tableCodeColumn')" align="center" prop="code" width="150px" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableCodeColumn')" align="center" prop="code" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableOrderDateColumn')" align="center" prop="orderDate" :formatter="dateFormatter2" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableDeliveryDateColumn')" align="center" prop="deliveryDate" :formatter="dateFormatter2" sortable/>
<el-table-column :label="t('ProductionPlan.Task.tableTaskTypeColumn')" align="center" prop="taskType" sortable>

2
src/views/mes/taskManagement/index.vue
Unescape Escape View File

@ -84,7 +84,7 @@
:label="t('EquipmentManagement.TaskManagement.name')"
align="center"
prop="name"
min-width="140"
min-width="200"
sortable />
<el-table-column
:label="t('EquipmentManagement.TaskManagement.taskType')"

6
src/views/mes/zjTask/index.vue
Unescape Escape View File

@ -112,12 +112,12 @@ type="success" plain @click="handleExport" :loading="exportLoading"
<!-- <el-table-column type="selection" width="55" fixed="left" reserve-selection /> -->
<el-table-column :label="t('QualityManagement.ZjTask.index')" type="index" width="80"/>
<el-table-column :label="t('QualityManagement.ZjTask.code')" align="center" prop="code" width="160px" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.type')" align="center" width="90px">
<el-table-column :label="t('QualityManagement.ZjTask.type')" align="center" width="160px">
<template #default="scope">
<DictTag type="mes_zj_task_type" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column :label="t('QualityManagement.ZjTask.status')" align="center" prop="status" width="90px" sortable>
<el-table-column :label="t('QualityManagement.ZjTask.status')" align="center" prop="status" width="160px" sortable>
<template #default="scope">
<DictTag :type="'job_status'" :value="scope.row.status" />
</template>
@ -128,7 +128,7 @@ type="success" plain @click="handleExport" :loading="exportLoading"
<DictTag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.orgType" />
</template>
</el-table-column>
<el-table-column :label="t('QualityManagement.ZjTask.schemaName')" align="center" prop="schemaName" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.schemaName')" align="center" prop="schemaName" width="150px" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.managerName')" align="center" prop="managerName" sortable />
<el-table-column :label="t('QualityManagement.ZjTask.executorName')" align="center" prop="executorName" sortable />
<el-table-column

4
src/views/mold/moldrepair/index.vue
Unescape Escape View File

@ -107,12 +107,12 @@
<el-table-column type="selection" width="55" fixed="left" reserve-selection />
<el-table-column :label="t('MoldManagement.MoldRepair.repairCode')" align="center" prop="repairCode" min-width="150" sortable />
<el-table-column :label="t('MoldManagement.MoldRepair.repairName')" align="center" prop="repairName" min-width="150" sortable />
<el-table-column :label="t('MoldManagement.MoldRepair.moldName')" align="center" prop="moldName" min-width="160" sortable>
<el-table-column :label="t('MoldManagement.MoldRepair.moldName')" align="center" prop="moldName" min-width="200" sortable>
<template #default="scope">
{{ scope.row.moldName ?? scope.row.machineryName ?? '-' }}
</template>
</el-table-column>
<el-table-column :label="t('MoldManagement.MoldRepair.moldCode')" align="center" prop="moldCode" min-width="160" sortable>
<el-table-column :label="t('MoldManagement.MoldRepair.moldCode')" align="center" prop="moldCode" min-width="200" sortable>
<template #default="scope">
{{ scope.row.moldCode ?? scope.row.machineryCode ?? '-' }}
</template>

2
src/views/mold/taskConfiguration/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
>
<!-- <el-table-column type="selection" width="55" /> -->
<el-table-column :label="t('EquipmentManagement.TaskManagement.index')" type="index" align="center" width="70" />
<el-table-column :label="t('EquipmentManagement.TaskManagement.name')" align="center" prop="name" min-width="140" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.name')" align="center" prop="name" min-width="200" sortable />
<el-table-column :label="t('EquipmentManagement.TaskManagement.taskType')" align="center" prop="taskType" width="90" sortable>
<template #default="scope">
<el-tag v-if="scope.row.taskType === 1" type="primary">{{ t('EquipmentManagement.TaskManagement.taskTypeInspect') }}</el-tag>

2
src/views/mold/workOrderInquiry/index.vue
Unescape Escape View File

@ -69,7 +69,7 @@
<el-table-column type="selection" width="55" />
<el-table-column type="index" :label="t('MoldManagement.MoldWorkOrderInquiry.index')" align="center" width="70" />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.planNo')" align="center" prop="planNo" min-width="160" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.moldName')" align="center" prop="moldName" min-width="160" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.moldName')" align="center" prop="moldName" min-width="200" sortable />
<el-table-column :label="t('MoldManagement.MoldWorkOrderInquiry.planType')" align="center" prop="planType" min-width="110" sortable>
<template #default="scope">
<el-tag v-if="String(scope.row.planType) === '1'" type="primary">{{ t('MoldManagement.MoldWorkOrderInquiry.planTypeInspect') }}</el-tag>

Write Preview
Loading…
Cancel
Save