Merge branch 'bjxz-cjw' into bjxz-dev

This commit is contained in:
Vce 2024-05-30 11:54:59 +08:00
commit 103b87a61d

View File

@ -1767,6 +1767,33 @@
label-position="top"
label-width="80px"
>
<!-- 选择企业 -->
<el-form-item
:label="$t('message.laborMange.set')"
prop="enterpriseId"
:rules="[
{
required: true,
message: $t('message.laborMange.pleaseSelectMoveTo'),
trigger: 'change',
},
]"
>
<el-select
v-model="batchMoveForm.enterpriseId"
:placeholder="$t('message.laborMange.pleaseChoose')"
@change="changeMoveCompany"
style="width: 100%"
>
<el-option
v-for="item in enterpriseListData"
:key="item.id"
:label="item.enterpriseName"
:value="item.id"
></el-option>
</el-select>
</el-form-item>
<!-- 选择部门 -->
<el-form-item
:label="$t('message.laborMange.mobileDivision')"
prop="departmentId"
@ -2190,6 +2217,7 @@ export default {
batchMoveDialog: false, //
//
batchMoveForm: {
enterpriseId: "",
departmentId: "",
},
moveTeamList: [], //
@ -3601,12 +3629,35 @@ export default {
batchMove() {
this.batchMoveDialog = true;
this.batchMoveForm = {
enterpriseId: "",
departmentId: "",
};
setTimeout(() => {
this.$refs["batchMoveForm"].clearValidate();
}, 120);
},
//
changeMoveCompany(value) {
this.batchMoveForm.departmentId = "";
let data = {
enterpriseId: value,
projectSn: this.projectSn,
};
getDepartmentInfoList(data).then((res) => {
console.log("移动时,部门列表数据=====", res);
if (res.code == 200) {
// this.checkedTeamId = 0;
// this.checkedTeamId = type !== 1 ? 0 : this.checkedTeamId;
this.teamListData = res.result;
// this.getTableData();
}
});
// getTeamInfoList(data).then((res) => {
// if (res.code == 200) {
// this.moveTeamList = res.result;
// }
// });
},
//
saveBatchMove(formName) {