Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/business/group/addprofession.vue

@@ -181,7 +181,6 @@ export default {
     // 确定
     handleOk() {
       this.$refs.formData.validate(async (valid) => {
-        console.log(this.form.parentId);
         if (valid) {
           this.confirmLoading = true;
           let res = await saveBusiness({

base-manager-ui/admin/src/pages/basicset/dept/components/addWindowBusiness.vue

@@ -54,7 +54,7 @@
           }"
           :columns="columns"
           :data-source="siteBusinessList"
-          :rowKey="(record) => record.id"
+          :rowKey="(record) => record.businessId"
           :row-selection="{
             selectedRowKeys: rowKeys,
             onChange: handleChange,
@@ -193,17 +193,17 @@ export default {
     onSelectRow(record, selected) {
       if (selected && record.children && record.children.length) {
         record.children.forEach((v) => {
-          this.rowKeys = [...new Set([...this.rowKeys, v.id])];
+          this.rowKeys = [...new Set([...this.rowKeys, v.businessId])];
         });
       } else if (!selected && record.children && record.children.length) {
-        this.rowKeys = this.rowKeys.filter((v) => v != record.id);
+        this.rowKeys = this.rowKeys.filter((v) => v != record.businessId);
         record.children.forEach((v) => {
-          this.rowKeys = this.rowKeys.filter((val) => val != v.id);
+          this.rowKeys = this.rowKeys.filter((val) => val != v.businessId);
         });
       } else if (selected && record.parentId) {
         this.rowKeys = [...new Set([...this.rowKeys, record.parentId])];
       } else if (!selected) {
-        this.rowKeys = this.rowKeys.filter((v) => v != record.id);
+        this.rowKeys = this.rowKeys.filter((v) => v != record.businessId);
       }
     },
     // 保存窗口关联业务