longlong/xw_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改注册

Browse Source
This commit is contained in:
龙运模 2024-10-22 22:39:55 +08:00
parent c174f3df6a
commit 3d958f9346
6 changed files with 80 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/style/search.scss
View File

@ -2,13 +2,13 @@
border-radius: 8px; border-radius: 8px;
width: 560px; width: 560px;
.el-input-group__append{ .el-input-group__append{
background: var(--el-color-primary); background: var(--el-color-white);
padding: 0; padding: 0;
box-shadow: none; box-shadow: none;
border-radius: 0 7px 7px 0; border-radius:0 8px 8px 0;
border-top: 2px solid var(--el-color-primary); //border-top: 2px solid var(--el-color-primary);
border-bottom: 2px solid var(--el-color-primary); //border-bottom: 2px solid var(--el-color-primary);
border-right: 2px solid var(--el-color-primary); //border-right: 2px solid var(--el-color-primary);
} }
.el-input-group__prepend{ .el-input-group__prepend{
background: var(--el-color-white); background: var(--el-color-white);
@ -16,15 +16,15 @@
box-shadow: none; box-shadow: none;
border-radius: 8px 0 0 8px; border-radius: 8px 0 0 8px;
border: 0; border: 0;
border-top: 2px solid #c4c7ce; //border-top: 2px solid #c4c7ce;
border-bottom: 2px solid #c4c7ce; //border-bottom: 2px solid #c4c7ce;
border-left: 2px solid #c4c7ce; //border-left: 2px solid #c4c7ce;
} }
.el-input__wrapper{ .el-input__wrapper{
box-shadow: none; box-shadow: none;
border-top: 2px solid #c4c7ce; //border-top: 2px solid #c4c7ce;
border-bottom: 2px solid #c4c7ce; //border-bottom: 2px solid #c4c7ce;
} }
.searchDrop{ .searchDrop{
height: 100%; height: 100%;
@ -43,11 +43,12 @@
} }
.searchBtn{ .searchBtn{
color: var(--el-color-white); color: var(--el-color-white);
background: var(--el-color-primary);
width: 86px; width: 86px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
border-radius: 0 7px 7px 0; border-radius: 8px;
cursor: pointer; cursor: pointer;
.name{ .name{
margin-right: 5px; margin-right: 5px;

45
src/views/login/userRegister.vue
View File

@ -1,26 +1,30 @@
<template> <template>
<common-page title="注册"> <common-page title="注册">
<el-steps :active="stepActive" simple finish-status="success" process-status="finish"> <el-alert type="info" class="registerAlert" :closable="false">注册账户</el-alert>
<el-step title="填写信息" /> <!-- <el-steps :active="stepActive" simple finish-status="success" process-status="finish">-->
<el-step title="创建账户" /> <!-- <el-step title="填写信息" />-->
<el-step title="注册完成" /> <!-- <el-step title="创建账户" />-->
</el-steps> <!-- <el-step title="注册完成" />-->
<el-form v-if="stepActive==0" ref="stepForm_0" :model="form" :rules="rules" label-position="top"> <!-- </el-steps>-->
<el-form-item label="公司名称" prop="company_name"> <!-- <el-form v-if="stepActive==0" ref="stepForm_0" :model="form" :rules="rules" label-position="top">-->
<el-input v-model="form.company_name" placeholder="请输入公司名称"></el-input> <!-- <el-form-item label="公司名称" prop="company_name">-->
</el-form-item> <!-- <el-input v-model="form.company_name" placeholder="请输入公司名称"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="客户名称" prop="customer">-->
<!-- <el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-form>-->
<el-form ref="stepForm_1" :model="form" :rules="rules" label-position="top">
<el-form-item label="客户名称" prop="customer"> <el-form-item label="客户名称" prop="customer">
<el-input v-model="form.customer" placeholder="请输入客户名称"></el-input> <el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>
</el-form-item> </el-form-item>
</el-form>
<el-form v-if="stepActive==1" ref="stepForm_1" :model="form" :rules="rules" label-position="top">
<el-form-item label="电子邮箱" prop="email"> <el-form-item label="电子邮箱" prop="email">
<el-input v-model="form.email" placeholder="请输入邮箱地址"></el-input> <el-input v-model="form.email" placeholder="请输入邮箱地址"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="登录账号" prop="login_name"> <el-form-item label="登录账号" prop="login_name">
<el-input v-model="form.login_name" placeholder="请输入账号"></el-input> <el-input v-model="form.login_name" placeholder="请输入账号"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用户名" prop="name"> <el-form-item label="昵称" prop="name">
<el-input v-model="form.name" placeholder="请输入用户名"></el-input> <el-input v-model="form.name" placeholder="请输入用户名"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号" prop="mobile">
@ -46,8 +50,8 @@
</div> </div>
<el-form style="text-align: center;"> <el-form style="text-align: center;">
<div class="btnBox"> <div class="btnBox">
<el-button class="btn" v-if="stepActive>0 && stepActive<2" @click="pre" style="width: 100%;">上一步</el-button> <!-- <el-button class="btn" v-if="stepActive>0 && stepActive<2" @click="pre" style="width: 100%;">上一步</el-button>-->
<el-button class="btn" v-if="stepActive<2" type="primary" @click="next" style="width: 100%;">下一步</el-button> <el-button class="btn" v-if="stepActive<2" type="primary" @click="next" style="width: 100%;">提交注册</el-button>
<el-button class="btn" v-if="stepActive==2" type="primary" @click="goLogin" style="width: 100%;">完成</el-button> <el-button class="btn" v-if="stepActive==2" type="primary" @click="goLogin" style="width: 100%;">完成</el-button>
</div> </div>
</el-form> </el-form>
@ -68,7 +72,7 @@
disabled:false, disabled:false,
time:60, time:60,
stepActive: 0, stepActive: 1,
form: { form: {
email: "", email: "",
mobile:"", mobile:"",
@ -86,7 +90,7 @@
{ required: true, message: '请输入登录账号'} { required: true, message: '请输入登录账号'}
], ],
name:[ name:[
{ required: true, message: '请输入用户名'} { required: false, message: '请输入用户名'}
], ],
mobile: [ mobile: [
{ required: true, message: '请输入手机号'} { required: true, message: '请输入手机号'}
@ -199,4 +203,13 @@
transform: rotate(-45deg) translateY(-3px); transform: rotate(-45deg) translateY(-3px);
} }
} }
.registerAlert{
::v-deep .el-alert__content{
width: 100%;
.el-alert__description{
color: var(--el-color-primary);
text-align: center;
}
}
}
</style> </style>

2
src/views/order/order-logs.vue
View File

@ -24,7 +24,7 @@ export default {
}, },
params:{ params:{
bill_id: Number(this.$route.query.id), bill_id: Number(this.$route.query.id),
bill_type:1, // 1维保单 2维修单 bill_type:this.$route.query.type, // 1维保单 2维修单
} }
} }
}, },

31
src/views/order/orderList/index.vue
View File

@ -13,7 +13,6 @@
</scImport> </scImport>
<el-button type="primary" v-auth="'maintenanceOrderSubmit'" plain :size="size" :disabled="selection.length!=1" @click="save_maintenance">提交维保</el-button> <el-button type="primary" v-auth="'maintenanceOrderSubmit'" plain :size="size" :disabled="selection.length!=1" @click="save_maintenance">提交维保</el-button>
<el-button type="success" v-auth="'maintenanceOrderApproval'" :size="size" icon="sc-icon-OrderReview" :disabled="selection.length==0" @click="batch_review">批量审核</el-button> <el-button type="success" v-auth="'maintenanceOrderApproval'" :size="size" icon="sc-icon-OrderReview" :disabled="selection.length==0" @click="batch_review">批量审核</el-button>
<!-- <el-button type="primary" v-auth="'maintenanceOrderSend'" plain :size="size" :disabled="selection.length==0" @click="issued_maintenance">下发维保</el-button>-->
<el-button type="danger" v-auth="'maintenanceOrderDelete'" plain :size="size" icon="el-icon-Delete" :disabled="selection.length==0" @click="batch_del"></el-button> <el-button type="danger" v-auth="'maintenanceOrderDelete'" plain :size="size" icon="el-icon-Delete" :disabled="selection.length==0" @click="batch_del"></el-button>
</div> </div>
<div class="right-panel"> <div class="right-panel">
@ -65,9 +64,6 @@
<div v-auth="'maintenanceOrderDetail'"> <div v-auth="'maintenanceOrderDetail'">
<el-dropdown-item @click="table_show(scope.row)" icon="sc-icon-See">工单详情</el-dropdown-item> <el-dropdown-item @click="table_show(scope.row)" icon="sc-icon-See">工单详情</el-dropdown-item>
</div> </div>
<!-- <div v-auth="'maintenanceOrderSend'">-->
<!-- <el-dropdown-item icon="sc-icon-OrderMaintenance" @click="table_send(scope.row)">下发维保</el-dropdown-item>-->
<!-- </div>-->
<div v-auth="'orderLogsList'"> <div v-auth="'orderLogsList'">
<el-dropdown-item icon="sc-icon-OrderLog" @click="table_logs(scope.row)" divided>工单日志</el-dropdown-item> <el-dropdown-item icon="sc-icon-OrderLog" @click="table_logs(scope.row)" divided>工单日志</el-dropdown-item>
</div> </div>
@ -122,6 +118,7 @@ export default {
{name:'PE确认时间',type:'date',code:'pe_confirmation_time',show:true}, {name:'PE确认时间',type:'date',code:'pe_confirmation_time',show:true},
{name:'保修到期',type:'date',code:'warranty_end_date',show:true}, {name:'保修到期',type:'date',code:'warranty_end_date',show:true},
{name:'SLA到期时间',type:'date',code:'sla_expiration',show:true}, {name:'SLA到期时间',type:'date',code:'sla_expiration',show:true},
{name:'客户',type:'select',code:['customer_name'],placeholder:"请选择客户",isOpen:true,show:false},
{name:'维修单号',type:'text',code:['repair_order_no'],placeholder:"请输入维修单号",isOpen:true,show:false}, {name:'维修单号',type:'text',code:['repair_order_no'],placeholder:"请输入维修单号",isOpen:true,show:false},
{name:'维修等级',type:'select',code:'maintenance_level', data:[], placeholder:"请选择维修等级",show:false}, {name:'维修等级',type:'select',code:'maintenance_level', data:[], placeholder:"请选择维修等级",show:false},
{name:'园区名称',type:'select',code:['park_name'],data:[],placeholder:"请输入园区名称",isOpen:true,show:false}, {name:'园区名称',type:'select',code:['park_name'],data:[],placeholder:"请输入园区名称",isOpen:true,show:false},
@ -297,38 +294,14 @@ export default {
}, },
async save_maintenance() { async save_maintenance() {
eventBus.$emit('tagClose','/order/submit-order',{id:this.selection.map(em => em.id)[0]}); eventBus.$emit('tagClose','/order/submit-order',{id:this.selection.map(em => em.id)[0]});
// const params = {order_ids: this.selection.map(em => em.id)};
// const res = await this.$API.orders.order.maintenance.submit.post(params);
// if (res.code == 200) {
// this.$refs.table.refresh();
// this.$message.success("操作成功")
// }
},
async issued_maintenance() {
const params = {order_ids: this.selection.map(em => em.id)};
const res = await this.$API.orders.order.maintenance.send.post(params);
if (res.code == 200) {
this.$refs.table.refresh();
this.$message.success("操作成功")
}
}, },
// 工单设置 // 工单设置
async table_submit(row){ async table_submit(row){
eventBus.$emit('tagClose','/order/submit-order',{id:row.id}); eventBus.$emit('tagClose','/order/submit-order',{id:row.id});
}, },
async table_send(row) {
let params = {
order_ids:[row.id]
}
const res = await this.$API.orders.order.maintenance.send.post(params);
if (res.code == 200) {
this.$refs.table.refresh();
}
},
// 工单日志 // 工单日志
table_logs(row){ table_logs(row){
eventBus.$emit('tagClose','/order/order-logs',{id:row.id}); eventBus.$emit('tagClose','/order/order-logs',{id:row.id,type:1});
}, },
//表格选择后回调事件 //表格选择后回调事件
selectionChange(selection){ selectionChange(selection){

6
src/views/order/orderPlan/index.vue
View File

@ -85,9 +85,9 @@ export default {
searchShow:false, searchShow:false,
searchList:[ searchList:[
{name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true}, {name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true},
{name:'故障类型',type:'select',code:'fault_type', data:[], placeholder:"请选择故障类型",show:true}, {name:'故障类型',type:'select',code:['fault_type'], data:[], placeholder:"请选择故障类型",show:true},
{name:'整机型号',type:'select',code:'repair_status', data:[], placeholder:"请选择整机型号",isOpen:true,show:true}, {name:'整机型号',type:'select',code:['device_model'], data:[], placeholder:"请选择整机型号",isOpen:true,show:true},
{name:'园区名称',type:'select',code:'repair_status', data:[], placeholder:"请选择园区名称",isOpen:true,show:false}, {name:'机房城市',type:'select',code:['city'], data:[], placeholder:"请选择机房城市",isOpen:true,show:false},
{name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false}, {name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false},
{name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true}, {name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true},
], ],

42
src/views/order/repairList/index.vue
View File

@ -30,6 +30,7 @@
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item icon="sc-icon-MaintenanceSetup">执行维修</el-dropdown-item> <el-dropdown-item icon="sc-icon-MaintenanceSetup">执行维修</el-dropdown-item>
<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">工单详情</el-dropdown-item> <el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">工单详情</el-dropdown-item>
<el-dropdown-item icon="sc-icon-OrderLog" @click="table_logs(scope.row)" divided>工单日志</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
@ -84,10 +85,10 @@ export default {
exportShow:false, exportShow:false,
searchShow:false, searchShow:false,
searchList:[ searchList:[
{name:'创建日期',type:'date',code:'activation_date',show:true}, {name:'创建日期',type:'date',code:'created_at',show:true},
{name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true}, {name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true},
{name:'故障类型',type:'select',code:'fault_type', data:[], placeholder:"请选择故障类型",show:true}, {name:'故障类型',type:'select',code:['fault_type'], data:[], placeholder:"请选择故障类型",show:true},
{name:'状态',type:'select',code:'repair_status', data:[], placeholder:"请选择状态",isOpen:true,show:false}, {name:'状态',type:'select',code:['repair_status'], data:[], placeholder:"请选择状态",isOpen:true,show:false},
{name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false}, {name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false},
{name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true}, {name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true},
], ],
@ -128,30 +129,31 @@ export default {
} }
}) })
}, },
getSelectData(item){ async getSelectData(item) {
let {data, params} = item; let {data, params} = item;
this.params = params; this.params = params;
if(data.code == "id"){ let searchParams = this.$TOOL.objCopy(params);
this.getCompanyList(data,params) searchParams.field = ""
}else if(data.code == "active_status"){ if (typeof data.code === 'string') {
this.getStatusList(data,params); searchParams.field = data.code;
} else {
searchParams.field = data.code[0];
} }
}, if (data.type == 'select') {
const res = await this.$API.orders.order.maintenance.field.post(searchParams);
async getCompanyList(data,params) { if (res.code == 200) {
const res = await this.$API.system.company.select.post(params);
if (res.data && res.data.length > 0) { if (res.data && res.data.length > 0) {
res.data.forEach(item => { res.data.forEach(item => {
item.label = item.full_name; item.label = item[data.code];
}) })
} }
if(res.code == 200){
this.searchList.forEach(item => { this.searchList.forEach(item => {
if (item.code == data.code) { if (item.code == data.code) {
item.data = res.data; item.data = res.data;
} }
}) })
} }
}
}, },
//添加 //添加
@ -162,16 +164,20 @@ export default {
}) })
}, },
//查看 //查看
// table_show(row){ table_show(row){
// eventBus.$emit('tagClose','/order/order-info',{id:row.id}); eventBus.$emit('tagClose','/order/order-info',{id:row.id});
// }, },
//编辑 //编辑
table_edit(row){ table_edit(row){
this.dialog.save = true this.dialog.save = true
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.saveDialog.open('edit').setData(row) this.$refs.saveDialog.open('edit').setData(row);
}) })
}, },
// 工单日志
table_logs(row){
eventBus.$emit('tagClose','/order/order-logs',{id:row.id,type:2});
},
// 删除 // 删除
async table_del(row){ async table_del(row){
this.$confirm(`确定删除 ${row.name} 吗？`, '提示', { this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {