Skip to content

W
web-purchase
Commit 1ac35c5b authored by 张冬's avatar 张冬
Browse files
Options

密码编辑及修改bug

parent d15a4f98
Show whitespace changes
Inline Side-by-side
Showing with 262 additions and 150 deletions
src/api/purchaser/organization.js
View file @ 1ac35c5b
...@@ -35,6 +35,15 @@ export function roleadd(data) { ...@@ -35,6 +35,15 @@ export function roleadd(data) {
data:data data:data
}) })
} }
// 编辑密码
export function resetPassword(data) {
return request({
url:"reset-password",
method: 'post',
data:data
})
}
// 角色列表 // 角色列表
export function roleList(companyType) { export function roleList(companyType) {
return request({ return request({
......
src/components/citySelect/citySelect.vue
View file @ 1ac35c5b
<template> <template>
<div> <div>
<el-select v-model="provinceId" style="width: 167px; margin-right: 25px" @change="getProvince"> <el-select v-model="provinceId" style="width:167px;margin-right: 25px;" @change="getProvince">
<el-option v-for="item in provinceArr" :value="item.id" :key="item.id" :label="item.name"> </el-option> <el-option v-for="item in provinceArr" :value="item.id" :key="item.id" :label="item.name">
</el-option>
</el-select> </el-select>
<el-select v-model="cityId" style="width: 167px; margin-right: 25px" @change="getCity"> <el-select v-model="cityId" style="width:167px;margin-right: 25px;" @change="getCity">
<el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name"> </el-option> <el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name">
</el-option>
</el-select> </el-select>
<el-select v-model="districtId" style="width: 167px; margin-right: 25px" @change="getDistrict"> <el-select v-model="districtId" style="width:167px;margin-right: 25px;" @change="getDistrict">
<el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name"> </el-option> <el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name">
</el-option>
</el-select> </el-select>
</div> </div>
</template> </template>
<script> <script>
import { cityList } from '@/api/common/list'; import {
cityList
} from '@/api/common/list'
// import arrAll from './area.js' // import arrAll from './area.js'
export default { export default {
props: {
provinceId: ["Number","String"],
cityId: ["Number","String"],
districtId: ["Number","String"]
},
data() { data() {
return { return {
provinceId: '',
cityId: '',
districtId: '',
provinceArr: [], provinceArr: [],
cityArr: [], cityArr: [],
districtArr: [] districtArr: []
}; }
}, },
created() { created() {
this.getProvinceArr(); this.getProvinceArr()
if(this.provinceId){
console.log("获取省份列表")
this.getcityArr(this.provinceId);
}
if(this.cityId){
console.log("获取城市列表")
this.getdistrictArr(this.cityId);
}
}, },
methods: { methods: {
// 获取省列表 // 获取省列表
async getProvinceArr() { async getProvinceArr() {
const { code, data } = await cityList(0); const {
code,
data
} = await cityList(0)
if (code === 200) { if (code === 200) {
this.provinceArr = data; this.provinceArr = data
} }
}, },
// 获取市列表 // 获取市列表
async getcityArr(id) { async getcityArr(id) {
const { code, data } = await cityList(id); const {
code,
data
} = await cityList(id)
if (code === 200) { if (code === 200) {
this.cityArr = data; this.cityArr = data
} }
}, },
// 获取区列表 // 获取区列表
async getdistrictArr(id) { async getdistrictArr(id) {
const { code, data } = await cityList(id); const {
code,
data
} = await cityList(id)
if (code === 200) { if (code === 200) {
this.districtArr = data; this.districtArr = data
} }
}, },
getProvince() { getProvince() {
this.getcityArr(this.provinceId); this.getcityArr(this.provinceId)
this.cityId = ''; this.cityId = ''
this.districtId = ''; this.districtId = ''
this.$emit('sendprovinceId', this.provinceId); this.$emit('sendprovinceId', this.provinceId)
}, },
getCity() { getCity() {
this.getdistrictArr(this.cityId); this.getdistrictArr(this.cityId)
this.districtId = ''; this.districtId = ''
this.$emit('sendcityId', this.cityId); this.$emit('sendcityId', this.cityId)
}, },
getDistrict() { getDistrict() {
this.$emit('senddistrictId', this.districtId); this.$emit('senddistrictId', this.districtId)
} }
} }
...@@ -91,7 +98,7 @@ export default { ...@@ -91,7 +98,7 @@ export default {
// getDistrict() { // getDistrict() {
// this.$emit('getCity', this.county) // this.$emit('getCity', this.county)
// } // }
}; }
</script> </script>
<style> <style>
......
src/components/detail/companyDetail.vue
View file @ 1ac35c5b
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</li> </li>
<li> <li>
<div>结算账户名</div> <div>结算账户名</div>
<div>{{ detail.bankName }}</div> <div>{{ detail.bankAccountName}}</div>
</li> </li>
<li> <li>
<div>注册资本(万元)</div> <div>注册资本(万元)</div>
......
src/pages/purchaser/bid/bidStage/clearManagement/confirm.vue
View file @ 1ac35c5b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="content-head"> <div class="content-head">
<dataBreadcrumb :breads="breads"></dataBreadcrumb> <dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>查看澄清确认函</h3> <h3>澄清确认函</h3>
<h5>投标方向招标方发送澄清确认函</h5> <h5>投标方向招标方发送澄清确认函</h5>
</div> </div>
<div class="content flex-center"> <div class="content flex-center">
......
src/pages/purchaser/bid/editProject/editProject.vue
View file @ 1ac35c5b
...@@ -66,19 +66,20 @@ export default { ...@@ -66,19 +66,20 @@ export default {
await this.$refs.timeSet.next(); await this.$refs.timeSet.next();
await this.$refs.fileUpload.next(); await this.$refs.fileUpload.next();
console.log('通过'); console.log('通过');
const { msg, code } = await editProject(this.detail); console.log(this.detail)
if (code == 200) { // const { msg, code } = await editProject(this.detail);
this.$message({ // if (code == 200) {
message: msg, // this.$message({
type: 'success', // message: msg,
duration: 1500 // type: 'success',
}); // duration: 1500
setTimeout(() => { // });
this.$router.go(-1) // setTimeout(() => {
}, 1500); // this.$router.go(-1)
} else { // }, 1500);
this.$message.error(msg); // } else {
} // this.$message.error(msg);
// }
}, },
// 获取详情 // 获取详情
async getenquiryProjectId() { async getenquiryProjectId() {
......
src/pages/purchaser/bid/editProject/timeSet.vue
View file @ 1ac35c5b
...@@ -111,7 +111,6 @@ export default { ...@@ -111,7 +111,6 @@ export default {
rules: { rules: {
releaseTime: [ releaseTime: [
{ {
type: 'date',
required: true, required: true,
message: '请选择时间', message: '请选择时间',
trigger: 'change' trigger: 'change'
...@@ -122,7 +121,6 @@ export default { ...@@ -122,7 +121,6 @@ export default {
], ],
startTime: [ startTime: [
{ {
type: 'date',
required: true, required: true,
message: '请选择时间', message: '请选择时间',
trigger: 'change' trigger: 'change'
...@@ -133,7 +131,6 @@ export default { ...@@ -133,7 +131,6 @@ export default {
], ],
endTime: [ endTime: [
{ {
type: 'date',
required: true, required: true,
message: '请选择时间', message: '请选择时间',
trigger: 'change' trigger: 'change'
...@@ -144,7 +141,7 @@ export default { ...@@ -144,7 +141,7 @@ export default {
], ],
answerQuestionEndTime: [ answerQuestionEndTime: [
{ {
type: 'date',
required: true, required: true,
message: '请选择时间', message: '请选择时间',
trigger: 'change' trigger: 'change'
...@@ -155,7 +152,6 @@ export default { ...@@ -155,7 +152,6 @@ export default {
], ],
openBidStartTime: [ openBidStartTime: [
{ {
type: 'date',
required: true, required: true,
message: '请选择时间', message: '请选择时间',
trigger: 'change' trigger: 'change'
......
src/pages/purchaser/bid/reviewed/inquiryAnnouncement.vue
View file @ 1ac35c5b
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
</div> </div>
<div class="bottomButton"> <div class="bottomButton">
<el-button @click="cancel">取消</el-button> <el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="submit1" v-if="type == 1">编辑</el-button> <el-button type="primary" @click="submit1" v-if="type == 1">提交审核</el-button>
<el-button type="primary" @click="submit" v-else>提交审核</el-button> <el-button type="primary" @click="submit" v-else>提交审核</el-button>
</div> </div>
</div> </div>
......
src/pages/purchaser/bid/reviewed/tenderAnnouncement.vue
View file @ 1ac35c5b
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</div> </div>
<div class="bottomButton"> <div class="bottomButton">
<el-button @click="back">取消</el-button> <el-button @click="back">取消</el-button>
<el-button type="primary" @click="submit1" v-if="type == 1">提交编辑</el-button> <el-button type="primary" @click="submit1" v-if="type == 1">提交审核</el-button>
<el-button type="primary" @click="submit" v-else>提交审核</el-button> <el-button type="primary" @click="submit" v-else>提交审核</el-button>
</div> </div>
</div> </div>
......
src/pages/purchaser/bid/seeProject/message.vue
View file @ 1ac35c5b
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
:provinceId="ruleForm.provinceId" :provinceId="ruleForm.provinceId"
:cityId="ruleForm.cityId" :cityId="ruleForm.cityId"
:districtId="ruleForm.districtId" :districtId="ruleForm.districtId"
:type='true'
></citySelect> ></citySelect>
</el-form-item> </el-form-item>
<el-form-item label="最小投标单位数：" prop="minTender" disabled> <el-form-item label="最小投标单位数：" prop="minTender" disabled>
......
src/pages/purchaser/bid/workbench.vue
View file @ 1ac35c5b
...@@ -300,7 +300,10 @@ export default { ...@@ -300,7 +300,10 @@ export default {
} else if (item2.buttonId == 3 && item2.status == 1) { } else if (item2.buttonId == 3 && item2.status == 1) {
item1.url = '/purchaser/bid/editProject'; item1.url = '/purchaser/bid/editProject';
item1.label = '编辑项目信息'; item1.label = '编辑项目信息';
}else { } else if (item2.buttonId == 12 && item2.status == 2) {
item1.url = '/purchaser/bid/bidSure/see';
item1.label = '查看评标';
} else {
item1.url = this.geturl(item1.url, item2.status); item1.url = this.geturl(item1.url, item2.status);
item1.label = this.getlabel(item1.label, item2.status); item1.label = this.getlabel(item1.label, item2.status);
} }
......
src/pages/purchaser/organization/jurisdictionSee.vue
View file @ 1ac35c5b
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
<div class="message"> <div class="message">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm"> <el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="角色名称" prop="roleName"> <el-form-item label="角色名称" prop="roleName">
<el-input v-model.trim="form.roleName" :disabled="state"></el-input> <el-input v-model.trim="form.roleName" :disabled="state" maxlength="30"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" :disabled="state" maxlength="300"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="权限" prop="menuPOList"> <el-form-item label="权限" prop="menuPOList">
<el-tree <el-tree
...@@ -63,7 +66,8 @@ export default { ...@@ -63,7 +66,8 @@ export default {
}, },
form: { form: {
roleName: '', roleName: '',
menuPOList: [] menuPOList: [],
remark:""
}, },
rules: { rules: {
roleName: [ roleName: [
...@@ -109,6 +113,7 @@ export default { ...@@ -109,6 +113,7 @@ export default {
this.data = data; this.data = data;
var { data, code } = await roledetail(id); var { data, code } = await roledetail(id);
this.form.roleName=data.roleName this.form.roleName=data.roleName
this.form.remark=data.remark
this.list = data.menuIdList; this.list = data.menuIdList;
this.state=true this.state=true
}, },
......
src/pages/purchaser/organization/memberManagement.vue
View file @ 1ac35c5b
<template> <template>
<div> <div>
<div class="content"> <div class="content">
<dataTable :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist" ref="table" url="sys/user/member/list"> <dataTable
:columns="columns"
:page-obj="pageObj"
:breads="breads"
:checklist="checklist"
ref="table"
url="sys/user/member/list"
>
<el-button slot="moreButton" type="primary" @click="add('form')">添加新用户</el-button> <el-button slot="moreButton" type="primary" @click="add('form')">添加新用户</el-button>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button> <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="myId!==scope.row.uid">删除</el-button> <el-button type="text" size="small" @click="editPassword(scope.row)">修改密码</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="myId!== scope.row.uid">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</dataTable> </dataTable>
...@@ -22,12 +30,17 @@ ...@@ -22,12 +30,17 @@
<el-input v-model.trim="form.email" autocomplete="off" placeholder="请输入" maxlength="30"></el-input> <el-input v-model.trim="form.email" autocomplete="off" placeholder="请输入" maxlength="30"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="密码" label-width="100px" prop="password"> <el-form-item label="密码" label-width="100px" prop="password">
<el-input v-model.trim="form.password" autocomplete="off" show-password placeholder="请输入" maxlength="30"></el-input> <el-input
v-model.trim="form.password"
autocomplete="off"
show-password
placeholder="请输入"
maxlength="30"
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="角色" label-width="100px" prop="roleId"> <el-form-item label="角色" label-width="100px" prop="roleId">
<el-select v-model="form.roleId" placeholder="请选择"> <el-select v-model="form.roleId" placeholder="请选择">
<el-option v-for="item in roles" :key="item.roleId" :label="item.roleName" :value="item.roleId"> <el-option v-for="item in roles" :key="item.roleId" :label="item.roleName" :value="item.roleId"> </el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -49,8 +62,7 @@ ...@@ -49,8 +62,7 @@
</el-form-item> </el-form-item>
<el-form-item label="角色" label-width="100px" prop="roleId"> <el-form-item label="角色" label-width="100px" prop="roleId">
<el-select v-model="form1.roleId" placeholder="请选择"> <el-select v-model="form1.roleId" placeholder="请选择">
<el-option v-for="item in roles" :key="item.roleId" :label="item.roleName" :value="item.roleId"> <el-option v-for="item in roles" :key="item.roleId" :label="item.roleName" :value="item.roleId"> </el-option>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
...@@ -59,20 +71,25 @@ ...@@ -59,20 +71,25 @@
<el-button type="primary" @click="submitData1">确 定</el-button> <el-button type="primary" @click="submitData1">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="isPassword" title="修改密码">
<el-form ref="passwordForm" :model="passwordForm" :rules="rules">
<el-form-item label="密码" label-width="100px" prop="password">
<el-input placeholder="请输入密码" v-model.trim="passwordForm.password" show-password maxlength="30"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="isPassword = false">取 消</el-button>
<el-button type="primary" @click="sure">确 定</el-button>
</div>
</el-dialog>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import { import { roleList, checkAccount, useradd, userdelete, useredit ,resetPassword} from '@api/purchaser/organization';
roleList, import dataTable from '@components/dataTable.vue';
checkAccount, export default {
useradd,
userdelete,
useredit
} from '@api/purchaser/organization'
import dataTable from '@components/dataTable.vue'
export default {
components: { components: {
dataTable dataTable
}, },
...@@ -81,7 +98,7 @@ ...@@ -81,7 +98,7 @@
if (!value) { if (!value) {
return callback(new Error('手机号不能为空')); return callback(new Error('手机号不能为空'));
} else { } else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/ const reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
if (reg.test(value)) { if (reg.test(value)) {
callback(); callback();
} else { } else {
...@@ -90,19 +107,28 @@ ...@@ -90,19 +107,28 @@
} }
}; };
return { return {
myId:"", passwordForm: {
checklist: [{ phone: '',
password: ''
},
isPassword: false,
myId: '',
checklist: [
{
title: '姓名', title: '姓名',
type: 'input', type: 'input',
model: 'name' model: 'name'
}, { },
{
title: '手机', title: '手机',
type: 'input', type: 'input',
model: 'phone' model: 'phone'
}], }
],
breads: ['组织管理', '成员管理'], breads: ['组织管理', '成员管理'],
tableData: [], tableData: [],
columns: [{ columns: [
{
label: '姓名', label: '姓名',
prop: 'name' prop: 'name'
}, },
...@@ -128,12 +154,12 @@ ...@@ -128,12 +154,12 @@
size: 10, size: 10,
currentPage: 1, currentPage: 1,
func: (currentPage) => { func: (currentPage) => {
this.pageTurning(currentPage) this.pageTurning(currentPage);
} }
}, },
dialogFormVisible1:false, dialogFormVisible1: false,
dialogFormVisible: false, dialogFormVisible: false,
form1:{}, form1: {},
form: { form: {
name: '', name: '',
phone: '', phone: '',
...@@ -143,17 +169,22 @@ ...@@ -143,17 +169,22 @@
}, },
roles: [], roles: [],
rules: { rules: {
name: [{ name: [
{
required: true, required: true,
message: '请输入', message: '请输入',
trigger: 'blur' trigger: 'blur'
}], }
phone: [{ ],
phone: [
{
required: true, required: true,
validator: checkPhone, validator: checkPhone,
trigger: 'blur' trigger: 'blur'
}], }
email: [{ ],
email: [
{
required: true, required: true,
message: '请输入电子邮箱', message: '请输入电子邮箱',
trigger: 'blur' trigger: 'blur'
...@@ -163,7 +194,8 @@ ...@@ -163,7 +194,8 @@
message: '请输入正确的邮箱地址' message: '请输入正确的邮箱地址'
} }
], ],
password: [{ password: [
{
required: true, required: true,
message: '请输入密码', message: '请输入密码',
trigger: 'blur' trigger: 'blur'
...@@ -173,109 +205,121 @@ ...@@ -173,109 +205,121 @@
message: '密码需由8-16位数字字母组合' message: '密码需由8-16位数字字母组合'
} }
], ],
roleId: [{ roleId: [
{
required: true, required: true,
message: '请选择', message: '请选择',
trigger: 'change' trigger: 'change'
}],
uid:""
} }
],
uid: ''
} }
};
}, },
methods: { methods: {
// 密码编辑
editPassword(row) {
this.isPassword = true;
this.passwordForm.phone = row.phone;
},
// 密码确定接口
async sure() {
try {
const valid = await this.$refs['passwordForm'].validate();
if (valid) {
let form = this.passwordForm;
const { code, msg } = await resetPassword(form);
if (code === 200) {
this.$message.success(msg);
this.isPassword = false;
} else {
this.$message.error(msg);
}
}
} catch (e) {
console.log(e);
}
},
// 删除 // 删除
async handdelete(row) { async handdelete(row) {
try { try {
await this.$confirm("确定要删除么？", '提示', { await this.$confirm('确定要删除么？', '提示', {
type: 'warning' type: 'warning'
}) });
const { const { msg, code } = await userdelete(row.uid);
msg,
code
} = await userdelete(row.uid)
if (code == 200) { if (code == 200) {
this.$message.success(msg) this.$message.success(msg);
this.$refs.table.getauditList() this.$refs.table.getauditList();
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e);
} }
}, },
// 编辑 // 编辑
edit(row) { edit(row) {
this.form1 = Object.assign({}, row) this.form1 = Object.assign({}, row);
this.dialogFormVisible1 = true this.dialogFormVisible1 = true;
this.uid=row.uid this.uid = row.uid;
}, },
// 获取角色列表 // 获取角色列表
async getroleList() { async getroleList() {
let type = JSON.parse(localStorage.getItem("userInfo")).type let type = JSON.parse(localStorage.getItem('userInfo')).type;
const { const { data, code } = await roleList(type);
data, this.roles = data;
code
} = await roleList(type)
this.roles = data
}, },
// 添加新用户 // 添加新用户
add(form) { add(form) {
this.form = Object.assign({}) this.form = Object.assign({});
this.dialogFormVisible = true this.dialogFormVisible = true;
}, },
// 提交添加 // 提交添加
async submitData() { async submitData() {
try { try {
const valid = await this.$refs['form'].validate() const valid = await this.$refs['form'].validate();
if (valid) { if (valid) {
let form = this.form let form = this.form;
const { const { code, msg } = await useradd(form);
code,
msg
} = await useradd(form)
if (code === 200) { if (code === 200) {
this.$message.success(msg) this.$message.success(msg);
this.dialogFormVisible = false this.dialogFormVisible = false;
this.$refs.table.getauditList() this.$refs.table.getauditList();
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e);
} }
}, },
// 提交编辑 // 提交编辑
async submitData1() { async submitData1() {
try { try {
const valid = await this.$refs['form'].validate() const valid = await this.$refs['form'].validate();
if (valid) { if (valid) {
let form = this.form1 let form = this.form1;
form.uid=this.uid form.uid = this.uid;
const { const { code, msg } = await useredit(form);
code,
msg
} = await useredit(form)
if (code === 200) { if (code === 200) {
this.$message.success(msg) this.$message.success(msg);
this.dialogFormVisible1 = false this.dialogFormVisible1 = false;
this.$refs.table.getauditList() this.$refs.table.getauditList();
} else { } else {
this.$message.error(msg) this.$message.error(msg);
} }
} }
} catch (e) { } catch (e) {
console.log(e) console.log(e);
}
} }
},
}, },
created() { created() {
this.myId=JSON.parse(localStorage.getItem("userInfo")).userId this.myId = JSON.parse(localStorage.getItem('userInfo')).userId;
this.getroleList() this.getroleList();
}
} }
};
</script> </script>
<style scoped> <style scoped>
</style> </style>
src/pages/supply/bid/joinProject/bidStage/clearManagement/confirm.vue
View file @ 1ac35c5b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div> <div>
<div class="content-head"> <div class="content-head">
<dataBreadcrumb :breads="breads"></dataBreadcrumb> <dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>查看澄清确认函</h3> <h3>澄清确认函</h3>
<h5>投标方向招标方发送澄清确认函</h5> <h5>投标方向招标方发送澄清确认函</h5>
</div> </div>
<div class="content flex-center"> <div class="content flex-center">
......
src/pages/supply/organization/jurisdictionSee.vue
View file @ 1ac35c5b
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
<el-form-item label="角色名称" prop="roleName"> <el-form-item label="角色名称" prop="roleName">
<el-input v-model.trim="form.roleName" :disabled="state"></el-input> <el-input v-model.trim="form.roleName" :disabled="state"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="2" :disabled="state" maxlength="300"></el-input>
</el-form-item>
<el-form-item label="权限" prop="menuPOList"> <el-form-item label="权限" prop="menuPOList">
<el-tree <el-tree
:data="data" :data="data"
...@@ -63,7 +66,8 @@ export default { ...@@ -63,7 +66,8 @@ export default {
}, },
form: { form: {
roleName: '', roleName: '',
menuPOList: [] menuPOList: [],
remark:""
}, },
rules: { rules: {
roleName: [ roleName: [
...@@ -109,6 +113,7 @@ export default { ...@@ -109,6 +113,7 @@ export default {
this.data = data; this.data = data;
var { data, code } = await roledetail(id); var { data, code } = await roledetail(id);
this.form.roleName=data.roleName this.form.roleName=data.roleName
this.form.remark=data.remark
this.list = data.menuIdList; this.list = data.menuIdList;
this.state=true this.state=true
}, },
......
src/pages/supply/organization/memberManagement.vue
View file @ 1ac35c5b
...@@ -3,9 +3,10 @@ ...@@ -3,9 +3,10 @@
<div class="content"> <div class="content">
<dataTable :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist" ref="table" url="sys/user/member/list"> <dataTable :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist" ref="table" url="sys/user/member/list">
<el-button slot="moreButton" type="primary" @click="add('form')">添加新用户</el-button> <el-button slot="moreButton" type="primary" @click="add('form')">添加新用户</el-button>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100"> <el-table-column slot="operate" label="操作" align="center" fixed="right" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button> <el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
<el-button type="text" size="small" @click="editPassword(scope.row)">修改密码</el-button>
<el-button type="text" size="small" @click="handdelete(scope.row)" v-if="myId!==scope.row.uid">删除</el-button> <el-button type="text" size="small" @click="handdelete(scope.row)" v-if="myId!==scope.row.uid">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -58,6 +59,17 @@ ...@@ -58,6 +59,17 @@
<el-button @click="dialogFormVisible1 = false">取 消</el-button> <el-button @click="dialogFormVisible1 = false">取 消</el-button>
<el-button type="primary" @click="submitData1">确 定</el-button> <el-button type="primary" @click="submitData1">确 定</el-button>
</div> </div>
</el-dialog>
<el-dialog :visible.sync="isPassword" title="修改密码">
<el-form ref="passwordForm" :model="passwordForm" :rules="rules">
<el-form-item label="密码" label-width="100px" prop="password">
<el-input placeholder="请输入密码" v-model.trim="passwordForm.password" show-password maxlength="30"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="isPassword = false">取 消</el-button>
<el-button type="primary" @click="sure">确 定</el-button>
</div>
</el-dialog> </el-dialog>
</div> </div>
</div> </div>
...@@ -69,7 +81,8 @@ ...@@ -69,7 +81,8 @@
checkAccount, checkAccount,
useradd, useradd,
userdelete, userdelete,
useredit useredit,
resetPassword
} from '@api/purchaser/organization' } from '@api/purchaser/organization'
import dataTable from '@components/dataTable.vue' import dataTable from '@components/dataTable.vue'
export default { export default {
...@@ -90,6 +103,11 @@ ...@@ -90,6 +103,11 @@
} }
}; };
return { return {
passwordForm: {
phone: '',
password: ''
},
isPassword:false,
myId:"", myId:"",
checklist: [{ checklist: [{
title: '姓名', title: '姓名',
...@@ -183,6 +201,29 @@ ...@@ -183,6 +201,29 @@
} }
}, },
methods: { methods: {
// 密码编辑
editPassword(row) {
this.isPassword = true;
this.passwordForm.phone = row.phone;
},
// 密码确定接口
async sure() {
try {
const valid = await this.$refs['passwordForm'].validate();
if (valid) {
let form = this.passwordForm;
const { code, msg } = await resetPassword(form);
if (code === 200) {
this.$message.success(msg);
this.isPassword = false;
} else {
this.$message.error(msg);
}
}
} catch (e) {
console.log(e);
}
},
// 删除 // 删除
async handdelete(row) { async handdelete(row) {
try { try {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment