🎨 style(mes): 代码格式化调整
对 MES 模块多个 Vue 组件进行代码格式化: - 长属性行拆分为多行 - 多行属性合并为更紧凑的格式 - 删除多余空行 - 统一分号/逗号风格 无逻辑变更,纯格式调整。 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>pull/871/MERGE
parent
5af93de4f5
commit
06b00efcbe
|
|
@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
|
|||
import CalendarLegend from './CalendarLegend.vue'
|
||||
import { useCalendar } from './useCalendar'
|
||||
|
||||
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } =
|
||||
useCalendar()
|
||||
const {
|
||||
loading,
|
||||
currentDate,
|
||||
calendarDayMap,
|
||||
holidaySet,
|
||||
loadHolidays,
|
||||
fetchCalendar,
|
||||
watchMonth
|
||||
} = useCalendar()
|
||||
|
||||
const selectedTeamId = ref<number>() // 当前选中的班组编号
|
||||
const teamList = ref<CalTeamVO[]>([]) // 所有班组列表
|
||||
|
|
|
|||
|
|
@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
|
|||
import CalendarLegend from './CalendarLegend.vue'
|
||||
import { useCalendar } from './useCalendar'
|
||||
|
||||
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } =
|
||||
useCalendar()
|
||||
const {
|
||||
loading,
|
||||
currentDate,
|
||||
calendarDayMap,
|
||||
holidaySet,
|
||||
loadHolidays,
|
||||
fetchCalendar,
|
||||
watchMonth
|
||||
} = useCalendar()
|
||||
|
||||
const selectedType = ref<number>() // 当前选中的班组类型(枚举 MES_CAL_CALENDAR_TYPE)
|
||||
|
||||
|
|
|
|||
|
|
@ -38,8 +38,15 @@ import CalendarDateCell from './CalendarDateCell.vue'
|
|||
import CalendarLegend from './CalendarLegend.vue'
|
||||
import { useCalendar } from './useCalendar'
|
||||
|
||||
const { loading, currentDate, calendarDayMap, holidaySet, loadHolidays, fetchCalendar, watchMonth } =
|
||||
useCalendar()
|
||||
const {
|
||||
loading,
|
||||
currentDate,
|
||||
calendarDayMap,
|
||||
holidaySet,
|
||||
loadHolidays,
|
||||
fetchCalendar,
|
||||
watchMonth
|
||||
} = useCalendar()
|
||||
|
||||
const userId = ref<number>() // 当前选中的用户编号
|
||||
|
||||
|
|
|
|||
|
|
@ -59,7 +59,10 @@
|
|||
<el-table-column label="手机号" align="center" prop="telephone" min-width="120" />
|
||||
<el-table-column label="备注" align="center" prop="remark" min-width="100" />
|
||||
</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" />
|
||||
</div>
|
||||
</el-card>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,14 @@
|
|||
<template>
|
||||
<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" /> 添加成员
|
||||
</el-button>
|
||||
<!-- 列表 -->
|
||||
|
|
|
|||
|
|
@ -25,11 +25,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="方案类型" prop="type">
|
||||
<el-select
|
||||
v-model="formData.type"
|
||||
placeholder="请选择方案类型"
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-select v-model="formData.type" placeholder="请选择方案类型" class="!w-1/1">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_SUBJECT_TYPE)"
|
||||
:key="dict.value"
|
||||
|
|
@ -53,11 +49,7 @@
|
|||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="周期类型" prop="cycleType">
|
||||
<el-select
|
||||
v-model="formData.cycleType"
|
||||
placeholder="请选择周期类型"
|
||||
class="!w-1/1"
|
||||
>
|
||||
<el-select v-model="formData.cycleType" placeholder="请选择周期类型" class="!w-1/1">
|
||||
<el-option
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_DV_CYCLE_TYPE)"
|
||||
:key="dict.value"
|
||||
|
|
@ -100,11 +92,7 @@
|
|||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input
|
||||
v-model="formData.remark"
|
||||
type="textarea"
|
||||
placeholder="请输入备注"
|
||||
/>
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,14 @@
|
|||
<div v-if="selectedItem" class="leading-6">
|
||||
<div>编码:{{ selectedItem.code }}</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>
|
||||
</template>
|
||||
<el-input
|
||||
|
|
@ -40,7 +47,12 @@
|
|||
</el-tooltip>
|
||||
</div>
|
||||
<!-- 弹窗必须放在 div 外部,否则弹窗内的点击事件会冒泡到 div 触发 handleClick -->
|
||||
<DvCheckPlanSelectDialog ref="dialogRef" :multiple="false" :type="type" @selected="handleSelected" />
|
||||
<DvCheckPlanSelectDialog
|
||||
ref="dialogRef"
|
||||
:multiple="false"
|
||||
:type="type"
|
||||
@selected="handleSelected"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ const open = async (selectedIds?: number[]) => {
|
|||
selectedRadioId.value = undefined
|
||||
currentRadioRow.value = undefined
|
||||
preSelectedIds.value = selectedIds ?? []
|
||||
|
||||
|
||||
if (workshopList.value.length === 0) {
|
||||
workshopList.value = await MdWorkshopApi.getWorkshopSimpleList()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -64,11 +64,11 @@ const loadData = async () => {
|
|||
const dates = data.map((d) => d.date.substring(5))
|
||||
const quantities = data.map((d) => d.quantity)
|
||||
const qualified = data.map((d) => d.qualifiedQuantity)
|
||||
const unqualified = data.map((d) => d.unqualifiedQuantity);
|
||||
(trendChartOptions as any).xAxis.data = dates;
|
||||
(trendChartOptions as any).series[0].data = quantities;
|
||||
(trendChartOptions as any).series[1].data = qualified;
|
||||
(trendChartOptions as any).series[2].data = unqualified
|
||||
const unqualified = data.map((d) => d.unqualifiedQuantity)
|
||||
;(trendChartOptions as any).xAxis.data = dates
|
||||
;(trendChartOptions as any).series[0].data = quantities
|
||||
;(trendChartOptions as any).series[1].data = qualified
|
||||
;(trendChartOptions as any).series[2].data = unqualified
|
||||
}
|
||||
|
||||
/** 组件挂载时自动加载数据 */
|
||||
|
|
|
|||
|
|
@ -89,7 +89,10 @@
|
|||
<el-table-column label="单位" align="center" prop="unitMeasureName" width="80" />
|
||||
<el-table-column label="物料/产品" align="center" prop="itemOrProduct" width="100">
|
||||
<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>
|
||||
</el-table-column>
|
||||
<el-table-column label="所属分类" align="center" prop="itemTypeName" width="120" />
|
||||
|
|
|
|||
|
|
@ -42,7 +42,12 @@
|
|||
</el-col>
|
||||
<el-col :span="12">
|
||||
<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-col>
|
||||
<el-col :span="12">
|
||||
|
|
|
|||
|
|
@ -163,7 +163,9 @@ const handleDelete = async (id: number) => {
|
|||
const dialogVisible = ref(false) // 弹窗的是否展示
|
||||
const formLoading = ref(false) // 表单的加载中
|
||||
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 formData = ref({
|
||||
id: undefined as number | undefined,
|
||||
|
|
|
|||
|
|
@ -320,7 +320,6 @@ const handleGenerateWorkOrder = (bomRow: any) => {
|
|||
message.info('已从 BOM 物料预填子工单,请补充工单编码等信息后保存')
|
||||
}
|
||||
|
||||
|
||||
/** 工单来源变更:非客户订单时清空来源单据编号和客户 */
|
||||
watch(
|
||||
() => formData.value.orderSourceType,
|
||||
|
|
|
|||
|
|
@ -76,9 +76,7 @@ const message = useMessage() // 消息弹窗
|
|||
const myWorkstation = ref<ProWorkRecordVO | null>(null) // 当前工作站绑定状态
|
||||
const clockInPopoverVisible = ref(false) // 上工弹窗是否可见
|
||||
const selectedWorkstationId = ref<number>() // 选中的工作站编号
|
||||
const isClockIn = computed(
|
||||
() => myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN
|
||||
) // 是否处于上工状态
|
||||
const isClockIn = computed(() => myWorkstation.value?.type === MesProWorkRecordTypeEnum.CLOCK_IN) // 是否处于上工状态
|
||||
|
||||
/** 查询当前用户工作站 */
|
||||
const loadMyWorkstation = async () => {
|
||||
|
|
|
|||
|
|
@ -83,9 +83,7 @@ const formRef = ref() // 表单 Ref
|
|||
|
||||
/** 生成缺陷编码 */
|
||||
const generateCode = async () => {
|
||||
formData.value.code = await AutoCodeRecordApi.generateAutoCode(
|
||||
MesAutoCodeRuleCode.QC_DEFECT_CODE
|
||||
)
|
||||
formData.value.code = await AutoCodeRecordApi.generateAutoCode(MesAutoCodeRuleCode.QC_DEFECT_CODE)
|
||||
}
|
||||
|
||||
/** 打开弹窗 */
|
||||
|
|
|
|||
|
|
@ -54,7 +54,12 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<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
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_TM_TOOL_STATUS)"
|
||||
:key="dict.value"
|
||||
|
|
@ -64,8 +69,12 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
<el-button @click="handleQuery"
|
||||
><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button
|
||||
>
|
||||
<el-button @click="resetQuery"
|
||||
><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button
|
||||
>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
|
|
@ -114,7 +123,9 @@
|
|||
{{ scope.row.nextMaintenDate ? formatDate(scope.row.nextMaintenDate) : '-' }}
|
||||
</span>
|
||||
<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 v-else>-</span>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -62,8 +62,12 @@
|
|||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
||||
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
||||
<el-button @click="handleQuery"
|
||||
><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>
|
||||
</ContentWrap>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,13 @@
|
|||
<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="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
|
||||
v-if="isUpdate || isStock"
|
||||
label="操作"
|
||||
|
|
|
|||
|
|
@ -134,9 +134,10 @@
|
|||
@click="handleCancel(scope.row.id)"
|
||||
v-hasPermi="['mes:wm-outsource-issue:update']"
|
||||
v-if="
|
||||
[MesWmOutsourceIssueStatusEnum.APPROVING, MesWmOutsourceIssueStatusEnum.APPROVED].includes(
|
||||
scope.row.status
|
||||
)
|
||||
[
|
||||
MesWmOutsourceIssueStatusEnum.APPROVING,
|
||||
MesWmOutsourceIssueStatusEnum.APPROVED
|
||||
].includes(scope.row.status)
|
||||
"
|
||||
>
|
||||
取消
|
||||
|
|
|
|||
|
|
@ -16,7 +16,13 @@
|
|||
<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="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">
|
||||
<el-button link type="primary" @click="emit('edit-detail', scope.row.id)">
|
||||
编辑
|
||||
|
|
|
|||
|
|
@ -38,7 +38,12 @@
|
|||
<MdVendorSelect v-model="queryParams.vendorId" class="!w-240px" />
|
||||
</el-form-item>
|
||||
<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
|
||||
v-for="dict in getIntDictOptions(DICT_TYPE.MES_WM_OUTSOURCE_RECEIPT_STATUS)"
|
||||
:key="dict.value"
|
||||
|
|
|
|||
|
|
@ -36,9 +36,7 @@
|
|||
</el-table-column>
|
||||
<el-table-column v-if="isEditable" label="操作" align="center" width="120">
|
||||
<template #default="scope">
|
||||
<el-button link type="danger" @click="handleRemoveChild(scope.row.id)">
|
||||
移除
|
||||
</el-button>
|
||||
<el-button link type="danger" @click="handleRemoveChild(scope.row.id)"> 移除 </el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
|
|
|||
|
|
@ -87,7 +87,12 @@
|
|||
:formatter="dateFormatter2"
|
||||
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="clientCode" min-width="100" />
|
||||
<el-table-column label="客户名称" align="center" prop="clientName" min-width="120" />
|
||||
|
|
|
|||
|
|
@ -174,7 +174,11 @@
|
|||
<script setup lang="ts">
|
||||
import { WmProductSalesApi, WmProductSalesVO } from '@/api/mes/wm/productsales'
|
||||
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 WmSalesNoticeSelect from '@/views/mes/wm/salesnotice/components/WmSalesNoticeSelect.vue'
|
||||
import { WmSalesNoticeVO } from '@/api/mes/wm/salesnotice'
|
||||
|
|
|
|||
|
|
@ -116,9 +116,7 @@
|
|||
<!-- DONE 后续接入批次选择器和质量状态选择器 -->
|
||||
<WmBatchSelect v-model="formData.valueId" @change="handleBatchChange" />
|
||||
</template>
|
||||
<template
|
||||
v-else-if="formData.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS"
|
||||
>
|
||||
<template v-else-if="formData.type === MesWmStockTakingParamTypeEnum.QUALITY_STATUS">
|
||||
<el-select
|
||||
v-model="formData.valueCode"
|
||||
placeholder="请选择质量状态"
|
||||
|
|
@ -341,7 +339,6 @@ const handleQualityStatusChange = (val: string) => {
|
|||
formData.value.valueName = selected?.label || ''
|
||||
}
|
||||
|
||||
|
||||
/** 库区仓库选择回调:清空库区 */
|
||||
const handleLocationWarehouseChange = () => {
|
||||
formData.value.valueId = undefined
|
||||
|
|
|
|||
|
|
@ -5,13 +5,7 @@
|
|||
<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="quantity" width="100" />
|
||||
<el-table-column
|
||||
v-if="isStock"
|
||||
label="操作"
|
||||
align="center"
|
||||
width="120"
|
||||
fixed="right"
|
||||
>
|
||||
<el-table-column v-if="isStock" label="操作" align="center" width="120" fixed="right">
|
||||
<template #default="scope">
|
||||
<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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue