Skip to content

D
dsk-cr20g
Commit 5e3ac391 authored by danfuman's avatar danfuman
Browse files
Options

修改

parent c19840f7
Hide whitespace changes
Inline Side-by-side
Showing with 90 additions and 37 deletions
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 5e3ac391
......@@ -384,13 +384,18 @@ export default {
.el-input__suffix{
margin-top: -1px;
}
.el-input__inner:focus{
border-color: #e0e0e0;
}
.el-input-group__append{
width: 59px;
width: 60px;
padding: 0;
text-align: center;
background: #F5F5F5;
color:#0081FF;
border-left: 0;
padding: 0;
text-align: center;
border-radius: 0;
border-right: 0;
}
}
.total{
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 5e3ac391
......@@ -15,10 +15,10 @@
</div>
<div class="wr_bot">
<div class="times"><img src="@/assets/images/project/ico_4.png">
<el-date-picker value-format="yyyy-MM-dd"
v-model="queryParam.finishTime"
type="date"
placeholder="完成时间">
<el-date-picker value-format="yyyy-MM-dd HH:mm:ss"
v-model="queryParam.dueTime"
type="datetime"
placeholder="截止时间">
</el-date-picker>
</div>
<div class="sels">
......@@ -35,23 +35,31 @@
</div>
</div>
<skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
<div v-else>
<div class="tasktitle"><strong>我的任务</strong><span @click="getYQ">{{yqnum}}条已逾期</span><!--<span class="on">4条已逾期</span>--></div>
<div class="tabList" v-else>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="进行中任务" name="first"></el-tab-pane>
<el-tab-pane label="已完成任务" name="second"></el-tab-pane>
<el-tab-pane :label="yqnum" name="third"></el-tab-pane>
</el-tabs>
<div class="tasklist" v-for="(item,index) in datalist.rows">
<div class="task_name">{{item.task}}</div>
<div class="task_con"><span>发起时间：{{item.createTime}}</span><span v-if="item.target">关联客户：<font class="wordprimary">{{item.target}}</font></span><span v-if="item.finishTime">完成时间：{{item.finishTime}}</span></div>
<div class="select" :class="{'on':item.state == 2}">
<div class="select" :class="{'on':item.state == 1}">
<div class="select-popper">
<span>
{{item.state == 2?"已完成":"未完成"}}
{{item.state == 1?"已完成":"进行中"}}
<i class="el-icon-caret-bottom"></i>
</span>
<el-select v-if="isDisableds == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)">
<el-option label="未完成" value="1"></el-option>
<el-option label="已完成" value="2"></el-option>
<el-option label="进行中" value="0"></el-option>
<el-option label="已完成" value="1"></el-option>
</el-select>
</div></div>
</div>
<!--<div class="tasktitle"><strong>已完成</strong></div>-->
<!---->
<!--<div class="tasktitle"><strong>进行中</strong><span @click="getYQ">{{yqnum}}条已逾期</span>&lt;!&ndash;<span class="on">4条已逾期</span>&ndash;&gt;</div>-->
<div class="tables" v-if="datalist.total>searchPram.pageSize">
<div class="bottems">
......@@ -89,6 +97,7 @@
},
data(){
return{
activeName:'first',
isEdit:false,
value:'',
status:0,
......@@ -96,22 +105,33 @@
businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),//项目详情id
target:'',
task:'',
finishTime:'',
dueTime:'',
},
searchPram:{
businessId:this.detailId ? this.detailId : parseInt(this.$route.query.id),
pageSize:20,
pageNum:1,
state:null,
},
datalist:[],
yqnum:0,//已逾期数量
yqnum:'',//已逾期数量
isDisableds:this.isDisabled,
isSkeleton:true,
}
},
created(){
this.getList()
let params={
...this.searchPram,
state:2,
// cancelHttp: true
}
getGZDB(params).then(result=>{
this.datalist = result.code == 200?result:[]
console.log(this.datalist.rows)
if(this.datalist){
this.yqnum = `已逾期 ${this.datalist.rows.length} 条`;
}
})
},
methods:{
getEdit(){
......@@ -119,43 +139,46 @@
this.value = ""
},
add(){
if(this.queryParam.task == '' || this.queryParam.finishTime == '')
// if(this.queryParam.task == '' || this.queryParam.dueTime == '')
if(this.queryParam.task == '')
return this.$message.warning('时间和内容需填写完整！')
addGZDB(this.queryParam).then(result=>{
if(result.code == 200){
this.$message.success("添加成功！")
this.getList()
this.queryParam.target = ''
this.queryParam.task = ''
this.queryParam.finishTime = ''
}else{
this.$message.error(result.msg)
}
})
addGZDB(this.queryParam).then(result=>{
if(result.code == 200){
this.$message.success("添加成功！")
this.getList()
this.queryParam.target = ''
this.queryParam.task = ''
this.queryParam.dueTime = ''
}else{
this.$message.error(result.msg)
}
})
},
cancel(){
this.isEdit = false;
this.queryParam.target = ''
this.queryParam.task = ''
this.queryParam.finishTime = ''
this.queryParam.dueTime = ''
},
getList(){
this.isSkeleton = true
getGZDB(this.searchPram).then(result=>{
let params={
...this.searchPram,
state:this.activeName === 'first'? 0 : this.activeName === 'second'? 1 : 2,
// cancelHttp: true
}
getGZDB(params).then(result=>{
this.isSkeleton = false
this.datalist = result.code == 200?result:[]
let num = 0
this.datalist.rows.forEach(item=>{
if(item.state == 0)
num++;
})
this.yqnum = num
})
},
handleCurrentChange(val){
this.searchPram.pageNum = val
this.getList()
},
handleClick(){
this.getList()
},
changes(id,state){
let param={
id:id,
......@@ -172,7 +195,7 @@
},
getYQ(){
let state = this.searchPram.state
this.searchPram.state = state == 0?null:0
this.searchPram.state = state == 2?null:2
this.handleCurrentChange(1)
},
}
......@@ -180,6 +203,31 @@
</script>
<style lang="scss" scoped>
.records{
.tasklist{
.select{
background: #FFEBEB;
color: #FF3C3C;
.select-popper{
color: #FF3C3C;
}
}
}
}
.tabList{
margin-top: 18px;
::v-deep .el-tabs{
.el-tabs__header{
margin: 0;
}
.el-tabs__active-bar{
height: 1px;
}
.el-tabs__nav-wrap::after{
height: 1px;
}
}
}
.wc{
position: absolute;
right: 0;
......
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