用户管理修改

src/crud/components/DialogCollapse.operation.vue

@@ -35,7 +35,7 @@
               <div style="background-color: #999; height: 1px; flex: 1"></div>
             </div>
             <!-- 此处的width决定了是否要换行 v-show="!item.form.hide"-->
-             <!-- {{ form[item.form.prop ? item.form.prop : item.prop] }} -->
+<!--             {{ form[item.form.prop ? item.form.prop : item.prop] }}-->
             <el-form-item
               style="position: relative"
               v-if="

src/views/system/branch/index.vue

@@ -182,9 +182,9 @@
         :searchForm="searchForm" @btnSearch="btnSearch2" @CurrentChange="handleCurrentChangeTwo" @handleDelete="itemDelete"
         :tableData="tableItemData">
         <template #search>
-          <el-input maxlength="60" v-trim clearable v-model="searchForm2.centerServiceHallId" style="width: 200px"
+          <el-input maxlength="60" v-trim clearable v-model="searchForm2.id" style="width: 200px"
             placeholder="请输入中心网点编号" />
-          <el-input maxlength="60" v-trim clearable v-model="searchForm2.centerServicehallName" style="width: 200px"
+          <el-input maxlength="60" v-trim clearable v-model="searchForm2.name" style="width: 200px"
             placeholder="请输入中心网点名称" />
         </template>
       </crud-template>
@@ -640,6 +640,8 @@ function getAgencyList() {
   })
 }
 function importData(url) {
+    //判断url是否以/开头，剔除/
+  url = url.startsWith('/') ? url.substring(1) : url
   // importFn('a8f9dac698cb4793bb15f26fd608d2b3', getList(), { excelFileUrl: url })
   BaseService.postN('/userw/serviceHall/registerFullBath', { excelFileUrl: url }).then((res: any) => {
     if (res && res.code === 0) {

src/views/system/roleManage/index.vue

@@ -692,10 +692,15 @@
   }
   // 获取所属系统
   function getSystemList(rbacSource) {
+    // console.log("--------->",rbacSource)
+    let tmpSource = rbacSource ?? addForm.value.roleSource;
+    if(tmpSource===''||tmpSource===undefined||tmpSource===null){
+      return
+    }
     BaseService.postN('/userw/rbac/systemTypeListByRbacSource', {
-      rbacSource: rbacSource ?? addForm.value.roleSource,
+      rbacSource: tmpSource,
     }).then((res: any) => {
-      console.log("--------->",res)
+      
       if (res && res.code === 0) {
         let list = res.data.list || []
         let dataList = [] as IObject[]

src/views/system/userManage/index.vue

@@ -522,9 +522,10 @@
     }
     BaseService.postN('/userw/staff/changeLogPage', params).then(
       (res: any) => {
+          // console.log("res.data.result",res.data.result)
         if (res && res.code === 0) {
           const bizContent = res.data
-          const data = bizContent.data || []
+          const data = bizContent.result || []
           nextTick(() => {
             tableData1.value = data
           })