|
@@ -92,19 +92,19 @@
|
|
|
v-model="form.extInfo.teamId"
|
|
v-model="form.extInfo.teamId"
|
|
|
clearable
|
|
clearable
|
|
|
:filterable="true"
|
|
:filterable="true"
|
|
|
- @change="userListFn"
|
|
|
|
|
>
|
|
>
|
|
|
<el-option
|
|
<el-option
|
|
|
v-for="item in teamPagerList"
|
|
v-for="item in teamPagerList"
|
|
|
:key="item.id"
|
|
:key="item.id"
|
|
|
:label="item.name"
|
|
:label="item.name"
|
|
|
:value="item.id"
|
|
:value="item.id"
|
|
|
|
|
+ @click.native="userListFn(item)"
|
|
|
/>
|
|
/>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
- <el-form-item label="人员:" prop="extInfo.teamId">
|
|
|
|
|
|
|
+ <el-form-item label="人员:" prop="extInfo.userIds">
|
|
|
<el-select
|
|
<el-select
|
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
|
v-model="form.extInfo.userIds"
|
|
v-model="form.extInfo.userIds"
|
|
@@ -247,7 +247,7 @@
|
|
|
@click.native="handleProduce"
|
|
@click.native="handleProduce"
|
|
|
></el-input>
|
|
></el-input>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- </el-col>
|
|
|
|
|
|
|
+ </el-col> -->
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
|
|
<el-form-item label="所属工作中心:" prop="extInfo.workCenterId">
|
|
@@ -267,7 +267,7 @@
|
|
|
</el-option>
|
|
</el-option>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
- </el-col> -->
|
|
|
|
|
|
|
+ </el-col>
|
|
|
|
|
|
|
|
<el-col :span="8">
|
|
<el-col :span="8">
|
|
|
<el-form-item label="状态:" prop="enabled">
|
|
<el-form-item label="状态:" prop="enabled">
|
|
@@ -495,14 +495,20 @@
|
|
|
'extInfo.assetName': [
|
|
'extInfo.assetName': [
|
|
|
{ required: true, message: '请选择', trigger: 'change' }
|
|
{ required: true, message: '请选择', trigger: 'change' }
|
|
|
],
|
|
],
|
|
|
- 'extInfo.workshopId': {
|
|
|
|
|
|
|
+ 'extInfo.assetName': [
|
|
|
|
|
+ { required: true, message: '请选择', trigger: 'change' }
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'extInfo.assetName': [
|
|
|
|
|
+ { required: true, message: '请选择', trigger: 'change' }
|
|
|
|
|
+ ],
|
|
|
|
|
+ 'extInfo.teamId': {
|
|
|
required: true,
|
|
required: true,
|
|
|
- message: '请输入',
|
|
|
|
|
|
|
+ message: '请选择',
|
|
|
trigger: 'change'
|
|
trigger: 'change'
|
|
|
},
|
|
},
|
|
|
- 'extInfo.workCenterId': {
|
|
|
|
|
|
|
+ 'extInfo.userIds': {
|
|
|
required: true,
|
|
required: true,
|
|
|
- message: '请输入',
|
|
|
|
|
|
|
+ message: '请选择',
|
|
|
trigger: 'change'
|
|
trigger: 'change'
|
|
|
},
|
|
},
|
|
|
taskNames: {
|
|
taskNames: {
|
|
@@ -591,13 +597,14 @@
|
|
|
this.$refs.productRefs.open(this.form.extInfo, '选择设备', '4');
|
|
this.$refs.productRefs.open(this.form.extInfo, '选择设备', '4');
|
|
|
},
|
|
},
|
|
|
userListFn(e, init) {
|
|
userListFn(e, init) {
|
|
|
- console.log(e);
|
|
|
|
|
- let that = this;
|
|
|
|
|
- listUserByIds([e]).then((res) => {
|
|
|
|
|
- that.userList = res;
|
|
|
|
|
|
|
+ listUserByIds([e.teamId || e.id]).then((res) => {
|
|
|
|
|
+ this.userList = res;
|
|
|
});
|
|
});
|
|
|
if (!init) {
|
|
if (!init) {
|
|
|
- that.form.extInfo.userIds = [];
|
|
|
|
|
|
|
+ this.form.extInfo.userIds = [];
|
|
|
|
|
+ if (e.workCenterIds.length) {
|
|
|
|
|
+ this.form.extInfo.workCenterId = e.workCenterIds[0];
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
@@ -614,8 +621,6 @@
|
|
|
|
|
|
|
|
this.form.taskIds = [data.id];
|
|
this.form.taskIds = [data.id];
|
|
|
this.form.taskNames = [data.name];
|
|
this.form.taskNames = [data.name];
|
|
|
-
|
|
|
|
|
- this.form.extInfo.workCenterId = data.workCenterId;
|
|
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
determineChoose(title, row) {
|
|
determineChoose(title, row) {
|
|
@@ -906,7 +911,7 @@
|
|
|
this.form?.extInfo?.teamId &&
|
|
this.form?.extInfo?.teamId &&
|
|
|
typeof this.form?.extInfo?.teamId === 'string'
|
|
typeof this.form?.extInfo?.teamId === 'string'
|
|
|
) {
|
|
) {
|
|
|
- this.userListFn(this.form.extInfo.teamId, 'init');
|
|
|
|
|
|
|
+ this.userListFn(this.form.extInfo, 'init');
|
|
|
}
|
|
}
|
|
|
if (res.taskList?.length) {
|
|
if (res.taskList?.length) {
|
|
|
this.form.taskNames = res.taskList.map((i) => i.name);
|
|
this.form.taskNames = res.taskList.map((i) => i.name);
|