Merge branch 'master' into houxq

src/pages/manage/grzx/zhxx.vue

@@ -40,7 +40,7 @@ async function initDetailInfo(flag) {
 
 const currentIndex = ref(0);
 async function initData(user_role_id_ext) {
-  let { code, data } = await request({ url: "/txwx/user_role/index", data: { tur_id: user_role_id_ext, limit: "100" } });
+  let { code, data } = await request({ url: "/txwx/user_role/index", data: { tur_id: user_role_id_ext, limit: "100", M5jxrcL: "" } });
   if (code == 1) {
     userData.value = data.page_data;
   }

src/pages/manage/jcxxgl/xxgl/index_xj.vue

@@ -72,10 +72,7 @@
           <el-input class="rank" v-model="ruleForm.sm_email" />
         </el-form-item>
         <el-form-item label="详细地址" prop="detail_area">
-          <el-input
-            class="rank"
-            v-model="ruleForm.detail_area"
-          />
+          <el-input class="rank" v-model="ruleForm.detail_area" />
         </el-form-item>
       </div>
       <el-form-item label="学校风采" prop="sm_brief">
@@ -111,10 +108,10 @@ let ruleForm = $ref({
   sm_address: [],
   sm_period: "",
   detail_area: "",
-  sm_email:'',
-  sm_brief:''
+  sm_email: "",
+  sm_brief: "",
+  sm_address_detail: '',
 });
-
 request({
   url:'/school/main/detail',
   data:{
@@ -125,9 +122,21 @@ request({
     Object.keys(ruleForm).forEach((key, item)=>{
       ruleForm[key] = res.data.one_info[key]
     })
-    ruleForm.sm_address = [res.data.one_info.sm_area_id1,res.data.one_info.sm_area_id2,res.data.one_info?.sm_area_id3];
+   if (res.data.one_info.sm_area_id1 * 1 >= 32 && res.data.one_info.sm_area_id1 * 1 <= 36) {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2
+      ];
+    } else {
+      ruleForm.sm_address = [
+        res.data.one_info.sm_area_id1,
+        res.data.one_info.sm_area_id2,
+        res.data.one_info?.sm_area_id3 == 0 ? '' : res.data.one_info?.sm_area_id3,
+      ];
+    }
     ruleForm.detail_area = res.data.one_info.sm_address;
     ruleForm.sm_brief = res.data.one_info.sm_brief;
+    handleChange(ruleForm.sm_address)
   }
 })
 
@@ -177,18 +186,29 @@ request({
   }
 });
 
-function handleChange(val) {
-  console.log(val);
-  val.forEach((item) => {
-    request({
-      url: "/common/district/search",
+let address_name = [];
+
+async function handleChange(val) {
+  console.log(ruleForm.sm_address, 'rule');
+  console.log(val, 'val');
+  address_name = [];
+  let name = '';
+  for (var key in val) {
+    await request({
+      url: "/common/district/detail",
       data: {
-        id: item,
+        id: val[key],
       },
-    }).then((res) => {});
-  });
+    }).then((res) => {
+      if (res.code == "1") {
+        address_name.push(res.data.one_info.name);
+        console.log(address_name);
+      }
+    }).catch(err => {
+      console.log(err);
+    });
+  }
 }
-
 // 地址级联
 let address = $ref("");
 let props = {
@@ -241,25 +261,25 @@ let props = {
 
 
 let isButton = $ref(false);
-let isEdit;
 // 提交
 function submitForm(formName) {
   if (!formName) return;
   formName.validate((valid) => {
     let data = {
-      id:'10025',
+      id: user.value.sm_id,
+      // id: '10001',
       school_main: {
-        ..._.omit(ruleForm, "sm_address", "detail_area"),
-        sm_ms_lat: latitude,
-        sm_ms_lng: longitude,
+        ..._.omit(ruleForm, "sm_address", "detail_area", 'sm_address_detail'),
         sm_address: ruleForm.detail_area,
         sm_area_id1: ruleForm.sm_address[0],
+        sm_area_id1_name: address_name[0],
         sm_area_id2: ruleForm.sm_address[1],
+        sm_area_id2_name: address_name[1],
         sm_area_id3: ruleForm?.sm_address[2],
+        sm_area_id3_name: address_name[2],
       },
     };
     if (valid) {
-      if (!isEdit) {
         isButton = true;
         request({
           url: "/school/main/edit",
@@ -274,9 +294,6 @@ function submitForm(formName) {
             isButton = false;
           }
         });
-      } else {
-        isButton = false;
-      }
     } else {
       isButton = false;
     }

src/pages/manage/jcxxgl/xxgl/xj_detail.vue

@@ -27,13 +27,14 @@
 </template>
 <script setup>
 import { useRouter } from "vue-router";
+import { user } from '@/store/index'
 const router = useRouter();
 let detailData = $ref({});
 let https = window.GLOBAL_CONFIG.api;
 request({
   url: "/school/main/detail",
   data: {
-    id: "10025",
+    id: user.value.sm_id,
   },
 }).then((res) => {
   if (res.code == "1") {

src/pages/manage/yhxx/jdxx/index.vue

@@ -3,37 +3,19 @@
     <div class="search flex justify-between bg-white rounded-md">
       <el-form :inline="true" class="demo-form-inline" size="default">
         <el-form-item>
-          <el-input
-            v-model="form_query.ue_jbxx_ju_sydw"
-            placeholder="请输入事业单位"
-            class="w-40"
-            @change="initData"
-            clearable
-          />
+          <el-input v-model="form_query.ue_jbxx_ju_sydw" placeholder="请输入事业单位" class="w-40" @change="initData" clearable />
           <!-- <el-select v-model="form_query.ue_jbxx_ju_sydw" placeholder="全部事业单位" class="w-40" @change="initData">
             <el-option v-for="item in sydwList" :key="item" :label="item" :value="item" />
           </el-select> -->
         </el-form-item>
         <el-form-item>
-          <el-input
-            v-model="form_query.ue_jbxx_ju_bm"
-            placeholder="请输入部门"
-            class="w-40"
-            @change="initData"
-            clearable
-          />
+          <el-input v-model="form_query.ue_jbxx_ju_bm" placeholder="请输入部门" class="w-40" @change="initData" clearable />
           <!-- <el-select v-model="form_query.ue_jbxx_ju_bm" placeholder="全部部门" class="w-40" @change="initData">
             <el-option v-for="item in bmList" :key="item" :label="item" :value="item" />
           </el-select> -->
         </el-form-item>
         <el-form-item>
-          <el-input
-            v-model="form_query.ue_jbxx_ju_zw"
-            placeholder="请输入职位"
-            class="w-40"
-            @change="initData"
-            clearable
-          />
+          <el-input v-model="form_query.ue_jbxx_ju_zw" placeholder="请输入职位" class="w-40" @change="initData" clearable />
           <!-- <el-select v-model="form_query.ue_jbxx_ju_zw" placeholder="全部职位" class="w-40" @change="initData">
             <el-option v-for="item in zwList" :key="item" :label="item" :value="item" />
           </el-select> -->
@@ -48,52 +30,23 @@
         <div>
           <el-button type="primary" @click="handleAdd">新增</el-button>
           <el-button type="primary" @click="exportAll">导出</el-button>
-          <import-button
-            url="/user/main"
-            :d="{ user_role_id: '3' }"
-            @success="initData"
-          >
+          <import-button url="/user/main" :d="{ user_role_id: '3' }" @success="initData">
             <template #text>批量导入</template>
           </import-button>
-          <el-button
-            type="danger"
-            @click="handleMulDelete"
-            :disabled="multipleSelection.length == 0"
-            >删除</el-button
-          >
+          <el-button type="danger" @click="handleMulDelete" :disabled="multipleSelection.length == 0">删除</el-button>
         </div>
         <div class="flex content-center">
-          <el-input
-            v-model="form_query.keyword"
-            class="w-40 mx-2"
-            size="small"
-            placeholder="请输搜索关键词"
-            :suffix-icon="Search"
-            clearable
-          />
+          <el-input v-model="form_query.keyword" class="w-40 mx-2" size="small" placeholder="请输搜索关键词" :suffix-icon="Search" clearable />
 
           <el-button type="primary" @click="initData">搜索</el-button>
         </div>
       </div>
       <el-table :data="tableData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column
-          prop="user_id"
-          label="ID"
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          prop="user_name"
-          label="账号"
-          width="180"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="user_realname"
-          label="姓名"
-          width="150"
-        ></el-table-column>
-        <el-table-column prop="ue_jbxx_ju_sydw" label="事业单位" >
+        <el-table-column prop="user_id" label="ID" width="100"></el-table-column>
+        <el-table-column prop="user_name" label="账号" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="user_realname" label="姓名" width="150"></el-table-column>
+        <el-table-column prop="ue_jbxx_ju_sydw" label="事业单位">
           <template #default="scope">
             {{ scope.row.ext.ue_jbxx_ju_sydw }}
           </template>
@@ -110,87 +63,38 @@
         </el-table-column>
         <el-table-column label="操作" width="245">
           <template #default="scope">
-            <el-button type="text" @click="handleDetail(scope.row.user_id)"
-              >详情 |</el-button
-            >
-            <el-button type="text" @click="handleEdit(scope.row)"
-              >编辑 |</el-button
-            >
-            <el-button type="text" @click="handleDelete(scope.row.user_id)"
-              >删除
+            <el-button type="text" @click="handleDetail(scope.row.user_id)">详情 |</el-button>
+            <el-button type="text" @click="handleEdit(scope.row)">编辑 |</el-button>
+            <el-button type="text" @click="handleDelete(scope.row.user_id)">删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="flex justify-end my-10">
-        <el-pagination
-          v-model:current-page="form_query.page"
-          v-model:page-size="form_query.limit"
-          layout="total,sizes, prev, pager, next, jumper"
-          :total="total"
-          :background="true"
-          @current-change="initData"
-          :hide-on-single-page="false"
-        />
+        <el-pagination v-model:current-page="form_query.page" v-model:page-size="form_query.limit" layout="total,sizes, prev, pager, next, jumper" :total="total" :background="true" @current-change="initData" :hide-on-single-page="false" />
       </div>
       <el-dialog v-model="dialogVisible" :title="title" width="780px">
-        <el-form
-          ref="ruleFormRef"
-          :model="ruleForm"
-          :rules="rules"
-          label-width="120px"
-          class="demo-ruleForm"
-          :size="formSize"
-          status-icon
-        >
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="120px" class="demo-ruleForm" :size="formSize" status-icon>
           <h3 class="text-hex-00A3FF">账号信息</h3>
           <div class="flex">
             <el-form-item label="账号：" prop="user_name">
               <el-input class="rank" v-model="ruleForm.user_name" />
             </el-form-item>
             <el-form-item label="密码：" prop="user_password">
-              <el-input
-                class="rank"
-                v-model="ruleForm.user_password"
-                :disabled="isEdit"
-              />
+              <el-input class="rank" v-model="ruleForm.user_password" :disabled="isEdit" />
             </el-form-item>
           </div>
           <div class="flex">
             <el-form-item label="用户角色：" prop="user_role_id_sub">
-              <el-select
-                multiple
-                collapse-tags
-                v-model="userRoleData"
-                filterable
-                clearable
-                @change="handleRoleChange"
-              >
-                <el-option
-                  v-for="(item, index) in roleList"
-                  :key="index"
-                  :label="item.tur_role_name"
-                  :value="item.tur_id"
-                />
+              <el-select multiple collapse-tags v-model="userRoleData" filterable clearable @change="handleRoleChange">
+                <el-option v-for="(item, index) in roleList" :key="index" :label="item.tur_role_name" :value="item.tur_id" />
               </el-select>
-              <el-button
-                type="primary"
-                class="ml-100px"
-                plain
-                @click="setRoleDialogVisible = true"
-                >自定义角色</el-button
-              >
+              <el-button type="primary" class="ml-100px" plain @click="setRoleDialogVisible = true">自定义角色</el-button>
             </el-form-item>
           </div>
           <h3 class="text-hex-00A3FF">基本信息</h3>
           <el-form-item label="头像：">
-            <file-upload-progress
-              v-if="dialogVisible"
-              v-model:part="ruleForm.user_avatar"
-              :limit="1"
-              accept=".jpg,.jpeg,.webp,.png"
-              :size-limit="500 * 1024"
-            >
+            <file-upload-progress v-if="dialogVisible" v-model:part="ruleForm.user_avatar" :limit="1" accept=".jpg,.jpeg,.webp,.png" :size-limit="500 * 1024">
               <el-button type="primary"> 点击上传 </el-button>
 
               <template #tip>
@@ -251,30 +155,15 @@
         </el-form>
         <div class="text-center">
           <el-button @click="dialogVisible = false">取消</el-button>
-          <el-button
-            type="primary"
-            :disabled="isButton"
-            @click="handleSubmit(ruleFormRef)"
-          >
+          <el-button type="primary" :disabled="isButton" @click="handleSubmit(ruleFormRef)">
             确定
           </el-button>
         </div>
       </el-dialog>
-      <el-dialog
-        v-model="detailDialogVisible"
-        class="_"
-        width="778"
-        title="详情"
-      >
+      <el-dialog v-model="detailDialogVisible" class="_" width="778" title="详情">
         <img class="avatar" :src="ruleForm.user_avatar" />
 
-        <el-form
-          class="grid grid-cols-2"
-          ref="ruleFormRef"
-          label-position="right"
-          label-width="90px"
-          :model="detailForm"
-        >
+        <el-form class="grid grid-cols-2" ref="ruleFormRef" label-position="right" label-width="90px" :model="detailForm">
           <el-form-item label="账号:">
             {{ detailForm.user_name }}
           </el-form-item>
@@ -308,26 +197,12 @@
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" type="primary" @click="handleFormCancel"
-              >返回</el-button
-            >
+            <el-button size="large" type="primary" @click="handleFormCancel">返回</el-button>
           </span>
         </template>
       </el-dialog>
-      <el-dialog
-        v-model="setRoleDialogVisible"
-        class="_"
-        width="565"
-        title="自定义角色"
-        destroy-on-close
-        @close="handleClose"
-      >
-        <el-form
-          class="table"
-          ref="ruleFormRef1"
-          :model="roleData"
-          :rules="roleRules"
-        >
+      <el-dialog v-model="setRoleDialogVisible" class="_" width="565" title="自定义角色" destroy-on-close @close="handleClose">
+        <el-form class="table" ref="ruleFormRef1" :model="roleData" :rules="roleRules">
           <el-form-item label="角色名：" prop="tur_role_name" class="w-270px">
             <el-input v-model="roleData.tur_role_name" type="text" />
           </el-form-item>
@@ -339,11 +214,7 @@
         <template #footer>
           <span class="flex_center space-x-12">
             <el-button size="large" @click="handleClose">取消</el-button>
-            <el-button
-              size="large"
-              type="primary"
-              @click="PermissionSubmit(ruleFormRef1)"
-            >
+            <el-button size="large" type="primary" @click="PermissionSubmit(ruleFormRef1)">
               确定
             </el-button>
           </span>
@@ -413,7 +284,7 @@ let roleRules = $ref({
 //角色列表
 let roleList = $ref([]);
 function initRoleData() {
-  role_list().then((res) => {
+  role_list({ limit: "100", M5jxrcL: "" }).then((res) => {
     if (res.code === "1") {
       roleList = res.data.page_data;
     }
@@ -510,8 +381,8 @@ function handleDetail(id) {
           detailData.gender == 1
             ? "男"
             : detailData.gender == 2
-            ? "女"
-            : "保密",
+              ? "女"
+              : "保密",
         ue_jbxx_ju_sydw: detailData.ext.ue_jbxx_ju_sydw,
         ue_jbxx_ju_zw: detailData.ext.ue_jbxx_ju_zw,
         ue_jbxx_ju_bm: detailData.ext.ue_jbxx_ju_bm,
@@ -648,7 +519,7 @@ function handleMulDelete() {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 // 单个删除
 function handleDelete(id) {
@@ -674,7 +545,7 @@ function handleDelete(id) {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 function exportAll() {
   let ids = multipleSelection.join(",");

src/pages/manage/yhxx/jsgl/index.vue

@@ -3,13 +3,7 @@
     <div class="search flex justify-between bg-white rounded-md">
       <el-form :inline="true" class="demo-form-inline" size="default">
         <el-form-item>
-           <el-input
-            v-model="form_query.ue_jbxx_ju_sydw"
-            placeholder="请输入事业单位"
-            class="w-40"
-            @change="initData"
-            clearable
-          />
+          <el-input v-model="form_query.ue_jbxx_ju_sydw" placeholder="请输入事业单位" class="w-40" @change="initData" clearable />
           <!-- <el-select
             v-model="form_query.ue_jbxx_ju_sydw"
             placeholder="全部事业单位"
@@ -34,33 +28,17 @@
         <div>
           <el-button type="primary" @click="exportAll">导出</el-button>
           <el-button type="primary" @click="toModify()">角色权限修改</el-button>
-          <el-button
-            type="danger"
-            @click="handleMulDelete"
-            :disabled="multipleSelection.length == 0"
-            >删除</el-button
-          >
+          <el-button type="danger" @click="handleMulDelete" :disabled="multipleSelection.length == 0">删除</el-button>
         </div>
         <div class="flex content-center">
-          <el-input
-            v-model="form_query.keyword"
-            class="w-40 mx-2"
-            size="small"
-            placeholder="请输搜索关键词"
-            :suffix-icon="Search"
-            clearable
-          />
+          <el-input v-model="form_query.keyword" class="w-40 mx-2" size="small" placeholder="请输搜索关键词" :suffix-icon="Search" clearable />
           <el-button type="primary" @click="initData">搜索</el-button>
         </div>
       </div>
       <el-table :data="tableData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="user_realname" label="姓名"></el-table-column>
-        <el-table-column
-          prop="user_name"
-          label="账号"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column prop="user_name" label="账号" show-overflow-tooltip></el-table-column>
         <el-table-column prop="user_realname" label="性别"></el-table-column>
         <el-table-column prop="ue_jbxx_ju_sydw" label="事业单位">
           <template #default="scope">
@@ -83,96 +61,42 @@
         <el-table-column label="操作" width="120">
           <template #default="scope">
             <!-- <el-button type="text" @click="setMorePermission(scope.row)">添加额外权限 |</el-button> -->
-            <el-button
-              type="text"
-              @click="
+            <el-button type="text" @click="
                 handleDetail(scope.row.user_id), (detailDialogVisible = true)
-              "
-              >详情 |</el-button
-            >
-            <el-button type="text" @click="handleDelete(scope.row.user_id)"
-              >删除
+              ">详情 |</el-button>
+            <el-button type="text" @click="handleDelete(scope.row.user_id)">删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="flex justify-end my-10">
-        <el-pagination
-          v-model:current-page="form_query.page"
-          v-model:page-size="form_query.limit"
-          layout="total,sizes, prev, pager, next, jumper"
-          :total="total"
-          :background="true"
-          @current-change="initData"
-          :hide-on-single-page="false"
-        />
+        <el-pagination v-model:current-page="form_query.page" v-model:page-size="form_query.limit" layout="total,sizes, prev, pager, next, jumper" :total="total" :background="true" @current-change="initData" :hide-on-single-page="false" />
       </div>
 
-      <el-dialog
-        v-model="setRoleDialogVisible"
-        class="_"
-        width="600"
-        title="添加额外权限"
-        destroy-on-close
-      >
-        <el-form
-          class="table"
-          :model="roleForm"
-          ref="ruleFormRef"
-          label-position="right"
-          label-width="90px"
-        >
+      <el-dialog v-model="setRoleDialogVisible" class="_" width="600" title="添加额外权限" destroy-on-close>
+        <el-form class="table" :model="roleForm" ref="ruleFormRef" label-position="right" label-width="90px">
           <el-form-item label="角色:">
-            <el-select
-              v-model="roleForm.current"
-              class="w-40"
-              @change="initRoleData"
-            >
-              <el-option
-                v-for="(item, index) in roleData"
-                :key="index"
-                :label="item.tur_role_name"
-                :value="index"
-              />
+            <el-select v-model="roleForm.current" class="w-40" @change="initRoleData">
+              <el-option v-for="(item, index) in roleData" :key="index" :label="item.tur_role_name" :value="index" />
             </el-select>
           </el-form-item>
           <el-form-item label="额外权限:">
-            <menu-item
-              v-model="roleForm.tur_role_menu"
-              :extraName="roleForm.extraName"
-            ></menu-item>
+            <menu-item v-model="roleForm.tur_role_menu" :extraName="roleForm.extraName"></menu-item>
           </el-form-item>
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" @click="setRoleDialogVisible = false"
-              >取消</el-button
-            >
-            <el-button
-              size="large"
-              type="primary"
-              @click="setRoleDialogVisible = false"
-            >
+            <el-button size="large" @click="setRoleDialogVisible = false">取消</el-button>
+            <el-button size="large" type="primary" @click="setRoleDialogVisible = false">
               确定
             </el-button>
           </span>
         </template>
       </el-dialog>
 
-      <el-dialog
-        v-model="detailDialogVisible"
-        class="_"
-        width="778"
-        title="详情"
-      >
+      <el-dialog v-model="detailDialogVisible" class="_" width="778" title="详情">
         <img class="avatar" :src="ruleForm.user_avatar" />
-        <el-form
-          class="grid grid-cols-2"
-          ref="ruleFormRef"
-          label-position="right"
-          label-width="90px"
-          :model="detailForm"
-        >
+        <el-form class="grid grid-cols-2" ref="ruleFormRef" label-position="right" label-width="90px" :model="detailForm">
           <el-form-item label="账号:">
             {{ detailForm.user_name }}
           </el-form-item>
@@ -206,9 +130,7 @@
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" type="primary" @click="handleFormCancel"
-              >返回</el-button
-            >
+            <el-button size="large" type="primary" @click="handleFormCancel">返回</el-button>
           </span>
         </template>
       </el-dialog>
@@ -238,6 +160,7 @@ async function setMorePermission(item) {
   let obj = {
     tur_id: item.user_role_id_ext,
     limit: 999,
+    M5jxrcL: ""
   };
   let { code, data } = await request({
     url: "/txwx/user_role/index",
@@ -362,8 +285,8 @@ function handleDetail(id) {
           detailData.gender == 1
             ? "男"
             : detailData.gender == 2
-            ? "女"
-            : "保密",
+              ? "女"
+              : "保密",
         ue_jbxx_ju_sydw: detailData.ext.ue_jbxx_ju_sydw,
         ue_jbxx_ju_zw: detailData.ext.ue_jbxx_ju_zw,
         ue_jbxx_ju_bm: detailData.ext.ue_jbxx_ju_bm,
@@ -402,7 +325,7 @@ function handleMulDelete() {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 //单个删除
 function handleDelete(id) {
@@ -428,7 +351,7 @@ function handleDelete(id) {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 function handleFormCancel() {
   detailDialogVisible.value = false;

src/pages/manage/yhxx/jsgl/rolePermission.vue

@@ -3,13 +3,7 @@
     <div class="search flex justify-between bg-white rounded-md">
       <el-form :inline="true" class="demo-form-inline" size="default">
         <el-form-item>
-          <el-input
-            v-model="form_query.ue_jbxx_ju_sydw"
-            placeholder="请输入事业单位"
-            class="w-40"
-            @change="initData"
-            clearable
-          />
+          <el-input v-model="form_query.ue_jbxx_ju_sydw" placeholder="请输入事业单位" class="w-40" @change="initData" clearable />
           <!-- <el-select v-model="form_query.ue_jbxx_ju_sydw" placeholder="全部事业单位" class="w-40" @change="initData">
             <el-option v-for="item in sydwList" :key="item" :label="item" :value="item" />
           </el-select> -->
@@ -26,36 +20,17 @@
           <import-button url="/txwx/user_role" @success="initData">
             <template #text>批量导入</template>
           </import-button>
-          <el-button type="primary" @click="addPermission()"
-            >新增自定义角色</el-button
-          >
-          <el-button
-            type="danger"
-            @click="handleMulDelete"
-            :disabled="multipleSelection.length == 0"
-            >删除</el-button
-          >
+          <el-button type="primary" @click="addPermission()">新增自定义角色</el-button>
+          <el-button type="danger" @click="handleMulDelete" :disabled="multipleSelection.length == 0">删除</el-button>
         </div>
         <div class="flex content-center">
-          <el-input
-            v-model="form_query.keyword"
-            class="w-40 mx-2"
-            size="small"
-            placeholder="请输搜索关键词"
-            :suffix-icon="Search"
-            clearable
-          />
+          <el-input v-model="form_query.keyword" class="w-40 mx-2" size="small" placeholder="请输搜索关键词" :suffix-icon="Search" clearable />
           <el-button type="primary" @click="initData">搜索</el-button>
         </div>
       </div>
       <el-table :data="tableData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column
-          prop="tur_role_name"
-          label="角色名"
-          width="500"
-          show-overflow-tooltip
-        ></el-table-column>
+        <el-table-column prop="tur_role_name" label="角色名" width="500" show-overflow-tooltip></el-table-column>
         <el-table-column prop="user_grade_num" label="注册时间">
           <template #default="scope">
             {{ scope.row.ex.create_dateline }}
@@ -63,43 +38,21 @@
         </el-table-column>
         <el-table-column label="操作" width="245">
           <template #default="scope">
-            <el-button type="text" @click="Staffing(scope.row)"
-              >配置人员 |</el-button
-            >
-            <el-button type="text" @click="editPermission(scope.row.tur_id)"
-              >编辑 |</el-button
-            >
-            <el-button type="text" @click="handleDelete(scope.row.tur_id)"
-              >删除
+            <el-button type="text" @click="Staffing(scope.row)">配置人员 |</el-button>
+            <el-button type="text" @click="editPermission(scope.row.tur_id)">编辑 |</el-button>
+            <el-button type="text" @click="handleDelete(scope.row.tur_id)">删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="flex justify-end my-10">
-        <el-pagination
-          v-model:current-page="form_query.page"
-          v-model:page-size="form_query.limit"
-          layout="total,sizes, prev, pager, next, jumper"
-          :total="total"
-          :background="true"
-          @current-change="initData"
-          :hide-on-single-page="false"
-        />
+        <el-pagination v-model:current-page="form_query.page" v-model:page-size="form_query.limit" layout="total,sizes, prev, pager, next, jumper" :total="total" :background="true" @current-change="initData" :hide-on-single-page="false" />
       </div>
 
-      <el-dialog
-        v-model="setRoleDialogVisible"
-        width="565"
-        destroy-on-close
-        :title="title"
-      >
+      <el-dialog v-model="setRoleDialogVisible" width="565" destroy-on-close :title="title">
         <el-form ref="ruleFormRef" :model="roleData" :rules="roleRules">
           <el-form-item label="角色名：" prop="tur_role_name" class="w-270px">
-            <el-input
-              size="small"
-              v-model="roleData.tur_role_name"
-              type="text"
-            />
+            <el-input size="small" v-model="roleData.tur_role_name" type="text" />
           </el-form-item>
           <el-form-item label="" prop="tur_role_menu">
             <div class="w-full">设置权限：</div>
@@ -108,14 +61,8 @@
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" @click="setRoleDialogVisible = false"
-              >取消</el-button
-            >
-            <el-button
-              size="large"
-              type="primary"
-              @click="PermissionSubmit(ruleFormRef)"
-            >
+            <el-button size="large" @click="setRoleDialogVisible = false">取消</el-button>
+            <el-button size="large" type="primary" @click="PermissionSubmit(ruleFormRef)">
               确定
             </el-button>
           </span>
@@ -123,42 +70,21 @@
       </el-dialog>
 
       <!-- 配置人员对话框 -->
-      <el-dialog
-        v-model="StaffingDialogVisible"
-        class="_"
-        width="565"
-        title="配置人员"
-      >
-        <el-form
-          ref="ruleFormRef"
-          :model="userForm"
-          label-position="right"
-          label-width="90px"
-        >
+      <el-dialog v-model="StaffingDialogVisible" class="_" width="565" title="配置人员">
+        <el-form ref="ruleFormRef" :model="userForm" label-position="right" label-width="90px">
           <el-form-item label="角色名：" prop="tur_role_name" class="w-295px">
             {{ roleName }}
           </el-form-item>
           <el-form-item label="配置人员：">
             <el-select v-model="userForm.user_id" multiple>
-              <el-option
-                v-for="item in userData"
-                :key="item.user_id"
-                :label="item.user_realname"
-                :value="item.user_id"
-              />
+              <el-option v-for="item in userData" :key="item.user_id" :label="item.user_realname" :value="item.user_id" />
             </el-select>
           </el-form-item>
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" @click="StaffingDialogVisible = false"
-              >取消</el-button
-            >
-            <el-button
-              size="large"
-              type="primary"
-              @click="handleSubmit(ruleFormRef)"
-            >
+            <el-button size="large" @click="StaffingDialogVisible = false">取消</el-button>
+            <el-button size="large" type="primary" @click="handleSubmit(ruleFormRef)">
               确定
             </el-button>
           </span>
@@ -207,6 +133,7 @@ let form_query = $ref({
   limit: 6,
   keyword: "",
   user_role_id: "3",
+  M5jxrcL: ""
 });
 
 //列表
@@ -264,7 +191,7 @@ function handleMulDelete() {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 //单个删除
 function handleDelete(id) {
@@ -285,7 +212,7 @@ function handleDelete(id) {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 
 let roleData = $ref({

src/pages/manage/yhxx/jsxx/index.vue

@@ -3,51 +3,18 @@
     <div class="search flex justify-between bg-white rounded-md">
       <el-form :inline="true" class="demo-form-inline" size="default">
         <el-form-item label="">
-          <el-select
-            v-model="form_query.sm_id"
-            filterable
-            clearable
-            placeholder="全部学校"
-            @change="initData"
-          >
-            <el-option
-              v-for="(item, index) in tableSchoolData"
-              :key="index"
-              :label="item.sm_name"
-              :value="item.id"
-            />
+          <el-select v-model="form_query.sm_id" filterable clearable placeholder="全部学校" @change="initData">
+            <el-option v-for="(item, index) in tableSchoolData" :key="index" :label="item.sm_name" :value="item.id" />
           </el-select>
         </el-form-item>
         <el-form-item label="">
-          <el-select
-            placeholder="全部年级"
-            v-model="form_query.user_grade_num"
-            @change="initData"
-             filterable
-            clearable
-          >
-            <el-option
-              v-for="(item, index) in tableGradeData"
-              :key="index"
-              :label="item.tjzn_njmc"
-              :value="item.tjzn_id"
-            />
+          <el-select placeholder="全部年级" v-model="form_query.user_grade_num" @change="initData" filterable clearable>
+            <el-option v-for="(item, index) in tableGradeData" :key="index" :label="item.tjzn_njmc" :value="item.tjzn_id" />
           </el-select>
         </el-form-item>
         <el-form-item label="">
-          <el-select
-            v-model="form_query.subject_id"
-            placeholder="全部学科"
-            @change="initData"
-             filterable
-            clearable
-          >
-            <el-option
-              v-for="(item, index) in tableSubjectData"
-              :key="index"
-              :label="item.tjzx_xkmc"
-              :value="item.tjzx_id"
-            />
+          <el-select v-model="form_query.subject_id" placeholder="全部学科" @change="initData" filterable clearable>
+            <el-option v-for="(item, index) in tableSubjectData" :key="index" :label="item.tjzx_xkmc" :value="item.tjzx_id" />
           </el-select>
         </el-form-item>
       </el-form>
@@ -60,51 +27,22 @@
         <div>
           <el-button type="primary" @click="handleAdd">新增</el-button>
           <el-button type="primary" @click="exportAll">导出</el-button>
-          <import-button
-            url="/user/main"
-            :d="{ user_role_id: '75' }"
-            @success="initData"
-          >
+          <import-button url="/user/main" :d="{ user_role_id: '75' }" @success="initData">
             <template #text>批量导入</template>
           </import-button>
-          <el-button
-            type="danger"
-            @click="handleMulDelete"
-            :disabled="multipleSelection.length == 0"
-            >删除</el-button
-          >
+          <el-button type="danger" @click="handleMulDelete" :disabled="multipleSelection.length == 0">删除</el-button>
         </div>
         <div class="flex content-center">
-          <el-input
-            v-model="form_query.keyword"
-            class="w-40 mx-2"
-            size="small"
-            placeholder="请输搜索关键词"
-            :suffix-icon="Search"
-            clearable
-          />
+          <el-input v-model="form_query.keyword" class="w-40 mx-2" size="small" placeholder="请输搜索关键词" :suffix-icon="Search" clearable />
           <el-button type="primary" @click="initData">搜索</el-button>
         </div>
       </div>
       <el-table :data="tableData" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-        <el-table-column
-          prop="user_id"
-          label="ID"
-          width="100"
-        ></el-table-column>
-        <el-table-column
-          prop="user_name"
-          label="账号"
-          width="180"
-          show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column
-          prop="user_realname"
-          label="姓名"
-          width="150"
-        ></el-table-column>
-        <el-table-column prop="sm_id" label="学校" >
+        <el-table-column prop="user_id" label="ID" width="100"></el-table-column>
+        <el-table-column prop="user_name" label="账号" width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="user_realname" label="姓名" width="150"></el-table-column>
+        <el-table-column prop="sm_id" label="学校">
           <template #default="scope">
             <div v-for="item in tableSchoolData" :key="item.id">
               <span v-if="item.id == scope.row.sm_id">{{ item.sm_name }}</span>
@@ -115,88 +53,39 @@
         <el-table-column prop="subject_id" label="学科"> </el-table-column>
         <el-table-column label="操作" width="245">
           <template #default="scope">
-            <el-button type="text" @click="handleDetail(scope.row.user_id)"
-              >详情 |</el-button
-            >
-            <el-button type="text" @click="handleEdit(scope.row)"
-              >编辑 |</el-button
-            >
-            <el-button type="text" @click="handleDelete(scope.row.user_id)"
-              >删除
+            <el-button type="text" @click="handleDetail(scope.row.user_id)">详情 |</el-button>
+            <el-button type="text" @click="handleEdit(scope.row)">编辑 |</el-button>
+            <el-button type="text" @click="handleDelete(scope.row.user_id)">删除
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <div class="flex justify-end my-10">
-        <el-pagination
-          v-model:current-page="form_query.page"
-          v-model:page-size="form_query.limit"
-          layout="total,sizes, prev, pager, next, jumper"
-          :total="total"
-          :background="true"
-          @current-change="initData"
-          :hide-on-single-page="false"
-        />
+        <el-pagination v-model:current-page="form_query.page" v-model:page-size="form_query.limit" layout="total,sizes, prev, pager, next, jumper" :total="total" :background="true" @current-change="initData" :hide-on-single-page="false" />
       </div>
 
       <el-dialog v-model="dialogVisible" :title="title" width="780px">
-        <el-form
-          ref="ruleFormRef"
-          :model="ruleForm"
-          :rules="rules"
-          label-width="120px"
-          class="demo-ruleForm"
-          :size="formSize"
-          status-icon
-        >
+        <el-form ref="ruleFormRef" :model="ruleForm" :rules="rules" label-width="120px" class="demo-ruleForm" :size="formSize" status-icon>
           <h3 class="text-hex-00A3FF">账号信息</h3>
           <div class="flex">
             <el-form-item label="账号：" prop="user_name">
               <el-input class="rank" v-model="ruleForm.user_name" />
             </el-form-item>
             <el-form-item label="密码：" prop="user_password">
-              <el-input
-                class="rank"
-                :disabled="isEdit"
-                v-model="ruleForm.user_password"
-              />
+              <el-input class="rank" :disabled="isEdit" v-model="ruleForm.user_password" />
             </el-form-item>
           </div>
           <div class="flex">
             <el-form-item label="用户角色：" prop="user_role_id_sub">
-              <el-select
-                multiple
-                collapse-tags
-                v-model="userRoleData"
-                filterable
-                clearable
-                @change="handleRoleChange"
-              >
-                <el-option
-                  v-for="(item, index) in roleList"
-                  :key="index"
-                  :label="item.tur_role_name"
-                  :value="item.tur_id"
-                />
+              <el-select multiple collapse-tags v-model="userRoleData" filterable clearable @change="handleRoleChange">
+                <el-option v-for="(item, index) in roleList" :key="index" :label="item.tur_role_name" :value="item.tur_id" />
               </el-select>
-              <el-button
-                type="primary"
-                class="ml-100px"
-                plain
-                @click="setRoleDialogVisible = true"
-                >自定义角色</el-button
-              >
+              <el-button type="primary" class="ml-100px" plain @click="setRoleDialogVisible = true">自定义角色</el-button>
             </el-form-item>
           </div>
           <h3 class="text-hex-00A3FF">基本信息</h3>
           <el-form-item label="头像：">
-            <file-upload-progress
-              v-if="dialogVisible"
-              v-model:part="ruleForm.user_avatar"
-              :limit="1"
-              accept=".jpg,.jpeg,.webp,.png"
-              :size-limit="500 * 1024"
-            >
+            <file-upload-progress v-if="dialogVisible" v-model:part="ruleForm.user_avatar" :limit="1" accept=".jpg,.jpeg,.webp,.png" :size-limit="500 * 1024">
               <el-button type="primary"> 点击上传 </el-button>
               <template #tip>
                 <div class="mt-2 text-xs">
@@ -222,18 +111,8 @@
 
           <div class="flex">
             <el-form-item label="学校：" prop="sm_id">
-              <el-select
-                v-model="ruleForm.sm_id"
-                filterable
-                clearable
-                placeholder="全部学校"
-              >
-                <el-option
-                  v-for="(item, index) in tableSchoolData"
-                  :key="index"
-                  :label="item.sm_name"
-                  :value="item.id"
-                />
+              <el-select v-model="ruleForm.sm_id" filterable clearable placeholder="全部学校">
+                <el-option v-for="(item, index) in tableSchoolData" :key="index" :label="item.sm_name" :value="item.id" />
               </el-select>
             </el-form-item>
           </div>
@@ -248,46 +127,25 @@
                 </div>
                 <div class="w-565px">
                   <div class="h-40px w-full justify-end flex items-center">
-                    <el-icon
-                      @click="deleteOffice(i)"
-                      color="#409eff"
-                      size="20px"
-                    >
+                    <el-icon @click="deleteOffice(i)" color="#409eff" size="20px">
                       <Delete />
                     </el-icon>
                   </div>
                   <div class="w-full office">
                     <span>年级：</span>
-                    <remote-select
-                      v-model:model-name="p.grade_name"
-                      v-model="p.grade_id"
-                      to="jcxxgl_zyflgl_nj"
-                      :fields="['tjzn_id', 'tjzn_njmc']"
-                    ></remote-select>
+                    <remote-select v-model:model-name="p.grade_name" v-model="p.grade_id" to="jcxxgl_zyflgl_nj" :fields="['tjzn_id', 'tjzn_njmc']"></remote-select>
                   </div>
                   <div class="flex office">
                     <span class="mr-10px text-right">学科:</span>
-                    <remote-select
-                      v-model:model-name="p.xueke_name"
-                      v-model="p.xueke_id"
-                      to="jcxxgl_zyflgl_xk"
-                      :fields="['tjzx_id', 'tjzx_xkmc']"
-                    ></remote-select>
+                    <remote-select v-model:model-name="p.xueke_name" v-model="p.xueke_id" to="jcxxgl_zyflgl_xk" :fields="['tjzx_id', 'tjzx_xkmc']"></remote-select>
                     <span class="mr-10px ml-60px text-right">任教班级:</span>
-                    <remote-select
-                      v-model="p.class_id"
-                      to="jcxxgl_zyflgl_bj"
-                      v-model:model-name="p.class_name"
-                      :fields="['tjzb_id', 'tjzb_bjmc']"
-                    ></remote-select>
+                    <remote-select v-model="p.class_id" to="jcxxgl_zyflgl_bj" v-model:model-name="p.class_name" :fields="['tjzb_id', 'tjzb_bjmc']"></remote-select>
                   </div>
                 </div>
               </div>
             </el-form-item>
 
-            <el-button class="ml-100px" @click="addOffice" type="primary" plain
-              >添加</el-button
-            >
+            <el-button class="ml-100px" @click="addOffice" type="primary" plain>添加</el-button>
           </div>
           <el-form-item label="爱好特长：" class="w-640px" prop="about">
             <el-input type="textarea" v-model="ruleForm.about" />
@@ -310,26 +168,10 @@
         </div>
       </el-dialog>
 
-      <el-dialog
-        v-model="setRoleDialogVisible"
-        class="_"
-        width="565"
-        destroy-on-close
-        title="自定义角色"
-        @close="handleClose"
-      >
-        <el-form
-          class="table"
-          ref="ruleFormRef1"
-          :model="roleData"
-          :rules="roleRules"
-        >
+      <el-dialog v-model="setRoleDialogVisible" class="_" width="565" destroy-on-close title="自定义角色" @close="handleClose">
+        <el-form class="table" ref="ruleFormRef1" :model="roleData" :rules="roleRules">
           <el-form-item label="角色名：" prop="tur_role_name" class="w-270px">
-            <el-input
-              size="small"
-              v-model="roleData.tur_role_name"
-              type="text"
-            />
+            <el-input size="small" v-model="roleData.tur_role_name" type="text" />
           </el-form-item>
           <el-form-item label="" prop="tur_role_menu">
             <div class="w-full">设置权限：</div>
@@ -339,31 +181,16 @@
         <template #footer>
           <span class="flex_center space-x-12">
             <el-button size="large" @click="handleClose">取消</el-button>
-            <el-button
-              size="large"
-              type="primary"
-              @click="PermissionSubmit(ruleFormRef1)"
-            >
+            <el-button size="large" type="primary" @click="PermissionSubmit(ruleFormRef1)">
               确定
             </el-button>
           </span>
         </template>
       </el-dialog>
 
-      <el-dialog
-        v-model="detailDialogVisible"
-        class="_"
-        width="778"
-        title="详情"
-      >
+      <el-dialog v-model="detailDialogVisible" class="_" width="778" title="详情">
         <img class="avatar" :src="ruleForm.user_avatar" />
-        <el-form
-          class="grid grid-cols-2"
-          ref="ruleFormRef"
-          label-position="right"
-          label-width="90px"
-          :model="detailForm"
-        >
+        <el-form class="grid grid-cols-2" ref="ruleFormRef" label-position="right" label-width="90px" :model="detailForm">
           <el-form-item label="账号:">
             {{ detailForm.user_name }}
           </el-form-item>
@@ -385,8 +212,7 @@
             <div v-for="item in officeData" :key="item">
               <span class="mr-30px">
                 {{ item.grade_name }}{{ item.class_name
-                }}{{ item.xueke_name }}</span
-              >
+                }}{{ item.xueke_name }}</span>
             </div>
           </el-form-item>
           <el-form-item label="特长:" class="col-span-full">
@@ -401,9 +227,7 @@
         </el-form>
         <template #footer>
           <span class="flex_center space-x-12">
-            <el-button size="large" type="primary" @click="handleFormCancel"
-              >返回</el-button
-            >
+            <el-button size="large" type="primary" @click="handleFormCancel">返回</el-button>
           </span>
         </template>
       </el-dialog>
@@ -516,7 +340,7 @@ function initClassData() {
 //角色列表
 let roleList = $ref([]);
 function initRoleData() {
-  role_list({ limit: 100 }).then((res) => {
+  role_list({ limit: 100, M5jxrcL: "" }).then((res) => {
     if (res.code === "1") {
       roleList = res.data.page_data;
     }
@@ -559,8 +383,8 @@ function handleDetail(id) {
           detailData.gender == 1
             ? "男"
             : detailData.gender == 2
-            ? "女"
-            : "保密",
+              ? "女"
+              : "保密",
         sm_id: detailData.sm_id,
         user_phone: detailData.user_phone,
         user_email: detailData.user_email,
@@ -824,7 +648,7 @@ function handleMulDelete() {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 //单个删除
 function handleDelete(id) {
@@ -850,7 +674,7 @@ function handleDelete(id) {
         }
       });
     })
-    .catch(() => {});
+    .catch(() => { });
 }
 function exportAll() {
   let ids = multipleSelection.join(",");