Browse Source

修改用户

fix_bug_pro20231227
pref_mail@163.com 2 years ago
parent
commit
099a19068c
  1. 2
      src/config/website.js
  2. 15
      src/views/reservation/reservation_list.vue
  3. 44
      src/views/system/user.vue

2
src/config/website.js

@ -11,7 +11,7 @@ export default {
tenantMode: true, // 是否开启租户模式
tenantId: '000000', // 管理组租户编号
captchaMode: false, // 是否开启验证码模式
switchMode: false, // 是否开启部门切换模式
switchMode: true, // 是否开启部门切换模式
lockPage: '/lock',
tokenTime: 3000,
tokenHeader: 'Blade-Auth',

15
src/views/reservation/reservation_list.vue

@ -19,11 +19,6 @@
<el-form-item label="收件人电话:">
<el-input v-model="query.deliveryPhone" placeholder="请输入收件人电话"></el-input>
</el-form-item>
<!-- <el-form-item label="顾客姓名:">-->
<!-- <el-input v-model="query.customerName" placeholder="请输入服务类型"></el-input>-->
<!-- </el-form-item>-->
<!-- 查询按钮 -->
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="searchChange"> </el-button>
<el-button icon="el-icon-delete" @click="searchReset()"> </el-button>
@ -33,15 +28,15 @@
<el-row style="margin-top: 30px">
<el-button-group>
<el-button type="primary" icon="el-icon-warning" @click="aaa">待确认</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="bbb"
<!-- <el-button type="primary" icon="el-icon-circle-check" @click="bbb"
>已确认<i class="el-icon-arrow-right el-icon--right"></i
></el-button>
></el-button> -->
<!-- <el-button type="primary" icon="el-icon-view" @click="ccc">全部</el-button>-->
</el-button-group>
<div class="avue-crud__header">
<!-- 头部左侧按钮模块 -->
<div class="avue-crud__left" style="margin-top: 20px">
<el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加预约</el-button>
<el-button
v-if="this.query.reservationStatus === '1'"
type="danger"
@ -49,7 +44,7 @@
@click="handleConfirmReservations"
plain
>批量确认
</el-button>
</el-button> -->
<el-button
v-if="this.query.reservationStatus === '2'"
type="danger"
@ -96,7 +91,7 @@
<el-button size="small" @click="cancelReservation(slotProps.scope)">取消预约</el-button>
<br/>
<!-- ${{slotProps.scope}}-->
<el-button v-if="this.query.reservationStatus==='1'?true:false " type="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button>
<!-- <el-button v-if="this.query.reservationStatus==='1'?true:false " type="small" @click="confirmReservation(slotProps.scope)">确认预约</el-button> -->
</template>
</tablecmt>
<!-- <el-popover :visible="visible" placement="top-start" :width="160">-->

44
src/views/system/user.vue

@ -362,7 +362,7 @@ export default {
trigger: 'click',
},
],
span: 24,
// span: 24,
},
{
label: '登录账号',
@ -375,32 +375,32 @@ export default {
},
],
},
{
label: '用户平台',
type: 'select',
dicUrl: '/blade-system/dict/dictionary?code=user_type',
props: {
label: 'dictValue',
value: 'dictKey',
},
dataType: 'number',
slot: true,
prop: 'userType',
rules: [
{
required: true,
message: '请选择用户平台',
trigger: 'blur',
},
],
},
// {
// label: '',
// type: 'select',
// dicUrl: '/blade-system/dict/dictionary?code=user_type',
// props: {
// label: 'dictValue',
// value: 'dictKey',
// },
// dataType: 'number',
// slot: true,
// prop: 'userType',
// rules: [
// {
// required: true,
// message: '',
// trigger: 'blur',
// },
// ],
// },
{
label: '密码',
prop: 'password',
hide: true,
editDisplay: false,
viewDisplay: false,
rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
// rules: [{ required: true, validator: validatePass, trigger: 'blur' }],
},
{
label: '确认密码',
@ -408,7 +408,7 @@ export default {
hide: true,
editDisplay: false,
viewDisplay: false,
rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
// rules: [{ required: true, validator: validatePass2, trigger: 'blur' }],
},
{
label: '停用时间',

Loading…
Cancel
Save