|
|
@@ -67,6 +67,24 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="3">
|
|
|
+ <el-form-item label="工序">
|
|
|
+ <el-select
|
|
|
+ filterable
|
|
|
+ collapse-tags
|
|
|
+ v-model="filterForm.data.workprocid"
|
|
|
+ placeholder=""
|
|
|
+ style="width: 100%;"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item of nameObj.workprocid.arr"
|
|
|
+ :key="item.id"
|
|
|
+ :value="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
@@ -103,7 +121,13 @@
|
|
|
@click="but_update"
|
|
|
:loading="loading"
|
|
|
v-privilege="activeMenu + 'PUT'"
|
|
|
- >修改轮次描述</el-button>
|
|
|
+ >修改轮次描述</el-button>
|
|
|
+ <el-switch
|
|
|
+ v-model="leftIssueShow"
|
|
|
+ active-text="显示全部"
|
|
|
+ inactive-text="隐藏已下发"
|
|
|
+ @change="leftIssueShowChange">
|
|
|
+ </el-switch>
|
|
|
<div style="float:right; text-align: right;">
|
|
|
<el-radio-group v-model="radio" @change="radioChange()">
|
|
|
<el-radio :label="0">
|
|
|
@@ -827,12 +851,21 @@
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
<el-dialog
|
|
|
- title="炼钢轮次描述-修改"
|
|
|
+ title="高线轮次描述-修改"
|
|
|
:visible.sync="dialog.editorBox3.show"
|
|
|
width="400px"
|
|
|
:close-on-click-modal="false"
|
|
|
:show-close="!loading">
|
|
|
<div>
|
|
|
+ <div class="lastData">查询到工序 <el-tag size="medium">
|
|
|
+ {{ nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType] ?
|
|
|
+ nameObj.workprocid.obj[lastIssuedData.arr[0].workprocType].name :
|
|
|
+ lastIssuedData.arr[0].workprocType }}</el-tag> 最近一次下发的数据：
|
|
|
+ <div>轮次计划 <el-tag size="small">{{lastIssuedData.arr[0].id}}</el-tag></div>
|
|
|
+ <div>国贸订单 <el-tag size="small">{{lastIssuedData.arr[0].parentid}}</el-tag></div>
|
|
|
+ <div>下发时间 <el-tag size="small">{{lastIssuedData.arr[0].issuedTime}}</el-tag></div>
|
|
|
+ <div>轮次描述 <el-tag size="small">{{lastIssuedData.arr[0].describe}}</el-tag></div>
|
|
|
+ </div>
|
|
|
<el-form
|
|
|
:model="dialog.editorBox3.form.data"
|
|
|
ref="dialog_form3"
|
|
|
@@ -902,7 +935,7 @@ export default {
|
|
|
Gmid: '',
|
|
|
timegranid: '',
|
|
|
clock: '',
|
|
|
- workprocid: '',
|
|
|
+ workprocid: 'AT2005',
|
|
|
workprocType: '',
|
|
|
workproc_type: '',
|
|
|
energyid: '',
|
|
|
@@ -943,17 +976,17 @@ export default {
|
|
|
pageNum1: 1,
|
|
|
pageSize1: 100,
|
|
|
total1: 0,
|
|
|
- singleTableHeight: 100,
|
|
|
+ singleTableHeight: 100,
|
|
|
+ leftIssueShow: false,
|
|
|
leftTableData: [],
|
|
|
- leftTableDataObj: {},
|
|
|
+ leftTableDataObj: {},
|
|
|
+ leftTableDataAll: [],
|
|
|
leftTableLoading: false,
|
|
|
leftTableWidth: 550,
|
|
|
difference: 0,
|
|
|
rightTableData: [],
|
|
|
- rightTableObj: {
|
|
|
- },
|
|
|
- leftData: {
|
|
|
- },
|
|
|
+ rightTableObj: {},
|
|
|
+ leftData: {},
|
|
|
multipleSelection: [],
|
|
|
multipleSelectionAscLeft: [],
|
|
|
tableFormDataObj: {},
|
|
|
@@ -1201,6 +1234,17 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ },
|
|
|
+ lastIssuedData: {
|
|
|
+ obj: {},
|
|
|
+ arr: [{
|
|
|
+ id: '',
|
|
|
+ parentid: '',
|
|
|
+ describe: '',
|
|
|
+ issuedTime: '',
|
|
|
+ currentDescribe: '',
|
|
|
+ workprocType: ''
|
|
|
+ }]
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
@@ -1363,7 +1407,7 @@ export default {
|
|
|
getTableData (pageNum1) {
|
|
|
let that = this,
|
|
|
params = {
|
|
|
- workprocType: that.filterForm.data.workproc_type,
|
|
|
+ workprocType: that.filterForm.data.workprocid,
|
|
|
startTime: that.filterForm.data.clock[0],
|
|
|
endTime: that.filterForm.data.clock[1],
|
|
|
id: that.filterForm.data.Gmid,
|
|
|
@@ -1438,8 +1482,10 @@ export default {
|
|
|
yxf_weight: item.YXF_WEIGHT,
|
|
|
tag: item.TAG ? item.TAG : '0'
|
|
|
};
|
|
|
- }
|
|
|
- that.leftTableData = arr;
|
|
|
+ }
|
|
|
+ that.leftTableDataAll = arr;
|
|
|
+ that.leftIssueShow = false;
|
|
|
+ that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
that.leftTableDataObj = obj;
|
|
|
that.total1 = res.data.total;
|
|
|
that.dialog.fRow = null;
|
|
|
@@ -2473,11 +2519,13 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
that.$refs['dialog_form3'].clearValidate();
|
|
|
}, 100);
|
|
|
+ that.getLastIssuedData();
|
|
|
that.dialog.editorBox3.show = true;
|
|
|
} else {
|
|
|
this.$message.error('至少要选择一条数据');
|
|
|
}
|
|
|
},
|
|
|
+ // 轮次描述复制
|
|
|
but_copy () {
|
|
|
let that = this;
|
|
|
that.$refs['dialog_form3'].validate((valid) => {
|
|
|
@@ -2488,6 +2536,47 @@ export default {
|
|
|
that.dialog.editorBox3.show = false;
|
|
|
}
|
|
|
});
|
|
|
+ },
|
|
|
+ // 显示/隐藏
|
|
|
+ leftIssueShowChange (val) {
|
|
|
+ let that = this;
|
|
|
+ if (val) {
|
|
|
+ that.leftTableData = that.leftTableDataAll;
|
|
|
+ } else {
|
|
|
+ that.leftTableData = that.leftTableDataAll.filter(item => item.kxf_weight > 0);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ // 获取最后一次下发的数据
|
|
|
+ getLastIssuedData () {
|
|
|
+ let that = this;
|
|
|
+ let id = 'G-G1';
|
|
|
+ if (that.filterForm.data.workprocid === 'AT2006') {
|
|
|
+ id = 'G-G2';
|
|
|
+ }
|
|
|
+ let url = 'pass/ems/v1/emsprodplanrounds/getLastIssuedData/';
|
|
|
+ that.axios.get(url, {
|
|
|
+ params: {
|
|
|
+ id: id,
|
|
|
+ workprocType: that.filterForm.data.workprocid
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .then(function (res) {
|
|
|
+ if (res.code === '0') {
|
|
|
+ let arr = [];
|
|
|
+ let obj = {};
|
|
|
+ for (let item of res.data) {
|
|
|
+ // console.log('获取当前工序最后一次下发的数据');
|
|
|
+ // item.currentDescribe = item.describe.substring(8);
|
|
|
+ // item.currentDescribe = item.currentDescribe.replace(/[^0-9]/ig,"");
|
|
|
+ arr.push(item);
|
|
|
+ obj[id] = item;
|
|
|
+ }
|
|
|
+ that.lastIssuedData.arr = arr;
|
|
|
+ that.lastIssuedData.obj = obj;
|
|
|
+ } else {
|
|
|
+ that.$message.error(res.message);
|
|
|
+ }
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -2550,6 +2639,12 @@ function sortNumber (a, b) {
|
|
|
}
|
|
|
td .el-form-item__error {
|
|
|
position: static;
|
|
|
+ }
|
|
|
+ .lastData {
|
|
|
+ margin: 0px 0px 10px 5px;
|
|
|
+ div {
|
|
|
+ margin: 3px;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
</style>
|
QuietShadow