feat(storearea): 优化库区管理功能
This commit is contained in:
parent
4c93ff75e2
commit
970533321e
@ -139,6 +139,8 @@ public class StoreAreaServiceImpl extends ServiceImpl<StoreAreaMapper, StoreArea
|
|||||||
entity = new StoreAreaEntity();
|
entity = new StoreAreaEntity();
|
||||||
}
|
}
|
||||||
BeanUtils.copyProperties(storeAreaForm, entity);
|
BeanUtils.copyProperties(storeAreaForm, entity);
|
||||||
|
StoreHouseEntity info = storeHouseService.getInfo(String.valueOf(entity.getStoreHouseId()));
|
||||||
|
entity.setStoreType(info.getStoreType());
|
||||||
this.saveOrUpdate(entity);
|
this.saveOrUpdate(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -10,11 +10,11 @@
|
|||||||
</JnpfSelect>
|
</JnpfSelect>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-col>
|
</el-col>
|
||||||
<el-col :span="6">
|
<!-- <el-col :span="6">-->
|
||||||
<el-form-item label="仓库名称">
|
<!-- <el-form-item label="仓库名称">-->
|
||||||
<el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>
|
<!-- <el-input v-model="query.storeHouseName" placeholder="请输入" clearable></el-input>-->
|
||||||
</el-form-item>
|
<!-- </el-form-item>-->
|
||||||
</el-col>
|
<!-- </el-col>-->
|
||||||
<el-col :span="6">
|
<el-col :span="6">
|
||||||
<el-form-item label="状态">
|
<el-form-item label="状态">
|
||||||
<JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable :options="enabledStatusOptions"
|
<JnpfSelect v-model="query.enabledStatus" placeholder="请选择" clearable :options="enabledStatusOptions"
|
||||||
@ -39,8 +39,11 @@
|
|||||||
</div>
|
</div>
|
||||||
<JNPF-table v-loading="listLoading" :data="list">
|
<JNPF-table v-loading="listLoading" :data="list">
|
||||||
<el-table-column prop="storeHouseName" label="仓库名称" align="center"/>
|
<el-table-column prop="storeHouseName" label="仓库名称" align="center"/>
|
||||||
<el-table-column prop="storeType" label="仓库类型" align="center"/>
|
<el-table-column prop="storeType" label="仓库类型" align="center">
|
||||||
<el-table-column prop="storeAreCd" label="库区编码" align="center"/>
|
<template slot-scope="scope">
|
||||||
|
{{ getCustomerLabel('storeType', scope.row.storeType) || scope.row.storeType }}
|
||||||
|
</template>
|
||||||
|
</el-table-column> <el-table-column prop="storeAreCd" label="库区编码" align="center"/>
|
||||||
<el-table-column prop="storeAreaName" label="库区名称" align="center"/>
|
<el-table-column prop="storeAreaName" label="库区名称" align="center"/>
|
||||||
<el-table-column prop="enabledStatus" label="状态" align="center">
|
<el-table-column prop="enabledStatus" label="状态" align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
@ -70,8 +73,7 @@ import request from "@/utils/request";
|
|||||||
import { mapGetters } from "vuex";
|
import { mapGetters } from "vuex";
|
||||||
import JNPFForm from "./form";
|
import JNPFForm from "./form";
|
||||||
import jnpf from "@/utils/jnpf";
|
import jnpf from "@/utils/jnpf";
|
||||||
import { getCustomerLabel } from "../customer/options";
|
import { getCustomerLabel, customerOptions } from "../customer/options";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "storearea",
|
name: "storearea",
|
||||||
components: {
|
components: {
|
||||||
@ -106,6 +108,8 @@ export default {
|
|||||||
{ fullName: "未启用", id: 2 },
|
{ fullName: "未启用", id: 2 },
|
||||||
],
|
],
|
||||||
enabledStatusProps: { label: "fullName", value: "id" },
|
enabledStatusProps: { label: "fullName", value: "id" },
|
||||||
|
storeTypeOptions: customerOptions.storeType || [],
|
||||||
|
storeTypeProps: { label: "fullName", value: "id" },
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user