🎨 style(mes): 代码格式化调整

对 MES 模块多个 Vue 组件进行代码格式化:
- 长属性行拆分为多行
- 多行属性合并为更紧凑的格式
- 删除多余空行
- 统一分号/逗号风格

无逻辑变更,纯格式调整。

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
pull/871/MERGE
YunaiV 2026-04-07 18:52:50 +08:00
parent 5af93de4f5
commit 06b00efcbe
26 changed files with 136 additions and 69 deletions

View File

@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
import CalendarLegend from './CalendarLegend.vue' import CalendarLegend from './CalendarLegend.vue'
import { useCalendar } from './useCalendar' import { useCalendar } from './useCalendar'
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } = const {
useCalendar() loading,
currentDate,
calendarDayMap,
holidaySet,
loadHolidays,
fetchCalendar,
watchMonth
} = useCalendar()
const selectedTeamId = ref<number>() // const selectedTeamId = ref<number>() //
const teamList = ref<CalTeamVO[]>([]) // const teamList = ref<CalTeamVO[]>([]) //

View File

@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
import CalendarLegend from './CalendarLegend.vue' import CalendarLegend from './CalendarLegend.vue'
import { useCalendar } from './useCalendar' import { useCalendar } from './useCalendar'
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } = const {
useCalendar() loading,
currentDate,
calendarDayMap,
holidaySet,
loadHolidays,
fetchCalendar,
watchMonth
} = useCalendar()
const selectedType = ref<number>() // MES_CAL_CALENDAR_TYPE const selectedType = ref<number>() // MES_CAL_CALENDAR_TYPE

View File

@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
import CalendarLegend from './CalendarLegend.vue' import CalendarLegend from './CalendarLegend.vue'
import { useCalendar } from './useCalendar' import { useCalendar } from './useCalendar'
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } = const {
useCalendar() loading,
currentDate,
calendarDayMap,
holidaySet,
loadHolidays,
fetchCalendar,
watchMonth
} = useCalendar()
const userId = ref<number>() // const userId = ref<number>() //

View File

@ -59,7 +59,10 @@
<el-table-column label="手机号" align="center" prop="telephone" min-width="120" /> <el-table-column label="手机号" align="center" prop="telephone" min-width="120" />
<el-table-column label="备注" align="center" prop="remark" min-width="100" /> <el-table-column label="备注" align="center" prop="remark" min-width="100" />
</el-table> </el-table>
<div v-if="selectedTeamId && !memberLoading && memberList.length === 0" class="member-empty-tip"> <div
v-if="selectedTeamId && !memberLoading && memberList.length === 0"
class="member-empty-tip"
>
<el-empty description="暂无成员" :image-size="60" /> <el-empty description="暂无成员" :image-size="60" />
</div> </div>
</el-card> </el-card>

View File

@ -2,7 +2,14 @@
<template> <template>
<div> <div>
<!-- 操作栏 --> <!-- 操作栏 -->
<el-button v-if="isEditable" type="primary" plain size="small" @click="openForm()" class="mb-10px"> <el-button
v-if="isEditable"
type="primary"
plain
size="small"
@click="openForm()"
class="mb-10px"
>
<Icon icon="ep:plus" class="mr-5px" /> 添加成员 <Icon icon="ep:plus" class="mr-5px" /> 添加成员
</el-button> </el-button>
<!-- 列表 --> <!-- 列表 -->

View File

@ -25,11 +25,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="方案类型" prop="type"> <el-form-item label="方案类型" prop="type">
<el-select <el-select v-model="formData.type" placeholder="请选择方案类型" class="!w-1/1">
v-model="formData.type"
placeholder="请选择方案类型"
class="!w-1/1"
>
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_SUBJECT_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_SUBJECT_TYPE)"
:key="dict.value" :key="dict.value"
@ -53,11 +49,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="周期类型" prop="cycleType"> <el-form-item label="周期类型" prop="cycleType">
<el-select <el-select v-model="formData.cycleType" placeholder="请选择周期类型" class="!w-1/1">
v-model="formData.cycleType"
placeholder="请选择周期类型"
class="!w-1/1"
>
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_CYCLE_TYPE)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_CYCLE_TYPE)"
:key="dict.value" :key="dict.value"
@ -100,11 +92,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
v-model="formData.remark"
type="textarea"
placeholder="请输入备注"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

View File

@ -26,7 +26,14 @@
<div v-if="selectedItem" class="leading-6"> <div v-if="selectedItem" class="leading-6">
<div>编码{{ selectedItem.code }}</div> <div>编码{{ selectedItem.code }}</div>
<div>名称{{ selectedItem.name }}</div> <div>名称{{ selectedItem.name }}</div>
<div>频度{{ selectedItem.cycleCount || '-' }} <dict-tag class="ml-4px" :type="DICT_TYPE.MES_DV_CYCLE_TYPE" :value="selectedItem.cycleType" /></div> <div>
频度{{ selectedItem.cycleCount || '-' }}
<dict-tag
class="ml-4px"
:type="DICT_TYPE.MES_DV_CYCLE_TYPE"
:value="selectedItem.cycleType"
/>
</div>
</div> </div>
</template> </template>
<el-input <el-input
@ -40,7 +47,12 @@
</el-tooltip> </el-tooltip>
</div> </div>
<!-- 弹窗必须放在 div 外部否则弹窗内的点击事件会冒泡到 div 触发 handleClick --> <!-- 弹窗必须放在 div 外部否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
<DvCheckPlanSelectDialog ref="dialogRef" :multiple="false" :type="type" @selected="handleSelected" /> <DvCheckPlanSelectDialog
ref="dialogRef"
:multiple="false"
:type="type"
@selected="handleSelected"
/>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">

View File

@ -64,11 +64,11 @@ const loadData = async () => {
const dates = data.map((d) => d.date.substring(5)) const dates = data.map((d) => d.date.substring(5))
const quantities = data.map((d) => d.quantity) const quantities = data.map((d) => d.quantity)
const qualified = data.map((d) => d.qualifiedQuantity) const qualified = data.map((d) => d.qualifiedQuantity)
const unqualified = data.map((d) => d.unqualifiedQuantity); const unqualified = data.map((d) => d.unqualifiedQuantity)
(trendChartOptions as any).xAxis.data = dates; ;(trendChartOptions as any).xAxis.data = dates
(trendChartOptions as any).series[0].data = quantities; ;(trendChartOptions as any).series[0].data = quantities
(trendChartOptions as any).series[1].data = qualified; ;(trendChartOptions as any).series[1].data = qualified
(trendChartOptions as any).series[2].data = unqualified ;(trendChartOptions as any).series[2].data = unqualified
} }
/** 组件挂载时自动加载数据 */ /** 组件挂载时自动加载数据 */

View File

@ -89,7 +89,10 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100"> <el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT" :value="scope.row.itemOrProduct" /> <dict-tag
:type="DICT_TYPE.MES_MD_ITEM_OR_PRODUCT"
:value="scope.row.itemOrProduct"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="所属分类" align="center" prop="itemTypeName" width="120" /> <el-table-column label="所属分类" align="center" prop="itemTypeName" width="120" />

View File

@ -42,7 +42,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="生产数量" prop="quantity"> <el-form-item label="生产数量" prop="quantity">
<el-input-number v-model="formData.quantity" :min="1" controls-position="right" class="!w-1/1" /> <el-input-number
v-model="formData.quantity"
:min="1"
controls-position="right"
class="!w-1/1"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">

View File

@ -163,7 +163,9 @@ const handleDelete = async (id: number) => {
const dialogVisible = ref(false) // const dialogVisible = ref(false) //
const formLoading = ref(false) // const formLoading = ref(false) //
const bomFormType = ref('create') // const bomFormType = ref('create') //
const dialogTitle = computed(() => bomFormType.value === 'create' ? '添加 BOM 物料' : '编辑 BOM 物料') const dialogTitle = computed(() =>
bomFormType.value === 'create' ? '添加 BOM 物料' : '编辑 BOM 物料'
)
const formRef = ref() // Ref const formRef = ref() // Ref
const formData = ref({ const formData = ref({
id: undefined as number | undefined, id: undefined as number | undefined,

View File

@ -320,7 +320,6 @@ const handleGenerateWorkOrder = (bomRow: any) => {
message.info('已从 BOM 物料预填子工单,请补充工单编码等信息后保存') message.info('已从 BOM 物料预填子工单,请补充工单编码等信息后保存')
} }
/** 工单来源变更:非客户订单时清空来源单据编号和客户 */ /** 工单来源变更:非客户订单时清空来源单据编号和客户 */
watch( watch(
() => formData.value.orderSourceType, () => formData.value.orderSourceType,

View File

@ -76,9 +76,7 @@ const message = useMessage() // 消息弹窗
const myWorkstation = ref<ProWorkRecordVO | null>(null) // const myWorkstation = ref<ProWorkRecordVO | null>(null) //
const clockInPopoverVisible = ref(false) // const clockInPopoverVisible = ref(false) //
const selectedWorkstationId = ref<number>() // const selectedWorkstationId = ref<number>() //
const isClockIn = computed( const isClockIn = computed(() => myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN) //
() => myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN
) //
/** 查询当前用户工作站 */ /** 查询当前用户工作站 */
const loadMyWorkstation = async () => { const loadMyWorkstation = async () => {

View File

@ -83,9 +83,7 @@ const formRef = ref() // 表单 Ref
/** 生成缺陷编码 */ /** 生成缺陷编码 */
const generateCode = async () => { const generateCode = async () => {
formData.value.code = await AutoCodeRecordApi.generateAutoCode( formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.QC_DEFECT_CODE)
MesAutoCodeRuleCode.QC_DEFECT_CODE
)
} }
/** 打开弹窗 */ /** 打开弹窗 */

View File

@ -54,7 +54,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px"> <el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_TM_TOOL_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_TM_TOOL_STATUS)"
:key="dict.value" :key="dict.value"
@ -64,8 +69,12 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
>
<el-button @click="resetQuery"
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
>
<el-button <el-button
type="primary" type="primary"
plain plain
@ -114,7 +123,9 @@
{{ scope.row.nextMaintenDate ? formatDate(scope.row.nextMaintenDate) : '-' }} {{ scope.row.nextMaintenDate ? formatDate(scope.row.nextMaintenDate) : '-' }}
</span> </span>
<span v-else-if="scope.row.maintenType === MesMaintenTypeEnum.USAGE"> <span v-else-if="scope.row.maintenType === MesMaintenTypeEnum.USAGE">
{{ scope.row.nextMaintenPeriod != null ? scope.row.nextMaintenPeriod + ' 次' : '-' }} {{
scope.row.nextMaintenPeriod != null ? scope.row.nextMaintenPeriod + ' 次' : '-'
}}
</span> </span>
<span v-else>-</span> <span v-else>-</span>
</template> </template>

View File

@ -62,8 +62,12 @@
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery"
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> ><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
>
<el-button @click="resetQuery"
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</ContentWrap> </ContentWrap>

View File

@ -33,7 +33,13 @@
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" /> <el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
<el-table-column label="领料数量" align="center" prop="quantity" width="100" /> <el-table-column label="领料数量" align="center" prop="quantity" width="100" />
<el-table-column label="批次号" align="center" prop="batchCode" min-width="120" /> <el-table-column label="批次号" align="center" prop="batchCode" min-width="120" />
<el-table-column label="备注" align="center" prop="remark" min-width="150" show-overflow-tooltip /> <el-table-column
label="备注"
align="center"
prop="remark"
min-width="150"
show-overflow-tooltip
/>
<el-table-column <el-table-column
v-if="isUpdate || isStock" v-if="isUpdate || isStock"
label="操作" label="操作"

View File

@ -134,9 +134,10 @@
@click="handleCancel(scope.row.id)" @click="handleCancel(scope.row.id)"
v-hasPermi="['mes:wm-outsource-issue:update']" v-hasPermi="['mes:wm-outsource-issue:update']"
v-if=" v-if="
[MesWmOutsourceIssueStatusEnum.APPROVING, MesWmOutsourceIssueStatusEnum.APPROVED].includes( [
scope.row.status MesWmOutsourceIssueStatusEnum.APPROVING,
) MesWmOutsourceIssueStatusEnum.APPROVED
].includes(scope.row.status)
" "
> >
取消 取消

View File

@ -16,7 +16,13 @@
<el-table-column label="库区名称" align="center" prop="locationName" min-width="100" /> <el-table-column label="库区名称" align="center" prop="locationName" min-width="100" />
<el-table-column label="库位名称" align="center" prop="areaName" min-width="100" /> <el-table-column label="库位名称" align="center" prop="areaName" min-width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="100" /> <el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column v-if="isUpdate || isStock" label="操作" align="center" width="120" fixed="right"> <el-table-column
v-if="isUpdate || isStock"
label="操作"
align="center"
width="120"
fixed="right"
>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)"> <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
编辑 编辑

View File

@ -38,7 +38,12 @@
<MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" /> <MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" />
</el-form-item> </el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择单据状态" clearable class="!w-240px"> <el-select
v-model="queryParams.status"
placeholder="请选择单据状态"
clearable
class="!w-240px"
>
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS)"
:key="dict.value" :key="dict.value"

View File

@ -36,9 +36,7 @@
</el-table-column> </el-table-column>
<el-table-column v-if="isEditable" label="操作" align="center" width="120"> <el-table-column v-if="isEditable" label="操作" align="center" width="120">
<template #default="scope"> <template #default="scope">
<el-button link type="danger" @click="handleRemoveChild(scope.row.id)"> <el-button link type="danger" @click="handleRemoveChild(scope.row.id)"> </el-button>
移除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

View File

@ -87,7 +87,12 @@
:formatter="dateFormatter2" :formatter="dateFormatter2"
width="120" width="120"
/> />
<el-table-column label="销售订单编号" align="center" prop="salesOrderCode" min-width="140" /> <el-table-column
label="销售订单编号"
align="center"
prop="salesOrderCode"
min-width="140"
/>
<el-table-column label="发票编号" align="center" prop="invoiceCode" min-width="120" /> <el-table-column label="发票编号" align="center" prop="invoiceCode" min-width="120" />
<el-table-column label="客户编码" align="center" prop="clientCode" min-width="100" /> <el-table-column label="客户编码" align="center" prop="clientCode" min-width="100" />
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" /> <el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />

View File

@ -174,7 +174,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales' import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record' import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record'
import { MesAutoCodeRuleCode, MesWmProductSalesStatusEnum, MesWmSalesNoticeStatusEnum } from '@/views/mes/utils/constants' import {
MesAutoCodeRuleCode,
MesWmProductSalesStatusEnum,
MesWmSalesNoticeStatusEnum
} from '@/views/mes/utils/constants'
import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue' import MdClientSelect from '@/views/mes/md/client/components/MdClientSelect.vue'
import WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue' import WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue'
import { WmSalesNoticeVO } from '@/api/mes/wm/salesnotice' import { WmSalesNoticeVO } from '@/api/mes/wm/salesnotice'

View File

@ -116,9 +116,7 @@
<!-- DONE 后续接入批次选择器和质量状态选择器 --> <!-- DONE 后续接入批次选择器和质量状态选择器 -->
<WmBatchSelect v-model="formData.valueId" @change="handleBatchChange" /> <WmBatchSelect v-model="formData.valueId" @change="handleBatchChange" />
</template> </template>
<template <template v-else-if="formData.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS">
v-else-if="formData.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS"
>
<el-select <el-select
v-model="formData.valueCode" v-model="formData.valueCode"
placeholder="请选择质量状态" placeholder="请选择质量状态"
@ -341,7 +339,6 @@ const handleQualityStatusChange = (val: string) => {
formData.value.valueName = selected?.label || '' formData.value.valueName = selected?.label || ''
} }
/** 库区仓库选择回调:清空库区 */ /** 库区仓库选择回调:清空库区 */
const handleLocationWarehouseChange = () => { const handleLocationWarehouseChange = () => {
formData.value.valueId = undefined formData.value.valueId = undefined

View File

@ -5,13 +5,7 @@
<el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" /> <el-table-column label="移入库区" align="center" prop="toLocationName" min-width="100" />
<el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" /> <el-table-column label="移入库位" align="center" prop="toAreaName" min-width="100" />
<el-table-column label="数量" align="center" prop="quantity" width="100" /> <el-table-column label="数量" align="center" prop="quantity" width="100" />
<el-table-column <el-table-column v-if="isStock" label="操作" align="center" width="120" fixed="right">
v-if="isStock"
label="操作"
align="center"
width="120"
fixed="right"
>
<template #default="scope"> <template #default="scope">
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)">编辑</el-button> <el-button link type="primary" @click="emit('edit-detail', scope.row.id)">编辑</el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button> <el-button link type="danger" @click="handleDelete(scope.row.id)"></el-button>