Skip to content

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

密码编辑及修改bug

parent d15a4f98
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 113 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-select> </el-option>
<el-select v-model="cityId" style="width: 167px; margin-right: 25px" @change="getCity"> </el-select>
<el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name"> </el-option> <el-select v-model="cityId" style="width:167px;margin-right: 25px;" @change="getCity">
</el-select> <el-option v-for="item in cityArr" :value="item.id" :key="item.id" :label="item.name">
<el-select v-model="districtId" style="width: 167px; margin-right: 25px" @change="getDistrict"> </el-option>
<el-option v-for="item in districtArr" :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">
</div> <el-option v-for="item in districtArr" :value="item.id" :key="item.id" :label="item.name">
</el-option>
</el-select>
</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"], data() {
cityId: ["Number","String"], return {
districtId: ["Number","String"] provinceId: '',
cityId: '',
districtId: '',
provinceArr: [],
cityArr: [],
districtArr: []
}
},
created() {
this.getProvinceArr()
},
methods: {
// 获取省列表
async getProvinceArr() {
const {
code,
data
} = await cityList(0)
if (code === 200) {
this.provinceArr = data
}
}, },
data() { // 获取市列表
return { async getcityArr(id) {
provinceArr: [], const {
cityArr: [], code,
districtArr: [] data
}; } = await cityList(id)
if (code === 200) {
this.cityArr = data
}
}, },
created() { // 获取区列表
this.getProvinceArr(); async getdistrictArr(id) {
if(this.provinceId){ const {
console.log("获取省份列表") code,
this.getcityArr(this.provinceId); data
} } = await cityList(id)
if(this.cityId){ if (code === 200) {
console.log("获取城市列表") this.districtArr = data
this.getdistrictArr(this.cityId); }
}
}, },
methods: {
// 获取省列表
async getProvinceArr() {
const { code, data } = await cityList(0);
if (code === 200) {
this.provinceArr = data;
}
},
// 获取市列表
async getcityArr(id) {
const { code, data } = await cityList(id);
if (code === 200) {
this.cityArr = data;
}
},
// 获取区列表
async getdistrictArr(id) {
const { code, data } = await cityList(id);
if (code === 200) {
this.districtArr = data;
}
},
getProvince() {
this.getcityArr(this.provinceId); getProvince() {
this.cityId = ''; this.getcityArr(this.provinceId)
this.districtId = ''; this.cityId = ''
this.$emit('sendprovinceId', this.provinceId); this.districtId = ''
}, this.$emit('sendprovinceId', this.provinceId)
getCity() {
this.getdistrictArr(this.cityId); },
this.districtId = ''; getCity() {
this.$emit('sendcityId', this.cityId); this.getdistrictArr(this.cityId)
}, this.districtId = ''
getDistrict() { this.$emit('sendcityId', this.cityId)
this.$emit('senddistrictId', this.districtId); },
} getDistrict() {
this.$emit('senddistrictId', this.districtId)
} }
}
// getCounty() { // getCounty() {
// for (var i = 0; i < this.cityArr.length; i++) { // for (var i = 0; i < this.cityArr.length; i++) {
// var obj = this.cityArr[i] // var obj = this.cityArr[i]
// if (this.city == obj.name) { // if (this.city == obj.name) {
// this.countyArr = obj.sub // this.countyArr = obj.sub
// this.county = '' // this.county = ''
// this.$emit('getCounty', this.city) // this.$emit('getCounty', this.city)
// } // }
// } // }
// }, // },
// 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: [
...@@ -108,7 +112,8 @@ export default { ...@@ -108,7 +112,8 @@ 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/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: [
...@@ -108,7 +112,8 @@ export default { ...@@ -108,7 +112,8 @@ 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>
...@@ -59,6 +60,17 @@ ...@@ -59,6 +60,17 @@
<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>
...@@ -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