feat: 合并Gin_Vue

src/views/system/role/components/auth-user-select.vue

@@ -88,14 +88,24 @@ let tableState: TabeStateType = reactive({
 let tableColumns: ColumnsType = [
   {
     title: '用户编号',
-    dataIndex: 'id',
+    dataIndex: 'userId',
     align: 'center',
   },
   {
     title: '登录账号',
-    dataIndex: 'accountId',
+    dataIndex: 'userName',
     align: 'center',
-  }, 
+  },
+  {
+    title: '用户昵称',
+    dataIndex: 'nickName',
+    align: 'center',
+  },
+  {
+    title: '手机号码',
+    dataIndex: 'phonenumber',
+    align: 'center',
+  },
   {
     title: '用户状态',
     dataIndex: 'status',
@@ -107,8 +117,8 @@ let tableColumns: ColumnsType = [
     dataIndex: 'createTime',
     align: 'center',
     customRender(opt) {
-      if (!opt.value) return '';
-      return parseDateToStr(opt.value);
+      if (+opt.value <= 0) return '';
+      return parseDateToStr(+opt.value);
     },
   },
 ];
@@ -224,7 +234,7 @@ watch(
             ></a-input>
           </a-form-item>
         </a-col>
-        <!-- <a-col :lg="8" :md="12" :xs="24">
+        <a-col :lg="8" :md="12" :xs="24">
           <a-form-item label="手机号码" name="phonenumber">
             <a-input
               v-model:value="queryParams.phonenumber"
@@ -233,7 +243,7 @@ watch(
               placeholder="请输入手机号码"
             ></a-input>
           </a-form-item>
-        </a-col> -->
+        </a-col>
         <a-col :lg="8" :md="12" :xs="24">
           <a-form-item label="用户状态" name="status">
             <a-select
@@ -264,7 +274,7 @@ watch(
 
     <a-table
       class="table"
-      row-key="id"
+      row-key="userId"
       :columns="tableColumns"
       :loading="tableState.loading"
       :data-source="tableState.data"
@@ -277,11 +287,11 @@ watch(
         onChange: fnTableSelectedRowKeys,
       }"
     >
-      <!-- <template #bodyCell="{ column, record }">
+      <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'status'">
           <DictTag :options="dict.sysNormalDisable" :value="record.status" />
         </template>
-      </template> -->
+      </template>
     </a-table>
   </a-modal>
 </template>