Skip to content

9
912project
提交 b6452ff2 authored 作者: zax's avatar zax
浏览文件
操作

合并分支 'zax' 到 'master'

项目管理问题修改 查看合并请求 !62
上级 640f488f 6ece527f
隐藏空白字符变更
内嵌 并排
正在显示 包含 122 行增加 和 26 行删除
src/assets/changeElementStyle.css
浏览文件 @ b6452ff2
......@@ -199,4 +199,4 @@
}
.el-upload-list{
display: none;
}
}
\ No newline at end of file
src/components/projectManagement/document/document.vue
浏览文件 @ b6452ff2
......@@ -47,7 +47,7 @@
<span class="button buttonSave buttonHandle">
上传
<el-upload
style="margin-top: -38px;width: 58px;position: absolute; right: 27px;"
style="margin: -34px 27px 0 0;width: 58px;position: absolute;"
class="upload-demo"
action="https://jsonplaceholder.typicode.com/posts/"
:before-upload="uploadFile">
......@@ -177,10 +177,13 @@ export default {
return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
}
},
// 最近提交时间转换
uploadTimeChange(row) {
if (row.uploadTime) {
let d = new Date(row.uploadTime);
return d.getFullYear() + '-' + (d.getMonth() + 1) + '-' + d.getDate() + ' ' + d.getHours() + ':' + d.getMinutes() + ':' + d.getSeconds();
} else {
return '暂无提交'
}
}
}
......@@ -225,4 +228,19 @@ export default {
.document .content>>>.el-upload{
width: 100%;
}
.document .content .buttonSave{
/*background-color: #ffffff;*/
/*color: #4877e6;*/
}
/*表格单双行hover*/
.document>>>.el-table--striped .el-table__body tr.el-table__row--striped.el-table__row--striped.el-table__row--striped:hover td .buttonSave{
background-color: #ffffff!important;
color: #4877e6!important;
/*表格双行hover样式*/
}
.document>>>.el-table--enable-row-hover .el-table__body tr:hover>td .buttonSave{
background-color: #ffffff !important;
color: #4877e6!important;
/*表格单行hover样式*/
}
</style>
src/components/projectManagement/project/projectAdd.vue
浏览文件 @ b6452ff2
......@@ -3,7 +3,7 @@
<el-row>
<el-col :span="24">
<div class="content">
<p class="title">新增项目</p>
<p class="title"><span class="backImg" @click="backPath"></span><span class="title-text">新增项目</span></p>
<el-scrollbar style="height: 94%">
<el-col :span="24">
<div class="content-title">
......@@ -12,11 +12,11 @@
</div>
<p class="search">
<span class="search-input">
<span>项目名称：</span>
<span class="before">项目名称：</span>
<el-input v-model="name" size="medium" placeholder="请输入"></el-input>
</span>
<span class="search-input">
<span>开始时间：</span>
<span class="before">开始时间：</span>
<el-date-picker
v-model="startTime"
type="date"
......@@ -25,7 +25,7 @@
</el-date-picker>
</span>
<span class="search-input">
<span>完成时间：</span>
<span class="before">完成时间：</span>
<el-date-picker
v-model="endTime"
type="date"
......@@ -36,7 +36,7 @@
</p>
<p class="search">
<span class="search-input">
<span>技术路线：</span>
<span class="before">技术路线：</span>
<el-select v-model="techVal" @change="search" size="medium" placeholder="请选择" clearable>
<el-option
v-for="item in techList"
......@@ -47,7 +47,7 @@
</el-select>
</span>
<span class="search-input">
<span>建设方：</span>
<span class="before">建设方：</span>
<el-select v-model="build" placeholder="请选择" clearable>
<el-option
v-for="item in buildList"
......@@ -58,7 +58,7 @@
</el-select>
</span>
<span class="search-input">
<span>集成商：</span>
<span class="before">集成商：</span>
<el-select v-model="integrate" placeholder="请选择" clearable>
<el-option
v-for="item in integrateList"
......@@ -71,7 +71,7 @@
</p>
<p class="search" style="width: 59.5%">
<span class="search-input">
<span>开发商：</span>
<span class="before">开发商：</span>
<el-select v-model="develop" placeholder="请选择" clearable>
<el-option
v-for="item in developList"
......@@ -82,7 +82,7 @@
</el-select>
</span>
<span class="search-input">
<span>监理方：</span>
<span class="before">监理方：</span>
<el-select v-model="supervisor" placeholder="请选择" clearable>
<el-option
v-for="item in supervisorList"
......@@ -147,6 +147,15 @@
</el-date-picker>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="操作"
type="datetime"
align="center">
<template slot-scope="scope">
<span class="buttonSave" @click="softwareDelete(scope.$index)">删除</span>
</template>
</el-table-column>
</el-table>
<p class="add">
<span class="addMes" @click="addSoftware"><span class="add-icon"></span><span class="add-text">新增信息</span></span>
......@@ -203,6 +212,15 @@
<el-input v-model="scope.row.expect" placeholder="请输入"></el-input>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="操作"
type="datetime"
align="center">
<template slot-scope="scope">
<span class="buttonSave" @click="productDelete(scope.$index)">删除</span>
</template>
</el-table-column>
</el-table>
<p class="add">
<span class="addMes" @click="addProduct"><span class="add-icon"></span><span class="add-text">新增信息</span></span>
......@@ -236,11 +254,19 @@
align="center">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.name !== '里程碑3'"
v-model="scope.row.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
<el-date-picker
v-if="scope.row.name === '里程碑3'"
v-model="endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</template>
</el-table-column>
<el-table-column
......@@ -409,8 +435,12 @@ export default {
'中间件': 5,
'其他': 6
}
this.productData.map(item => { // 产品类型转换
this.productData.map((item, index) => { // 产品类型转换
item.form = changeProduct[item.form]
console.log(item.name)
if (item.name === '') {
this.productData.splice(index, 1)
}
})
let techId = '';
this.techList.map(item => { // 技术路线id
......@@ -442,12 +472,21 @@ export default {
thirdId = item.id
}
})
this.softwareData.map(item => { // 软件信息时间转换
this.softwareData.map((item, index) => { // 软件信息时间转换
item.startTime = new Date(item.startTime).getTime();
item.endTime = new Date(item.endTime).getTime();
if (item.name === '') {
this.softwareData.splice(index, 1)
}
})
this.milepostData.map(item => { // 里程碑时间转换
this.milepostData.map((item, index) => { // 里程碑时间转换
item.endTime = new Date(item.endTime).getTime();
if (index === 0) { // 里程碑1开始时间与项目开始时间一致
item.startTime = new Date(this.startTime).getTime()
}
if (index === 2) { // 里程碑3与项目完成时间一致
item.endTime = new Date(this.endTime).getTime()
}
})
let data = {
consId: consId,
......@@ -470,17 +509,17 @@ export default {
};
console.log(data)
if (this.supervisor && this.endTime && this.startTime && this.develop && this.integrate && this.build) {
this.$server.postProjectAdd(data).then(res => {
console.log(res)
if (res.data.code === 200) {
this.$message.success('项目新增成功！');
this.$router.push({name: 'projectManagement'});
} else {
this.$message.error('项目新增失败！');
}
}).catch(err => {
this.$message.error('项目新增失败！');
})
// this.$server.postProjectAdd(data).then(res => {
// console.log(res)
// if (res.data.code === 200) {
// this.$message.success('项目新增成功！');
// this.$router.push({name: 'projectManagement'});
// } else {
// this.$message.error('项目新增失败！');
// }
// }).catch(err => {
// this.$message.error('项目新增失败！');
// })
} else {
this.$message.error('基本信息项不可为空！');
}
......@@ -516,6 +555,18 @@ export default {
// 里程碑名称转换
typeChange(val) {
return this.typeVal[val.type];
},
// 返回项目管理
backPath () {
this.$router.push({name: 'projectManagement'});
},
// 软件信息列表删除
softwareDelete(index) {
this.softwareData.splice(index, 1)
},
// 产品信息列表删除
productDelete(index) {
this.productData.splice(index, 1);
}
}
}
......@@ -670,5 +721,30 @@ export default {
.projectAdd .content>>>.el-scrollbar__wrap{
margin-bottom: 0px !important;
}
.projectAdd .content .buttonSave:hover{
background: rgba(72,119,230,.6);
}
/*返回按钮*/
.projectAdd .content .backImg{
width: 25px;
height: 25px;
position: absolute;
cursor: pointer;
background-image: url("../../../assets/img/back.png");
}
.projectAdd .content .backImg:hover{
background-image: url("../../../assets/img/back-select.png");
}
.projectAdd .content .title-text{
margin-left: 29px;
vertical-align: middle;
}
.projectAdd .content .before:before{
content: '*';
color: #F56C6C;
margin-right: 4px;
}
.projectAdd .content>>>.el-scrollbar__wrap {
overflow-x: hidden;
}
</style>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论