joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改收令单位不显示调度命令问题

Browse Source
This commit is contained in:
dong 2023-04-19 10:41:17 +08:00
parent c52925960c
commit d082dc2fbc
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/theme/components/menus/dialog/cmdManage.vue
View File

@ -38,18 +38,18 @@
<span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span> <span style="margin-left: 10px">{{ getStateInfo(scope.row.rcvCompanies).time || '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="发令单位"> <el-table-column label="发令单位" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span> <span style="margin-left: 10px">{{ scope.row.sendCompany ? scope.row.sendCompany.name : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="sender" label="发令人" /> <el-table-column prop="sender" label="发令人" show-overflow-tooltip />
<el-table-column label="签否"> <el-table-column label="签否">
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span> <span style="margin-left: 10px">{{ getSignedStatus(getStateInfo(scope.row.rcvCompanies)) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="签收人"> <el-table-column label="签收人" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span> <span style="margin-left: 10px">{{ getSignedBy(scope.row.rcvCompanies) || '' }}</span>
</template> </template>
@ -352,7 +352,10 @@ export default {
}, },
findDisCmdObj(obj, val) { findDisCmdObj(obj, val) {
return Object.values(obj).find(item => { return Object.values(obj).find(item => {
return item.rcvCompanies[0].id == val; const find = item.rcvCompanies.find(ii => {
return ii.id == val;
});
return find;
}); });
}, },
searchCmd() { searchCmd() {

6
src/views/newMap/display/terminals/dispatchCmd.vue
View File

@ -1324,11 +1324,8 @@ export default {
console.log('tabClick'); console.log('tabClick');
}, },
selectionChange(selection) { selectionChange(selection) {
this.command.rcvCompanies = [];
selection.forEach(item => { selection.forEach(item => {
const find = this.command.rcvCompanies.find(every => {
return item.code == every.code;
});
if (!find) {
const obj = { const obj = {
name: item.name, name: item.name,
rsCompany: true, rsCompany: true,
@ -1337,7 +1334,6 @@ export default {
...item ...item
}; };
this.command.rcvCompanies.push(obj); this.command.rcvCompanies.push(obj);
}
}); });
}, },
getCompanyIdList(sum) { getCompanyIdList(sum) {