Merge remote-tracking branch 'origin/main'

src/components/settings/item/group/GroupList.vue

@@ -63,7 +63,7 @@ const deleteGroup = (row: any) => {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
   }).then(() => {
-    post(API.Item.Base.DeleteGroup., {id: row.id}).then((res: any) => {
+    post(API.Item.Base.DeleteGroup, {id: row.id}).then((res: any) => {
       init();
     })
   }).catch((err) => {

src/views/settings/item.vue

@@ -9,10 +9,7 @@
             class="demo-form-inline"
         >
           <el-form-item>
-            <el-input v-model="search.itemSocialCode" placeholder="医保码编码" style="width: 200px"></el-input>
+            <el-input v-model="search.name" placeholder="项目名称"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-input v-model="search.itemName" placeholder="项目名称" style="width: 200px"></el-input>
           </el-form-item>
         </el-form>
       </div>

src/views/settings/member.vue

@@ -12,7 +12,7 @@
             <el-input v-model="search.name" placeholder="请输入姓名" style="width: 200px"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-select v-model="search.sectionId" placeholder="请选择" style="width: 200px">
+            <el-select v-model="search.role" placeholder="请选择" style="width: 200px">
               <el-option
                   v-for="item in roleList"
                   :key="item.value"
@@ -43,27 +43,27 @@
       <el-table :data="tableData" style="width: 100%;height: 100%" @row-click="rowClick" :header-cell-style="{ backgroundColor: '#F1F5FB' }">
         <el-table-column prop="date" label="日期" width="180" show-overflow-tooltip>
           <template #default="scope">
-            {{ formatDate(scope.row.memberInfo.createDatetime) }}
+            {{ formatDate(scope.row.createDatetime) }}
           </template>
         </el-table-column>
         <el-table-column prop="name" label="姓名" width="180" show-overflow-tooltip>
           <template #default="scope">
-            {{ scope.row.memberInfo.name }}
+            {{ scope.row.name }}
           </template>
         </el-table-column>
         <el-table-column prop="role" label="角色" width="180" show-overflow-tooltip>
           <template #default="scope">
-            {{ roleList.find((item: any) => item.value === scope.row.memberInfo.role)?.label || '-' }}
+            {{ roleList.find((item: any) => item.value === scope.row.role)?.label || '' }}
           </template>
         </el-table-column>
         <el-table-column prop="sectionNames" label="科室" show-overflow-tooltip>
           <template #default="scope">
-            {{ scope.row.memberInfo.sectionNames }}
+            {{ scope.row.sectionNames }}
           </template>
         </el-table-column>
         <el-table-column prop="memo" label="备注" show-overflow-tooltip>
           <template #default="scope">
-            {{ scope.row.memberInfo.memo }}
+            {{ scope.row.memo }}
           </template>
         </el-table-column>
       </el-table>
@@ -137,18 +137,11 @@ const roleList = [
 ]
 const init = (() => {
   isShow.value = false
-  post(API.Organization.Member.List, {page: page.value, size: pageSize.value, ...search.value}).then((res: any) => {
+  post(API.Organization.Member.Search, {query:{pageNum: page.value, pageSize: pageSize.value, ...search.value}}).then((res: any) => {
-    tableData.value = res.list
+    tableData.value = res
     total.value = res.total_count
-    list()
   })
 })
-const sectionList = ref<any>([]);
-const list = () => {
-  post(API.Organization.Section.AllList).then((res: any) => {
-    sectionList.value = res
-  })
-}
 onMounted(() => {
   init()
 })