Merge remote-tracking branch 'origin/main'

src/main/resources/views/platform/sys/union/branchUnionCommitteeMemberManage.js

@@ -92,8 +92,7 @@ const branchUnionCommitteeMemberManage = {
                 sessionId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
                 userId: [{required: true, message: "必填", trigger: ["change", "blur"]}],
             },
-            sessionOptions: [],
-            pageDataUrl:"/platform/sys/committeeMember/pageData"
+            sessionOptions: []
         }
     },
     methods: {
@@ -108,6 +107,12 @@ const branchUnionCommitteeMemberManage = {
                 }
             })
         },
+        pageData() {
+            $.get("/platform/sys/committeeMember/pageData", this.pageForm).then((res) => {
+                this.tableData = res.data.list
+                this.pageForm.totalCount = res.data.totalCount
+            })
+        },
         openAdd() {
             this.dialogFormVisible = true
             this.$nextTick(() => {
@@ -119,7 +124,7 @@ const branchUnionCommitteeMemberManage = {
                 if (!valid) return
                 const session = this.sessionOptions.find(item => item.id === this.formData.sessionId)
                 this.formData.sessionName = session.fullName
-                this.$axios.post("/platform/sys/committeeMember/insert", this.formData).then((res) => {
+                $.post("/platform/sys/committeeMember/insert", this.formData).then((res) => {
                     this.dialogFormVisible = false
                     this.$message.success(res.msg)
                     this.pageData()
@@ -132,7 +137,7 @@ const branchUnionCommitteeMemberManage = {
                 cancelButtonText: "取消",
                 type: "info"
             }).then(() => {
-                this.$axios.post("/platform/sys/committeeMember/delete", {id}).then((res) => {
+                $.post("/platform/sys/committeeMember/delete", {id}).then((res) => {
                     this.$message.success(res.msg)
                     this.pageData()
                 })
@@ -144,7 +149,7 @@ const branchUnionCommitteeMemberManage = {
                 cancelButtonText: "取消",
                 type: "info"
             }).then(() => {
-                this.$axios.post("/platform/sys/committeeMember/deleteRole", {sessionId:this.pageForm.sessionId}).then((res) => {
+                $.post("/platform/sys/committeeMember/deleteRole", {sessionId:this.pageForm.sessionId}).then((res) => {
                     this.$message.success(res.msg)
                     this.pageData()
                 })

src/main/resources/views/platform/sys/union/branchUnionUserManage.js

@@ -51,13 +51,13 @@ const branchUnionUserManage = {
                             <user-select
                                 v-model="formData.userId"
                                 style="width: 100%"
-                                api="/platform/sys/union/listUserSelect"
+                                api="/platform/sys/union/listUnion"
                                 :api_params="{ unionId: union_id }"
                                 :option_label_func="
-                            (item) => {
-                                return item.username + item.loginname + '(' + item.unitName + ')'
-                            }
-                        "
+                                    (item) => {
+                                        return item.username + item.loginname + '(' + item.unitName + ')'
+                                    }
+                                "
                             ></user-select>
                         </el-form-item>
                     </el-form>