update 添加国际化翻译
This commit is contained in:
hzz
parent
d064e3ac2b
commit
db225eddc7
@ -30,9 +30,14 @@ export default {
|
|||||||
"组织架构": "Organization",
|
"组织架构": "Organization",
|
||||||
"针管理": "Needle",
|
"针管理": "Needle",
|
||||||
"加工次数管理": "Process",
|
"加工次数管理": "Process",
|
||||||
|
"配件管理": "Accessory",
|
||||||
|
"面线管理": "Upper Thread",
|
||||||
|
"底线管理": "Bottom Thread",
|
||||||
|
"梭芯信息": "Bobbin",
|
||||||
},
|
},
|
||||||
"common": {
|
"common": {
|
||||||
"新增": "Add",
|
"新增": "Add",
|
||||||
|
"添加": "Add",
|
||||||
"修改": "Edit",
|
"修改": "Edit",
|
||||||
"删除": "Delete",
|
"删除": "Delete",
|
||||||
"搜索": "Search",
|
"搜索": "Search",
|
||||||
@ -46,9 +51,15 @@ export default {
|
|||||||
"操作": "Operation",
|
"操作": "Operation",
|
||||||
"详情": "Detail",
|
"详情": "Detail",
|
||||||
"状态": "Status",
|
"状态": "Status",
|
||||||
"序号": "ID",
|
"序号": "Index",
|
||||||
"创建时间": "Create Time",
|
"创建时间": "Create Time",
|
||||||
"更新时间": "Update Time"
|
"更新时间": "Update Time",
|
||||||
|
"请输入": "Please input ",
|
||||||
|
"确 定": "OK",
|
||||||
|
"取 消": "Cancel",
|
||||||
|
"添加成功": "Add Success",
|
||||||
|
"修改成功": "Edit Success",
|
||||||
|
"删除成功": "Delete Success",
|
||||||
},
|
},
|
||||||
"validate": {
|
"validate": {
|
||||||
"required": "Can not be empty",
|
"required": "Can not be empty",
|
||||||
@ -59,7 +70,7 @@ export default {
|
|||||||
"min": "Minimum value is"
|
"min": "Minimum value is"
|
||||||
},
|
},
|
||||||
"login": {
|
"login": {
|
||||||
"标题": "CASM",
|
"标题": "CASM Sewing Management System",
|
||||||
"用户登录": "User Login",
|
"用户登录": "User Login",
|
||||||
"登录": "Login in",
|
"登录": "Login in",
|
||||||
"账号": "Username",
|
"账号": "Username",
|
||||||
@ -87,5 +98,46 @@ export default {
|
|||||||
"tagsView": "Open Tags-View",
|
"tagsView": "Open Tags-View",
|
||||||
"fixedHeader": "Fixed Header",
|
"fixedHeader": "Fixed Header",
|
||||||
"sidebarLogo": "Sidebar Logo"
|
"sidebarLogo": "Sidebar Logo"
|
||||||
}
|
},
|
||||||
|
"device": {
|
||||||
|
"设备信息": "Device Info",
|
||||||
|
"设备名称": "Device Name",
|
||||||
|
"设备编号": "Number",
|
||||||
|
"设备类型": "Type",
|
||||||
|
"车间名称": "Workshop",
|
||||||
|
"产线名称": "Prod Line",
|
||||||
|
"保养周期": "Maint Cycle",
|
||||||
|
"供货商名称": "Supplier",
|
||||||
|
"供货商联络人": "Contact",
|
||||||
|
"生产厂家": "Manufacturer",
|
||||||
|
"联系电话": "Phone",
|
||||||
|
"品牌": "Brand",
|
||||||
|
"设备型号": "Model",
|
||||||
|
"备注": "Remark",
|
||||||
|
"图片": "Image",
|
||||||
|
},
|
||||||
|
"product": {
|
||||||
|
"产品信息": "Product Info",
|
||||||
|
"产品名称": "ProductName",
|
||||||
|
"产品编码": "ProductCode",
|
||||||
|
"产品类型": "ProductType",
|
||||||
|
"备注": "Remark",
|
||||||
|
"图片": "Image",
|
||||||
|
"底线编码": "BottomCode",
|
||||||
|
"面线编码": "UpperCode",
|
||||||
|
"表面张力": "Tension",
|
||||||
|
"最小值": "Min",
|
||||||
|
"最大值": "Max",
|
||||||
|
"最小针数": "MinNeedle",
|
||||||
|
"最大针数": "MaxNeedle",
|
||||||
|
"缝纫次数": "SewingTimes",
|
||||||
|
"针号":"Needle",
|
||||||
|
"面线信息":"UpperThread",
|
||||||
|
"底线信息":"BottomThread",
|
||||||
|
"梭芯信息":"Bobbin",
|
||||||
|
"排序":"Sort",
|
||||||
|
"类型":"Type",
|
||||||
|
"第几针":"Needle No.",
|
||||||
|
"步骤":"Step",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@ -1,6 +1,6 @@
|
|||||||
export default {
|
export default {
|
||||||
//菜单
|
//菜单
|
||||||
"menus":{
|
"menus": {
|
||||||
"首页": "首页",
|
"首页": "首页",
|
||||||
"实时生产监控": "实时生产监控",
|
"实时生产监控": "实时生产监控",
|
||||||
"仪表盘": "仪表盘",
|
"仪表盘": "仪表盘",
|
||||||
@ -31,9 +31,14 @@ export default {
|
|||||||
"组织架构": "组织架构",
|
"组织架构": "组织架构",
|
||||||
"针管理": "针管理",
|
"针管理": "针管理",
|
||||||
"加工次数管理": "加工次数管理",
|
"加工次数管理": "加工次数管理",
|
||||||
|
"配件管理": "配件管理",
|
||||||
|
"面线管理": "面线管理",
|
||||||
|
"底线管理": "底线管理",
|
||||||
|
"梭芯信息": "梭芯管理",
|
||||||
},
|
},
|
||||||
"common":{
|
"common": {
|
||||||
"新增": "新增",
|
"新增": "新增",
|
||||||
|
"添加": "添加",
|
||||||
"修改": "修改",
|
"修改": "修改",
|
||||||
"删除": "删除",
|
"删除": "删除",
|
||||||
"搜索": "搜索",
|
"搜索": "搜索",
|
||||||
@ -50,9 +55,14 @@ export default {
|
|||||||
"序号": "序号",
|
"序号": "序号",
|
||||||
"创建时间": "创建时间",
|
"创建时间": "创建时间",
|
||||||
"更新时间": "更新时间",
|
"更新时间": "更新时间",
|
||||||
|
"请输入": "请输入",
|
||||||
|
"确 定": "确 定",
|
||||||
|
"取 消": "取 消",
|
||||||
|
"添加成功": "添加成功",
|
||||||
|
"修改成功": "修改成功",
|
||||||
|
"删除成功": "删除成功",
|
||||||
},
|
},
|
||||||
"validate":{
|
"validate": {
|
||||||
"required": "不能为空",
|
"required": "不能为空",
|
||||||
"format": "格式不正确",
|
"format": "格式不正确",
|
||||||
"length": "长度不正确",
|
"length": "长度不正确",
|
||||||
@ -89,5 +99,46 @@ export default {
|
|||||||
"tagsView": "开启 Tags-View",
|
"tagsView": "开启 Tags-View",
|
||||||
"fixedHeader": "固定 Header",
|
"fixedHeader": "固定 Header",
|
||||||
"sidebarLogo": "侧边栏 Logo"
|
"sidebarLogo": "侧边栏 Logo"
|
||||||
}
|
},
|
||||||
|
"device": {
|
||||||
|
"设备信息": "设备信息",
|
||||||
|
"设备名称": "设备名称",
|
||||||
|
"设备编号": "设备编号",
|
||||||
|
"设备类型": "设备类型",
|
||||||
|
"车间名称": "车间名称",
|
||||||
|
"产线名称": "产线名称",
|
||||||
|
"保养周期": "保养周期",
|
||||||
|
"供货商名称": "供货商名称",
|
||||||
|
"供货商联络人": "供货商联络人",
|
||||||
|
"生产厂家": "生产厂家",
|
||||||
|
"联系电话": "联系电话",
|
||||||
|
"品牌": "品牌",
|
||||||
|
"设备型号": "设备型号",
|
||||||
|
"备注": "备注",
|
||||||
|
"图片": "图片",
|
||||||
|
},
|
||||||
|
"product": {
|
||||||
|
"产品信息": "产品信息",
|
||||||
|
"产品名称": "产品名称",
|
||||||
|
"产品编码": "产品编码",
|
||||||
|
"产品类型": "产品类型",
|
||||||
|
"备注": "备注",
|
||||||
|
"图片": "图片",
|
||||||
|
"底线编码": "底线编码",
|
||||||
|
"面线编码": "面线编码",
|
||||||
|
"表面张力": "表面张力",
|
||||||
|
"最小值": "最小值",
|
||||||
|
"最大值": "最大值",
|
||||||
|
"最小针数": "最小针数",
|
||||||
|
"最大针数": "最大针数",
|
||||||
|
"缝纫次数": "缝纫次数",
|
||||||
|
"针号":"针号",
|
||||||
|
"面线信息":"面线信息",
|
||||||
|
"底线信息":"底线信息",
|
||||||
|
"梭芯信息":"梭芯信息",
|
||||||
|
"排序":"排序",
|
||||||
|
"类型":"类型",
|
||||||
|
"第几针":"第几针",
|
||||||
|
"步骤":"步骤",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
@ -17,7 +17,7 @@
|
|||||||
import variables from '@/assets/styles/variables.module.scss'
|
import variables from '@/assets/styles/variables.module.scss'
|
||||||
import logo from '@/assets/logo/logo.png'
|
import logo from '@/assets/logo/logo.png'
|
||||||
import useSettingsStore from '@/store/modules/settings'
|
import useSettingsStore from '@/store/modules/settings'
|
||||||
|
const {proxy} = getCurrentInstance();
|
||||||
defineProps({
|
defineProps({
|
||||||
collapse: {
|
collapse: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
@ -25,7 +25,7 @@ defineProps({
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
const title = import.meta.env.VITE_APP_TITLE;
|
const title = proxy.tLang('login','标题')//import.meta.env.VITE_APP_TITLE;
|
||||||
const settingsStore = useSettingsStore();
|
const settingsStore = useSettingsStore();
|
||||||
const sideTheme = computed(() => settingsStore.sideTheme);
|
const sideTheme = computed(() => settingsStore.sideTheme);
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
import axios from 'axios'
|
import axios from 'axios'
|
||||||
import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
|
import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
|
||||||
|
import { getStoredLanguage } from "@/utils/languageStorage";
|
||||||
import { getToken } from '@/utils/auth'
|
import { getToken } from '@/utils/auth'
|
||||||
import errorCode from '@/utils/errorCode'
|
import errorCode from '@/utils/errorCode'
|
||||||
import { tansParams, blobValidate } from '@/utils/ruoyi'
|
import { tansParams, blobValidate } from '@/utils/ruoyi'
|
||||||
@ -29,6 +30,9 @@ service.interceptors.request.use(config => {
|
|||||||
if (getToken() && !isToken) {
|
if (getToken() && !isToken) {
|
||||||
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
|
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
|
||||||
}
|
}
|
||||||
|
// 设置语言
|
||||||
|
const language = getStoredLanguage()||'zh-CN';
|
||||||
|
config.headers['language'] = language;
|
||||||
// get请求映射params参数
|
// get请求映射params参数
|
||||||
if (config.method === 'get' && config.params) {
|
if (config.method === 'get' && config.params) {
|
||||||
let url = config.url + '?' + tansParams(config.params);
|
let url = config.url + '?' + tansParams(config.params);
|
||||||
|
|||||||
@ -1,48 +1,48 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="设备名称" prop="name">
|
<el-form-item :label="tLang('device','设备名称')" prop="name">
|
||||||
<el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.name" :placeholder="tLang('common','请输入') + tLang('device','设备名称')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备编号" prop="code">
|
<el-form-item :label="tLang('device','设备编号')" prop="code">
|
||||||
<el-input v-model="queryParams.code" placeholder="请输入设备编号" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.code" :placeholder="tLang('common','请输入') + tLang('device','设备编号')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="车间名称" prop="workShop">
|
<el-form-item :label="tLang('device','车间名称')" prop="workShop">
|
||||||
<el-input v-model="queryParams.workShop" placeholder="请输入车间名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.workShop" :placeholder="tLang('common','请输入') + tLang('device','车间名称')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产线名称" prop="lineName">
|
<el-form-item :label="tLang('device','产线名称')" prop="lineName">
|
||||||
<el-input v-model="queryParams.lineName" placeholder="请输入产线名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.lineName" :placeholder="tLang('common','请输入') + tLang('device','产线名称')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="保养周期" prop="maintenance">
|
<el-form-item :label="tLang('device','保养周期')" prop="maintenance">
|
||||||
<el-input v-model="queryParams.maintenance" placeholder="请输入保养周期" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.maintenance" :placeholder="tLang('common','请输入') + tLang('device','保养周期')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="供货商名称" prop="supplier">
|
<el-form-item :label="tLang('device','供货商名称')" prop="supplier">
|
||||||
<el-input v-model="queryParams.supplier" placeholder="请输入供货商名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.supplier" :placeholder="tLang('common','请输入') + tLang('device','供货商名称')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="供货商联络人" prop="supplierContactPerson">
|
<el-form-item :label="tLang('device','供货商联络人')" prop="supplierContactPerson">
|
||||||
<el-input v-model="queryParams.supplierContactPerson" placeholder="请输入供货商联络人" clearable
|
<el-input v-model="queryParams.supplierContactPerson" :placeholder="tLang('common','请输入') + tLang('device','供货商联络人')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="生产厂家" prop="manufacturer">
|
<el-form-item :label="tLang('device','生产厂家')" prop="manufacturer">
|
||||||
<el-input v-model="queryParams.manufacturer" placeholder="请输入生产厂家" clearable
|
<el-input v-model="queryParams.manufacturer" :placeholder="tLang('common','请输入') + tLang('device','生产厂家')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系电话" prop="contactPhone">
|
<el-form-item :label="tLang('device','联系电话')" prop="contactPhone">
|
||||||
<el-input v-model="queryParams.contactPhone" placeholder="请输入联系电话" clearable
|
<el-input v-model="queryParams.contactPhone" :placeholder="tLang('common','请输入') + tLang('device','联系电话')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="品牌" prop="brand">
|
<el-form-item :label="tLang('device','品牌')" prop="brand">
|
||||||
<el-input v-model="queryParams.brand" placeholder="请输入品牌" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.brand" :placeholder="tLang('common','请输入') + tLang('device','品牌')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="针数" prop="needleNum">
|
<!-- <el-form-item :label="针数" prop="needleNum">
|
||||||
<el-input v-model="queryParams.needleNum" placeholder="请输入针数" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.needleNum" :placeholder="tLang('common','请输入') + 针数" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="设备型号" prop="model">
|
<el-form-item :label="tLang('device','设备型号')" prop="model">
|
||||||
<el-input v-model="queryParams.model" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.model" :placeholder="tLang('common','请输入') + tLang('device','设备型号')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="search" size="mini" @click="handleQuery">{{tLang('common','搜索')}}</el-button>
|
||||||
<el-button icon="refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="refresh" size="mini" @click="resetQuery">{{tLang('common','重置')}}</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
|
||||||
@ -68,22 +68,20 @@
|
|||||||
|
|
||||||
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column type="index" :label="$t('common.序号')" width="55" align="center" />
|
<el-table-column type="index" :label="$t('common.序号')" width="60" align="center" />
|
||||||
<el-table-column label="设备名称" align="center" v-if="columns[0].visible" prop="name" />
|
<el-table-column :label="tLang('device','设备名称')" align="center" v-if="columns[0].visible" prop="name" />
|
||||||
<el-table-column label="设备编号" align="center" v-if="columns[1].visible" prop="code" />
|
<el-table-column :label="tLang('device','设备编号')" align="center" v-if="columns[1].visible" prop="code" />
|
||||||
<el-table-column label="设备类型" align="center" v-if="columns[2].visible" prop="type" />
|
<el-table-column :label="tLang('device','设备类型')" align="center" v-if="columns[2].visible" prop="type" />
|
||||||
<el-table-column label="车间名称" align="center" v-if="columns[3].visible" prop="workShop" />
|
<el-table-column :label="tLang('device','车间名称')" align="center" v-if="columns[3].visible" prop="workShop" />
|
||||||
<el-table-column label="产线名称" align="center" v-if="columns[4].visible" prop="lineName" />
|
<el-table-column :label="tLang('device','产线名称')" align="center" v-if="columns[4].visible" prop="lineName" />
|
||||||
<el-table-column label="保养周期" align="center" v-if="columns[5].visible" prop="maintenance" />
|
<el-table-column :label="tLang('device','保养周期')" align="center" v-if="columns[5].visible" prop="maintenance" />
|
||||||
<el-table-column label="供货商名称" align="center" v-if="columns[6].visible" prop="supplier" />
|
<el-table-column :label="tLang('device','供货商名称')" align="center" v-if="columns[6].visible" prop="supplier" />
|
||||||
<el-table-column label="供货商联络人" align="center" v-if="columns[7].visible" prop="supplierContactPerson" />
|
<el-table-column :label="tLang('device','供货商联络人')" align="center" v-if="columns[7].visible" prop="supplierContactPerson" />
|
||||||
<el-table-column label="生产厂家" align="center" v-if="columns[8].visible" prop="manufacturer" />
|
<el-table-column :label="tLang('device','生产厂家')" align="center" v-if="columns[8].visible" prop="manufacturer" />
|
||||||
<el-table-column label="联系电话" align="center" v-if="columns[9].visible" prop="contactPhone" />
|
<el-table-column :label="tLang('device','联系电话')" align="center" v-if="columns[9].visible" prop="contactPhone" />
|
||||||
<el-table-column label="品牌" align="center" v-if="columns[10].visible" prop="brand" />
|
<el-table-column :label="tLang('device','品牌')" align="center" v-if="columns[10].visible" prop="brand" />
|
||||||
<!-- <el-table-column label="针数" align="center" v-if="columns[11].visible" prop="needleNum" /> -->
|
<el-table-column :label="tLang('device','设备型号')" align="center" v-if="columns[11].visible" prop="model" />
|
||||||
<el-table-column label="设备型号" align="center" v-if="columns[12].visible" prop="model" />
|
<el-table-column :label="tLang('device','备注')" align="center" v-if="columns[12].visible" prop="remark" />
|
||||||
<!-- <el-table-column label="图片(文件)" align="center" prop="file" /> -->
|
|
||||||
<el-table-column label="备注" align="center" v-if="columns[13].visible" prop="remark" />
|
|
||||||
<el-table-column :label="tLang('common','操作')" align="center" class-name="small-padding fixed-width">
|
<el-table-column :label="tLang('common','操作')" align="center" class-name="small-padding fixed-width">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tooltip :content="tLang('common','详情')" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','详情')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
@ -108,56 +106,56 @@
|
|||||||
<!-- 添加或修改设备信息对话框 -->
|
<!-- 添加或修改设备信息对话框 -->
|
||||||
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
|
<el-dialog :title="title" v-model="open" width="800px" append-to-body>
|
||||||
<el-form ref="formRef" :inline="true" :model="form" :rules="rules" class="demo-form-inline" label-width="100px">
|
<el-form ref="formRef" :inline="true" :model="form" :rules="rules" class="demo-form-inline" label-width="100px">
|
||||||
<el-form-item label="设备名称" prop="name">
|
<el-form-item :label="tLang('device','设备名称')" prop="name">
|
||||||
<el-input v-model="form.name" placeholder="请输入设备名称" />
|
<el-input v-model="form.name" :placeholder="tLang('common','请输入') + tLang('device','设备名称')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备编号" prop="code">
|
<el-form-item :label="tLang('device','设备编号')" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入设备编号" />
|
<el-input v-model="form.code" :placeholder="tLang('common','请输入') + tLang('device','设备编号')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备类型" prop="code">
|
<el-form-item :label="tLang('device','设备类型')" prop="code">
|
||||||
<el-input v-model="form.type" placeholder="请输入设备编号" />
|
<el-input v-model="form.type" :placeholder="tLang('common','请输入') + tLang('device','设备编号')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="车间名称" prop="workShop">
|
<el-form-item :label="tLang('device','车间名称')" prop="workShop">
|
||||||
<el-input v-model="form.workShop" placeholder="请输入车间名称" />
|
<el-input v-model="form.workShop" :placeholder="tLang('common','请输入') + tLang('device','车间名称')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产线名称" prop="lineName">
|
<el-form-item :label="tLang('device','产线名称')" prop="lineName">
|
||||||
<el-input v-model="form.lineName" placeholder="请输入产线名称" />
|
<el-input v-model="form.lineName" :placeholder="tLang('common','请输入') + tLang('device','产线名称')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="保养周期" prop="maintenance">
|
<el-form-item :label="tLang('device','保养周期')" prop="maintenance">
|
||||||
<el-input v-model="form.maintenance" placeholder="请输入保养周期" />
|
<el-input v-model="form.maintenance" :placeholder="tLang('common','请输入') + tLang('device','保养周期')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="供货商名称" prop="supplier">
|
<el-form-item :label="tLang('device','供货商名称')" prop="supplier">
|
||||||
<el-input v-model="form.supplier" placeholder="请输入供货商名称" />
|
<el-input v-model="form.supplier" :placeholder="tLang('common','请输入') + tLang('device','供货商名称')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="供货商联络人" prop="supplierContactPerson">
|
<el-form-item :label="tLang('device','供货商联络人')" prop="supplierContactPerson">
|
||||||
<el-input v-model="form.supplierContactPerson" placeholder="请输入供货商联络人" />
|
<el-input v-model="form.supplierContactPerson" :placeholder="tLang('common','请输入') + tLang('device','供货商联络人')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="生产厂家" prop="manufacturer">
|
<el-form-item :label="tLang('device','生产厂家')" prop="manufacturer">
|
||||||
<el-input v-model="form.manufacturer" placeholder="请输入生产厂家" />
|
<el-input v-model="form.manufacturer" :placeholder="tLang('common','请输入') + tLang('device','生产厂家')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="联系电话" prop="contactPhone">
|
<el-form-item :label="tLang('device','联系电话')" prop="contactPhone">
|
||||||
<el-input v-model="form.contactPhone" placeholder="请输入联系电话" />
|
<el-input v-model="form.contactPhone" :placeholder="tLang('common','请输入') + tLang('device','联系电话')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="品牌" prop="brand">
|
<el-form-item :label="tLang('device','品牌')" prop="brand">
|
||||||
<el-input v-model="form.brand" placeholder="请输入品牌" />
|
<el-input v-model="form.brand" :placeholder="tLang('common','请输入') + tLang('device','品牌')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- <el-form-item label="针数" prop="needleNum">
|
<!-- <el-form-item :label="针数" prop="needleNum">
|
||||||
<el-input-number v-model="form.needleNum" :min="1" />
|
<el-input-number v-model="form.needleNum" :min="1" />
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<el-form-item label="设备型号" prop="model">
|
<el-form-item :label="tLang('device','设备型号')" prop="model">
|
||||||
<el-input v-model="form.model" placeholder="请输入设备型号" />
|
<el-input v-model="form.model" :placeholder="tLang('common','请输入') + tLang('device','设备型号')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="图片(文件)" prop="file">
|
<el-form-item :label="tLang('device','图片')" prop="file">
|
||||||
<image-upload v-model="form.file" />
|
<image-upload v-model="form.file" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item :label="tLang('device','备注')" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" :placeholder="tLang('common','请输入') + tLang('device','备注')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">{{tLang('common','确 定')}}</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">{{tLang('common','取 消')}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -211,6 +209,7 @@ let queryParams = reactive({
|
|||||||
})
|
})
|
||||||
// 表单参数
|
// 表单参数
|
||||||
let form = ref({})
|
let form = ref({})
|
||||||
|
const formRef = ref(null)
|
||||||
// 表单校验
|
// 表单校验
|
||||||
let rules = ref({
|
let rules = ref({
|
||||||
needleNum: [
|
needleNum: [
|
||||||
@ -224,20 +223,19 @@ let rules = ref({
|
|||||||
})
|
})
|
||||||
// 列显隐信息
|
// 列显隐信息
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ key: 0, label: `设备名称`, visible: true },
|
{ key: 0, label: proxy.tLang('device',`设备名称`), visible: true },
|
||||||
{ key: 1, label: `设备编号`, visible: true },
|
{ key: 1, label: proxy.tLang('device',`设备编号`), visible: true },
|
||||||
{ key: 2, label: `设备类型`, visible: true },
|
{ key: 2, label: proxy.tLang('device',`设备类型`), visible: true },
|
||||||
{ key: 3, label: `车间名称`, visible: true },
|
{ key: 3, label:proxy.tLang('device',`车间名称`) , visible: true },
|
||||||
{ key: 4, label: `产线名称`, visible: false },
|
{ key: 4, label:proxy.tLang('device',`产线名称`) , visible: false },
|
||||||
{ key: 5, label: `保养周期`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`保养周期`) , visible: false },
|
||||||
{ key: 5, label: `供货商名称`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`供货商名称`) , visible: false },
|
||||||
{ key: 5, label: `供货商联络人`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`供货商联络人`) , visible: false },
|
||||||
{ key: 5, label: `生产厂家`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`生产厂家`) , visible: false },
|
||||||
{ key: 5, label: `联系电话`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`联系电话`) , visible: false },
|
||||||
{ key: 5, label: `品牌`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`品牌`) , visible: false },
|
||||||
{ key: 5, label: `针数`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`设备型号`) , visible: false },
|
||||||
{ key: 5, label: `设备型号`, visible: false },
|
{ key: 5, label:proxy.tLang('device',`备注`) , visible: false },
|
||||||
{ key: 5, label: `备注`, visible: false },
|
|
||||||
]);
|
]);
|
||||||
/** 查询设备信息列表 */
|
/** 查询设备信息列表 */
|
||||||
function getList() {
|
function getList() {
|
||||||
@ -332,7 +330,7 @@ function handleUpdate(row) {
|
|||||||
}
|
}
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
function submitForm() {
|
function submitForm() {
|
||||||
proxy.$refs["formRef"].validate(valid => {
|
formRef.value.validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
if (form.value.id != null) {
|
if (form.value.id != null) {
|
||||||
updateDevice(form.value).then(response => {
|
updateDevice(form.value).then(response => {
|
||||||
|
|||||||
@ -4,23 +4,23 @@
|
|||||||
label-width="68px">
|
label-width="68px">
|
||||||
<el-form-item label="产品编码" prop="productionCode">
|
<el-form-item label="产品编码" prop="productionCode">
|
||||||
<el-input v-model="queryParams.productionCode" placeholder="请输入产品编码" clearable
|
<el-input v-model="queryParams.productionCode" placeholder="请输入产品编码" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="设备编码" prop="deviceCode">
|
<el-form-item label="设备编码" prop="deviceCode">
|
||||||
<el-input v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable
|
<el-input v-model="queryParams.deviceCode" placeholder="请输入设备编码" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="员工编码" prop="persionCode">
|
<el-form-item label="员工编码" prop="persionCode">
|
||||||
<el-input v-model="queryParams.persionCode" placeholder="请输入员工编码" clearable
|
<el-input v-model="queryParams.persionCode" placeholder="请输入员工编码" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="目标产量" prop="planOutput">
|
<el-form-item label="目标产量" prop="planOutput">
|
||||||
<el-input v-model="queryParams.planOutput" placeholder="请输入目标产量" clearable
|
<el-input v-model="queryParams.planOutput" placeholder="请输入目标产量" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="当前产量" prop="output">
|
<el-form-item label="当前产量" prop="output">
|
||||||
<el-input v-model="queryParams.output" placeholder="请输入当前产量" clearable
|
<el-input v-model="queryParams.output" placeholder="请输入当前产量" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="开始时间" prop="starttime">
|
<el-form-item label="开始时间" prop="starttime">
|
||||||
<el-date-picker clearable v-model="queryParams.starttime" type="date" value-format="yyyy-MM-dd"
|
<el-date-picker clearable v-model="queryParams.starttime" type="date" value-format="yyyy-MM-dd"
|
||||||
@ -33,7 +33,7 @@
|
|||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="批次" prop="batch">
|
<el-form-item label="批次" prop="batch">
|
||||||
<el-input v-model="queryParams.batch" placeholder="请输入批次" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.batch" placeholder="请输入批次" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
|
|||||||
@ -2,38 +2,38 @@
|
|||||||
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
||||||
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
||||||
label-width="100px">
|
label-width="100px">
|
||||||
<el-form-item label="产品条码" prop="code">
|
<el-form-item :label="tLang('product','产品编码')" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入产品条码" />
|
<el-input v-model="form.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="针号" prop="needleNum">
|
<el-form-item :label="tLang('product','针号')" prop="needleNum">
|
||||||
<el-input v-model="form.needleNum" placeholder="请输入针号" />
|
<el-input v-model="form.needleNum" :placeholder="tLang('common','请输入') + tLang('product','针号')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="面线信息" prop="surfacelineId">
|
<el-form-item :label="tLang('product','面线信息')" prop="surfacelineId">
|
||||||
<el-input v-model="form.surfacelineId" placeholder="请输入面线信息" />
|
<el-input v-model="form.surfacelineId" :placeholder="tLang('common','请输入') + tLang('product','面线信息')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="底线信息" prop="bottomlineId">
|
<el-form-item :label="tLang('product','底线信息')" prop="bottomlineId">
|
||||||
<el-input v-model="form.bottomlineId" placeholder="请输入底线信息" />
|
<el-input v-model="form.bottomlineId" :placeholder="tLang('common','请输入') + tLang('product','底线信息')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="梭芯信息" prop="shuttlecoreId">
|
<el-form-item :label="tLang('product','梭芯信息')" prop="shuttlecoreId">
|
||||||
<el-input v-model="form.shuttlecoreId" placeholder="请输入梭芯信息" />
|
<el-input v-model="form.shuttlecoreId" :placeholder="tLang('common','请输入') + tLang('product','梭芯信息')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="排序" prop="sort">
|
<el-form-item :label="tLang('product','排序')" prop="sort">
|
||||||
<el-input v-model="form.sort" placeholder="请输入排序" />
|
<el-input v-model="form.sort" :placeholder="tLang('common','请输入') + tLang('product','排序')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最小值" prop="min">
|
<el-form-item :label="tLang('product','最小值')" prop="min">
|
||||||
<el-input v-model="form.min" placeholder="请输入最小值" />
|
<el-input v-model="form.min" :placeholder="tLang('common','请输入') + tLang('product','最小值')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最大值" prop="max">
|
<el-form-item :label="tLang('product','最大值')" prop="max">
|
||||||
<el-input v-model="form.max" placeholder="请输入最大值" />
|
<el-input v-model="form.max" :placeholder="tLang('common','请输入') + tLang('product','最大值')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item :label="tLang('product','备注')" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" :placeholder="tLang('common','请输入') + tLang('product','备注')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">{{tLang('common','确 定')}}</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">{{tLang('common','取 消')}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -42,10 +42,11 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
const emit = defineEmits();
|
const emit = defineEmits();
|
||||||
const proxy = getCurrentInstance();
|
const {proxy} = getCurrentInstance();
|
||||||
const rules = {
|
const rules = {
|
||||||
code: [{ required: true, message: "请输入产品编码", trigger: "blur" }],
|
code: [{ required: true, message: `${proxy.tLang('common','请输入') + proxy.tLang('product','产品编码')}`, trigger: "blur" }],
|
||||||
};
|
};
|
||||||
|
const formRef = ref()
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
modelValue: [String, Object, Array],
|
modelValue: [String, Object, Array],
|
||||||
title: String,
|
title: String,
|
||||||
@ -61,7 +62,7 @@ function close() {
|
|||||||
emit("update:modelValue", false);
|
emit("update:modelValue", false);
|
||||||
}
|
}
|
||||||
function submitForm() {
|
function submitForm() {
|
||||||
proxy.refs["formRef"].validate(valid => {
|
formRef.value.validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
emit("submitForm", props.form);
|
emit("submitForm", props.form);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,50 +1,41 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="产品条码" prop="code">
|
<el-form-item :label="tLang('product','产品编码')" prop="code">
|
||||||
<el-input v-model="queryParams.code" placeholder="请输入产品条码" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="针号" prop="needleNum">
|
<el-form-item :label="tLang('product','针号')" prop="needleNum">
|
||||||
<el-input v-model="queryParams.needleNum" placeholder="请输入针号" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.needleNum" :placeholder="tLang('common','请输入') + tLang('product','针号')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="面线信息" prop="surfacelineId">
|
<el-form-item :label="tLang('product','面线信息')" prop="surfacelineId">
|
||||||
<el-input v-model="queryParams.surfacelineId" placeholder="请输入面线信息" clearable
|
<el-input v-model="queryParams.surfacelineId" :placeholder="tLang('common','请输入') + tLang('product','面线信息')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="底线信息" prop="bottomlineId">
|
<el-form-item :label="tLang('product','底线信息')" prop="bottomlineId">
|
||||||
<el-input v-model="queryParams.bottomlineId" placeholder="请输入底线信息" clearable
|
<el-input v-model="queryParams.bottomlineId" :placeholder="tLang('common','请输入') + tLang('product','底线信息')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="梭芯信息" prop="shuttlecoreId">
|
<el-form-item :label="tLang('product','梭芯信息')" prop="shuttlecoreId">
|
||||||
<el-input v-model="queryParams.shuttlecoreId" placeholder="请输入梭芯信息" clearable
|
<el-input v-model="queryParams.shuttlecoreId" :placeholder="tLang('common','请输入') + tLang('product','梭芯信息')" clearable
|
||||||
@keyup.enter.native="handleQuery" />
|
@keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="排序" prop="sort">
|
|
||||||
<el-input v-model="queryParams.sort" placeholder="请输入排序" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="最小值" prop="min">
|
|
||||||
<el-input v-model="queryParams.min" placeholder="请输入最小值" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="最大值" prop="max">
|
|
||||||
<el-input v-model="queryParams.max" placeholder="请输入最大值" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="search" size="mini" @click="handleQuery">{{tLang('common','搜索')}}</el-button>
|
||||||
<el-button icon="refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="refresh" size="mini" @click="resetQuery">{{tLang('common','重置')}}</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
||||||
v-hasPermi="['product:needle:add']">新增</el-button>
|
v-hasPermi="['product:needle:add']">{{tLang('common','新增')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||||
v-hasPermi="['product:needle:edit']">修改</el-button>
|
v-hasPermi="['product:needle:edit']">{{tLang('common','修改')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||||
v-hasPermi="['product:needle:remove']">删除</el-button>
|
v-hasPermi="['product:needle:remove']">{{tLang('common','删除')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<!-- <el-col :span="1.5">
|
||||||
<el-button type="warning" plain icon="download" size="mini" @click="handleExport"
|
<el-button type="warning" plain icon="download" size="mini" @click="handleExport"
|
||||||
@ -54,25 +45,25 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-table v-loading="loading" :data="productionLineRelationList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="productionLineRelationList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
<el-table-column type="index" :label="tLang('common','序号')" width="60" align="center" />
|
||||||
<!-- <el-table-column label="主键id" align="center" prop="id" /> -->
|
<!-- <el-table-column :label="主键id" align="center" prop="id" /> -->
|
||||||
<el-table-column label="产品编号" align="center" v-if="columns[0].visible" prop="code" />
|
<el-table-column :label="tLang('product','产品编码')" align="center" v-if="columns[0].visible" prop="code" />
|
||||||
<el-table-column label="针号" align="center" v-if="columns[1].visible" prop="needleNum" />
|
<el-table-column :label="tLang('product','针号')" align="center" v-if="columns[1].visible" prop="needleNum" />
|
||||||
<el-table-column label="面线信息" align="center" v-if="columns[2].visible" prop="surfacelineId" />
|
<el-table-column :label="tLang('product','面线信息')" align="center" v-if="columns[2].visible" prop="surfacelineId" />
|
||||||
<el-table-column label="底线信息" align="center" v-if="columns[3].visible" prop="bottomlineId" />
|
<el-table-column :label="tLang('product','底线信息')" align="center" width="80" v-if="columns[3].visible" prop="bottomlineId" />
|
||||||
<el-table-column label="梭芯信息" align="center" v-if="columns[4].visible" prop="shuttlecoreId" />
|
<el-table-column :label="tLang('product','梭芯信息')" align="center" v-if="columns[4].visible" prop="shuttlecoreId" />
|
||||||
<el-table-column label="排序" align="center" v-if="columns[5].visible" prop="sort" />
|
<el-table-column :label="tLang('product','排序')" align="center" v-if="columns[5].visible" prop="sort" />
|
||||||
<el-table-column label="最小值" align="center" v-if="columns[6].visible" prop="min" />
|
<el-table-column :label="tLang('product','最小值')" align="center" v-if="columns[6].visible" prop="min" />
|
||||||
<el-table-column label="最大值" align="center" v-if="columns[7].visible" prop="max" />
|
<el-table-column :label="tLang('product','最大值')" align="center" v-if="columns[7].visible" prop="max" />
|
||||||
<el-table-column label="类型" align="center" v-if="columns[8].visible" prop="type" />
|
<el-table-column :label="tLang('product','类型')" align="center" v-if="columns[8].visible" prop="type" />
|
||||||
<!-- <el-table-column label="备注" align="center" prop="remark" /> -->
|
<!-- <el-table-column :label="备注" align="center" prop="remark" /> -->
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column :label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','修改')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||||
v-hasPermi="['product:needle:edit']"></el-button>
|
v-hasPermi="['product:needle:edit']"></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','删除')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['product:needle:remove']"></el-button>
|
v-hasPermi="['product:needle:remove']"></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@ -128,15 +119,15 @@ let total = ref(0)
|
|||||||
let productionLineRelationList = ref([])
|
let productionLineRelationList = ref([])
|
||||||
// 列显隐信息
|
// 列显隐信息
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ key: 0, label: `产品编码`, visible: true },
|
{ key: 0, label: proxy.tLang('product','产品编码'), visible: true },
|
||||||
{ key: 1, label: `针号`, visible: true },
|
{ key: 1, label: proxy.tLang('product','针号'), visible: true },
|
||||||
{ key: 2, label: `面线信息`, visible: true },
|
{ key: 2, label: proxy.tLang('product','面线信息'), visible: true },
|
||||||
{ key: 3, label: `底线信息`, visible: true },
|
{ key: 3, label: proxy.tLang('product','底线信息'), visible: true },
|
||||||
{ key: 4, label: `梭芯信息`, visible: true },
|
{ key: 4, label: proxy.tLang('product','梭芯信息'), visible: true },
|
||||||
{ key: 5, label: `排序`, visible: true },
|
{ key: 5, label: proxy.tLang('product','排序'), visible: true },
|
||||||
{ key: 6, label: `最小值`, visible: true },
|
{ key: 6, label: proxy.tLang('product','最小值'), visible: true },
|
||||||
{ key: 7, label: `最大值`, visible: true },
|
{ key: 7, label: proxy.tLang('product','最大值'), visible: true },
|
||||||
{ key: 8, label: `类型`, visible: true },
|
{ key: 8, label: proxy.tLang('product','类型'), visible: true },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let infoDialog = ref(false)
|
let infoDialog = ref(false)
|
||||||
@ -176,7 +167,7 @@ function resetQuery() {
|
|||||||
function handleAdd() {
|
function handleAdd() {
|
||||||
reset();
|
reset();
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "添加针(底线/面线)/张力";
|
title.value = proxy.tLang('common','添加') + ' '+proxy.tLang('product','针号');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**详情按钮操作 */
|
/**详情按钮操作 */
|
||||||
@ -192,13 +183,13 @@ function submitForm(propform) {
|
|||||||
|
|
||||||
if (propform.id != null) {
|
if (propform.id != null) {
|
||||||
updateProductionLineRelation(propform).then(response => {
|
updateProductionLineRelation(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("修改成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','修改成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addProductionLineRelation(propform).then(response => {
|
addProductionLineRelation(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("新增成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','新增成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
@ -238,7 +229,7 @@ function handleUpdate(row) {
|
|||||||
getProductionLineRelation(id).then(response => {
|
getProductionLineRelation(id).then(response => {
|
||||||
form.value = response.data;
|
form.value = response.data;
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "修改针(底线/面线)/张力";
|
title.value = proxy.tLang('common','修改') + ' ' + proxy.tLang('product','针号');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -249,7 +240,7 @@ function handleDelete(row) {
|
|||||||
return delProductionLineRelation(id);
|
return delProductionLineRelation(id);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
getList();
|
getList();
|
||||||
proxy.$modal.msgSuccess("删除成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','删除成功'));
|
||||||
}).catch(() => { });
|
}).catch(() => { });
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|||||||
@ -2,27 +2,27 @@
|
|||||||
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
||||||
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
||||||
label-width="100px">
|
label-width="100px">
|
||||||
<el-form-item label="产品名称" prop="name">
|
<el-form-item :label="tLang('product','产品名称')" prop="name">
|
||||||
<el-input v-model="props.form.name" placeholder="请输入产品名称" />
|
<el-input v-model="props.form.name" :placeholder="tLang('common','请输入') + tLang('product','产品名称')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产品类型" prop="type">
|
<el-form-item :label="tLang('product','产品类型')" prop="type">
|
||||||
<el-input v-model="props.form.type" placeholder="请输入产品类型" />
|
<el-input v-model="props.form.type" :placeholder="tLang('common','请输入') + tLang('product','产品类型')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产品编码" prop="code">
|
<el-form-item :label="tLang('product','产品编码')" prop="code">
|
||||||
<el-input v-model="props.form.code" placeholder="请输入产品编码" />
|
<el-input v-model="props.form.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item :label="tLang('product','备注')" prop="remark">
|
||||||
<el-input v-model="props.form.remark" style="width: 600px" :rows="4" type="textarea" placeholder="请输入" />
|
<el-input v-model="props.form.remark" style="width: 600px" :rows="4" type="textarea" :placeholder="tLang('common','请输入')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="图片(文件)" prop="file">
|
<el-form-item :label="tLang('product','图片')" prop="file">
|
||||||
<image-upload v-model="props.form.file" />
|
<image-upload v-model="props.form.file" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">{{tLang('common','确 定')}}</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">{{tLang('common','取 消')}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -32,6 +32,7 @@
|
|||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
const emit = defineEmits();
|
const emit = defineEmits();
|
||||||
const proxy = getCurrentInstance();
|
const proxy = getCurrentInstance();
|
||||||
|
const formRef = ref();
|
||||||
const rules = {
|
const rules = {
|
||||||
name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
|
name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
|
||||||
code: [{ required: true, message: "请输入产品编码", trigger: "blur" }],
|
code: [{ required: true, message: "请输入产品编码", trigger: "blur" }],
|
||||||
@ -59,7 +60,7 @@ function close() {
|
|||||||
emit("update:modelValue", false);
|
emit("update:modelValue", false);
|
||||||
}
|
}
|
||||||
function submitForm() {
|
function submitForm() {
|
||||||
proxy.refs["formRef"].validate((valid) => {
|
formRef.value.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
emit("submitForm", props.form);
|
emit("submitForm", props.form);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,32 +1,32 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="产品名称" prop="name">
|
<el-form-item :label="tLang('product','产品名称')" prop="name">
|
||||||
<el-input v-model="queryParams.name" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.name" :placeholder="tLang('common','请输入') + tLang('product','产品名称')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产品编码" prop="code">
|
<el-form-item :label="tLang('product','产品编码')" prop="code">
|
||||||
<el-input v-model="queryParams.code" placeholder="请输入设备编号" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="产品类型" prop="type">
|
<el-form-item :label="tLang('product','产品类型')" prop="type">
|
||||||
<el-input v-model="queryParams.type" placeholder="请输入设备编号" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.type" :placeholder="tLang('common','请输入') + tLang('product','产品类型')" clearable @keyup.enter="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="search" size="mini" @click="handleQuery">{{tLang('common','搜索')}}</el-button>
|
||||||
<el-button icon="refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="refresh" size="mini" @click="resetQuery">{{tLang('common','重置')}}</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
||||||
v-hasPermi="['product:product:add']">新增</el-button>
|
v-hasPermi="['product:product:add']">{{tLang('common','新增')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||||
v-hasPermi="['product:product:edit']">修改</el-button>
|
v-hasPermi="['product:product:edit']">{{tLang('common','修改')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||||
v-hasPermi="['product:product:remove']">删除</el-button>
|
v-hasPermi="['product:product:remove']">{{tLang('common','删除')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<!-- <el-col :span="1.5">
|
<!-- <el-col :span="1.5">
|
||||||
<el-button type="warning" plain icon="download" size="mini" @click="handleExport"
|
<el-button type="warning" plain icon="download" size="mini" @click="handleExport"
|
||||||
@ -36,21 +36,21 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<el-table v-loading="loading" :data="productionList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="productionList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
<el-table-column type="index" :label="tLang('common','序号')" width="60" align="center" />
|
||||||
<el-table-column label="产品名称" align="center" v-if="columns[0].visible" prop="name" />
|
<el-table-column :label="tLang('product','产品名称')" align="center" v-if="columns[0].visible" prop="name" />
|
||||||
<el-table-column label="产品类型" align="center" v-if="columns[1].visible" prop="type" />
|
<el-table-column :label="tLang('product','产品类型')" align="center" v-if="columns[1].visible" prop="type" />
|
||||||
<el-table-column label="产品编码" align="center" v-if="columns[2].visible" prop="code" />
|
<el-table-column :label="tLang('product','产品编码')" align="center" v-if="columns[2].visible" prop="code" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column :label="tLang('common','操作')" align="center" class-name="small-padding fixed-width">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tooltip content="详情" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','详情')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Tickets" @click="handleInfo(scope.row)"
|
<el-button link type="primary" icon="Tickets" @click="handleInfo(scope.row)"
|
||||||
v-hasPermi="['product:product:info']"></el-button>
|
v-hasPermi="['product:product:info']"></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','修改')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||||
v-hasPermi="['product:product:edit']"></el-button>
|
v-hasPermi="['product:product:edit']"></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
<el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip :content="tLang('common','删除')" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
|
||||||
v-hasPermi="['product:product:remove']"></el-button>
|
v-hasPermi="['product:product:remove']"></el-button>
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@ -104,9 +104,9 @@ let productionList = ref([
|
|||||||
])
|
])
|
||||||
// 列显隐信息
|
// 列显隐信息
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ key: 0, label: `产品名称`, visible: true },
|
{ key: 0, label: proxy.tLang('product','产品名称'), visible: true },
|
||||||
{ key: 1, label: `产品类型`, visible: true },
|
{ key: 1, label: proxy.tLang('product','产品类型'), visible: true },
|
||||||
{ key: 2, label: `产品编码`, visible: true },
|
{ key: 2, label: proxy.tLang('product','产品编码'), visible: true },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let infoDialog = ref(false)
|
let infoDialog = ref(false)
|
||||||
@ -145,7 +145,7 @@ function resetQuery() {
|
|||||||
function handleAdd() {
|
function handleAdd() {
|
||||||
reset();
|
reset();
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "添加产品信息";
|
title.value = proxy.tLang('common','添加') + proxy.tLang('product','产品信息');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**详情按钮操作 */
|
/**详情按钮操作 */
|
||||||
@ -160,13 +160,13 @@ function handleInfo(row) {
|
|||||||
function submitForm(propform) {
|
function submitForm(propform) {
|
||||||
if (propform.id != null) {
|
if (propform.id != null) {
|
||||||
updateProduction(propform).then(response => {
|
updateProduction(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("修改成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','修改成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addProduction(propform).then(response => {
|
addProduction(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("新增成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','添加成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
@ -199,7 +199,7 @@ function handleUpdate(row) {
|
|||||||
getProduction(id).then(response => {
|
getProduction(id).then(response => {
|
||||||
form.value = response.data;
|
form.value = response.data;
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "修改产品信息";
|
title.value = proxy.tLang('common','修改') + proxy.tLang('product','产品信息');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -210,7 +210,7 @@ function handleDelete(row) {
|
|||||||
return delProduction(id);
|
return delProduction(id);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
getList();
|
getList();
|
||||||
proxy.$modal.msgSuccess("删除成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','删除成功'));
|
||||||
}).catch(() => { });
|
}).catch(() => { });
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|||||||
@ -1,45 +1,43 @@
|
|||||||
<template>
|
<template>
|
||||||
<el-dialog v-model="props.modelValue" title="设备详情" @close="close" width="800">
|
<el-dialog v-model="props.modelValue" :title="tLang('product','产品信息')" @close="close" width="800">
|
||||||
<el-descriptions title="产品信息" column="2">
|
<el-descriptions :title="tLang('product','产品信息')" column="2">
|
||||||
<el-descriptions-item label="产品名称">{{ props.info.name }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','产品名称')">{{ props.info.name }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="产品类型">{{ props.info.type }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','产品类型')">{{ props.info.type }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="产品编码">{{ props.info.code }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','产品编码')">{{ props.info.code }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions title="" column="3">
|
||||||
<el-descriptions-item label="">{{ "针1" }}</el-descriptions-item>
|
<el-descriptions-item>{{ "针1" }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="底线编码">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','底线编码')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="面线编码">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','面线编码')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions title="" column="3">
|
||||||
<el-descriptions-item label="">{{ "针2" }}</el-descriptions-item>
|
<el-descriptions-item >{{ "针2" }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="底线编码">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','底线编码')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="面线编码">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','面线编码')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions title="" column="3">
|
||||||
<el-descriptions-item label="">{{ "针1表面张力" }}</el-descriptions-item>
|
<el-descriptions-item >{{ "针1表面张力" }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最小值">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最小值')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最大值">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最大值')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions title="" column="3">
|
||||||
<el-descriptions-item label="">{{ "针2表面张力" }}</el-descriptions-item>
|
<el-descriptions-item >{{ "针2表面张力" }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最小值">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最小值')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最大值">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最大值')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions :title="tLang('product','缝纫次数')" column="3">
|
||||||
<el-descriptions-item label="">{{ "缝纫" }}</el-descriptions-item>
|
<el-descriptions-item >{{ "缝纫" }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最小针数">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最小针数')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最大针数">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最大针数')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
<el-descriptions-item >{{ "标签" }}</el-descriptions-item>
|
||||||
<el-descriptions title="" column="3">
|
<el-descriptions-item :label="tLang('product','最小针数')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="">{{ "标签" }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','最大针数')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="最小针数">{{ props.info.remark }}</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="最大针数">{{ props.info.remark }}</el-descriptions-item>
|
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="1">
|
<el-descriptions title="" column="1">
|
||||||
<el-descriptions-item label="备注信息">{{ props.info.remark }}</el-descriptions-item>
|
<el-descriptions-item :label="tLang('product','备注')">{{ props.info.remark }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions title="" column="">
|
<el-descriptions title="" column="">
|
||||||
<el-descriptions-item label="设备图片">
|
<el-descriptions-item :label="tLang('product','图片')">
|
||||||
<div v-if="props.info.file && props.info.file.length > 0" style="width: 100%;display: flex;flex-direction: row;justify-content: center;">
|
<div v-if="props.info.file && props.info.file.length > 0" style="width: 100%;display: flex;flex-direction: row;justify-content: center;">
|
||||||
<el-image v-for="(item, index) in props.info?.file.split(',')" :key="index" :src="baseUrl + item"
|
<el-image v-for="(item, index) in props.info?.file.split(',')" :key="index" :src="baseUrl + item"
|
||||||
style="width: 100px; height: 100px; margin-right: 10px; margin-bottom: 10px"
|
style="width: 100px; height: 100px; margin-right: 10px; margin-bottom: 10px"
|
||||||
|
|||||||
@ -2,32 +2,32 @@
|
|||||||
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
<el-dialog v-model="props.modelValue" :title="props.title" @close="close" width="800">
|
||||||
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
<el-form ref="formRef" :inline="true" :model="props.form" :rules="rules" class="demo-form-inline"
|
||||||
label-width="100px">
|
label-width="100px">
|
||||||
<el-form-item label="产品条码" prop="code">
|
<el-form-item :label="tLang('product','产品编码')" prop="code">
|
||||||
<el-input v-model="form.code" placeholder="请输入产品条码" />
|
<el-input v-model="form.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="第几针" prop="num">
|
<el-form-item :label="tLang('product','第几针')" prop="num">
|
||||||
<el-input v-model="form.num" placeholder="请输入第几针" />
|
<el-input v-model="form.num" :placeholder="tLang('common','请输入') + tLang('product','第几针')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="步骤(缝纫、标签)" prop="step">
|
<el-form-item :label="tLang('product','步骤')" prop="step">
|
||||||
<el-input v-model="form.step" placeholder="请输入步骤(缝纫、标签)" />
|
<el-input v-model="form.step" :placeholder="tLang('common','请输入') + tLang('product','步骤')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最小值" prop="min">
|
<el-form-item :label="tLang('product','最小值')" prop="min">
|
||||||
<el-input v-model="form.min" placeholder="请输入最小值" />
|
<el-input v-model="form.min" :placeholder="tLang('common','请输入') + tLang('product','最小值')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="最大值" prop="max">
|
<el-form-item :label="tLang('product','最大值')" prop="max">
|
||||||
<el-input v-model="form.max" placeholder="请输入最大值" />
|
<el-input v-model="form.max" :placeholder="tLang('common','请输入') + tLang('product','最大值')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="排序" prop="sort">
|
<el-form-item :label="tLang('product','排序')" prop="sort">
|
||||||
<el-input v-model="form.sort" placeholder="请输入排序" />
|
<el-input v-model="form.sort" :placeholder="tLang('common','请输入') + tLang('product','排序')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="备注" prop="remark">
|
<el-form-item :label="tLang('product','备注')" prop="remark">
|
||||||
<el-input v-model="form.remark" placeholder="请输入备注" />
|
<el-input v-model="form.remark" :placeholder="tLang('common','请输入') + tLang('product','备注')" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<div class="dialog-footer">
|
<div class="dialog-footer">
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
<el-button type="primary" @click="submitForm">{{tLang('common','确 定')}}</el-button>
|
||||||
<el-button @click="cancel">取 消</el-button>
|
<el-button @click="cancel">{{tLang('common','取 消')}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@ -36,9 +36,10 @@
|
|||||||
<script setup>
|
<script setup>
|
||||||
import { ref } from "vue";
|
import { ref } from "vue";
|
||||||
const emit = defineEmits();
|
const emit = defineEmits();
|
||||||
const proxy = getCurrentInstance();
|
const {proxy} = getCurrentInstance();
|
||||||
|
const formRef = ref()
|
||||||
const rules = {
|
const rules = {
|
||||||
code: [{ required: true, message: "请输入产品编码", trigger: "blur" }],
|
code: [{ required: true, message: `${proxy.tLang('common','请输入') + proxy.tLang('product','产品编码')}`, trigger: "blur" }],
|
||||||
};
|
};
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
modelValue: [String, Object, Array],
|
modelValue: [String, Object, Array],
|
||||||
@ -50,19 +51,12 @@ const props = defineProps({
|
|||||||
});
|
});
|
||||||
const baseUrl = import.meta.env.VITE_APP_BASE_API;
|
const baseUrl = import.meta.env.VITE_APP_BASE_API;
|
||||||
|
|
||||||
//验证加工针数
|
|
||||||
function validateWorking(rule, value, callback) {
|
|
||||||
if (value[0].min === "" || value[0].max === "" || value[1].min === "" || value[1].max === "") {
|
|
||||||
callback(new Error("请输入加工针数"));
|
|
||||||
} else {
|
|
||||||
callback();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
function close() {
|
function close() {
|
||||||
emit("update:modelValue", false);
|
emit("update:modelValue", false);
|
||||||
}
|
}
|
||||||
function submitForm() {
|
function submitForm() {
|
||||||
proxy.refs["formRef"].validate((valid) => {
|
formRef.value.validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
emit("submitForm", props.form);
|
emit("submitForm", props.form);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,52 +1,43 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||||
<el-form-item label="产品条码" prop="code">
|
<el-form-item :label="tLang('product','产品条码')" prop="code">
|
||||||
<el-input v-model="queryParams.code" placeholder="请输入产品条码" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.code" :placeholder="tLang('common','请输入') + tLang('product','产品编码')" clearable @keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="第几针" prop="num">
|
<el-form-item :label="tLang('product','步骤')" prop="step">
|
||||||
<el-input v-model="queryParams.num" placeholder="请输入第几针" clearable @keyup.enter.native="handleQuery" />
|
<el-input v-model="queryParams.step" :placeholder="tLang('common','请输入') + tLang('product','步骤')" clearable @keyup.enter.native="handleQuery" />
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="步骤(缝纫、标签)" prop="step">
|
|
||||||
<el-input v-model="queryParams.step" placeholder="请输入步骤(缝纫、标签)" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="最小值" prop="min">
|
|
||||||
<el-input v-model="queryParams.min" placeholder="请输入最小值" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="最大值" prop="max">
|
|
||||||
<el-input v-model="queryParams.max" placeholder="请输入最大值" clearable @keyup.enter.native="handleQuery" />
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<el-button type="primary" icon="search" size="mini" @click="handleQuery">搜索</el-button>
|
<el-button type="primary" icon="search" size="mini" @click="handleQuery">{{tLang('common','搜索')}}</el-button>
|
||||||
<el-button icon="refresh" size="mini" @click="resetQuery">重置</el-button>
|
<el-button icon="refresh" size="mini" @click="resetQuery">{{tLang('common','重置')}}</el-button>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<el-row :gutter="10" class="mb8">
|
<el-row :gutter="10" class="mb8">
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
<el-button type="primary" plain icon="plus" size="mini" @click="handleAdd"
|
||||||
v-hasPermi="['product:working:add']">新增</el-button>
|
v-hasPermi="['product:working:add']">{{tLang('common','新增')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
<el-button type="success" plain icon="edit" size="mini" :disabled="single" @click="handleUpdate"
|
||||||
v-hasPermi="['product:working:edit']">修改</el-button>
|
v-hasPermi="['product:working:edit']">{{tLang('common','修改')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="1.5">
|
<el-col :span="1.5">
|
||||||
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
<el-button type="danger" plain icon="delete" size="mini" :disabled="multiple" @click="handleDelete"
|
||||||
v-hasPermi="['product:working:remove']">删除</el-button>
|
v-hasPermi="['product:working:remove']">{{tLang('common','删除')}}</el-button>
|
||||||
</el-col>
|
</el-col>
|
||||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-table v-loading="loading" :data="procedureList" @selection-change="handleSelectionChange">
|
<el-table v-loading="loading" :data="procedureList" @selection-change="handleSelectionChange">
|
||||||
<el-table-column type="selection" width="55" align="center" />
|
<el-table-column type="selection" width="55" align="center" />
|
||||||
<el-table-column type="index" label="序号" width="55" align="center" />
|
<el-table-column type="index" :label="tLang('common','序号')" width="60" align="center" />
|
||||||
<el-table-column label="产品条码" align="center" v-if="columns[0].visible" prop="code" />
|
<el-table-column :label="tLang('product','产品编码')" align="center" v-if="columns[0].visible" prop="code" />
|
||||||
<el-table-column label="第几针" align="center" v-if="columns[1].visible" prop="num" />
|
<el-table-column :label="tLang('product','第几针')" align="center" v-if="columns[1].visible" prop="num" />
|
||||||
<el-table-column label="步骤(缝纫、标签)" align="center" v-if="columns[2].visible" prop="step" />
|
<el-table-column :label="tLang('product','步骤')" align="center" v-if="columns[2].visible" prop="step" />
|
||||||
<el-table-column label="最小值" align="center" v-if="columns[3].visible" prop="min" />
|
<el-table-column :label="tLang('product','最小值')" align="center" v-if="columns[3].visible" prop="min" />
|
||||||
<el-table-column label="最大值" align="center" v-if="columns[4].visible" prop="max" />
|
<el-table-column :label="tLang('product','最大值')" align="center" v-if="columns[4].visible" prop="max" />
|
||||||
<el-table-column label="排序" align="center" v-if="columns[5].visible" prop="sort" />
|
<el-table-column :label="tLang('product','排序')" align="center" v-if="columns[5].visible" prop="sort" />
|
||||||
<el-table-column label="备注" align="center" v-if="columns[6].visible" prop="remark" />
|
<el-table-column :label="tLang('product','备注')" align="center" v-if="columns[6].visible" prop="remark" />
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
<el-table-column :label="tLang('common','操作')" align="center" class-name="small-padding fixed-width">
|
||||||
<template #default="scope">
|
<template #default="scope">
|
||||||
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
|
<el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
|
||||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||||
@ -104,13 +95,13 @@ let total = ref(0)
|
|||||||
let procedureList = ref([])
|
let procedureList = ref([])
|
||||||
// 列显隐信息
|
// 列显隐信息
|
||||||
const columns = ref([
|
const columns = ref([
|
||||||
{ key: 0, label: `产品编码`, visible: true },
|
{ key: 0, label:proxy.tLang('product','产品编码') , visible: true },
|
||||||
{ key: 1, label: `第几针`, visible: true },
|
{ key: 1, label:proxy.tLang('product','第几针') , visible: true },
|
||||||
{ key: 2, label: `步骤`, visible: true },
|
{ key: 2, label:proxy.tLang('product','步骤') , visible: true },
|
||||||
{ key: 3, label: `最小值`, visible: true },
|
{ key: 3, label:proxy.tLang('product','最小值') , visible: true },
|
||||||
{ key: 4, label: `最大值`, visible: true },
|
{ key: 4, label:proxy.tLang('product','最大值') , visible: true },
|
||||||
{ key: 5, label: `排序`, visible: true },
|
{ key: 5, label:proxy.tLang('product','排序') , visible: true },
|
||||||
{ key: 6, label: `备注`, visible: true },
|
{ key: 6, label:proxy.tLang('product','备注') , visible: true },
|
||||||
]);
|
]);
|
||||||
|
|
||||||
let infoDialog = ref(false)
|
let infoDialog = ref(false)
|
||||||
@ -149,7 +140,7 @@ function resetQuery() {
|
|||||||
function handleAdd() {
|
function handleAdd() {
|
||||||
reset();
|
reset();
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "添加缝纫次数";
|
title.value = proxy.tLang('common','添加') + ' ' + proxy.tLang('product','缝纫次数');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -159,13 +150,13 @@ function handleAdd() {
|
|||||||
function submitForm(propform) {
|
function submitForm(propform) {
|
||||||
if (propform.id != null) {
|
if (propform.id != null) {
|
||||||
updateProcedure(propform).then(response => {
|
updateProcedure(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("修改成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','修改成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
addProcedure(propform).then(response => {
|
addProcedure(propform).then(response => {
|
||||||
proxy.$modal.msgSuccess("新增成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','新增成功'));
|
||||||
open.value = false;
|
open.value = false;
|
||||||
getList();
|
getList();
|
||||||
});
|
});
|
||||||
@ -198,7 +189,7 @@ function handleUpdate(row) {
|
|||||||
getProcedure(id).then(response => {
|
getProcedure(id).then(response => {
|
||||||
form.value = response.data;
|
form.value = response.data;
|
||||||
open.value = true;
|
open.value = true;
|
||||||
title.value = "修改缝纫次数";
|
title.value = proxy.tLang('common','修改') + ' ' + proxy.tLang('product','缝纫次数');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -209,7 +200,7 @@ function handleDelete(row) {
|
|||||||
return delProcedure(id);
|
return delProcedure(id);
|
||||||
}).then(() => {
|
}).then(() => {
|
||||||
getList();
|
getList();
|
||||||
proxy.$modal.msgSuccess("删除成功");
|
proxy.$modal.msgSuccess(proxy.tLang('common','删除成功'));
|
||||||
}).catch(() => { });
|
}).catch(() => { });
|
||||||
}
|
}
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user