This commit is contained in:
15066119699 2025-03-06 02:59:33 +08:00
parent ac0a904176
commit ce5b1f206b

View File

@ -33,62 +33,62 @@
<el-form :model="queryParams" ref="queryForm" :inline="true" label-width="84px" :size="formSize"> <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="84px" :size="formSize">
<div class="search-form-content" :class="{ 'is-advanced': isAdvanced }"> <div class="search-form-content" :class="{ 'is-advanced': isAdvanced }">
<template v-if="isAdvanced"> <template v-if="isAdvanced">
<el-form-item label="物料编" prop="goodsId"> <el-form-item label="物料编" prop="goodsId">
<el-input <el-input
v-model="queryParams.goodsId" v-model="queryParams.goodsId"
placeholder="请输入物料编" placeholder="请输入物料编"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="goodsName"> <el-form-item label="物料描述" prop="goodsName">
<el-input <el-input
v-model="queryParams.goodsName" v-model="queryParams.goodsName"
placeholder="请输入物料名称" placeholder="请输入物料描述"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="goodsUnit"> <!--<el-form-item label="单位" prop="goodsUnit">-->
<el-input <!--<el-input-->
v-model="queryParams.goodsUnit" <!--v-model="queryParams.goodsUnit"-->
placeholder="请输入单位" <!--placeholder="请输入单位"-->
clearable <!--clearable-->
@keyup.enter.native="handleQuery" <!--@keyup.enter.native="handleQuery"-->
/> <!--/>-->
</el-form-item> <!--</el-form-item>-->
<el-form-item label="物料类" prop="goodsType"> <el-form-item label="物料类" prop="goodsType">
<el-input <el-input
v-model="queryParams.goodsType" v-model="queryParams.goodsType"
placeholder="请输入物料类型" placeholder="请输入物料类别"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="通用容器类型" prop="normalVehicleType">
<el-input
v-model="queryParams.normalVehicleType"
placeholder="请输入通用容器类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料状态" prop="goodsStatus">
<el-input
v-model="queryParams.goodsStatus"
placeholder="请输入物料状态"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="最近更新用户" prop="lastUpdateUser">
<el-input
v-model="queryParams.lastUpdateUser"
placeholder="请输入最近更新用户"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!--<el-form-item label="通用容器类型" prop="normalVehicleType">-->
<!--<el-input-->
<!--v-model="queryParams.normalVehicleType"-->
<!--placeholder="请输入通用容器类型"-->
<!--clearable-->
<!--@keyup.enter.native="handleQuery"-->
<!--/>-->
<!--</el-form-item>-->
<!--<el-form-item label="物料状态" prop="goodsStatus">-->
<!--<el-input-->
<!--v-model="queryParams.goodsStatus"-->
<!--placeholder="请输入物料状态"-->
<!--clearable-->
<!--@keyup.enter.native="handleQuery"-->
<!--/>-->
<!--</el-form-item>-->
<!--<el-form-item label="最近更新用户" prop="lastUpdateUser">-->
<!--<el-input-->
<!--v-model="queryParams.lastUpdateUser"-->
<!--placeholder="请输入最近更新用户"-->
<!--clearable-->
<!--@keyup.enter.native="handleQuery"-->
<!--/>-->
<!--</el-form-item>-->
</template> </template>
</div> </div>
<div class="search-form-footer"> <div class="search-form-footer">
@ -145,6 +145,15 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['app:goods:remove']" v-hasPermi="['app:goods:remove']"
>删除</el-button> >删除</el-button>
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="multiple"
@click="handleEnable"
v-hasPermi="['app:location:edit']"
>修改启用状态</el-button>
</el-button-group> </el-button-group>
</div> </div>
<div class="right"> <div class="right">
@ -242,35 +251,41 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body destroy-on-close> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body destroy-on-close>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="物料名称" prop="goodsName"> <el-form-item label="物料编码" prop="goodsId">
<el-input v-model="form.goodsName" placeholder="请输入物料名称" /> <el-input v-model="form.goodsId" placeholder="请输入物料编码" />
</el-form-item> </el-form-item>
<el-form-item label="单位" prop="goodsUnit"> <el-form-item label="物料描述" prop="goodsName">
<el-input v-model="form.goodsUnit" placeholder="请输入单位" /> <el-input v-model="form.goodsName" placeholder="请输入物料描述" />
</el-form-item> </el-form-item>
<el-form-item label="物料类型" prop="goodsType"> <el-form-item label="计量单位" prop="goodsUnit">
<el-input v-model="form.goodsType" placeholder="请输入物料类型" /> <el-input v-model="form.goodsUnit" placeholder="请输入计量单位" />
</el-form-item>
<el-form-item label="物料类别" prop="goodsType">
<el-input v-model="form.goodsType" placeholder="请输入物料类别" />
</el-form-item> </el-form-item>
<el-form-item label="通用容器类型" prop="normalVehicleType"> <el-form-item label="通用容器类型" prop="normalVehicleType">
<el-input v-model="form.normalVehicleType" placeholder="请输入通用容器类型" /> <el-input v-model="form.normalVehicleType" placeholder="请输入通用容器类型" />
</el-form-item> </el-form-item>
<el-form-item label="物料状态" prop="goodsStatus">
<el-input v-model="form.goodsStatus" placeholder="请输入物料状态" />
</el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item> </el-form-item>
<el-form-item label="最近更新用户" prop="lastUpdateUser"> <el-form-item label="状态" prop="goodsStatus">
<el-input v-model="form.lastUpdateUser" placeholder="请输入最近更新用户" /> <el-select v-model="form.goodsStatus" placeholder="请选择状态" clearable :style="{width: '100%'}">
</el-form-item> <el-option v-for="(item, index) in goodsStatusOptions" :key="index" :label="item.label"
<el-form-item label="最近更新时间" prop="lastUpdateTime"> :value="item.value" :disabled="item.disabled"></el-option>
<el-date-picker clearable </el-select>
v-model="form.lastUpdateTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最近更新时间">
</el-date-picker>
</el-form-item> </el-form-item>
<!--<el-form-item label="最近更新用户" prop="lastUpdateUser">-->
<!--<el-input v-model="form.lastUpdateUser" placeholder="请输入最近更新用户" />-->
<!--</el-form-item>-->
<!--<el-form-item label="最近更新时间" prop="lastUpdateTime">-->
<!--<el-date-picker clearable-->
<!--v-model="form.lastUpdateTime"-->
<!--type="date"-->
<!--value-format="yyyy-MM-dd"-->
<!--placeholder="请选择最近更新时间">-->
<!--</el-date-picker>-->
<!--</el-form-item>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button> <el-button type="primary" @click="submitForm"> </el-button>
@ -300,7 +315,7 @@
<script> <script>
// import {addMessage, updateMessage} from "@/api/system/message"; // import {addMessage, updateMessage} from "@/api/system/message";
import {getToken} from "@/utils/auth"; import {getToken} from "@/utils/auth";
import {addGoods, delGoods, getGoods, listGoods, updateGoods} from "@/api/system/goods"; import {addGoods, delGoods, getGoods, listGoods, updateGoods , enableGoods} from "@/api/system/goods";
export default { export default {
name: "goods", name: "goods",
@ -352,6 +367,7 @@ export default {
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
id: null,
goodsId: null, goodsId: null,
goodsName: null, goodsName: null,
goodsUnit: null, goodsUnit: null,
@ -361,6 +377,13 @@ export default {
lastUpdateUser: null, lastUpdateUser: null,
lastUpdateTime: null lastUpdateTime: null
}, },
goodsStatusOptions: [{
"label": "启用",
"value": 0
}, {
"label": "禁用",
"value": 1
}],
// //
form: {}, form: {},
// //
@ -435,7 +458,7 @@ export default {
// //
reset() { reset() {
this.form = { this.form = {
goodsId: null, id: null,
goodsName: null, goodsName: null,
goodsUnit: null, goodsUnit: null,
goodsType: null, goodsType: null,
@ -460,7 +483,7 @@ export default {
}, },
// //
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.goodsId) this.ids = selection.map(item => item.id)
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
@ -484,7 +507,7 @@ export default {
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.goodsId != null) { if (this.form.id != null) {
updateGoods(this.form).then(response => { updateGoods(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
@ -502,7 +525,7 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const materialCodes = row.goodsId || this.ids; const materialCodes = row.id || this.ids;
this.$modal.confirm('是否确认删除物料编号为"' + materialCodes + '"的数据项?').then(function () { this.$modal.confirm('是否确认删除物料编号为"' + materialCodes + '"的数据项?').then(function () {
return delGoods(materialCodes); return delGoods(materialCodes);
}).then(() => { }).then(() => {
@ -511,6 +534,20 @@ export default {
}).catch(() => { }).catch(() => {
}); });
}, },
/** 启用禁用按钮操作 */
handleEnable(row) {
const materialCodes = row.id || this.ids;
this.$modal.confirm('是否确认启用禁用物料号为"' + materialCodes + '"的数据项?').then(function () {
return enableGoods(materialCodes);
}).then(() => {
this.getList();
this.$modal.msgSuccess("修改状态成功");
}).catch(() => {
});
},
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('app/goods/export', { this.download('app/goods/export', {