Yangwl
/
LanJu_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
master
wws 1 year ago
parent d6165a0092 284ba780b1
commit 9ba845c490
7 changed files with 1001 additions and 1045 deletions
Show Stats Download Patch File Download Diff File

8
src/api/kanban/dailyoutput.js
Unescape Escape View File

@ -16,3 +16,11 @@ export function getMesBoardEquProductionToday(data) {
data: data data: data
}); });
} }
// 获取班次
export function getBoardShifts(data) {
return request({
url: '/mes/wcsInterface/getBoardShifts',
method: 'post',
data: data
});
}

986
src/views/kanban/dailyoutput/index.vue
View File

File diff suppressed because it is too large Load Diff

467
src/views/technology/process/content.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row v-if="optType !='view'" :gutter="10" class="mb8"> <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -9,7 +9,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['mes:pro:processcontent:add']" v-hasPermi="['mes:pro:processcontent:add']"
>新增</el-button> >新增</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -20,7 +21,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['mes:pro:processcontent:edit']" v-hasPermi="['mes:pro:processcontent:edit']"
>修改</el-button> >修改</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -31,7 +33,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:pro:processcontent:remove']" v-hasPermi="['mes:pro:processcontent:remove']"
>删除</el-button> >删除</el-button
>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -41,19 +44,54 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['mes:pro:processcontent:export']" v-hasPermi="['mes:pro:processcontent:export']"
>导出</el-button> >导出</el-button
>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="processcontentList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="processcontentList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="顺序编号" align="center" prop="orderNum" /> <el-table-column label="顺序编号" align="center" prop="orderNum" />
<el-table-column label="步骤说明" width="400px" align="center" prop="contentText" :show-overflow-tooltip="true"/> <el-table-column
<el-table-column label="辅助设备" align="center" prop="device" :show-overflow-tooltip="true"/> label="步骤说明"
<el-table-column label="BOM材料" align="center" prop="material" :show-overflow-tooltip="true"/> width="400px"
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="操作" width="100px" v-if="optType !='view'" align="center" class-name="small-padding fixed-width"> prop="contentText"
:show-overflow-tooltip="true"
/>
<el-table-column
label="辅助设备"
align="center"
prop="device"
:show-overflow-tooltip="true"
/>
<el-table-column
label="BOM材料"
align="center"
prop="material"
:show-overflow-tooltip="true"
/>
<el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
width="100px"
v-if="optType != 'view'"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
@ -61,20 +99,22 @@
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['mes:pro:processcontent:edit']" v-hasPermi="['mes:pro:processcontent:edit']"
>修改</el-button> >修改</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['mes:pro:processcontent:remove']" v-hasPermi="['mes:pro:processcontent:remove']"
>删除</el-button> >删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@ -84,13 +124,17 @@
<!-- 添加或修改生产工序内容对话框 --> <!-- 添加或修改生产工序内容对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row > <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="顺序编号" prop="orderNum"> <el-form-item label="顺序编号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入顺序编号" /> <el-input-number
</el-form-item> :min="1"
</el-col> v-model="form.orderNum"
<!-- placeholder="请输入顺序编号"
/>
</el-form-item>
</el-col>
<!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="材料URL" prop="docUrl"> <el-form-item label="材料URL" prop="docUrl">
<el-input v-model="form.docUrl" placeholder="请输入材料URL" /> <el-input v-model="form.docUrl" placeholder="请输入材料URL" />
@ -98,38 +142,118 @@
</el-col>--> </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="辅助设备" prop="device"> <!-- <el-form-item label="辅助设备" prop="device">
<el-input v-model="form.device" placeholder="请选择辅助设备" > <el-input v-model="form.device" placeholder="请选择辅助设备">
<el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button> <el-button
</el-input> slot="append"
<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect> @click="handleSelectEquipment"
</el-form-item> icon="el-icon-search"
</el-col> ></el-button>
</el-input>
<ItemSelect
ref="itemSelect"
@onSelected="onItemSelectedEquipment"
>
</ItemSelect>
</el-form-item> -->
</el-col>
<el-col :span="24">
<div class="tagbox">
<div class="tagboxlabel" style="font-weight: 600; color: #606266">
辅助设备
</div>
<div class="tag" style="" placeholder="请选择辅助设备">
<el-tag
:key="index"
class="tagitem"
v-for="(tag, index) in selectsubsidiaryListtag"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>
{{ tag }}
</el-tag>
</div>
<el-button
slot="append"
class="button1"
@click="handleSelectEquipment"
icon="el-icon-search"
></el-button>
<ItemSelect
ref="itemSelect"
@onSelected="onItemSelectedEquipment"
>
</ItemSelect>
</div>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="BOM材料" prop="material"> <!-- <el-form-item label="BOM材料" prop="material">
<el-input v-model="form.material" placeholder="请选择BOM材料" > <el-input v-model="form.material" placeholder="请选择BOM材料">
<el-button slot="append" @click="handleSelectBom" icon="el-icon-search"></el-button> <el-button
slot="append"
@click="handleSelectBom"
icon="el-icon-search"
></el-button>
</el-input> </el-input>
<ItemSelectBom ref="itemSelectBom" @onSelected="onItemSelectedBom" ></ItemSelectBom> <ItemSelectBom
</el-form-item> ref="itemSelectBom"
@onSelected="onItemSelectedBom"
></ItemSelectBom>
</el-form-item> -->
<div class="tagbox">
<div class="tagboxlabel" style="font-weight: 600; color: #606266">
BOM材料
</div>
<div class="tag" style="" placeholder="请选择BOM材料">
<el-tag
:key="index"
class="tagitem"
v-for="(tag, index) in selectBOMListtag"
closable
:disable-transitions="false"
@close="handleCloseBOM(tag)"
>
{{ tag }}
</el-tag>
</div>
<el-button
slot="append"
class="button1"
@click="handleSelectBom"
icon="el-icon-search"
></el-button>
<ItemSelectBom
ref="itemSelectBom"
@onSelected="onItemSelectedBom"
></ItemSelectBom>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="步骤说明" prop="contentText"> <el-form-item label="步骤说明" prop="contentText">
<el-input v-model="form.contentText" type="textarea" placeholder="请输入内容" /> <el-input
</el-form-item> v-model="form.contentText"
</el-col> type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
</el-form-item> v-model="form.remark"
</el-col> type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -141,14 +265,20 @@
</template> </template>
<script> <script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/processcontent"; import {
import ItemSelect from "./single.vue"; listProcesscontent,
import ItemSelectBom from "./singleBom.vue"; getProcesscontent,
import { Message } from 'element-ui' delProcesscontent,
addProcesscontent,
updateProcesscontent,
} from "@/api/technology/processcontent";
import ItemSelect from "./single.vue";
import ItemSelectBom from "./singleBom.vue";
import { Message } from "element-ui";
export default { export default {
name: "Processcontent", name: "Processcontent",
components: {ItemSelect,ItemSelectBom}, components: { ItemSelect, ItemSelectBom },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -170,8 +300,8 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
checkMaterial :null, checkMaterial: null,
checkDevice :null, checkDevice: null,
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
@ -187,85 +317,121 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
processId: [ processId: [
{ required: true, message: "工序不能为空", trigger: "blur" } { required: true, message: "工序不能为空", trigger: "blur" },
], ],
} },
// 新增-辅助设备选中listtag
selectsubsidiaryListtag: [],
selectBOMListtag: [],
}; };
}, },
props :{ props: {
processId: undefined, processId: undefined,
optType: undefined optType: undefined,
}, },
created() { created() {
this.getList(); this.getList();
}, },
methods: { methods: {
// 新增—设备选择
handleClose(tag) {
this.selectsubsidiaryListtag.splice(
this.selectsubsidiaryListtag.indexOf(tag),
1
);
this.form.device = "";
var code = [];
this.selectsubsidiaryListtag.forEach((item) => {
if (item) {
code.push(item);
}
});
console.log(code, this.selectsubsidiaryListtag);
this.form.device = code.join(",");
},
// 新增—BOM选择
handleCloseBOM(tag) {
this.selectBOMListtag.splice(this.selectBOMListtag.indexOf(tag), 1);
this.form.material = "";
var code = [];
this.selectBOMListtag.forEach((item) => {
if (item) {
code.push(item);
}
});
console.log(code, this.selectBOMListtag);
this.form.material = code.join(",");
},
//新增 设备选择弹出框 //新增 设备选择弹出框
onItemSelectedEquipment(obj){ onItemSelectedEquipment(obj) {
if(this.form.device == null || this.form.device == ""){ if (this.form.device == null || this.form.device == "") {
console.log("device是空，if获取的obj",obj); console.log("device是空，if获取的obj", obj);
console.log("device是空，if获取的device",this.form.device); console.log("device是空，if获取的device", this.form.device);
this.form.device = obj; this.form.device = obj;
}else{ this.selectsubsidiaryListtag = obj.split(",");
if(obj != undefined && obj != null && obj != "" ){ } else {
const a = obj.split(','); if (obj != undefined && obj != null && obj != "") {
const len = obj.split(',').length; const a = obj.split(",");
console.log('切割的数组',obj.split(',')); const len = obj.split(",").length;
a.forEach(item => { console.log("切割的数组", obj.split(","));
const b = this.form.device.split(','); a.forEach((item) => {
const b = this.form.device.split(",");
const size = b.length; const size = b.length;
console.log("size",size,b[size-1]) console.log("size", size, b[size - 1]);
const item1 = item+','; const item1 = item + ",";
console.log("打印item1",item1); console.log("打印item1", item1);
this.checkDevice = this.form.device.search(item1) != -1; this.checkDevice = this.form.device.search(item1) != -1;
console.log("check的值",this.checkDevice); console.log("check的值", this.checkDevice);
if(this.checkDevice == true || b[size-1] == item){ if (this.checkDevice == true || b[size - 1] == item) {
console.log("重复添加",true); console.log("重复添加", true);
Message.warning('您已经添加过该设备,请勿重复添加！！！'); Message.warning("您已经添加过该设备,请勿重复添加！！！");
}else if(this.checkDevice == false){ } else if (this.checkDevice == false) {
this.form.device = this.form.device +","+item; this.selectsubsidiaryListtag.push(item);
this.form.device = this.form.device + "," + item;
} }
}) });
} }
} }
}, },
//新增 BOM选择弹出框 //新增 BOM选择弹出框
onItemSelectedBom(obj){ onItemSelectedBom(obj) {
if(this.form.material == null ||this.form.material == ""){ if (this.form.material == null || this.form.material == "") {
console.log("material是空，if获取的obj",obj); console.log("material是空，if获取的obj", obj);
console.log("material是空，if获取的material",this.form.material); console.log("material是空，if获取的material", this.form.material);
this.form.material = obj; this.form.material = obj;
}else{ this.selectBOMListtag = obj.split(",");
if(obj != undefined && obj != null){ } else {
const a = obj.split(','); if (obj != undefined && obj != null) {
const len = obj.split(',').length; const a = obj.split(",");
console.log('切割的数组',obj.split(',')); const len = obj.split(",").length;
a.forEach(item => { console.log("切割的数组", obj.split(","));
a.forEach((item) => {
this.checkMaterial = this.form.material.search(item) != -1; this.checkMaterial = this.form.material.search(item) != -1;
console.log("check的值",this.check); console.log("check的值", this.check);
if(this.checkMaterial == true){ if (this.checkMaterial == true) {
console.log("重复添加",true); console.log("重复添加", true);
Message.warning('您已经添加过该物料Bom,请勿重复添加！！！'); Message.warning("您已经添加过该物料Bom,请勿重复添加！！！");
}else if(this.checkMaterial == false){ } else if (this.checkMaterial == false) {
this.form.material = this.form.material +","+item; this.selectBOMListtag.push(item);
this.form.material = this.form.material + "," + item;
} }
}) });
} }
} }
}, },
//新增 设备选择弹出框 //新增 设备选择弹出框
handleSelectEquipment(){ handleSelectEquipment() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
// //新增 设备选择弹出框 // //新增 设备选择弹出框
handleSelectBom(){ handleSelectBom() {
this.$refs.itemSelectBom.showFlag = true; this.$refs.itemSelectBom.showFlag = true;
}, },
/** 查询生产工序内容列表 */ /** 查询生产工序内容列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listProcesscontent(this.queryParams).then(response => { listProcesscontent(this.queryParams).then((response) => {
this.processcontentList = response.rows; this.processcontentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -290,7 +456,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -306,22 +472,36 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.contentId) this.ids = selection.map((item) => item.contentId);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加操作步骤"; this.title = "添加操作步骤";
this.selectsubsidiaryListtag = [];
this.selectBOMListtag = [];
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const contentId = row.contentId || this.ids const contentId = row.contentId || this.ids;
getProcesscontent(contentId).then(response => { this.selectsubsidiaryListtag = [];
this.selectBOMListtag = [];
getProcesscontent(contentId).then((response) => {
this.form = response.data; this.form = response.data;
if (this.form.material != "" && this.form.material != null) {
this.selectBOMListtag = JSON.parse(
JSON.stringify(this.form.material.split(","))
);
}
if (this.form.device != "" && this.form.device != null) {
this.selectsubsidiaryListtag = JSON.parse(
JSON.stringify(this.form.device.split(","))
);
}
this.open = true; this.open = true;
this.title = "修改操作步骤"; this.title = "修改操作步骤";
}); });
@ -329,16 +509,16 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
// debugger // debugger
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.contentId != null) { if (this.form.contentId != null) {
updateProcesscontent(this.form).then(response => { updateProcesscontent(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addProcesscontent(this.form).then(response => { addProcesscontent(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -350,19 +530,70 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const contentIds = row.contentId || this.ids; const contentIds = row.contentId || this.ids;
this.$modal.confirm('是否确认删除操作步骤？').then(function() { this.$modal
return delProcesscontent(contentIds); .confirm("是否确认删除操作步骤？")
}).then(() => { .then(function () {
this.getList(); return delProcesscontent(contentIds);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('technology/pro/processcontent/export', { this.download(
...this.queryParams "technology/pro/processcontent/export",
}, `processcontent_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
`processcontent_${new Date().getTime()}.xlsx`
);
},
},
}; };
</script> </script>
<style lang="scss" scoped>
.tagbox {
display: flex;
/* overflow: scroll; */
position: relative;
width: 100%;
// padding-left: 26px;
margin-bottom: 15px;
.tagboxlabel {
width: 109px;
text-align: right;
vertical-align: middle;
font-size: 14px;
color: black;
line-height: 40px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin-right: 15px;
}
.tag {
width: 82%;
border: 1px #dcdfe6 solid;
height: 70px;
padding: 5px 15px;
overflow-y: scroll;
.tagitem {
margin-left: 5px;
}
}
.button1 {
width: 57px;
height: 35px;
margin-left: 10px;
background: #f5f7fa;
}
}
div.tag:empty:before {
content: attr(placeholder);
color: #bbb;
}
</style>

8
src/views/technology/process/index.vue
Unescape Escape View File

@ -341,8 +341,8 @@
</el-col> </el-col>
<el-col :span="16"> <el-col :span="16">
<div class="tagbox"> <div class="tagbox">
<div class="tagboxlabel">线体设备</div> <div class="tagboxlabel" style="font-weight: 600;color: #606266;">线体设备</div>
<div class="tag" style=""> <div class="tag" style="" placeholder="请选择线体设备">
<el-tag <el-tag
:key="index" :key="index"
class="tagitem" class="tagitem"
@ -910,4 +910,8 @@ export default {
background: #F5F7FA; background: #F5F7FA;
} }
} }
div.tag:empty:before {
content: attr(placeholder);
color: #bbb;
}
</style> </style>

51
src/views/technology/process/singleBom.vue
Unescape Escape View File

@ -26,7 +26,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
<el-form-item label="BOM物料编码" prop="itemCode"> <el-form-item label="BOM物料编码" prop="itemCode">
<el-input <el-input
v-model="queryParams.itemCode" v-model="queryParams.component"
placeholder="请输入BOM物料编码" placeholder="请输入BOM物料编码"
clearable clearable
style="width: 240px" style="width: 240px"
@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input
v-model="queryParams.itemName" v-model="queryParams.componentName"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -55,9 +55,6 @@
</el-table-column> </el-table-column>
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<el-table-column label="BOM物料编码" align="center" key="itemCode" prop="bomCode" v-if="columns[0].visible" >
</el-table-column>
<el-table-column label="产品名称" align="left" key="itemName" prop="productDescZh" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件编码" align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="BOM物料组件编码" align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件名称" align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="BOM物料组件名称" align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
</el-table> </el-table>
@ -112,10 +109,10 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: undefined, itemName: undefined,
bomCode: undefined, component: '',
itemTypeId: 0, //itemTypeId: 0,
itemCodeGet: '', itemCodeGet: '',
productDescZh : undefined, componentName : ''
}, },
// 列信息 // 列信息
columns: [ columns: [
@ -203,51 +200,15 @@ export default {
this.handleQuery(); this.handleQuery();
}, },
// handleCurrent(row){
// if(row){
// this.selectedRows = row;
// }
// },
// handleRowDbClick(row){
// if(row){
// this.selectedRows = row;
// this.$emit('onSelected',this.selectedRows);
// this.showFlag = false;
// }
// },
// 多选框选中数据 // 多选框选中数据
handleBomSelectionChange(selection) { handleBomSelectionChange(selection) {
this.ids = selection.map(item => item.bomCode); this.ids = selection.map(item => item.component);
this.single = selection.length!==1; this.single = selection.length!==1;
this.multiple = !selection.length; this.multiple = !selection.length;
console.log("多选框",this.ids); console.log("多选框",this.ids);
}, },
// 单选选中数据
// handleRowChange(row) {
// debugger;
// if(row){
// this.selectedRows = row;
// }
// },
//确定选中
// confirmSelect(){
// if(this.selectedItemId ==null || this.selectedItemId==0){
// this.$notify({
// title:'提示',
// type:'warning',
// message: '请至少选择一条数据!'
// });
// return;
// }
// this.$emit('onSelected',this.selectedRows);
// this.showFlag = false;
// }
//
submitBomForm() { submitBomForm() {
const data = this.ids; const data = this.ids;
console.log("数据",data); console.log("数据",data);

510
src/views/technology/recipe/content.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-row v-if="optType !='view'" :gutter="10" class="mb8"> <el-row v-if="optType != 'view'" :gutter="10" class="mb8">
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
@ -8,8 +8,8 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
>新增</el-button
>新增</el-button> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -19,8 +19,8 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
>修改</el-button
>修改</el-button> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -30,8 +30,8 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
>删除</el-button
>删除</el-button> >
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
@ -40,45 +40,99 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
>导出</el-button
>导出</el-button> >
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="recipecontentList" @selection-change="handleSelectionChange"> <el-table
v-loading="loading"
:data="recipecontentList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="顺序编号" align="center" prop="orderNum" /> <el-table-column label="顺序编号" align="center" prop="orderNum" />
<el-table-column label="步骤说明" width="300px" align="center" prop="contentText" :show-overflow-tooltip="true"/> <el-table-column
<el-table-column label="辅助设备" align="center" prop="device" :show-overflow-tooltip="true"/> label="步骤说明"
<el-table-column label="BOM材料" align="center" prop="material" :show-overflow-tooltip="true"/> width="300px"
<el-table-column label="用量" align="center" prop="dosage" :show-overflow-tooltip="true"/> align="center"
<el-table-column label="单位" align="center" prop="unit" :show-overflow-tooltip="true"/> prop="contentText"
<el-table-column label="安全用量" align="center" prop="safeDosage" :show-overflow-tooltip="true"/> :show-overflow-tooltip="true"
<el-table-column label="控制参数" align="center" prop="controlParameters" :show-overflow-tooltip="true"/> />
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/> <el-table-column
<el-table-column label="操作" width="100px" v-if="optType !='view'" align="center" class-name="small-padding fixed-width"> label="辅助设备"
align="center"
prop="device"
:show-overflow-tooltip="true"
/>
<el-table-column
label="BOM材料"
align="center"
prop="material"
:show-overflow-tooltip="true"
/>
<el-table-column
label="用量"
align="center"
prop="dosage"
:show-overflow-tooltip="true"
/>
<el-table-column
label="单位"
align="center"
prop="unit"
:show-overflow-tooltip="true"
/>
<el-table-column
label="安全用量"
align="center"
prop="safeDosage"
:show-overflow-tooltip="true"
/>
<el-table-column
label="控制参数"
align="center"
prop="controlParameters"
:show-overflow-tooltip="true"
/>
<el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="操作"
width="100px"
v-if="optType != 'view'"
align="center"
class-name="small-padding fixed-width"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
>修改</el-button
>修改</el-button> >
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
>删除</el-button
>删除</el-button> >
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total > 0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.pageSize"
@ -88,13 +142,17 @@
<!-- 添加或修改生产工序内容对话框 --> <!-- 添加或修改生产工序内容对话框 -->
<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row > <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="顺序编号" prop="orderNum"> <el-form-item label="顺序编号" prop="orderNum">
<el-input-number :min="1" v-model="form.orderNum" placeholder="请输入顺序编号" /> <el-input-number
</el-form-item> :min="1"
</el-col> v-model="form.orderNum"
<!-- placeholder="请输入顺序编号"
/>
</el-form-item>
</el-col>
<!--
<el-col :span="12"> <el-col :span="12">
<el-form-item label="材料URL" prop="docUrl"> <el-form-item label="材料URL" prop="docUrl">
<el-input v-model="form.docUrl" placeholder="请输入材料URL" /> <el-input v-model="form.docUrl" placeholder="请输入材料URL" />
@ -102,60 +160,130 @@
</el-col>--> </el-col>-->
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <!-- <el-col :span="12">
<el-form-item label="辅助设备" prop="device"> <el-form-item label="辅助设备" prop="device">
<el-input v-model="form.device" placeholder="请选择辅助设备" > <el-input v-model="form.device" placeholder="请选择辅助设备" >
<el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectEquipment" icon="el-icon-search"></el-button>
</el-input> </el-input>
<ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect> <ItemSelect ref="itemSelect" @onSelected="onItemSelectedEquipment" > </ItemSelect>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="12"> <el-col :span="24">
<div class="tagbox">
<div class="tagboxlabel" style="font-weight: 600; color: #606266">
辅助设备
</div>
<div class="tag" style="" placeholder="请选择辅助设备">
<el-tag
:key="index"
class="tagitem"
v-for="(tag, index) in selectsubsidiaryListtag"
closable
:disable-transitions="false"
@close="handleClose(tag)"
>
{{ tag }}
</el-tag>
</div>
<el-button
slot="append"
class="button1"
@click="handleSelectEquipment"
icon="el-icon-search"
></el-button>
<ItemSelect
ref="itemSelect"
@onSelected="onItemSelectedEquipment"
>
</ItemSelect>
</div>
</el-col>
<!-- <el-col :span="12">
<el-form-item label="BOM材料" prop="material"> <el-form-item label="BOM材料" prop="material">
<el-input v-model="form.material" placeholder="请选择BOM材料" > <el-input v-model="form.material" placeholder="请选择BOM材料" >
<el-button slot="append" @click="handleSelectBom" icon="el-icon-search"></el-button> <el-button slot="append" @click="handleSelectBom" icon="el-icon-search"></el-button>
</el-input> </el-input>
<ItemSelectBom ref="itemSelectBom" @onSelected="onItemSelectedBom" ></ItemSelectBom> <ItemSelectBom ref="itemSelectBom" @onSelected="onItemSelectedBom" ></ItemSelectBom>
</el-form-item> </el-form-item>
</el-col> </el-col> -->
<el-col :span="24">
<div class="tagbox">
<div class="tagboxlabel" style="font-weight: 600; color: #606266">
BOM材料
</div>
<div class="tag" style="" placeholder="请选择BOM材料">
<el-tag
:key="index"
class="tagitem"
v-for="(tag, index) in selectBOMListtag"
closable
:disable-transitions="false"
@close="handleCloseBOM(tag)"
>
{{ tag }}
</el-tag>
</div>
<el-button
slot="append"
class="button1"
@click="handleSelectBom"
icon="el-icon-search"
></el-button>
<ItemSelectBom
ref="itemSelectBom"
@onSelected="onItemSelectedBom"
></ItemSelectBom>
</div>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="用量" prop="dosage"> <el-form-item label="用量" prop="dosage">
<el-input v-model="form.dosage" placeholder="请输入用量" /> <el-input v-model="form.dosage" placeholder="请输入用量" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="单位" prop="unit"> <el-form-item label="单位" prop="unit">
<el-input v-model="form.unit" placeholder="请输入单位" /> <el-input v-model="form.unit" placeholder="请输入单位" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="控制参数" prop="controlParameters"> <el-form-item label="控制参数" prop="controlParameters">
<el-input v-model="form.controlParameters" placeholder="请输入控制参数" /> <el-input
</el-form-item> v-model="form.controlParameters"
</el-col> placeholder="请输入控制参数"
<el-col :span="12"> />
<el-form-item label="安全用量" prop="safeDosage"> </el-form-item>
<el-input v-model="form.safeDosage" placeholder="安全设置" /> </el-col>
</el-form-item> <el-col :span="12">
</el-col> <el-form-item label="安全用量" prop="safeDosage">
<el-input v-model="form.safeDosage" placeholder="安全设置" />
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="步骤说明" prop="contentText"> <el-form-item label="步骤说明" prop="contentText">
<el-input v-model="form.contentText" type="textarea" placeholder="请输入内容" /> <el-input
</el-form-item> v-model="form.contentText"
</el-col> type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> <el-input
</el-form-item> v-model="form.remark"
</el-col> type="textarea"
placeholder="请输入内容"
/>
</el-form-item>
</el-col>
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -167,22 +295,29 @@
</template> </template>
<script> <script>
import { listProcesscontent, getProcesscontent, delProcesscontent, addProcesscontent, updateProcesscontent } from "@/api/technology/recipecontent"; import {
import ItemSelect from "./single.vue"; listProcesscontent,
import ItemSelectBom from "./singleBom.vue"; getProcesscontent,
import { Message } from 'element-ui' delProcesscontent,
addProcesscontent,
updateProcesscontent,
} from "@/api/technology/recipecontent";
import ItemSelect from "./single.vue";
import ItemSelectBom from "./singleBom.vue";
import { Message } from "element-ui";
export default { export default {
name: "Processcontent", name: "Processcontent",
components: {ItemSelect,ItemSelectBom}, components: { ItemSelect, ItemSelectBom },
data() { data() {
return { return {
checkMaterial :null, checkMaterial: null,
checkDevice :null, checkDevice: null,
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
ids: [], ids: [],
idsName: [],
// 非单个禁用 // 非单个禁用
single: true, single: true,
// 非多个禁用 // 非多个禁用
@ -213,14 +348,17 @@ export default {
// 表单校验 // 表单校验
rules: { rules: {
recipeId: [ recipeId: [
{ required: true, message: "工序不能为空", trigger: "blur" } { required: true, message: "工序不能为空", trigger: "blur" },
], ],
} },
// 新增-辅助设备选中listtag
selectsubsidiaryListtag: [],
selectBOMListtag: [],
}; };
}, },
props :{ props: {
recipeId: undefined, recipeId: undefined,
optType: undefined optType: undefined,
}, },
created() { created() {
this.getList(); this.getList();
@ -229,7 +367,7 @@ export default {
/** 查询生产工序内容列表 */ /** 查询生产工序内容列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listProcesscontent(this.queryParams).then(response => { listProcesscontent(this.queryParams).then((response) => {
this.recipecontentList = response.rows; this.recipecontentList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -254,7 +392,7 @@ export default {
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null updateTime: null,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -270,9 +408,9 @@ export default {
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.contentId) this.ids = selection.map((item) => item.contentId);
this.single = selection.length!==1 this.single = selection.length !== 1;
this.multiple = !selection.length this.multiple = !selection.length;
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
@ -283,9 +421,21 @@ export default {
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const contentId = row.contentId || this.ids const contentId = row.contentId || this.ids;
getProcesscontent(contentId).then(response => { this.selectsubsidiaryListtag = [];
this.selectBOMListtag = [];
getProcesscontent(contentId).then((response) => {
this.form = response.data; this.form = response.data;
if (this.form.material != "" && this.form.material != null) {
this.selectBOMListtag = JSON.parse(
JSON.stringify(this.form.material.split(","))
);
}
if (this.form.device != "" && this.form.device != null) {
this.selectsubsidiaryListtag = JSON.parse(
JSON.stringify(this.form.device.split(","))
);
}
this.open = true; this.open = true;
this.title = "修改操作步骤"; this.title = "修改操作步骤";
}); });
@ -293,16 +443,16 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
// debugger // debugger
this.$refs["form"].validate(valid => { this.$refs["form"].validate((valid) => {
if (valid) { if (valid) {
if (this.form.contentId != null) { if (this.form.contentId != null) {
updateProcesscontent(this.form).then(response => { updateProcesscontent(this.form).then((response) => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.open = false; this.open = false;
this.getList(); this.getList();
}); });
} else { } else {
addProcesscontent(this.form).then(response => { addProcesscontent(this.form).then((response) => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess("新增成功");
this.open = false; this.open = false;
this.getList(); this.getList();
@ -311,83 +461,165 @@ export default {
} }
}); });
}, },
// 新增—设备选择
handleClose(tag) {
this.selectsubsidiaryListtag.splice(
this.selectsubsidiaryListtag.indexOf(tag),
1
);
this.form.device = "";
var code = [];
this.selectsubsidiaryListtag.forEach((item) => {
if (item) {
code.push(item);
}
});
console.log(code, this.selectsubsidiaryListtag);
this.form.device = code.join(",");
},
// 新增—BOM选择
handleCloseBOM(tag) {
this.selectBOMListtag.splice(this.selectBOMListtag.indexOf(tag), 1);
this.form.material = "";
var code = [];
this.selectBOMListtag.forEach((item) => {
if (item) {
code.push(item);
}
});
console.log(code, this.selectBOMListtag);
this.form.material = code.join(",");
},
//新增 设备选择弹出框 //新增 设备选择弹出框
onItemSelectedEquipment(obj){ onItemSelectedEquipment(obj) {
if(this.form.device == null || this.form.device == ""){ if (this.form.device == null || this.form.device == "") {
console.log("device是空，if获取的obj",obj); console.log("device是空，if获取的obj", obj);
console.log("device是空，if获取的device",this.form.device); console.log("device是空，if获取的device", this.form.device);
this.form.device = obj; this.form.device = obj;
}else{ this.selectsubsidiaryListtag = obj.split(",");
if(obj != undefined && obj != null && obj != ""){ } else {
const a = obj.split(','); if (obj != undefined && obj != null && obj != "") {
console.log('切割的数组',obj.split(',')); const a = obj.split(",");
a.forEach(item => { console.log("切割的数组", obj.split(","));
const b = this.form.device.split(','); a.forEach((item) => {
const b = this.form.device.split(",");
const size = b.length; const size = b.length;
console.log("size",size,b[size-1]) console.log("size", size, b[size - 1]);
const item1 = item+','; const item1 = item + ",";
console.log("打印item1",item1); console.log("打印item1", item1);
this.checkDevice = this.form.device.search(item1) != -1; this.checkDevice = this.form.device.search(item1) != -1;
console.log("check的值",this.checkDevice); console.log("check的值", this.checkDevice);
if(this.checkDevice == true ||b[size-1] == item){ if (this.checkDevice == true || b[size - 1] == item) {
console.log("重复添加",true); console.log("重复添加", true);
Message.warning('您已经添加过该设备,请勿重复添加！！！'); Message.warning("您已经添加过该设备,请勿重复添加！！！");
}else if(this.checkDevice == false){ } else if (this.checkDevice == false) {
this.form.device = this.form.device +","+item; this.selectsubsidiaryListtag.push(item);
this.form.device = this.form.device + "," + item;
} }
}) });
} }
} }
}, },
//新增 设备选择弹出框 //新增 BOM选择弹出框
onItemSelectedBom(obj){ onItemSelectedBom(obj) {
if(this.form.material == null || this.form.material == ""){ if (this.form.material == null || this.form.material == "") {
console.log("material是空，if获取的obj",obj); console.log("material是空，if获取的obj", obj);
console.log("material是空，if获取的material",this.form.material); console.log("material是空，if获取的material", this.form.material);
this.form.material = obj; this.form.material = obj;
}else{ this.selectBOMListtag = obj.split(",");
if(obj != undefined && obj != null && obj !=""){ } else {
const a = obj.split(','); if (obj != undefined && obj != null && obj != "") {
const len = obj.split(',').length; const a = obj.split(",");
console.log('切割的数组',obj.split(',')); const len = obj.split(",").length;
a.forEach(item => { console.log("切割的数组", obj.split(","));
a.forEach((item) => {
this.checkMaterial = this.form.material.search(item) != -1; this.checkMaterial = this.form.material.search(item) != -1;
console.log("check的值",this.check); console.log("check的值", this.check);
if(this.checkMaterial == true){ if (this.checkMaterial == true) {
console.log("重复添加",true); console.log("重复添加", true);
Message.warning('您已经添加过该物料Bom,请勿重复添加！！！'); Message.warning("您已经添加过该物料Bom,请勿重复添加！！！");
}else if(this.checkMaterial == false){ } else if (this.checkMaterial == false) {
this.form.material = this.form.material +","+item; this.selectBOMListtag.push(item);
this.form.material = this.form.material + "," + item;
} }
}) });
} }
} }
}, },
//新增 设备选择弹出框 //新增 设备选择弹出框
handleSelectEquipment(){ handleSelectEquipment() {
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
// 新增 设备选择弹出框 // 新增 设备选择弹出框
handleSelectBom(){ handleSelectBom() {
this.$refs.itemSelectBom.showFlag = true; this.$refs.itemSelectBom.showFlag = true;
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const contentIds = row.contentId || this.ids; const contentIds = row.contentId || this.ids;
this.$modal.confirm('是否确认删除操作步骤？').then(function() { this.$modal
return delProcesscontent(contentIds); .confirm("是否确认删除操作步骤？")
}).then(() => { .then(function () {
this.getList(); return delProcesscontent(contentIds);
this.$modal.msgSuccess("删除成功"); })
}).catch(() => {}); .then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('technology/pro/recipecontent/export', { this.download(
...this.queryParams "technology/pro/recipecontent/export",
}, `recipecontent_${new Date().getTime()}.xlsx`) {
} ...this.queryParams,
} },
`recipecontent_${new Date().getTime()}.xlsx`
);
},
},
}; };
</script> </script>
<style lang="scss" scoped>
.tagbox {
display: flex;
/* overflow: scroll; */
position: relative;
width: 100%;
// padding-left: 26px;
margin-bottom: 15px;
.tagboxlabel {
width: 109px;
text-align: right;
vertical-align: middle;
font-size: 14px;
color: black;
line-height: 40px;
-webkit-box-sizing: border-box;
box-sizing: border-box;
margin-right: 15px;
}
.tag {
width: 82%;
border: 1px #dcdfe6 solid;
height: 70px;
padding: 5px 15px;
overflow-y: scroll;
.tagitem {
margin-left: 5px;
}
}
.button1 {
width: 57px;
height: 35px;
margin-left: 10px;
background: #f5f7fa;
}
}
div.tag:empty:before {
content: attr(placeholder);
color: #bbb;
}
</style>

16
src/views/technology/recipe/singleBom.vue
Unescape Escape View File

@ -26,7 +26,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
<el-form-item label="BOM物料编码" prop="itemCode"> <el-form-item label="BOM物料编码" prop="itemCode">
<el-input <el-input
v-model="queryParams.itemCode" v-model="queryParams.component"
placeholder="请输入BOM物料编码" placeholder="请输入BOM物料编码"
clearable clearable
style="width: 240px" style="width: 240px"
@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="itemName"> <el-form-item label="产品名称" prop="itemName">
<el-input <el-input
v-model="queryParams.itemName" v-model="queryParams.componentName"
placeholder="请输入产品名称" placeholder="请输入产品名称"
clearable clearable
style="width: 240px" style="width: 240px"
@ -55,9 +55,6 @@
</el-table-column> </el-table-column>
<!-- 序号 --> <!-- 序号 -->
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column> <el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
<el-table-column label="BOM物料编码" align="center" key="itemCode" prop="bomCode" v-if="columns[0].visible" >
</el-table-column>
<el-table-column label="产品名称" align="left" key="itemName" prop="productDescZh" v-if="columns[1].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件编码" align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" /> <el-table-column label="BOM物料组件编码" align="left" key="component" prop="component" v-if="columns[2].visible" :show-overflow-tooltip="true" />
<el-table-column label="BOM物料组件名称" align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" /> <el-table-column label="BOM物料组件名称" align="left" key="componentName" prop="componentName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
</el-table> </el-table>
@ -112,10 +109,10 @@ export default {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
itemName: undefined, itemName: undefined,
bomCode: undefined, component: '',
itemTypeId: 0, //itemTypeId: 0,
itemCodeGet: '', itemCodeGet: '',
productDescZh : undefined, componentName : ''
}, },
// 列信息 // 列信息
columns: [ columns: [
@ -219,7 +216,8 @@ export default {
// 多选框选中数据 // 多选框选中数据
handleBomSelectionChange(selection) { handleBomSelectionChange(selection) {
this.ids = selection.map(item => item.bomCode); this.ids = selection.map(item => item.component);
this.idsName = selection.map(item => item.componentName);
this.single = selection.length!==1; this.single = selection.length!==1;
this.multiple = !selection.length; this.multiple = !selection.length;
console.log("多选框",this.ids); console.log("多选框",this.ids);

Write Preview
Loading…
Cancel
Save