Merge branch 'dev' of https://e.coding.net/g-cphe0354/yinshoukeguanliduan/management into ymf

src/views/shop/components/addStaff.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-dialog :title="title" :visible.sync="dialogVisible">
+    <el-dialog :title="title" :visible.sync="dialogVisible" @open="reset">
         <el-form ref="form" :model="form" :rules="rules" label-width="140px" label-position="left">
             <el-form-item label="员工姓名" prop="name">
                 <el-input v-model="form.name" placeholder="请输入员工姓名" />
@@ -7,11 +7,14 @@
             <el-form-item label="员工编号" prop="code">
                 <el-input v-model="form.code" placeholder="请输入员工编号" />
             </el-form-item>
+            <el-form-item label="手机号" prop="phone">
+                <el-input v-model="form.phone" placeholder="请输入手机号" />
+            </el-form-item>
             <el-form-item label="员工账号" prop="account">
                 <el-input v-model="form.account" placeholder="请输入员工账号，建议使用手机号" />
             </el-form-item>
-            <el-form-item label="手机号" prop="phone">
-                <el-input v-model="form.phone" placeholder="请输入手机号" />
+            <el-form-item label="登录密码">
+                <el-input type="password" v-model="form.password" placeholder="请输入登录密码，不填默认123456" />
             </el-form-item>
             <el-form-item label="最大优惠金额">
                 <el-input-number v-model="form.maxDiscountAmount" controls-position="right" :min="0"></el-input-number>
@@ -55,7 +58,8 @@ export default {
                 isPc: 1,
                 isManage: 1,
                 roleId: '',
-                phone: ''
+                phone: '',
+                password: ''
             },
             resetForm: '',
             rules: {
@@ -131,6 +135,7 @@ export default {
                             type: 'success'
                         });
                     } catch (error) {
+                        this.loading = false
                         console.log(error);
                     }
                 }