xins
/
hwmom-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 半制品工装页面

Browse Source
master
wanghao 1 month ago
parent b43e71790c
commit a9d067d84c
2 changed files with 39 additions and 24 deletions
Show Stats Download Patch File Download Diff File

59
src/views/wms/hsmTooling/index.vue
Unescape Escape View File

@ -4,10 +4,10 @@
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
<el-form-item label="工装条码" prop="toolingBarcode">
<el-input v-model="queryParams.toolingBarcode" placeholder="请输入工装条码" clearable @keyup.enter="handleQuery" />
<el-form-item label="流水卡号" prop="toolingBarcode">
<el-input v-model="queryParams.toolingBarcode" placeholder="请输入流水卡号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工装RFID条码" prop="toolingRfidBarcode" label-width="120px">
<el-form-item label="工装条码" prop="toolingRfidBarcode" label-width="120px">
<el-input v-model="queryParams.toolingRfidBarcode" placeholder="请输入工装RFID条码" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="工装类型" prop="toolingType">
@ -45,24 +45,26 @@
<el-table v-loading="loading" :data="hsmToolingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="创建人" align="center" prop="createdBy"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="工装条码" align="center" prop="toolingBarcode"/>
<el-table-column label="工装RFID条码" align="center" prop="toolingRfidBarcode"/>
<el-table-column label="id" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="流水卡号" align="center" prop="toolingBarcode"/>
<el-table-column label="工装条码" align="center" prop="toolingRfidBarcode"/>
<el-table-column label="工装类型" align="center" prop="toolingType">
<template #default="scope">
<dict-tag :options="wms_tooling_type" :value="scope.row.toolingType"/>
</template>
</el-table-column>
<el-table-column label="是否使用" align="center" prop="isUsed">
<el-table-column label="是否启用" align="center" prop="isUsed">
<template #default="scope">
<dict-tag :options="wms_halfproduct_used" :value="scope.row.isUsed"/>
</template>
</el-table-column>
<el-table-column label="创建人" align="center" prop="createdBy"/>
<el-table-column label="创建时间" align="center" prop="createdTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-tooltip content="修改" placement="top">
@ -80,11 +82,11 @@
<!-- 添加或修改半成品工装对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
<el-form ref="hsmToolingFormRef" :model="form" :rules="rules" label-width="120px">
<el-form-item label="工装条码" prop="toolingBarcode">
<el-input v-model="form.toolingBarcode" placeholder="请输入工装条码" />
</el-form-item>
<el-form-item label="工装RFID条码" prop="toolingRfidBarcode">
<el-input v-model="form.toolingRfidBarcode" placeholder="请输入工装RFID条码" />
<!-- <el-form-item label="流水卡号" prop="toolingBarcode">-->
<!-- <el-input v-model="form.toolingBarcode" placeholder="请输入流水卡号" />-->
<!-- </el-form-item>-->
<el-form-item label="工装条码" prop="toolingRfidBarcode">
<el-input v-model="form.toolingRfidBarcode" placeholder="请输入工装条码" />
</el-form-item>
<el-form-item label="工装类型" prop="toolingType">
<el-select v-model="form.toolingType" placeholder="请选择工装类型">
@ -96,6 +98,19 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="是否启用" prop="isUsed">
<el-select v-model="form.isUsed" placeholder="请选择">
<el-option
v-for="dict in wms_halfproduct_used"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
@ -132,7 +147,7 @@ const dialog = reactive<DialogOption>({
// 列显隐信息
const columns = ref<FieldOption[]>([
// { key: 0, label: `${comment}`, visible: true },
{ key: 0, label: `表主键`, visible: false },
// { key: 1, label: `${comment}`, visible: true },
// { key: 2, label: `${comment}`, visible: true },
// { key: 3, label: `${comment}`, visible: true },
@ -175,11 +190,11 @@ const data = reactive<PageData<HsmToolingForm, HsmToolingQuery>>({
}
},
rules: {
toolingBarcode: [
{ required: true, message: "工装条码不能为空", trigger: "blur" }
],
// toolingBarcode: [
// { required: true, message: "流水卡号不能为空", trigger: "blur" }
// ],
toolingRfidBarcode: [
{ required: true, message: "工装RFID条码不能为空", trigger: "blur" }
{ required: true, message: "工装条码不能为空", trigger: "blur" }
],
toolingType: [
{ required: true, message: "工装类型不能为空", trigger: "change" }

4
vite.config.ts
Unescape Escape View File

@ -26,8 +26,8 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
open: true,
proxy: {
[env.VITE_APP_BASE_API]: {
// target: 'http://localhost:6080',
target: 'http://192.168.100.100:6080',
target: 'http://localhost:6080',
// target: 'http://192.168.100.100:6080',
// target: 'http://192.168.137.1:6080',
// target: 'http://175.27.215.92:6080/prod-api',
changeOrigin: true,

Write Preview
Loading…
Cancel
Save