change - add物料信息、自定义数据

boardTest
yinq 1 year ago
parent 4b7af7e54b
commit 418140e6df

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询自定义数据维护列表
export function listBaseCustomData(query) {
return request({
url: '/mes/base/baseCustomData/list',
method: 'get',
params: query
})
}
// 查询自定义数据维护详细
export function getBaseCustomData(objId) {
return request({
url: '/mes/base/baseCustomData/' + objId,
method: 'get'
})
}
// 新增自定义数据维护
export function addBaseCustomData(data) {
return request({
url: '/mes/base/baseCustomData',
method: 'post',
data: data
})
}
// 修改自定义数据维护
export function updateBaseCustomData(data) {
return request({
url: '/mes/base/baseCustomData',
method: 'put',
data: data
})
}
// 删除自定义数据维护
export function delBaseCustomData(objId) {
return request({
url: '/mes/base/baseCustomData/' + objId,
method: 'delete'
})
}

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询物料信息列表
export function listBaseMaterialInfo(query) {
return request({
url: '/mes/base/baseMaterialInfo/list',
method: 'get',
params: query
})
}
// 查询物料信息详细
export function getBaseMaterialInfo(objId) {
return request({
url: '/mes/base/baseMaterialInfo/' + objId,
method: 'get'
})
}
// 新增物料信息
export function addBaseMaterialInfo(data) {
return request({
url: '/mes/base/baseMaterialInfo',
method: 'post',
data: data
})
}
// 修改物料信息
export function updateBaseMaterialInfo(data) {
return request({
url: '/mes/base/baseMaterialInfo',
method: 'put',
data: data
})
}
// 删除物料信息
export function delBaseMaterialInfo(objId) {
return request({
url: '/mes/base/baseMaterialInfo/' + objId,
method: 'delete'
})
}

@ -0,0 +1,333 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="自定义功能" prop="customFunction">
<el-input
v-model="queryParams.customFunction"
placeholder="请输入自定义功能"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="是否标识" prop="isFlag">
<el-select v-model="queryParams.isFlag" placeholder="请选择是否标识" clearable>
<el-option
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes/base:baseCustomData:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes/base:baseCustomData:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes/base:baseCustomData:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes/base:baseCustomData:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="baseCustomDataList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="自定义数据类型" align="center" prop="customType" v-if="columns[1].visible"/>
<el-table-column label="自定义功能" align="center" prop="customFunction" v-if="columns[2].visible"/>
<el-table-column label="自定义编号" align="center" prop="customCode" v-if="columns[3].visible"/>
<el-table-column label="自定义数据" align="center" prop="customData" v-if="columns[4].visible"/>
<el-table-column label="排序" align="center" prop="customSort" v-if="columns[5].visible"/>
<el-table-column label="备注" align="center" prop="remark" v-if="columns[6].visible"/>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[7].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes/base:baseCustomData:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/base:baseCustomData:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改自定义数据维护对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="自定义功能" prop="customFunction">
<el-input v-model="form.customFunction" placeholder="请输入自定义功能"/>
</el-form-item>
<el-form-item label="自定义编号" prop="customCode">
<el-input v-model="form.customCode" placeholder="请输入自定义编号"/>
</el-form-item>
<el-form-item label="自定义数据" prop="customData">
<el-input v-model="form.customData" placeholder="请输入自定义数据"/>
</el-form-item>
<el-form-item label="排序" prop="customSort">
<el-input v-model="form.customSort" placeholder="请输入排序"/>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
<el-form-item label="是否标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listBaseCustomData,
getBaseCustomData,
delBaseCustomData,
addBaseCustomData,
updateBaseCustomData
} from '@/api/mes/base/baseCustomData'
export default {
name: 'BaseCustomData',
dicts: ['is_flag'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
baseCustomDataList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
customType: null,
customFunction: null,
customCode: null,
customData: null,
customSort: null,
isFlag: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '主键标识不能为空', trigger: 'blur' }
]
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `自定义数据类型`, visible: false },
{ key: 2, label: `自定义功能`, visible: true },
{ key: 3, label: `自定义编号`, visible: true },
{ key: 4, label: `自定义数据`, visible: true },
{ key: 5, label: `排序`, visible: true },
{ key: 6, label: `备注`, visible: true },
{ key: 7, label: `是否标识`, visible: true },
{ key: 8, label: `创建人`, visible: false },
{ key: 9, label: `创建时间`, visible: true },
{ key: 10, label: `更新人`, visible: false },
{ key: 11, label: `更新时间`, visible: true }
]
}
},
created() {
this.getList()
},
methods: {
/** 查询自定义数据维护列表 */
getList() {
this.loading = true
listBaseCustomData(this.queryParams).then(response => {
this.baseCustomDataList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
customType: null,
customFunction: null,
customCode: null,
customData: null,
customSort: null,
remark: null,
isFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加自定义数据维护'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getBaseCustomData(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改自定义数据维护'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateBaseCustomData(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addBaseCustomData(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除自定义数据维护编号为"' + objIds + '"的数据项?').then(function() {
return delBaseCustomData(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/base/baseCustomData/export', {
...this.queryParams
}, `baseCustomData_${new Date().getTime()}.xlsx`)
}
}
}
</script>

@ -0,0 +1,414 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-form-item label="物料编码" prop="materialCode">
<el-input
v-model="queryParams.materialCode"
placeholder="请输入物料编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input
v-model="queryParams.materialName"
placeholder="请输入物料名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="工厂编号" prop="factoryCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.factoryCode"-->
<!-- placeholder="请输入工厂编号"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属工位" prop="productLineCode">-->
<!-- <el-input-->
<!-- v-model="queryParams.productLineCode"-->
<!-- placeholder="请输入所属工位"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['mes/base:baseMaterialInfo:add']"
>新增
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['mes/base:baseMaterialInfo:edit']"
>修改
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['mes/base:baseMaterialInfo:remove']"
>删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['mes/base:baseMaterialInfo:export']"
>导出
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="baseMaterialInfoList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="主键标识" align="center" prop="objId" v-if="columns[0].visible"/>
<el-table-column label="物料编码" align="center" prop="materialCode" v-if="columns[1].visible"/>
<el-table-column label="物料名称" align="center" prop="materialName" v-if="columns[2].visible"/>
<el-table-column label="物料大类" align="center" prop="materialCategories" v-if="columns[3].visible"/>
<el-table-column label="物料小类" align="center" prop="materialSubclass" v-if="columns[4].visible"/>
<el-table-column label="SAP物料类型" align="center" prop="materialType" v-if="columns[5].visible"/>
<el-table-column label="计量单位" align="center" prop="materialUnit" v-if="columns[6].visible"/>
<el-table-column label="单位工资(元)" align="center" prop="unitPrice" v-if="columns[7].visible"/>
<el-table-column label="物料型号" align="center" prop="materialSpecifications" v-if="columns[8].visible"/>
<el-table-column label="工厂编号" align="center" prop="factoryCode" v-if="columns[9].visible"/>
<el-table-column label="所属工位" align="center" prop="productLineCode" v-if="columns[10].visible"/>
<el-table-column label="是否标识" align="center" prop="isFlag" v-if="columns[11].visible">
<template slot-scope="scope">
<dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
</template>
</el-table-column>
<el-table-column label="增量日期" align="center" prop="incrementDate" width="180" v-if="columns[16].visible">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.incrementDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template>
</el-table-column>
<el-table-column label="商品编码" align="center" prop="productCode" v-if="columns[17].visible"/>
<el-table-column label="商品名称" align="center" prop="productName" v-if="columns[18].visible"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['mes/base:baseMaterialInfo:edit']"
>修改
</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['mes/base:baseMaterialInfo:remove']"
>删除
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改物料信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="物料编码" prop="materialCode">
<el-input v-model="form.materialCode" placeholder="请输入物料编码"/>
</el-form-item>
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" placeholder="请输入物料名称"/>
</el-form-item>
<el-form-item label="物料小类" prop="materialSubclass">
<el-radio-group v-model="form.materialSubclass">
<el-radio
v-for="dict in dict.type.material_subclass"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="计量单位" prop="materialUnit">
<el-input v-model="form.materialUnit" placeholder="请输入计量单位"/>
</el-form-item>
<el-form-item label="单位工资(元)" prop="unitPrice">
<el-input-number v-model="form.unitPrice" placeholder="请输入单位工资(元)"/>
</el-form-item>
<el-form-item label="物料型号" prop="materialSpecifications">
<el-input v-model="form.materialSpecifications" placeholder="请输入物料型号"/>
</el-form-item>
<!-- <el-form-item label="工厂编号" prop="factoryCode">-->
<!-- <el-input v-model="form.factoryCode" placeholder="请输入工厂编号"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属工位" prop="productLineCode">-->
<!-- <el-input v-model="form.productLineCode" placeholder="请输入所属工位"/>-->
<!-- </el-form-item>-->
<el-form-item label="是否标识" prop="isFlag">
<el-radio-group v-model="form.isFlag">
<el-radio
v-for="dict in dict.type.is_flag"
:key="dict.value"
:label="dict.value"
>{{ dict.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="增量日期" prop="incrementDate">
<el-date-picker clearable
v-model="form.incrementDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择增量日期"
>
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="商品编码" prop="productCode">-->
<!-- <el-input v-model="form.productCode" placeholder="请输入商品编码"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="商品名称" prop="productName">-->
<!-- <el-input v-model="form.productName" placeholder="请输入商品名称"/>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
listBaseMaterialInfo,
getBaseMaterialInfo,
delBaseMaterialInfo,
addBaseMaterialInfo,
updateBaseMaterialInfo
} from '@/api/mes/base/baseMaterialInfo'
export default {
name: 'BaseMaterialInfo',
dicts: ['material_subclass', 'is_flag'],
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
baseMaterialInfoList: [],
//
title: '',
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
materialCode: null,
materialName: null,
materialCategories: null,
materialSubclass: null,
materialType: null,
materialUnit: null,
unitPrice: null,
materialSpecifications: null,
factoryCode: null,
productLineCode: null,
isFlag: null,
incrementDate: null,
productCode: null,
productName: null
},
//
form: {},
//
rules: {
objId: [
{ required: true, message: '主键标识不能为空', trigger: 'blur' }
],
materialCode: [
{ required: true, message: '物料编码不能为空', trigger: 'blur' }
]
},
columns: [
{ key: 0, label: `主键标识`, visible: false },
{ key: 1, label: `物料编码`, visible: true },
{ key: 2, label: `物料名称`, visible: true },
{ key: 3, label: `物料大类`, visible: false },
{ key: 4, label: `物料小类`, visible: true },
{ key: 5, label: `SAP物料类型`, visible: false },
{ key: 6, label: `计量单位`, visible: true },
{ key: 7, label: `单位工资(元)`, visible: true },
{ key: 8, label: `物料型号`, visible: true },
{ key: 9, label: `工厂编号`, visible: true },
{ key: 10, label: `所属工位`, visible: true },
{ key: 11, label: `是否标识`, visible: true },
{ key: 12, label: `创建人`, visible: false },
{ key: 13, label: `创建时间`, visible: false },
{ key: 14, label: `更新人`, visible: false },
{ key: 15, label: `更新时间`, visible: false },
{ key: 16, label: `增量日期`, visible: true },
{ key: 17, label: `商品编码`, visible: false },
{ key: 18, label: `商品名称`, visible: false }
]
}
},
created() {
this.getList()
},
methods: {
/** 查询物料信息列表 */
getList() {
this.loading = true
listBaseMaterialInfo(this.queryParams).then(response => {
this.baseMaterialInfoList = response.rows
this.total = response.total
this.loading = false
})
},
//
cancel() {
this.open = false
this.reset()
},
//
reset() {
this.form = {
objId: null,
materialCode: null,
materialName: null,
materialCategories: null,
materialSubclass: '1',
materialType: null,
materialUnit: null,
unitPrice: null,
materialSpecifications: null,
factoryCode: null,
productLineCode: null,
isFlag: '0',
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
incrementDate: null,
productCode: null,
productName: null
}
this.resetForm('form')
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1
this.getList()
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm('queryForm')
this.handleQuery()
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.objId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = '添加物料信息'
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const objId = row.objId || this.ids
getBaseMaterialInfo(objId).then(response => {
this.form = response.data
this.open = true
this.title = '修改物料信息'
})
},
/** 提交按钮 */
submitForm() {
this.$refs['form'].validate(valid => {
if (valid) {
if (this.form.objId != null) {
updateBaseMaterialInfo(this.form).then(response => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
} else {
addBaseMaterialInfo(this.form).then(response => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
}
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const objIds = row.objId || this.ids
this.$modal.confirm('是否确认删除物料信息编号为"' + objIds + '"的数据项?').then(function() {
return delBaseMaterialInfo(objIds)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {
})
},
/** 导出按钮操作 */
handleExport() {
this.download('mes/base/baseMaterialInfo/export', {
...this.queryParams
}, `baseMaterialInfo_${new Date().getTime()}.xlsx`)
}
}
}
</script>
Loading…
Cancel
Save