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-12-11 15:06:23 +08:00
parent 3ac387e502
commit 5eff53bf42
30 changed files with 98 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/model/user.js
View File

@ -51,6 +51,13 @@ export default {
return await http.post(this.url, params);
},
},
resetPassword:{
url: `${config.API_URL}/user.find.password`,
name: "修改个人密码",
post: async function (params) {
return await http.post(this.url, params);
},
},
register:{
url: `${config.API_URL}/user.register`,
name: "邮箱注册用户",

1
src/components/scImport/index.vue
View File

@ -1,6 +1,5 @@
<template>
<slot name="header"></slot>
<!--<el-button v-auths="['organizationImport','userImport']" type="primary" :size="size" plain @click="importFile">批量导入</el-button>-->
<el-dialog v-bind="$attrs" :title="title" v-model="visible" :width="560" destroy-on-close draggable @closed="visible=false">
<div class="importBody">

9
src/components/scTable/index.vue
View File

@ -365,8 +365,13 @@
this.upData(filters)
},
// 表头列改变事件
headerDragend(newWidth,oldWidth,column,e){
console.log(newWidth,oldWidth,column,e,799)
async headerDragend(newWidth, oldWidth, column) {
this.userColumn.forEach(item=>{
if(item.prop === column.property){
item.width = newWidth
}
})
await config.columnSettingSave(this.tableName, this.userColumn, this.apiObj);
},
//远程合计行处理
remoteSummaryMethod(param){

2
src/views/cost/feeRecords/index.vue
View File

@ -29,7 +29,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange" :hideTotal="false">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange" :hideTotal="false">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/docsManager/document.vue
View File

@ -60,7 +60,7 @@
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" :params="params" :size="size" docsSort remoteSort stripe :rowChild="false">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" :params="params" :size="size" border docsSort remoteSort stripe :rowChild="false">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #name="scope">

5
src/views/docsManager/share.vue
View File

@ -8,9 +8,6 @@
<div class="item leftArrow" :class="routerList.length>1?'leftShow':''" @click="prev"><el-icon><el-icon-ArrowLeftBold/></el-icon></div>
<div class="item rightArrow leftShow" @click="upSearch"><el-icon><el-icon-RefreshLeft/></el-icon></div>
</div>
<!-- <div class="refreshBox" @click="upSearch">-->
<!-- <el-icon><el-icon-RefreshLeft/></el-icon>-->
<!-- </div>-->
<div class="breadcrumb">
<el-breadcrumb separator-icon="el-icon-ArrowRight">
<template v-for="item in routerList" :key="item">
@ -41,7 +38,7 @@
</div>
</el-header>
<el-main class="nopadding">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" :size="size" stripe :rowChild="false">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" :size="size" border stripe :rowChild="false">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #name="scope">

2
src/views/earlyManager/index.vue
View File

@ -20,7 +20,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" @selection-change="selectionChange" stripe :size="size">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" @selection-change="selectionChange" border stripe :size="size">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">

62
src/views/login/resetPassword.vue
View File

@ -5,25 +5,25 @@
<el-step title="完成重置" />
</el-steps>
<el-form v-if="stepActive==0" ref="form" :model="form" :rules="rules" :label-width="120">
<el-form-item label="登录账号" prop="user">
<el-input v-model="form.user" placeholder="请输入登录账号"></el-input>
<div class="el-form-item-msg">请输入注册时填写的登录账号</div>
<!-- <el-form-item label="登录账号" prop="user">-->
<!-- <el-input v-model="form.user" placeholder="请输入登录账号"></el-input>-->
<!-- <div class="el-form-item-msg">请输入注册时填写的登录账号</div>-->
<!-- </el-form-item>-->
<el-form-item label="手机号码" prop="mobile">
<el-input v-model="form.mobile" placeholder="请输入手机号码"></el-input>
</el-form-item>
<el-form-item label="手机号码" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号码"></el-input>
</el-form-item>
<el-form-item label="短信验证码" prop="yzm">
<el-form-item label="短信验证码" prop="verify_code">
<div class="yzm">
<el-input v-model="form.yzm" placeholder="请输入6位短信验证码"></el-input>
<el-input v-model="form.verify_code" placeholder="请输入6位短信验证码"></el-input>
<el-button @click="getYzm" :disabled="disabled">获取验证码<span v-if="disabled"> ({{time}})</span></el-button>
</div>
</el-form-item>
<el-form-item label="新密码" prop="newpw">
<el-input v-model="form.newpw" show-password placeholder="请输入新密码"></el-input>
<el-form-item label="新密码" prop="password">
<el-input v-model="form.password" show-password placeholder="请输入新密码"></el-input>
<div class="el-form-item-msg">请输入包含英文、数字的8位以上密码</div>
</el-form-item>
<el-form-item label="确认新密码" prop="newpw2">
<el-input v-model="form.newpw2" show-password placeholder="请再一次输入新密码"></el-input>
<el-form-item label="确认新密码" prop="confirm_password">
<el-input v-model="form.confirm_password" show-password placeholder="请再一次输入新密码"></el-input>
</el-form-item>
<el-form-item>
@ -49,29 +49,29 @@
return {
stepActive: 0,
form: {
user: "",
phone: "",
yzm: "",
newpw: "",
newpw2: ""
// user: "",
mobile: "",
verify_code: "",
password: "",
confirm_password: ""
},
rules: {
user: [
{ required: true, message: '请输入登录账号'}
],
phone: [
mobile: [
{ required: true, message: '请输入手机号'}
],
yzm: [
verify_code: [
{ required: true, message: '请输入短信验证码'}
],
newpw: [
password: [
{ required: true, message: '请输入新的密码'}
],
newpw2: [
confirm_password: [
{ required: true, message: '请再次输入新的密码'},
{validator: (rule, value, callback) => {
if (value !== this.form.newpw) {
if (value !== this.form.password) {
callback(new Error('两次输入密码不一致'));
}else{
callback();
@ -88,26 +88,30 @@
},
methods: {
async getYzm(){
var validate = await this.$refs.form.validateField("phone").catch(()=>{})
const validate = await this.$refs.form.validateField("mobile").catch(() => {});
if(!validate){ return false }
this.$message.success("已发送短信至手机号码")
const res = await this.$API.user.verifyCode.post({mobile: this.form.mobile});
if(res.code == 200){
this.$message.success("已发送短信至手机号码");
this.disabled = true
this.time = 60
var t = setInterval(() => {
const t = setInterval(() => {
this.time -= 1
if (this.time < 1) {
clearInterval(t)
this.disabled = false
this.time = 0
}
},1000)
}, 1000);
}
},
async save(){
var validate = await this.$refs.form.validate().catch(()=>{})
const validate = await this.$refs.form.validate().catch(() => {});
if(!validate){ return false }
const res = await this.$API.user.resetPassword.post(this.form);
if (res.code == 200) {
this.stepActive = 1
}
},
backLogin(){
this.$router.push({

2
src/views/order/inventoryList/index.vue
View File

@ -27,7 +27,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/order/inventoryStatistics/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

7
src/views/order/order-edit.vue
View File

@ -166,8 +166,8 @@
<el-col :span="25" :lg="24">
<el-form-item label="验证ERP库存" prop="is_verify_erp_inventory">
<el-radio-group v-model="form.is_verify_erp_inventory">
<el-radio :value="true">是</el-radio>
<el-radio :value="false">否</el-radio>
<el-radio :value="true" :label="true">是</el-radio>
<el-radio :value="false" :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@ -243,7 +243,7 @@ export default {
pe_confirmation_time: "", // PE确认时间
warranty_end_date: "", // 保修期结束
maintenance_plan: '', // 维保等级：1-铜牌；常量维护项
is_verify_erp_inventory:true,
is_verify_erp_inventory:false,
component_info:[],
process_engine:[]
},
@ -283,6 +283,7 @@ export default {
res.data.process_engine = obj.processedList;
res.data.process_num = obj.num;
}
this.form.is_verify_erp_inventory = res.data.is_verify_erp_inventory?res.data.is_verify_erp_inventory:false;
this.form.process_engine = res.data.process_engine;
this.form.component_info = res.data.component_info;
if(res.data.component_info.length==0){

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

@ -184,7 +184,15 @@ export default {
if (res.code == 200) {
if (res.data && res.data.length > 0) {
res.data.forEach(item => {
if(searchParams.field === 'business_status'){
this.statusList.forEach(em=>{
if(em.value === item[data.code]){
item.label = em.label;
}
})
}else{
item.label = item[data.code];
}
})
}
this.searchList.forEach(item => {

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

@ -18,7 +18,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #repair_date="scope">{{scope.row.repair_order && scope.row.repair_order.repair_date?scope.row.repair_order.repair_date:''}}</template>

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

@ -13,7 +13,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" :hideTotal="false" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" :hideTotal="false" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #repair_status="scope">

5
src/views/order/submit-order.vue
View File

@ -14,8 +14,8 @@
<span class="label labelText">验证ERP库存：</span>
<span class="text">
<el-radio-group v-model="info.is_verify_erp_inventory">
<el-radio :value="true">是</el-radio>
<el-radio :value="false">否</el-radio>
<el-radio :value="true" :label="true">是</el-radio>
<el-radio :value="false" :label="false">否</el-radio>
</el-radio-group>
</span>
</el-col>
@ -92,6 +92,7 @@ export default {
res.data.process_num = obj.num;
}
this.info = res.data;
this.info.is_verify_erp_inventory = res.data.is_verify_erp_inventory?res.data.is_verify_erp_inventory:false;
if(res.data.component_info.length==0){
this.info.component_info = [
{

2
src/views/reports/keepRepairReports/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/reports/shipmentReports/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/service/faq.vue
View File

@ -2,7 +2,7 @@
<el-container class="mainBox mainHeaderNoBorderPadding">
<div class="header">问题反馈</div>
<div class="content">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" :size="size" hideDo>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" :size="size" hideDo border>
<el-table-column type="index" label="序号"></el-table-column>
<template v-for="(item,index) in list.column" :key="index">
<el-table-column :label="item.label" :prop="item.prop" :width="item.width" show-overflow-tooltip>

2
src/views/service/queryRecord.vue
View File

@ -8,7 +8,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #type="scope">

2
src/views/setting/bom/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" :params="params" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" :params="params" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<!-- <template #disable_status="scope">-->

2
src/views/setting/company/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/setting/log/components/ability.vue
View File

@ -13,7 +13,7 @@
</scExport>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow @row-click="rowClick">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe border :size="size" highlightCurrentRow @row-click="rowClick">
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
</scTable>
</el-main>

2
src/views/setting/log/components/command.vue
View File

@ -14,7 +14,7 @@
</scExport>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe :size="size" highlightCurrentRow @row-click="rowClick">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" stripe border :size="size" highlightCurrentRow @row-click="rowClick">
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
</scTable>
</el-main>

2
src/views/setting/partsMag/components/info.vue
View File

@ -29,7 +29,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe :size="size">
<scTable ref="table" :apiObj="list.apiObj" row-key="id" @selection-change="selectionChange" stripe border :size="size">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">

2
src/views/setting/partsMag/components/library.vue
View File

@ -29,7 +29,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" @selection-change="selectionChange" stripe :size="size">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" @selection-change="selectionChange" stripe border :size="size">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<el-table-column label="操作" fixed="right" align="center" width="150">

2
src/views/setting/user/index.vue
View File

@ -55,7 +55,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" stripe :size="size">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" @selection-change="selectionChange" stripe border :size="size">
<el-table-column type="selection" align="center" width="45"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #company_sort_name="scope">

2
src/views/shipment/shipmentDataConfirm/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/shipment/shipmentList/index.vue
View File

@ -10,7 +10,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/shipment/shipmentStatistics/index.vue
View File

@ -28,7 +28,7 @@
<el-button :size="size" type="info" icon="el-icon-RefreshRight" @click="reset">重置</el-button>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @selection-change="selectionChange">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @selection-change="selectionChange">
<el-table-column type="selection" align="center" width="40"></el-table-column>
<sc-table-column label="序号" align="center" type="index"></sc-table-column>
<template #logo="scope">

2
src/views/userCenter/user/logs.vue
View File

@ -14,7 +14,7 @@
</scExport>
</div>
</div>
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe :size="size" @row-click="rowClick">
<scTable ref="table" :apiObj="list.apiObj" :column="list.column" row-key="id" stripe border :size="size" @row-click="rowClick">
<sc-table-column label="序号" type="index"></sc-table-column>
</scTable>
</el-main>