|
|
@@ -114,7 +114,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8" v-if="addForm.type == 1">
|
|
|
+ <!-- <el-col :span="8" v-if="addForm.type == 1">
|
|
|
<el-form-item label="场站" prop="productLineId">
|
|
|
<el-select
|
|
|
v-model="addForm.productLineId"
|
|
|
@@ -132,7 +132,7 @@
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
+ </el-col> -->
|
|
|
<el-col :span="8" v-if="addForm.autoOrder && addForm.type == 0">
|
|
|
<el-form-item label="部门" prop="groupId">
|
|
|
<deptSelect
|
|
|
@@ -1271,7 +1271,9 @@
|
|
|
codeNumber: data.codeNumber,
|
|
|
fixCode: data.fixCode,
|
|
|
id: data.deviceId,
|
|
|
- name: data.deviceName
|
|
|
+ name: data.deviceName,
|
|
|
+ postId: data.postId,
|
|
|
+ postName: data.postName
|
|
|
}
|
|
|
];
|
|
|
}
|
|
|
@@ -1538,21 +1540,21 @@
|
|
|
const currentTeam = this.teamAllList.find(
|
|
|
(item) => item.id === this.addForm.teamId
|
|
|
);
|
|
|
- if (!init) {
|
|
|
- this.addForm.productLineName = '';
|
|
|
- this.addForm.productLineId = '';
|
|
|
- }
|
|
|
- this.productLineList = [];
|
|
|
- currentTeam.factoryWorkstationVOList.forEach((item) => {
|
|
|
- if (
|
|
|
- !this.productLineList.find((p) => p.id === item.productionLineId)
|
|
|
- ) {
|
|
|
- this.productLineList.push({
|
|
|
- name: item.productionLineName,
|
|
|
- id: item.productionLineId
|
|
|
- });
|
|
|
- }
|
|
|
- });
|
|
|
+ // if (!init) {
|
|
|
+ // this.addForm.productLineName = '';
|
|
|
+ // this.addForm.productLineId = '';
|
|
|
+ // }
|
|
|
+ // this.productLineList = [];
|
|
|
+ // currentTeam.factoryWorkstationVOList.forEach((item) => {
|
|
|
+ // if (
|
|
|
+ // !this.productLineList.find((p) => p.id === item.productionLineId)
|
|
|
+ // ) {
|
|
|
+ // this.productLineList.push({
|
|
|
+ // name: item.productionLineName,
|
|
|
+ // id: item.productionLineId
|
|
|
+ // });
|
|
|
+ // }
|
|
|
+ // });
|
|
|
if (currentTeam) {
|
|
|
// 同步执行人
|
|
|
this.addForm.executeUsers = [
|
