Skip to content

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

中标人

parent 8a90beb2
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 214 deletions
src/api/common/list.js
View file @ bbf6a08a
......@@ -165,6 +165,21 @@ export function projectEnd(projectId) {
method: 'put'
})
}
// 权限菜单树
export function roleMenus(companyType) {
return request({
url: `/sys/menu/roleMenus?companyType=${companyType}`,
method: 'get'
})
}
// 添加角色
export function roleadd(data) {
return request({
url:"sys/role/add",
method: 'post',
data:data
})
}
// 部署线上
export function autodeploy() {
......
src/pages/purchaser/bid/bidSure/determine.vue
View file @ bbf6a08a
......@@ -57,12 +57,12 @@
},
data() {
return {
classify:"",
classify: "",
projectCode: "",
projectName: "",
file: [],
companyId: "",
projectId:"" ,
projectId: "",
content: '',
navs: ['确认中标人'],
breads: ['招标管理', '招标项目管理', '工作台'],
......@@ -107,22 +107,12 @@
},
// 获取中标人列表
async getcandidate() {
try {
let companyId=this.companyId;
if(companyId){
let projectId = localStorage.getItem("projectId");
const {
data,
code
} = await candidate(projectId)
if (code === 200) {
this.tableData = data
}
}else{
this.$message.error("请选择中标人")
}
} catch (e) {
console.log(e)
const {
data,
code
} = await candidate(projectId)
if (code === 200) {
this.tableData = data
}
},
// 获取项目分类
......@@ -133,7 +123,7 @@
data,
code
} = await projectClassify(projectId)
this.classify=data;
this.classify = data;
} catch (e) {
console.log(e)
}
......@@ -187,7 +177,8 @@
height: 50px;
}
span{
color:#B21F2D
span {
color: #B21F2D
}
</style>
src/pages/purchaser/bid/releaseProject/demand.vue
View file @ bbf6a08a
......@@ -44,7 +44,7 @@
<el-input v-model.trim="searchData.specification" placeholder='请输入' maxlength="30"></el-input>
</el-form-item>
<el-form-item label="标杆价(元)：" prop="price">
<el-input-number v-model="searchData.price" :min="0" :controls="false" :precision="2" placeholder="输入"></el-input-number>
<el-input-number v-model="searchData.price" :min="0" :controls="false" :precision="2" placeholder="请输入"></el-input-number>
</el-form-item>
<el-form-item label="备注：" prop="remark">
<el-input v-model.trim="searchData.remark" placeholder='请输入' maxlength="30"></el-input>
......@@ -193,7 +193,7 @@
unit: '',
brand: '',
specification: '',
price: '',
price: undefined,
remark: ""
},
tableData: [],
......@@ -331,14 +331,18 @@
},
next() {
let projectCommodityList = this.tableData;
if (projectCommodityList.length > 0) {
let ruleForm = {};
ruleForm.projectCommodityList = projectCommodityList;
this.$emit('getruleForm', ruleForm)
this.$parent.next()
} else {
this.$message.error('请添加标的需求');
}
// if (projectCommodityList.length > 0) {
// let ruleForm = {};
// ruleForm.projectCommodityList = projectCommodityList;
// this.$emit('getruleForm', ruleForm)
// this.$parent.next()
// } else {
// this.$message.error('请添加标的需求');
// }
let ruleForm = {};
ruleForm.projectCommodityList = projectCommodityList;
this.$emit('getruleForm', ruleForm)
this.$parent.next()
},
upper() {
this.$parent.upper()
......
src/pages/purchaser/bid/releaseProject/message.vue
View file @ bbf6a08a
......@@ -431,7 +431,7 @@ export default {
phone: ''
},
earnestInfoPO: {
money: '',
money: undefined,
account: '',
bank: '',
userName: '',
......
src/pages/purchaser/organization/jurisdictionList.vue
View file @ bbf6a08a
......@@ -2,7 +2,8 @@
<div >
<div class="content">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" >
<el-button type="primary" @click="add">创建新的角色</el-button>
<dataTable :table-data="tableData" :columns="columns" :is-pageobj="false" :tableTop="30">
<el-table-column slot="operate" label="操作" align="center" fixed="right" >
<template slot-scope="scope">
<el-button type="text" size="small" @click="see(scope.row)">查看</el-button>
......@@ -58,7 +59,10 @@ export default {
methods: {
see() {
this.$router.push('/purchaser/organization/jurisdictionSee')
}
},
add(){
this.$router.push("/purchaser/organization/jurisdictionSee")
}
}
}
</script>
......
src/pages/purchaser/organization/jurisdictionSee.vue
View file @ bbf6a08a
<template>
<div>
<div class="content-head">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>新建角色</h3>
<h5>新建角色</h5>
</div>
<div class="content">
<div class="message">
<div>角色名称：项目经理</div>
<div>备注：xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</div>
<div class="flex">
<div>权限</div>
<el-tree :data="data" :props="defaultProps" show-checkbox node-key="id">
</el-tree>
</div>
</div>
</div>
</div>
<div>
<div class="content-head">
<dataBreadcrumb :breads="breads"></dataBreadcrumb>
<h3>新建角色</h3>
<h5>新建角色</h5>
</div>
<div class="content">
<div class="message">
<el-form :model="form" :rules="rules" ref="form" label-width="100px" class="demo-ruleForm">
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="form.roleName"></el-input>
</el-form-item>
<el-form-item label="权限" prop="menuPOList">
<el-tree :data="data" :props="defaultProps" show-checkbox @check-change="handleCheckChange" node-key="id" ref="tree">
</el-tree>
</el-form-item>
</el-form>
</div>
</div>
<div class="centerButton">
<el-button @click="back">返回</el-button>
<el-button @click="add">添加</el-button>
</div>
</div>
</template>
<script>
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
components: {
dataBreadcrumb
},
data() {
return {
breads: ['系统管理', '权限管理'],
data: [{
id: 1,
label: '首页',
children: [{
id: 4,
label: '招标管理',
children: [{
id: 9,
label: '招标项目管理'
}]
}]
}, {
id: 2,
label: '平台交货管理',
children: [{
id: 5,
label: '平台交货列表'
}]
}, {
id: 3,
label: '供应商管理',
children: [{
id: 7,
label: '供应商列表'
}, {
id: 8,
label: '我的供应商'
}]
}, {
id: 10,
label: '组织管理',
children: [{
id: 11,
label: '单位信息'
}, {
id: 12,
label: '成员管理'
}, {
id: 13,
label: '权限管理'
}]
}, {
id: 14,
label: '系统管理',
children: [{
id: 15,
label: '绑定CA'
}, {
id: 16,
label: '日志列表'
}]
}],
defaultProps: {
children: 'children',
label: 'label'
}
}
},
methods: {
}
}
import {
roleMenus,roleadd
} from '@api/common/list'
import dataBreadcrumb from '@components/dataBreadcrumb.vue'
export default {
components: {
dataBreadcrumb
},
data() {
let check = async (rule, value, callback) => {
console.log("1")
console.log(this.form.menuPOList.length)
if (this.form.menuPOList.length == 0) {
console.log("空")
return callback(new Error('请选择权限'));
} else {
callback();
}
};
return {
breads: ['系统管理', '权限管理'],
data: [],
defaultProps: {
children: 'children',
label: 'label'
},
form: {
roleName: "",
menuPOList: []
},
rules: {
roleName: [{
required: true,
message: '请填写',
trigger: 'blur'
}],
menuPOList: [{
required: true,
validator: check,
trigger: 'change'
}],
}
}
},
methods: {
back() {
this.$router.go(-1)
},
async getroleMenus() {
const {
data,
code
} = await roleMenus(1)
this.data = data
},
handleCheckChange(data, checked, indeterminate) {
console.log(data, checked, indeterminate);
},
handleCheckChange() {
this.form.menuPOList = this.$refs.tree.getCheckedKeys()
},
async add() {
try {
const valid = await this.$refs['form'].validate()
if (valid) {
let form = this.form
const {
code,
msg
} = await roleadd(form)
if (code === 200) {
this.$message({
message: msg,
type: 'success',
duration: 1500
})
setTimeout(() => {
this.$router.go(-1)
}, 1500)
}else{
this.$message.error(msg)
}
}
} catch (e) {
console.log(e)
}
}
},
created() {
this.getroleMenus()
}
}
</script>
......@@ -102,6 +129,6 @@ export default {
}
.message>div {
margin-bottom: 30px;
margin-bottom: 30px;
}
</style>
src/pages/purchaser/organization/memberManagement.vue
View file @ bbf6a08a
......@@ -2,7 +2,7 @@
<div>
<div class="content">
<dataTable :table-data="tableData" :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist">
<el-button slot="moreButton" type="primary">添加新用户</el-button>
<el-button slot="moreButton" type="primary" @click="add">添加新用户</el-button>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="edit(scope.row)">编辑</el-button>
......@@ -146,8 +146,10 @@ export default {
edit(row) {
this.form = row
this.dialogFormVisible = true
}
},
add(){
this.$router.push("/purchaser/organization/jurisdictionSee")
}
}
}
</script>
......
src/pages/purchaser/supply/allSupply/allSupplySee.vue
View file @ bbf6a08a
......@@ -22,7 +22,7 @@
},
data() {
return {
breads: ['招标管理', '招标项目管理', '工作台'],
breads: ['供应商管理', '供应商列表'],
companyId:""
}
},
......
src/pages/purchaser/supply/mySupply/mySupplyList.vue
View file @ bbf6a08a
......@@ -24,7 +24,7 @@ export default {
type: 'input',
model: 'companyName'
}],
breads: ['供应商管理', '供应商列表'],
breads: ['供应商管理', '我的供应商'],
tableData: [],
columns: [{
label: '单位名称',
......
src/pages/purchaser/supply/mySupply/mySupplySee.vue
View file @ bbf6a08a
......@@ -22,7 +22,7 @@
},
data() {
return {
breads: ['招标管理', '招标项目管理', '工作台'],
breads: ['供应商管理', '我的供应商'],
companyId: ""
}
},
......
src/pages/purchaser/system/logList.vue
View file @ bbf6a08a
<template>
<div>
<div class="content">
<dataTable :table-data="tableData" :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist">
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="examine(scope.row)">审核</el-button>
</template>
</el-table-column>
</dataTable>
</div>
</div>
<div>
<div class="content">
<dataTable :table-data="tableData" :columns="columns" :page-obj="pageObj" :breads="breads" :checklist="checklist"
url="log/logList">
<el-table-column slot="name" label="姓名" align="center" width="100">
<template slot-scope="scope">
<div>{{scope.row.name?scope.row.name:"无"}}</div>
</template>
</el-table-column>
<el-table-column slot="args" label="请求参数" align="center" width="100">
<template slot-scope="scope">
<div>{{scope.row.args?scope.row.args:"无"}}</div>
</template>
</el-table-column>
<el-table-column slot="operate" label="操作" align="center" fixed="right" width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="examine(scope.row)">审核</el-button>
</template>
</el-table-column>
</dataTable>
</div>
</div>
</template>
<script>
import dataTable from '@components/dataTable.vue'
export default {
name: 'bidingList',
components: {
dataTable
},
data() {
return {
checklist: [{
title: '姓名',
type: 'input',
model: 'name'
}, {
title: '用户操作',
type: 'input',
model: 'operate'
}],
breads: ['系统管理', '日志列表'],
tableData: [{}],
columns: [{
label: '姓名',
prop: 'name'
},
{
label: '用户操作',
prop: 'operate'
},
{
label: '请求方式',
prop: 'requestType'
},
{
label: '请求参数',
prop: 'requestData'
},
{
label: '请求时长',
prop: 'requestTime'
},
{
label: '状态',
prop: 'state'
},
{
label: '操作IP',
prop: 'ip'
},
{
label: '创建时间',
prop: 'data'
}],
pageObj: {
size: 10,
total: 1,
currentPage: 1,
sizes: [100, 200, 300],
func: (currentPage) => {
this.pageTurning(currentPage)
}
}
}
},
methods: {
examine() {
this.$router.push('/admin/bid/bidingDetail')
}
}
}
import dataTable from '@components/dataTable.vue'
export default {
name: 'bidingList',
components: {
dataTable
},
data() {
return {
checklist: [{
title: '姓名',
type: 'input',
model: 'name'
}, {
title: '用户操作',
type: 'input',
model: 'operation'
}],
breads: ['系统管理', '日志列表'],
tableData: [{}],
columns: [{
slot: "name"
},
{
label: '用户操作',
prop: 'operation'
},
{
label: '请求方式',
prop: 'method'
},
{
slot: "args"
},
{
label: '请求时长',
prop: 'elapsed'
},
{
label: '状态',
prop: 'status'
},
{
label: '操作IP',
prop: 'ip'
},
{
label: '创建时间',
prop: 'createTime'
}
],
pageObj: {
size: 10,
currentPage: 1,
func: (currentPage) => {
this.pageTurning(currentPage)
}
}
}
},
methods: {
examine() {
this.$router.push('/admin/bid/bidingDetail')
}
}
}
</script>
<style scoped>
......
vue.config.js
View file @ bbf6a08a
......@@ -9,15 +9,15 @@ module.exports = {
assetsDir: 'static',
productionSourceMap: false,
chainWebpack: config => {
config.resolve.alias.set('@components', resolve('src/components'))
config.resolve.alias.set('@lib', resolve('src/lib'))
config.resolve.alias.set('@styles', resolve('src/styles'))
config.resolve.alias.set('@enum', resolve('src/enum'))
config.resolve.alias.set('@components', resolve('src/components'))
config.resolve.alias.set('@lib', resolve('src/lib'))
config.resolve.alias.set('@styles', resolve('src/styles'))
config.resolve.alias.set('@enum', resolve('src/enum'))
config.resolve.alias.set('@common', resolve('src/common'))
config.resolve.alias.set('@static', resolve('src/static'))
config.resolve.alias.set('@api', resolve('src/api'))
config.resolve.alias.set('@utils', resolve('src/utils'))
config.resolve.alias.set("@", resolve("src")); // key,value自行定义，比如.set('@@', resolve('src/components'))
config.resolve.alias.set("@", resolve("src")); // key,value自行定义，比如.set('@@', resolve('src/components'))
},
// devServer: {
// port:3001,
......
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