|
@@ -50,7 +50,7 @@
|
|
|
<div class="dispatch-process-meta">
|
|
<div class="dispatch-process-meta">
|
|
|
工序编码:{{ taskCodeDisplay(activeTask) }},所属班组:{{
|
|
工序编码:{{ taskCodeDisplay(activeTask) }},所属班组:{{
|
|
|
dispatchTeamDisplay(activeTask)
|
|
dispatchTeamDisplay(activeTask)
|
|
|
- }}
|
|
|
|
|
|
|
+ }},班组长:{{ dispatchTeamLeaderDisplay(activeTask) }}
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<div class="dispatch-toolbar">
|
|
<div class="dispatch-toolbar">
|
|
@@ -697,6 +697,14 @@
|
|
|
'teamNames',
|
|
'teamNames',
|
|
|
'executionTeamName'
|
|
'executionTeamName'
|
|
|
];
|
|
];
|
|
|
|
|
+ const DISPATCH_TEAM_LEADER_NAME_KEYS = [
|
|
|
|
|
+ 'dispatchTeamLeader',
|
|
|
|
|
+ 'executionTeamLeader',
|
|
|
|
|
+ 'teamLeaderUserName',
|
|
|
|
|
+ 'leaderUserName',
|
|
|
|
|
+ 'firstTaskTeamLeader',
|
|
|
|
|
+ 'executionLeaderName'
|
|
|
|
|
+ ];
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: 'TaskConfigPanel',
|
|
name: 'TaskConfigPanel',
|
|
@@ -1915,8 +1923,8 @@
|
|
|
this.$set(task, 'executionObjectType', '');
|
|
this.$set(task, 'executionObjectType', '');
|
|
|
this.$set(task, 'executionObjectName', '');
|
|
this.$set(task, 'executionObjectName', '');
|
|
|
this.$set(task, 'executionTeamName', '');
|
|
this.$set(task, 'executionTeamName', '');
|
|
|
- this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
- this.$set(task, 'executionTeamLeaderId', '');
|
|
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeaderId', '');
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
createDispatchTaskRow(row) {
|
|
createDispatchTaskRow(row) {
|
|
@@ -1960,8 +1968,8 @@
|
|
|
this.$set(task, 'executionObjectType', '');
|
|
this.$set(task, 'executionObjectType', '');
|
|
|
this.$set(task, 'executionObjectName', '');
|
|
this.$set(task, 'executionObjectName', '');
|
|
|
this.$set(task, 'executionTeamName', '');
|
|
this.$set(task, 'executionTeamName', '');
|
|
|
- this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
- this.$set(task, 'executionTeamLeaderId', '');
|
|
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeaderId', '');
|
|
|
},
|
|
},
|
|
|
clearDispatchTaskBinding(row, task = this.getDispatchRowTask(row)) {
|
|
clearDispatchTaskBinding(row, task = this.getDispatchRowTask(row)) {
|
|
|
if (!task) {
|
|
if (!task) {
|
|
@@ -1977,8 +1985,8 @@
|
|
|
this.$set(task, 'executionObjectType', '');
|
|
this.$set(task, 'executionObjectType', '');
|
|
|
this.$set(task, 'executionObjectName', '');
|
|
this.$set(task, 'executionObjectName', '');
|
|
|
this.$set(task, 'executionTeamName', '');
|
|
this.$set(task, 'executionTeamName', '');
|
|
|
- this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
- this.$set(task, 'executionTeamLeaderId', '');
|
|
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeaderId', '');
|
|
|
},
|
|
},
|
|
|
clearDispatchQuantityInput(row) {
|
|
clearDispatchQuantityInput(row) {
|
|
|
this.clearDispatchObject(row);
|
|
this.clearDispatchObject(row);
|
|
@@ -2072,8 +2080,8 @@
|
|
|
this.$set(task, 'executionObjectType', '');
|
|
this.$set(task, 'executionObjectType', '');
|
|
|
this.$set(task, 'executionObjectName', '');
|
|
this.$set(task, 'executionObjectName', '');
|
|
|
this.$set(task, 'executionTeamName', '');
|
|
this.$set(task, 'executionTeamName', '');
|
|
|
- this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
- this.$set(task, 'executionTeamLeaderId', '');
|
|
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeader', '');
|
|
|
|
|
+ // this.$set(task, 'executionTeamLeaderId', '');
|
|
|
},
|
|
},
|
|
|
clearDispatchStartTime(row) {
|
|
clearDispatchStartTime(row) {
|
|
|
if (row) {
|
|
if (row) {
|
|
@@ -2690,6 +2698,17 @@
|
|
|
]) || '所有班组'
|
|
]) || '所有班组'
|
|
|
);
|
|
);
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
|
|
+ dispatchTeamLeaderDisplay(row = this.activeTask) {
|
|
|
|
|
+ const plan = this.currentPlan || {};
|
|
|
|
|
+ return (
|
|
|
|
|
+ this.pickDispatchSingleValue([
|
|
|
|
|
+ { source: row || {}, keys: DISPATCH_TEAM_LEADER_NAME_KEYS },
|
|
|
|
|
+ { source: plan, keys: DISPATCH_TEAM_LEADER_NAME_KEYS }
|
|
|
|
|
+ ]) || '-'
|
|
|
|
|
+ );
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
handleDispatchPageSizeChange(size) {
|
|
handleDispatchPageSizeChange(size) {
|
|
|
this.dispatchPageSize = size;
|
|
this.dispatchPageSize = size;
|
|
|
this.dispatchPage = 1;
|
|
this.dispatchPage = 1;
|