Yangwl
/
LJ-UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
yangwl
wws 1 year ago
parent 9f8cc82b9d 9a28d79c98
commit b24299ed66
4 changed files with 122 additions and 47 deletions
Show Stats Download Patch File Download Diff File

8
src/api/technology/process.js
Unescape Escape View File

@ -86,3 +86,11 @@ export function listFactory(query) {
params: query params: query
}); });
} }
// 查询工作中心
export function getWorkCenterList() {
return request({
url: '/technology/pro/process/getWorkCenterList',
method: 'get'
});
}

8
src/api/wms/factory.js
Unescape Escape View File

@ -42,3 +42,11 @@ export function delFactory(factoryId) {
method: 'delete' method: 'delete'
}); });
} }
// 查询工作中心
export function getWorkCenterList() {
return request({
url: '/wms/factory/getWorkCenterList',
method: 'get'
});
}

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

@ -188,6 +188,29 @@
<el-input-number :min="0" :step="1" v-model="form.workTime" placeholder="请输入工作时长" /> <el-input-number :min="0" :step="1" v-model="form.workTime" placeholder="请输入工作时长" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8">
<el-form-item label="工作中心" prop="workCenter" style="width:310px">
<!-- <el-cascader
:show-all-levels="false"
:options="factoryOptions"
:props = "{checkStrictly: true , label:'factoryName',value:'factoryId',children:'children' }"
v-model="form.workCenter"
placeholder="请选择工作中心"
clearable
style="width:400px"
></el-cascader> -->
<template>
<el-select v-model="form.workCenter" filterable placeholder="请选择" @change="selectWorkCenter" >
<el-option
v-for="item in options1"
:key="item.factoryCode"
:label="item.factoryName"
:value="item.factoryCode">
</el-option>
</el-select>
</template>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -217,20 +240,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="8">
<el-form-item label="工作中心" prop="workCenter">
<el-cascader
:options="factoryOptions"
:props="workCenter"
v-model="form.workCenter"
placeholder="请选择工作中心"
clearable
style="width:400px"
></el-cascader>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row> <!-- <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="参数1温度" prop="param1"> <el-form-item label="参数1温度" prop="param1">
@ -282,7 +291,7 @@
</template> </template>
<script> <script>
import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment,listFactory} from "@/api/technology/process"; import { listProcess, getProcess, delProcess, addProcess, updateProcess ,listEquipment,getEquipment,listFactory,getWorkCenterList} from "@/api/technology/process";
import Processcontent from "./content.vue"; import Processcontent from "./content.vue";
import ItemSelect from "./single.vue"; import ItemSelect from "./single.vue";
import { Message } from 'element-ui' import { Message } from 'element-ui'
@ -295,7 +304,9 @@ export default {
components: {Processcontent,ItemSelect}, components: {Processcontent,ItemSelect},
data() { data() {
return { return {
workCenter: { multiple: true,label:'factoryName',value:'factoryId',children:'children' }, workCenter:[],
options1: [],
// workCenter: { multiple: true,checkStrictly: true , label:'factoryName',value:'factoryId',children:'children' },
checkEquipment:null, checkEquipment:null,
//自动生成编码 //自动生成编码
autoGenFlag:false, autoGenFlag:false,
@ -332,7 +343,9 @@ export default {
pageSize: 10, pageSize: 10,
processCode: null, processCode: null,
processName: null, processName: null,
enableFlag: null, enableFlag: null
// workCenter: null
// factoryCode: null
}, },
queryEquipmentParams: { queryEquipmentParams: {
equipmentTypeName :null, equipmentTypeName :null,
@ -366,6 +379,7 @@ export default {
}, },
fileList:[], fileList:[],
equipmentId:'', equipmentId:'',
options: null,
}; };
}, },
created() { created() {
@ -374,12 +388,18 @@ export default {
this.getTreeselect(); this.getTreeselect();
}, },
methods: { methods: {
selectWorkCenter(){
this.form.workshopCode = this.form.workCenter;
},
activated(){ activated(){
this.useTypeKey +=1 this.useTypeKey +=1
}, },
handleEquipmentSelectionChange (val) { handleEquipmentSelectionChange (val) {
this.equipmentList = val this.equipmentList = val
}, },
//中山榄菊日化实业有限公司 A001 //中山榄菊日化实业有限公司 A001
getTreeselect() { getTreeselect() {
listFactory().then(response => { listFactory().then(response => {
@ -389,6 +409,7 @@ export default {
this.factoryOptions.push(data); this.factoryOptions.push(data);
}); });
}, },
/** 查询物料信息列表 */ /** 查询物料信息列表 */
getEquipmentList() { getEquipmentList() {
this.loading = true; this.loading = true;
@ -400,10 +421,10 @@ export default {
}, },
// 筛选节点 // 筛选节点
filterNode(value, data) { // filterNode(value, data) {
if (!value) return true; // if (!value) return true;
return data.label.indexOf(value) !== -1; // return data.label.indexOf(value) !== -1;
}, // },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {
@ -507,6 +528,10 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
getWorkCenterList().then(response =>{
this.options1 = response.rows;
console.log(this.options1);
});
this.open = true; this.open = true;
this.title = "添加生产工序"; this.title = "添加生产工序";
this.optType = "add"; this.optType = "add";
@ -533,8 +558,14 @@ export default {
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const processId = row.processId || this.ids const processId = row.processId || this.ids
getWorkCenterList().then(response =>{
this.options1 = response.rows;
console.log(this.options1);
});
getProcess(processId).then(response => { getProcess(processId).then(response => {
this.form = response.data; this.form = response.data;
// console.log(this.form.workCenter);
// this.form.workCenter = this.form.workCenter.split(',');
if(response.data.files != null){ if(response.data.files != null){
var newFiles = []; var newFiles = [];
response.data.files.forEach(item =>{ response.data.files.forEach(item =>{
@ -553,9 +584,10 @@ export default {
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
if(Array.isArray(this.form.fileList)){ // console.log('workCENTER',this.form.workCenter);
this.form.fileList = this.listToString(this.form.fileList); // this.work = JSON.stringify(this.form.workCenter);
} // this.form.workCenter = JSON.stringify(this.form.workCenter);
// console.log('2',this.form.workCenter);
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if (this.form.processId != null) { if (this.form.processId != null) {
@ -575,18 +607,6 @@ export default {
}); });
}, },
//
submitEquipmentForm() {
const table = this.$refs.myTable;
const data = table.data;
console.log(data);
for (const one of data) {
const equipmentCode = one.equipmentCode;
this.form.workCenter = this.form.workCenter + ','+ equipmentCode;
this.boundeEuipmentOpen = false;
}
},
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const processIds = row.processId || this.ids; const processIds = row.processId || this.ids;
@ -637,11 +657,17 @@ export default {
} }
} }
}, },
//新增 设备选择弹出框 //新增 设备选择弹出框
handleSelectEquipment(){ handleSelectEquipment(){
this.$refs.itemSelect.showFlag = true; this.$refs.itemSelect.showFlag = true;
}, },
} },
// workCenterList(){
// console.log(查询workCenterList);
// getWorkCenterList().then(data => {
// this.options = data;
// });
// this.form.workCenter = this.options[0].factoryCode;
// },
}; };
</script> </script>

49
src/views/wms/equipment/index.vue
Unescape Escape View File

@ -16,6 +16,14 @@
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item>
<el-form-item label="设备类型编码" prop="equipmentTypeCode">
<el-input
v-model="queryParams.equipmentTypeCode"
placeholder="请输入设备类型编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -92,8 +100,8 @@
<el-table-column label="规格型号" align="center" prop="equipmentSpec" /> <el-table-column label="规格型号" align="center" prop="equipmentSpec" />
<el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" /> <el-table-column label="设备类型编码" align="center" prop="equipmentTypeCode" width="120" />
<el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/> <el-table-column label="设备类型名称" align="center" prop="equipmentTypeName" width="120"/>
<el-table-column label="所属车间编码" align="center" prop="workshopCode" width="120"/> <el-table-column label="所属工作中心编码" align="center" prop="workshopCode" width="150"/>
<el-table-column label="所属车间名称" align="center" prop="workshopName" width="120"/> <el-table-column label="所属工作中心名称" align="center" prop="workshopName" width="150"/>
<el-table-column label="设备状态" align="center" prop="status"> <el-table-column label="设备状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.status == 1 ? "正常" : "停用" }} {{ scope.row.status == 1 ? "正常" : "停用" }}
@ -167,13 +175,22 @@
</el-row> </el-row>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属车间编码" prop="workshopCode"> <el-form-item label="所属工作中心" prop="workCenter">
<el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" /> <template>
<el-select v-model="form.workCenter" filterable placeholder="请选择" @change="selectWorkCenter" style="width:355px">
<el-option
v-for="item in options1"
:key="item.factoryCode"
:label="item.factoryName"
:value="item.factoryCode">
</el-option>
</el-select>
</template>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属车间名称" prop="workshopName"> <el-form-item label="工作中心编码" prop="workshopCode">
<el-input v-model="form.workshopName" placeholder="请输入所属车间名称" /> <el-input v-model="form.workshopCode" placeholder="请输入所属车间编码" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -216,12 +233,16 @@
</template> </template>
<script> <script>
import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment } from "@/api/wms/equipment"; import { listEquipment, getEquipment, delEquipment, addEquipment, updateEquipment} from "@/api/wms/equipment";
import { getWorkCenterList,listFactory} from "@/api/wms/factory";
export default { export default {
name: "Equipment", name: "Equipment",
dicts: ['sys_normal_disable', 'equ_type'], dicts: ['sys_normal_disable', 'equ_type'],
data() { data() {
return { return {
workCenter:[],
options1: [],
value: '',
// 遮罩层 // 遮罩层
loading: true, loading: true,
// 选中数组 // 选中数组
@ -288,6 +309,9 @@ export default {
this.getList(); this.getList();
}, },
methods: { methods: {
selectWorkCenter(){
this.form.workshopCode = this.form.workCenter;
},
// 生成表头序号 // 生成表头序号
indexMethod(index){ indexMethod(index){
return index+1 ; return index+1 ;
@ -356,15 +380,24 @@ export default {
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset(); this.reset();
getWorkCenterList().then(response =>{
this.options1 = response.rows;
console.log(this.options1);
});
this.open = true; this.open = true;
this.title = "添加设备管理"; this.title = "添加设备管理";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
const equipmentId = row.equipmentId || this.ids const equipmentId = row.equipmentId || this.ids;
getWorkCenterList().then(response =>{
this.options1 = response.rows;
console.log(this.options1);
});
getEquipment(equipmentId).then(response => { getEquipment(equipmentId).then(response => {
this.form = response.data; this.form = response.data;
this.form.workCenter = this.form.workshopCode;
this.open = true; this.open = true;
this.title = "修改设备管理"; this.title = "修改设备管理";
}); });

Write Preview
Loading…
Cancel
Save