|
@@ -293,7 +293,10 @@
|
|
|
<script>
|
|
<script>
|
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
import dictMixins from '@/mixins/dictMixins';
|
|
|
import parentList from '@/components/contact/parentList.vue';
|
|
import parentList from '@/components/contact/parentList.vue';
|
|
|
- import { producetaskrulerecordSaveOrUpdateAndSubmit,getById } from '@/api/recordRules/index.js';
|
|
|
|
|
|
|
+ import {
|
|
|
|
|
+ producetaskrulerecordSaveOrUpdateAndSubmit,
|
|
|
|
|
+ getById
|
|
|
|
|
+ } from '@/api/recordRules/index.js';
|
|
|
import deptSelect from '@/components/CommomSelect/dept-select.vue';
|
|
import deptSelect from '@/components/CommomSelect/dept-select.vue';
|
|
|
import { getUserPage } from '@/api/system/organization';
|
|
import { getUserPage } from '@/api/system/organization';
|
|
|
import { getteampage, getTeam } from '@/api/main/index.js';
|
|
import { getteampage, getTeam } from '@/api/main/index.js';
|
|
@@ -645,14 +648,19 @@
|
|
|
);
|
|
);
|
|
|
console.log(this.allTeamList[index], 'dsadas');
|
|
console.log(this.allTeamList[index], 'dsadas');
|
|
|
this.teamUserList = this.allTeamList[index].userVOList;
|
|
this.teamUserList = this.allTeamList[index].userVOList;
|
|
|
-
|
|
|
|
|
- this.productLineList = this.allTeamList[
|
|
|
|
|
- index
|
|
|
|
|
- ].factoryWorkstationVOList.map((item) => {
|
|
|
|
|
- return {
|
|
|
|
|
- name: item.productionLineName,
|
|
|
|
|
- id: item.productionLineId
|
|
|
|
|
- };
|
|
|
|
|
|
|
+ this.productLineList = [];
|
|
|
|
|
+
|
|
|
|
|
+ this.allTeamList[index].factoryWorkstationVOList.forEach((item) => {
|
|
|
|
|
+ if (
|
|
|
|
|
+ !this.productLineList.find(
|
|
|
|
|
+ (p) => p.id === item.productionLineId
|
|
|
|
|
+ )
|
|
|
|
|
+ ) {
|
|
|
|
|
+ this.productLineList.push({
|
|
|
|
|
+ name: item.productionLineName,
|
|
|
|
|
+ id: item.productionLineId
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
console.log('this.teamUserList', this.teamUserList);
|
|
console.log('this.teamUserList', this.teamUserList);
|