|
@@ -5,7 +5,8 @@
|
|
|
<el-tab-pane label="人工填写过表号功能号" name="first"></el-tab-pane>
|
|
|
<!-- <el-tab-pane label="多个标识对应同一个信息点" name="second"></el-tab-pane> -->
|
|
|
</el-tabs>
|
|
|
- <el-table :data="tableData" style="width: 100%;max-height:400px;min-height:200px;" height="calc(100% - 160px)" @expand-change="expandRow" ref="expandTable">
|
|
|
+ <el-table :data="tableData" style="width: 100%;max-height:400px;min-height:200px;" height="calc(100% - 160px)" @expand-change="expandRow"
|
|
|
+ ref="expandTable">
|
|
|
<el-table-column type="expand" class-name="bgf5">
|
|
|
<template slot-scope="scope">
|
|
|
<el-row>
|
|
@@ -54,7 +55,7 @@
|
|
|
</el-table>
|
|
|
<span slot="footer" class="dialog-footer">
|
|
|
<span style="font-size:12px;color:red;" v-show="finished">请处理所有冲突</span>
|
|
|
- <el-button size="small">取消</el-button>
|
|
|
+ <el-button size="small" @click="handleClose">取消</el-button>
|
|
|
<el-button size="small" type="primary" @click="userSelected">使用选择的表号功能号</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
@@ -75,6 +76,7 @@ export default {
|
|
|
tableData: [],
|
|
|
activeName: "first", //当前所在tab页
|
|
|
finished: false, //未处理所有冲突提示文字
|
|
|
+ force: false, //请求冲突-默认false
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
@@ -87,7 +89,10 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
handleClick() { },
|
|
|
- handleClose(done) { },
|
|
|
+ handleClose() {
|
|
|
+ this.dialogVisible = false;
|
|
|
+ this.$emit('cancel')
|
|
|
+ },
|
|
|
//检查是否处理完所有冲突
|
|
|
userSelected() {
|
|
|
let flag = true;
|
|
@@ -136,7 +141,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
//确认冲突
|
|
|
- confirmClash(){
|
|
|
+ confirmClash() {
|
|
|
// let selectedRows = this.tableData.filter(item => {
|
|
|
// return item.checked == 'Old'
|
|
|
// })
|
|
@@ -144,8 +149,8 @@ export default {
|
|
|
let param = [];
|
|
|
selectedRows.map(t => {
|
|
|
let tempObj = {
|
|
|
- Objs:[t],
|
|
|
- Points:[t]
|
|
|
+ Objs: [t],
|
|
|
+ Points: [t]
|
|
|
}
|
|
|
param.push(tempObj)
|
|
|
})
|
|
@@ -154,7 +159,7 @@ export default {
|
|
|
})
|
|
|
},
|
|
|
//执行规则
|
|
|
- rulesConfirm(){
|
|
|
+ rulesConfirm() {
|
|
|
let param = {
|
|
|
Force: this.force
|
|
|
}
|
|
@@ -162,7 +167,8 @@ export default {
|
|
|
this.$message.success('执行成功');
|
|
|
this.dialogVisible = false;
|
|
|
this.tableData = []
|
|
|
- this.$emit('refresh')
|
|
|
+ let missionID = res.Content[0].Id
|
|
|
+ this.$emit('refresh', missionID)
|
|
|
})
|
|
|
}
|
|
|
},
|