|
|
@@ -104,15 +104,15 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="场站" prop="postName">
|
|
|
- <el-input
|
|
|
+ <el-form-item label="场站" prop="productLineId">
|
|
|
+ <!-- <el-input
|
|
|
v-model="addForm.postName"
|
|
|
size="small"
|
|
|
placeholder="自动带出"
|
|
|
disabled
|
|
|
>
|
|
|
- </el-input>
|
|
|
- <!-- <el-select
|
|
|
+ </el-input> -->
|
|
|
+ <el-select
|
|
|
v-model="addForm.productLineId"
|
|
|
placeholder="请选择场站"
|
|
|
filterable
|
|
|
@@ -126,7 +126,7 @@
|
|
|
@click.native="addForm.productLineName = item.name"
|
|
|
>
|
|
|
</el-option>
|
|
|
- </el-select> -->
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8" v-if="dispatchStatus && addForm.type == 0">
|
|
|
@@ -1140,8 +1140,8 @@
|
|
|
this.addForm.teamId = '';
|
|
|
this.addForm.teamName = '';
|
|
|
this.addForm.executeIdList = [];
|
|
|
- // this.addForm.productLineName = '';
|
|
|
- // this.addForm.productLineId = '';
|
|
|
+ this.addForm.productLineName = '';
|
|
|
+ this.addForm.productLineId = '';
|
|
|
this.productLineList = [];
|
|
|
},
|
|
|
//选择部门(搜索)
|
|
|
@@ -1541,21 +1541,21 @@
|
|
|
(item) => item.id === this.addForm.teamId
|
|
|
);
|
|
|
this.addForm.teamName = currentTeam.name;
|
|
|
- // 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) {
|
|
|
// // 同步执行人
|