Merge remote-tracking branch 'origin/master'

yangwl
mengjiao 2 months ago
commit 3ae5a42a97

@ -313,14 +313,14 @@ export default {
setInterval(() => this.getAlarmData(), 1000 * 60);
this.poolNameList = JSON.parse(localStorage.getItem("POOL_NAME_LIST"));
this.poolName = localStorage.getItem("USER_POOL_NAME_CURRENT");
/**
//
this.getUnReadList();
//
this.timer = setInterval(() => {
setTimeout(this.getUnReadList(), 30000);
}, 30000);
**/
},
components: {
Breadcrumb,

@ -444,7 +444,7 @@
<el-row>
<el-col class="my-step-mar" :span="24">
<el-input
placeholder="请输入名称并按回车查询"
placeholder="请输入设备编码,按搜索按钮查询"
v-model="equipmentItemSearch"
class="input-with-select"
style="width: 400px"
@ -1273,7 +1273,11 @@ export default {
// this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
// }
// }
//
this.equipmentItemList = [];
for (let i = 0; i < response.data.equipmentItem.length; i++) {
this.equipmentItemList.push(response.data.equipmentItem[i]);
};
this.loading = false;
this.open = true;
this.title = "修改计划";

@ -161,7 +161,7 @@
label="备品备件号"
align="center"
prop="materialCode"
width="120"
width="150"
/>
<el-table-column
label="备品备件名称"
@ -180,7 +180,7 @@
label="设备厂家"
align="center"
prop="spareSupplier"
width="200"
width="250"
/>
<el-table-column
label="规格型号"

@ -463,7 +463,7 @@
<el-row>
<el-col class="my-step-mar" :span="24">
<el-input
placeholder="请输入名称并按回车查询"
placeholder="请输入设备编码,按搜索按钮查询"
v-model="equipmentItemSearch"
class="input-with-select"
style="width: 400px"
@ -1310,6 +1310,11 @@ export default {
// }
// }
//
this.equipmentItemList = [];
for (let i = 0; i < response.data.equipmentItem.length; i++) {
this.equipmentItemList.push(response.data.equipmentItem[i]);
};
this.loading = false;
this.open = true;
this.title = "修改计划";

@ -500,7 +500,7 @@
<el-row>
<el-col class="my-step-mar" :span="24">
<el-input
placeholder="请输入名称并按回车查询"
placeholder="请输入设备编码,按搜索按钮查询"
v-model="equipmentItemSearch"
class="input-with-select"
style="width: 400px"
@ -1683,7 +1683,6 @@ export default {
initUpdatePlanInfo(row).then(response => {
this.form = response.data;
this.selectPersonList = response.data.personListVO;
for (let i = 0; i < this.form.equipmentItem.length; i++) {
@ -1693,9 +1692,12 @@ export default {
for (let j = 0; j < this.form.equipmentItem[i].equPlanDetailList.length; j++) {
this.form.equipmentItem[i].itemTempName = this.form.equipmentItem[i].itemTempName + this.form.equipmentItem[i].equPlanDetailList[j].itemName + ","
}
}
//
this.equipmentItemList = [];
for (let i = 0; i < response.data.equipmentItem.length; i++) {
this.equipmentItemList.push(response.data.equipmentItem[i]);
};
this.loading = false;
this.open = true;
this.title = "修改计划";

@ -448,6 +448,8 @@
</el-table-column>
<el-table-column label="单位" width="50" align="center" prop="unit" />
<el-table-column label="反冲标识" align="center" prop="recoil" />
<el-table-column label="单位数量" align="center" prop="erfmg" />
<el-table-column label="条目单位" align="center" prop="erfme" />
<el-table-column label="sap项目编码" align="center" prop="rspos" />
<el-table-column label="仓库" width="150" align="center" prop="warehouseCode">
<template slot-scope="scope">

@ -520,7 +520,7 @@
</el-date-picker>
</el-form-item>
</el-col>
<!-- 选择班次 -->
<el-col :span="12">
<el-form-item size="small" label="选择班次" class="my-select my-first">
@ -1531,6 +1531,11 @@ export default {
//
handleAutoSplit(row) {
this.autoSplitList = this.orderCodes;
if(this.orderCodes[0].prodDesc.includes("出口")){
this.$modal.msgError("物料描述有包含‘出口’信息,请手工折单!");
return
}
if(this.autoSplitList[0].status != 'o0'){
this.$modal.msgError("请选择完全未拆分的订单!");
return
@ -1650,7 +1655,7 @@ export default {
this.activeSplit = 0;
});
},
handleClose() {
handleClose() {
this.cancel();
},
shiftFormat(row,column){

@ -655,6 +655,14 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="电表编号" prop="attr2">
<el-input
v-model="form.attr2"
placeholder="请输入电表编号"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="24">

Loading…
Cancel
Save