Merge remote-tracking branch 'origin/master'
chj
1 year ago
commit
562f93b043
@ -0,0 +1,301 @@
|
||||
<template>
|
||||
<el-dialog title="设备选择"
|
||||
v-if="showFlag"
|
||||
:visible.sync="showFlag"
|
||||
:modal= false
|
||||
width="1100px"
|
||||
center
|
||||
>
|
||||
<el-row :gutter="20">
|
||||
<!--分类数据-->
|
||||
<el-col :span="4" :xs="24">
|
||||
<div class="head-container">
|
||||
<el-tree
|
||||
:data="treeData"
|
||||
node-key="id"
|
||||
:expand-on-click-node="false"
|
||||
:filter-node-method="filterNode"
|
||||
ref="tree"
|
||||
default-expand-all
|
||||
@node-click="handleNodeClick"
|
||||
/>
|
||||
</div>
|
||||
</el-col>
|
||||
|
||||
<!--设备数据-->
|
||||
<el-col :span="20" :xs="24">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="设备编码" prop="itemCode">
|
||||
<el-input
|
||||
v-model="queryParams.itemCode"
|
||||
placeholder="请输入设备编码"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="itemName">
|
||||
<el-input
|
||||
v-model="queryParams.itemName"
|
||||
placeholder="请输入设备名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@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-table v-loading="loading" :data="itemList" @selection-change="handleEquipmentSelectionChange" ref="myTable">
|
||||
<el-table-column width="50" align="center" type="selection">
|
||||
<!-- <template v-slot="scope">
|
||||
<el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
<!-- 序号 -->
|
||||
<el-table-column type="index" width="90" align="center" :index="indexMethod" label="序号"></el-table-column>
|
||||
<el-table-column label="设备编码" align="center" key="itemCode" prop="equipmentCode" v-if="columns[0].visible" >
|
||||
</el-table-column>
|
||||
<el-table-column label="设备类型编码" align="center" key="itemTypeCode" prop="equipmentTypeCode" v-if="columns[2].visible" >
|
||||
</el-table-column>
|
||||
<el-table-column label="设备名称" align="left" key="itemName" prop="equipmentName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitEquipmentForm">确 定</el-button>
|
||||
<el-button @click="showFlag=false">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment} from "@/api/technology/process";
|
||||
import { treeselect } from "@/api/wms/equipment";
|
||||
// import Treeselect from "@riophae/vue-treeselect";
|
||||
// import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
|
||||
export default {
|
||||
name: "MdItemSingle",
|
||||
// components: { Treeselect },
|
||||
data() {
|
||||
return {
|
||||
treeData: [{
|
||||
id: '1',
|
||||
label: '设备类别',
|
||||
children: [{
|
||||
id: 'equ_type_lg',
|
||||
label: '料罐'
|
||||
}, {
|
||||
id: 'equ_type_cxj',
|
||||
label: '成型机'
|
||||
}, {
|
||||
id: 'equ_type_hf',
|
||||
label: '烘房'
|
||||
}, {
|
||||
id: 'equ_type_spj',
|
||||
label: '收坯机'
|
||||
}, {
|
||||
id: 'equ_type_bzx',
|
||||
label: '包装线'
|
||||
}
|
||||
]
|
||||
}],
|
||||
showFlag:false,
|
||||
// 选中数组
|
||||
selectedItemId: undefined,
|
||||
selectedRows: undefined,
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total:0,
|
||||
// 设备产品表格数据
|
||||
itemList: null,
|
||||
// 树选项
|
||||
itemTypeOptions: undefined,
|
||||
//树名称
|
||||
equipmentTypeCode: undefined,
|
||||
defaultProps: {
|
||||
id: "id",
|
||||
label: "label"
|
||||
},
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
itemName: undefined,
|
||||
equipmentTypeCode: undefined,
|
||||
itemTypeId: 0,
|
||||
itemCodeGet: '',
|
||||
},
|
||||
// 列信息
|
||||
columns: [
|
||||
{ key: 0, label: `设备编码`, visible: true },
|
||||
{ key: 1, label: `设备名称`, visible: true },
|
||||
{ key: 2, label: `设备类型`, visible: true },
|
||||
]
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
// this.getTreeselect();
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
itemId: null,
|
||||
itemCode: this.processId,
|
||||
itemType: null,
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
||||
handleEquipmentSelectionChange (val) {
|
||||
this.itemList = val
|
||||
},
|
||||
|
||||
// 生成表头序号
|
||||
indexMethod(index){
|
||||
return index+1 ;
|
||||
},
|
||||
//
|
||||
|
||||
/** 查询设备编码列表*/
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listEquipment(this.queryParams).then(response => {
|
||||
this.itemList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
}
|
||||
);
|
||||
},
|
||||
|
||||
/** 查询分类下拉树结构 */
|
||||
// getTreeselect() {
|
||||
// treeselect().then(response => {
|
||||
// this.itemTypeOptions = response.rows;
|
||||
// console.log(response.rows);
|
||||
// num = response.total;
|
||||
// for (let id of response.rows) {
|
||||
// if(id == 'equ_type_lg'){
|
||||
// lable = '料罐';
|
||||
// }else if(id == 'equ_type_hf'){
|
||||
// lable = '烘房';
|
||||
// }else if(id == 'equ_type_cpj'){
|
||||
// lable = '收坯机';
|
||||
// }else if(id == 'equ_type_bzx'){
|
||||
// lable = '包装线';
|
||||
// }else if(id == 'equ_type_cxj'){
|
||||
// lable = '成型机';
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// },
|
||||
|
||||
// 筛选节点
|
||||
filterNode(value, data) {
|
||||
console.log(value, data);
|
||||
if (!value) return true;
|
||||
return data.label.indexOf(value) !== -1;
|
||||
},
|
||||
|
||||
// 节点单击事件
|
||||
handleNodeClick(data) {
|
||||
this.queryParams.equipmentTypeCode = data.id;
|
||||
console.log(this.equipmentTypeCode);
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
// handleCurrent(row){
|
||||
// if(row){
|
||||
// this.selectedRows = row;
|
||||
// }
|
||||
// },
|
||||
|
||||
// handleRowDbClick(row){
|
||||
// if(row){
|
||||
// this.selectedRows = row;
|
||||
// this.$emit('onSelected',this.selectedRows);
|
||||
// this.showFlag = false;
|
||||
// }
|
||||
// },
|
||||
|
||||
// 多选框选中数据
|
||||
handleEquipmentSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.equipmentCode);
|
||||
this.single = selection.length!==1;
|
||||
this.multiple = !selection.length;
|
||||
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;
|
||||
// }
|
||||
//
|
||||
submitEquipmentForm() {
|
||||
const data = this.ids;
|
||||
console.log("数据",data);
|
||||
const equipmentCode = data.toString();
|
||||
console.log("拆分数据",equipmentCode);
|
||||
console.log("原来的数据",this.queryParams.itemCodeGet);
|
||||
if(this.queryParams.itemCodeGet == ""){
|
||||
this.queryParams.itemCodeGet = equipmentCode;
|
||||
}else{
|
||||
this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ equipmentCode;
|
||||
}
|
||||
this.selectedRows = this.queryParams.itemCodeGet;
|
||||
this.$emit('onSelected', this.selectedRows);
|
||||
this.showFlag = false;
|
||||
this.queryParams.itemCodeGet = "";
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
@ -0,0 +1,247 @@
|
||||
<template>
|
||||
<el-dialog title="BOM物料选择"
|
||||
v-if="showFlag"
|
||||
:visible.sync="showFlag"
|
||||
:modal= false
|
||||
width="1100px"
|
||||
center
|
||||
>
|
||||
<el-row :gutter="20">
|
||||
<!--BOM数据-->
|
||||
<el-col :span="24" :xs="24">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="110px">
|
||||
<el-form-item label="BOM物料编码" prop="itemCode" style="width:350px">
|
||||
<el-input
|
||||
v-model="queryParams.itemCode"
|
||||
placeholder="请输入BOM物料编码"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="BOM物料名称" prop="itemName" style="width:350px">
|
||||
<el-input
|
||||
v-model="queryParams.itemName"
|
||||
placeholder="请输入BOM物料名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@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-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable">
|
||||
<el-table-column width="50" align="center" type="selection">
|
||||
<!-- <template v-slot="scope">
|
||||
<el-radio v-model="selectedItemId" :label="scope.row.itemId" @change="handleRowChange(scope.row)">{{""}}</el-radio>
|
||||
</template> -->
|
||||
</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="materialCode" v-if="columns[0].visible" >
|
||||
</el-table-column>
|
||||
<el-table-column label="BOM物料名称" align="left" key="itemName" prop="materialDesc" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitBomForm">确 定</el-button>
|
||||
<el-button @click="showFlag=false">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {listBom} from "@/api/technology/process";
|
||||
export default {
|
||||
name: "ItemSingleBom",
|
||||
// components: { Treeselect },
|
||||
data() {
|
||||
return {
|
||||
showFlag:false,
|
||||
// 选中数组
|
||||
selectedItemId: undefined,
|
||||
selectedRows: undefined,
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 设备产品表格数据
|
||||
itemList: null,
|
||||
// 树选项
|
||||
itemTypeOptions: undefined,
|
||||
//树名称
|
||||
materialCode: undefined,
|
||||
defaultProps: {
|
||||
id: "id",
|
||||
label: "label"
|
||||
},
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
itemName: undefined,
|
||||
materialCode: undefined,
|
||||
itemTypeId: 0,
|
||||
itemCodeGet: '',
|
||||
},
|
||||
// 列信息
|
||||
columns: [
|
||||
{ key: 0, label: `BOM物料编码`, visible: true },
|
||||
{ key: 1, label: `BOM物料名称`, visible: true }
|
||||
]
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
// this.getTreeselect();
|
||||
},
|
||||
|
||||
methods: {
|
||||
handleEquipmentSelectionChange (val) {
|
||||
this.itemList = val
|
||||
},
|
||||
|
||||
// 生成表头序号
|
||||
indexMethod(index){
|
||||
return index+1 ;
|
||||
},
|
||||
//
|
||||
|
||||
/** 查询设备编码列表*/
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listBom(this.queryParams).then(response => {
|
||||
this.itemList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
}
|
||||
);
|
||||
},
|
||||
|
||||
/** 查询分类下拉树结构 */
|
||||
// getTreeselect() {
|
||||
// treeselect().then(response => {
|
||||
// this.itemTypeOptions = response.rows;
|
||||
// console.log(response.rows);
|
||||
// num = response.total;
|
||||
// for (let id of response.rows) {
|
||||
// if(id == 'equ_type_lg'){
|
||||
// lable = '料罐';
|
||||
// }else if(id == 'equ_type_hf'){
|
||||
// lable = '烘房';
|
||||
// }else if(id == 'equ_type_cpj'){
|
||||
// lable = '收坯机';
|
||||
// }else if(id == 'equ_type_bzx'){
|
||||
// lable = '包装线';
|
||||
// }else if(id == 'equ_type_cxj'){
|
||||
// lable = '成型机';
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// },
|
||||
|
||||
// 筛选节点
|
||||
filterNode(value, data) {
|
||||
console.log(value, data);
|
||||
if (!value) return true;
|
||||
return data.label.indexOf(value) !== -1;
|
||||
},
|
||||
|
||||
// 节点单击事件
|
||||
handleNodeClick(data) {
|
||||
this.queryParams.materialCode = data.id;
|
||||
console.log(this.materialCode);
|
||||
this.handleQuery();
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1;
|
||||
this.getList();
|
||||
},
|
||||
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm");
|
||||
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) {
|
||||
this.ids = selection.map(item => item.materialCode);
|
||||
this.single = selection.length!==1;
|
||||
this.multiple = !selection.length;
|
||||
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() {
|
||||
const data = this.ids;
|
||||
console.log("数据",data);
|
||||
const equipmentCode = data.toString();
|
||||
console.log("拆分数据",materialCode);
|
||||
console.log("原来的数据",this.queryParams.itemCodeGet);
|
||||
if(this.queryParams.itemCodeGet == ""){
|
||||
this.queryParams.itemCodeGet = materialCode;
|
||||
}else{
|
||||
this.queryParams.itemCodeGet = this.queryParams.itemCodeGet + ','+ materialCode;
|
||||
}
|
||||
this.selectedRows = this.queryParams.itemCodeGet;
|
||||
this.$emit('onSelected', this.selectedRows);
|
||||
this.showFlag = false;
|
||||
this.queryParams.itemCodeGet = "";
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
Loading…
Reference in New Issue