zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix:成品库配棒管显示半成品的规格型号，不要显示物料编号

This commit is contained in:
shijing 2024-03-29 14:16:24 +08:00
parent 2d500e396d
commit bb7b2817e0
1 changed files with 433 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

385
src/views/inm/mioitem_form.vue
View File

@ -1,61 +1,150 @@
<template> <template>
<el-dialog :title="titleMap[form.type]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')"> <el-dialog
<el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px"> :title="titleMap[form.type]"
v-model="visible"
:size="1000"
destroy-on-close
@closed="$emit('closed')"
>
<el-form
ref="dialogForm"
:model="form"
:rules="rules"
label-width="120px"
>
<el-form-item label="物料"> <el-form-item label="物料">
<el-select v-model="selectMaterial" value-key="id" clearable filterable style="width: 100%" <el-select
@change="selectMaterialChange"> v-model="selectMaterial"
<el-option v-for="item in materialOptions" :key="item.id" :label="item.full_name" :value="item"> value-key="id"
clearable
filterable
style="width: 100%"
@change="selectMaterialChange"
>
<el-option
v-for="item in materialOptions"
:key="item.id"
:label="item.full_name"
:value="item"
>
<span style="float: left">{{ item.full_name }}</span> <span style="float: left">{{ item.full_name }}</span>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="批次号"> <el-form-item label="批次号">
<!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> --> <!-- <el-input v-model="form.batch" placeholder="手动输入批次号" :disabled="inputBatchDisable" /> -->
<el-select v-model="form.batch" filterable allow-create clearable style="width: 100%" <el-select
:disabled="inputBatchDisable"> v-model="form.batch"
<el-option v-for="item in wbatchOptions" :key="item.id" :value="item.batch"> filterable
allow-create
clearable
style="width: 100%"
:disabled="inputBatchDisable"
>
<el-option
v-for="item in wbatchOptions"
:key="item.id"
:value="item.batch"
>
<span style="float: left">{{ item.batch }}</span> <span style="float: left">{{ item.batch }}</span>
<span style=" <span
style="
float: right; float: right;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
font-size: 13px; font-size: 13px;
">{{ item.count }}</span> "
>{{ item.count }}</span
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="仓库已有批次"> <el-form-item label="仓库已有批次">
<el-select v-model="selectBatch" value-key="id" clearable style="width: 100%" @change="selectBatchChange" <el-select
@clear="selectBatchClear" :disabled="selectBatchDisable"> v-model="selectBatch"
<el-option v-for="item in batchOptions" :key="item.id" :label="item.batch" :value="item"> value-key="id"
clearable
style="width: 100%"
@change="selectBatchChange"
@clear="selectBatchClear"
:disabled="selectBatchDisable"
>
<el-option
v-for="item in batchOptions"
:key="item.id"
:label="item.batch"
:value="item"
>
<span style="float: left">{{ item.batch }}</span> <span style="float: left">{{ item.batch }}</span>
<span style=" <span
style="
float: right; float: right;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
font-size: 13px; font-size: 13px;
">{{ item.count }} -- {{ item.warehouse_name }}</span> "
>{{ item.count }} -- {{ item.warehouse_name }}</span
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="仓库"> <el-form-item label="仓库">
<el-select v-model="form.warehouse" clearable style="width: 100%" :disabled="warehouseDisable"> <el-select
<el-option v-for="item in warehouseOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> v-model="form.warehouse"
clearable
style="width: 100%"
:disabled="warehouseDisable"
>
<el-option
v-for="item in warehouseOptions"
:key="item.id"
:label="item.name"
:value="item.id"
></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="数量"> <el-form-item label="数量">
<el-input-number v-model="form.count" :min="1" style="width: 100%" /> <el-input-number
v-model="form.count"
:min="1"
style="width: 100%"
/>
</el-form-item> </el-form-item>
<div v-if="assembShow"> <div v-if="assembShow">
<el-row v-for="item in components" v-bind:key="item" style="margin-bottom: 8px"> <el-row
<el-col :span="12"> {{ item.number }} - {{ item.name }} </el-col> v-for="item in components"
v-bind:key="item"
style="margin-bottom: 8px"
>
<el-col :span="12" style="padding-left: 120px">
{{ item.name
}}<span v-if="item.model !== null"
>|{{ item.model }}</span
><span v-if="item.specification !== null"
>|{{ item.specification }}</span
>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-select v-model="item.batch" clearable style="width: 100%"> <el-select
<el-option v-for="itemx in item.batchOptions" :key="itemx.id" :label="itemx.batch" :value="itemx.batch"> v-model="item.batch"
<span style="float: left">{{ itemx.batch }}</span> clearable
<span style=" style="width: 100%"
>
<el-option
v-for="itemx in item.batchOptions"
:key="itemx.id"
:label="itemx.batch"
:value="itemx.batch"
>
<span style="float: left">{{
itemx.batch
}}</span>
<span
style="
float: right; float: right;
color: var(--el-text-color-secondary); color: var(--el-text-color-secondary);
font-size: 13px; font-size: 13px;
">{{ itemx.count }}</span> "
>{{ itemx.count }}</span
>
</el-option> </el-option>
</el-select> </el-select>
</el-col> </el-col>
@ -72,34 +161,40 @@
</template> </template>
<script> <script>
const defaultForm = { const defaultForm = {
"state": 10, state: 10,
"type": "do_in" type: "do_in",
} };
export default { export default {
emits: ["success", "closed"], emits: ["success", "closed"],
props: { props: {
cate: { type: String, default: '' }, cate: { type: String, default: "" },
mioId: { type: String, default: '' }, mioId: { type: String, default: "" },
belongDeptName: { type: String, default: '' }, belongDeptName: { type: String, default: "" },
belongDeptId: { type: String, default: null }, belongDeptId: { type: String, default: null },
mioObj: { type: Object } mioObj: { type: Object },
}, },
data() { data() {
return { return {
type: 'do_in', type: "do_in",
loading: false, loading: false,
mode: "add", mode: "add",
titleMap: { titleMap: {
'do_out': '生产领料', do_out: "生产领料",
'sale_out': '销售发货', sale_out: "销售发货",
'pur_in': '采购入库', pur_in: "采购入库",
'do_in': '生产入库', do_in: "生产入库",
'other_in': '其他入库', other_in: "其他入库",
'other_out': '其他出库', other_out: "其他出库",
}, },
form: {}, form: {},
rules: { rules: {
material: [{ required: true, message: "请选择所需产品", trigger: "blur" }], material: [
{
required: true,
message: "请选择所需产品",
trigger: "blur",
},
],
}, },
visible: false, visible: false,
isSaveing: false, isSaveing: false,
@ -121,24 +216,31 @@ export default {
}, },
methods: { methods: {
init() { init() {
this.getMaterialOptions() this.getMaterialOptions();
this.getWarehouseOptions() this.getWarehouseOptions();
}, },
getWarehouseOptions() { getWarehouseOptions() {
this.$API.inm.warehouse.list.req({ page: 0 }).then(res => { this.$API.inm.warehouse.list.req({ page: 0 }).then((res) => {
this.warehouseOptions = res this.warehouseOptions = res;
}) });
}, },
//获取车间物料批次号 //获取车间物料批次号
getWBatchs() { // getWBatchs() {
if (this.belongDeptId != null && this.belongDeptId != undefined && this.belongDeptId != '') { //
this.$API.wpm.wmaterial.list.req({ if (
"belong_dept": this.belongDeptId, this.belongDeptId != null &&
"material": this.form.material, this.belongDeptId != undefined &&
"page": 0 this.belongDeptId != ""
}).then(res => { ) {
this.wbatchOptions = res this.$API.wpm.wmaterial.list
.req({
belong_dept: this.belongDeptId,
material: this.form.material,
page: 0,
}) })
.then((res) => {
this.wbatchOptions = res;
});
} }
}, },
getMaterialOptions() { getMaterialOptions() {
@ -153,115 +255,135 @@ export default {
// 'other_out': '其他出库', // 'other_out': '其他出库',
//(10, '成品'), (20, '半成品'), (30, '主要原料'), //(10, '成品'), (20, '半成品'), (30, '主要原料'),
// (40, '辅助材料'), (50, '加工工具'), (60, '辅助工装'), (70, '办公用品') // (40, '辅助材料'), (50, '加工工具'), (60, '辅助工装'), (70, '办公用品')
let type__in = ''; let type__in = "";
if (cate == 'good') { if (cate == "good") {
type__in = '10' type__in = "10";
} else if (cate == 'halfgood') { } else if (cate == "halfgood") {
type__in = '20' type__in = "20";
} else if (cate == 'mainso') { } else if (cate == "mainso") {
type__in = '30' type__in = "30";
} else if (cate == 'helpso') { } else if (cate == "helpso") {
type__in = '40, 50, 60, 70' type__in = "40, 50, 60, 70";
} }
if (type == 'do_out') {//生产领料'10, 20, 30' if (type == "do_out") {
query = { page: 0, type__in: type__in, is_hidden: false, is_assemb: false }; //生产领料'10, 20, 30'
this.inputBatchDisable = true query = {
} page: 0,
else if (type == 'do_in') {//生产入库 type__in: type__in,
query = { page: 0, type__in: type__in, is_hidden: false } is_hidden: false,
this.inputBatchDisable = false; is_assemb: false,
} };
else if (type == 'pur_in') {//采购入库
query = { page: 0, type__in: type__in, is_hidden: false, pu_orderitem_material__pu_order: this.mioObj.pu_order }
this.inputBatchDisable = false
}
else if (type == 'sale_out') {//销售发货
query = { page: 0, type__in: 10, is_hidden: false, orderitem_material__order: this.mioObj.order }
this.inputBatchDisable = true; this.inputBatchDisable = true;
} } else if (type == "do_in") {
else { //生产入库
query = { page: 0 } query = { page: 0, type__in: type__in, is_hidden: false };
this.inputBatchDisable = false;
} else if (type == "pur_in") {
//采购入库
query = {
page: 0,
type__in: type__in,
is_hidden: false,
pu_orderitem_material__pu_order: this.mioObj.pu_order,
};
this.inputBatchDisable = false;
} else if (type == "sale_out") {
//销售发货
query = {
page: 0,
type__in: 10,
is_hidden: false,
orderitem_material__order: this.mioObj.order,
};
this.inputBatchDisable = true;
} else {
query = { page: 0 };
} }
this.$API.mtm.material.list.req(query).then(res => { this.$API.mtm.material.list.req(query).then((res) => {
this.materialOptions = res this.materialOptions = res;
}) });
}, },
async initAssemb(item) { async initAssemb(item) {
this.selectBatchDisable = true this.selectBatchDisable = true;
this.assembShow = true this.assembShow = true;
this.components = [] this.components = [];
var id__in = Object.keys(item.components).join(',') var id__in = Object.keys(item.components).join(",");
if (id__in.length > 0) { if (id__in.length > 0) {
var res = await this.$API.mtm.material.list.req({ page: 0, id__in: id__in }) var res = await this.$API.mtm.material.list.req({
this.components = res page: 0,
id__in: id__in,
});
this.components = res;
for (var i = 0; i < this.components.length; i++) { for (var i = 0; i < this.components.length; i++) {
var res2 = await this.$API.wpm.wmaterial.list.req({ page: 0, material: this.components[i].id, belong_dept: this.belongDeptId }) var res2 = await this.$API.wpm.wmaterial.list.req({
this.components[i].batchOptions = res2 page: 0,
material: this.components[i].id,
belong_dept: this.belongDeptId,
});
this.components[i].batchOptions = res2;
} }
} }
}, },
getBatchOptions() { getBatchOptions() {
// 车间批次 // 车间批次
this.getWBatchs(); this.getWBatchs();
this.$API.inm.warehouse.batch.req({ page: 0, material: this.form.material }).then(res => { this.$API.inm.warehouse.batch
this.batchOptions = res .req({ page: 0, material: this.form.material })
.then((res) => {
this.batchOptions = res;
if (res.length == 0) { if (res.length == 0) {
this.selectBatchDisable = true this.selectBatchDisable = true;
} else { } else {
this.selectBatchDisable = false this.selectBatchDisable = false;
} }
}) });
}, },
selectMaterialChange(item) { selectMaterialChange(item) {
var that = this var that = this;
var type = this.form.type var type = this.form.type;
var material = item.id var material = item.id;
that.form.material = material that.form.material = material;
if (type == 'do_in') { if (type == "do_in") {
if (item.is_assemb) { if (item.is_assemb) {
this.initAssemb(item) this.initAssemb(item);
} else { } else {
this.selectBatchDisable = false this.selectBatchDisable = false;
this.components = [] this.components = [];
this.assembShow = false this.assembShow = false;
this.getBatchOptions() this.getBatchOptions();
} }
} else {
this.getBatchOptions();
} }
else {
this.getBatchOptions()
}
}, },
getItem(options, id) { getItem(options, id) {
for (var i = 0; i < options.length; i++) { for (var i = 0; i < options.length; i++) {
if (options[i].id == id) { if (options[i].id == id) {
return options[i] return options[i];
} }
} }
}, },
selectBatchChange(item) { selectBatchChange(item) {
// var item = this.getItem(this.batchOptions, id) // var item = this.getItem(this.batchOptions, id)
this.form.batch = item.batch this.form.batch = item.batch;
this.form.warehouse = item.warehouse this.form.warehouse = item.warehouse;
this.warehouseDisable = true this.warehouseDisable = true;
this.inputBatchDisable = true this.inputBatchDisable = true;
}, },
selectBatchClear() { selectBatchClear() {
this.form.batch = '' this.form.batch = "";
this.form.warehouse = '' this.form.warehouse = "";
this.warehouseDisable = false this.warehouseDisable = false;
this.inputBatchDisable = false this.inputBatchDisable = false;
}, },
//显示 //显示
open(mode = "add", type = "") { open(mode = "add", type = "") {
this.mode = mode; this.mode = mode;
this.form.type = type; this.form.type = type;
if (mode == 'add') { if (mode == "add") {
this.init() this.init();
} }
this.visible = true; this.visible = true;
return this; return this;
@ -273,24 +395,32 @@ export default {
this.isSaveing = true; this.isSaveing = true;
this.form.mio = this.mioId; this.form.mio = this.mioId;
if (this.components.length > 0) { if (this.components.length > 0) {
this.form.assemb = [] this.form.assemb = [];
for (var i = 0; i < this.components.length; i++) { for (var i = 0; i < this.components.length; i++) {
this.form.assemb.push({ 'material': this.components[i].id, 'batch': this.components[i].batch }) this.form.assemb.push({
material: this.components[i].id,
batch: this.components[i].batch,
});
} }
} }
try { try {
var res; var res;
if (this.mode == "add") { if (this.mode == "add") {
res = await this.$API.inm.mioitem.create.req(this.form); res = await this.$API.inm.mioitem.create.req(
this.form
);
} else if (this.mode == "edit") { } else if (this.mode == "edit") {
res = await this.$API.inm.mioitem.update.req(this.form.id, this.form); res = await this.$API.inm.mioitem.update.req(
this.form.id,
this.form
);
} }
this.isSaveing = false; this.isSaveing = false;
this.$emit("success", this.form, this.mode); this.$emit("success", this.form, this.mode);
this.visible = false; this.visible = false;
this.$message.success("操作成功"); this.$message.success("操作成功");
} catch (err) { } catch (err) {
console.log(err) console.log(err);
//可以处理校验错误 //可以处理校验错误
this.isSaveing = false; this.isSaveing = false;
return err; return err;
@ -311,4 +441,3 @@ export default {
}; };
</script> </script>
<style></style> <style></style>