Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/department/DialogSupplierSelect.vue

@@ -116,7 +116,8 @@ const selections = ref([]);
  */
 function open(data) {
   visible.value = true;
-  queryParams.value.deptId = data;
+  queryParams.value.deptId = data.deptId;
+  queryParams.value.tenantId = data.tenantId;
   getList();
 }
 

src/views/business/department/form.vue

@@ -248,8 +248,10 @@ function submitForm() {
 }
 //打开选择外协商弹窗
 function handleSelectSupplierSingle() {
-  proxy.$refs.selectSupplierRef.open(
-    form.value.deptId == "" ? 0 : form.value.deptId
+  proxy.$refs.selectSupplierRef.open({
+    deptId:form.value.deptId == "" ? 0 : form.value.deptId,
+    tenantId:form.value.tenantId == "" ? 0 : form.value.tenantId
+  }
   );
 }
 //外协商带回

src/views/business/department/index.vue

@@ -226,6 +226,7 @@ function handleAddBatchUsers() {
 	const userInfo = {}
 	userInfo.identifying = true
 	userInfo.deptId = currentDept.value.id
+	userInfo.tenantId = currentDept.value.tenantId
 	proxy.$refs.personRef.open(userInfo)
 }
 /**员工多选带回 */
@@ -235,6 +236,7 @@ function handleMultipleSelected(selection) {
 		var newPerson = {}
 		newPerson.userId = selection[i].userId
 		newPerson.deptId = currentDept.value.id
+		newPerson.tenantId = currentDept.value.tenantId
 		newList.push(newPerson)
 	}
 	saveDeptUser(newList).then((response) => {

src/views/dialog/person.vue

@@ -87,6 +87,7 @@ const { queryParams } = toRefs(data)
  * 对话框打开 事件
  */
 function open(userInfo) {
+  console.log(userInfo)
   //部门管理新增
   if (userInfo.identifying) {
     identifying.value = userInfo.identifying
@@ -97,6 +98,9 @@ function open(userInfo) {
   if (userInfo.userIds) {
     userIds.value = userInfo.userIds
   }
+  if(userInfo.tenantId != null){
+    queryParams.value.tenantId = userInfo.tenantId
+  }
   visible.value = true
   getList()
 }