Merge branch 'feature/chw' into 'master'

调整

See merge request product/kim3-web-vue/starter-web-vue!20

src/components/table/index.vue

@@ -69,6 +69,7 @@
                 </a-space>
             </template>
         </a-drawer>
+        <slot name="children"></slot>
     </div>
 </template>
 

src/pages/system/view/organization/usermanagement/User.vue

 <template>
-    <div>
-        <my-table url="/api/v1/users" rowKey="userId" ref="table">
-            <template #search="{ query }">
-                <my-form-item label="归属部门">
-                    <OrganizationTree v-model="query.orgId" />
-                </my-form-item>
-                <my-form-item label="账号">
-                    <a-input placeholder="Basic usage" v-model="query.loginId" />
-                </my-form-item>
-            </template>
-            <template #buttons>
-                <a-button type="primary" @click="onAdd">新增</a-button>
+    <my-table url="/api/v1/users" rowKey="userId" ref="table">
+        <template #search="{ query }">
+            <my-form-item label="归属部门">
+                <OrganizationTree v-model="query.orgId" />
+            </my-form-item>
+            <my-form-item label="账号">
+                <a-input placeholder="Basic usage" v-model="query.loginId" />
+            </my-form-item>
+        </template>
+        <template #buttons>
+            <a-button type="primary" @click="onAdd">新增</a-button>
+        </template>
+
+        <a-table-column title="账号" data-index="loginId" />
+        <a-table-column title="姓名" data-index="userName" />
+        <a-table-column title="职称" data-index="userTitleName" />
+        <a-table-column title="移动电话" data-index="mobilePhone" />
+        <a-table-column title="固定电话" data-index="fixedPhone" />
+        <a-table-column title="电子邮箱" data-index="userEmail" />
+        <a-table-column title="是否锁定" data-index="isLockedName" />
+        <a-table-column title="操作">
+            <template #default="row">
+                <ActionButton :buttons="buttons" :row="row" />
             </template>
+        </a-table-column>
 
-            <a-table-column title="账号" data-index="loginId" />
-            <a-table-column title="姓名" data-index="userName" />
-            <a-table-column title="职称" data-index="userTitleName" />
-            <a-table-column title="移动电话" data-index="mobilePhone" />
-            <a-table-column title="固定电话" data-index="fixedPhone" />
-            <a-table-column title="电子邮箱" data-index="userEmail" />
-            <a-table-column title="是否锁定" data-index="isLockedName" />
-            <a-table-column title="操作">
-                <template #default="row">
-                    <ActionButton :buttons="buttons" :row="row" />
-                </template>
-            </a-table-column>
-        </my-table>
-        <Form ref="form" />
-    </div>
+        <template #children>
+            <Form ref="form" />
+        </template>
+    </my-table>
 </template>
 <script>
 import Form from './form.vue';

src/pages/system/view/organization/usermanagement/form.vue

 <template>
-    <Drawer ref="drawerRef" v-model="visible">
-        <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
+    <Drawer ref="drawerRef" v-model="visible" title="用户配置">
+        <!-- <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
             <a-form-model-item label="名称" prop="jobName">
                 <a-input v-model="form.jobName" :disabled="isView" />
             </a-form-model-item>
             <a-form-model-item label="描述" prop="jobDescription">
                 <a-textarea v-model="form.jobDescription" :disabled="isView" :rows="4" />
             </a-form-model-item>
+        </a-form-model> -->
+
+        <a-steps :current="current">
+            <a-step v-for="item in steps" :key="item.title" :title="item.title" />
+        </a-steps>
+        <a-form-model layout="vertical" :model="form" :rules="rules" ref="DrawerForm">
+            <a-form-model-item label="名称" prop="jobName">
+                <a-input v-model="form.jobName" :disabled="isView" />
+            </a-form-model-item>
         </a-form-model>
+        <template #footer>
+            <a-button type="primary" @click="prev" v-if="current > 0"> 上一步 </a-button>
+            <a-button type="primary" @click="next" v-if="current < 2"> 下一步 </a-button>
+        </template>
     </Drawer>
 </template>
 
@@ -27,12 +40,31 @@ export default {
                     { required: true, message: 'Please select Activity zone', trigger: 'change' },
                 ],
             },
+            current: 0,
+            steps: [
+                {
+                    title: '基本信息',
+                },
+                {
+                    title: '证件设置',
+                },
+                {
+                    title: '岗位设置',
+                },
+            ],
         };
     },
     methods: {
         open() {
             this.visible = true;
         },
+        next() {
+            this.current++;
+        },
+        prev() {
+            this.current--;
+        },
+
         add() {
             return JobsApi.addJobs({ ...this.form });
         },