|
@@ -159,7 +159,7 @@
|
|
<span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date" style="margin-left:5px"> {{element.endDate}}</i></span>
|
|
<span v-if="element.endDate >= times || element.taskStatus == 1"><i v-if="element.endDate != null" class="el-icon-date" style="margin-left:5px"> {{element.endDate}}</i></span>
|
|
<span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span class="element_span"> {{element.endDate}} 截止</span></i></em></span>
|
|
<span v-else><em v-if="element.endDate != null" style="display: inline-block;padding:3px 5px"><i v-if="element.endDate != null" class="el-icon-date"><span class="element_span"> {{element.endDate}} 截止</span></i></em></span>
|
|
<span v-if="element.executorName">
|
|
<span v-if="element.executorName">
|
|
- <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="'background:'+element.executorColor.split(',')[exeIndex]" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
|
|
|
|
|
|
+ <span v-for="(exeItem, exeIndex) in element.executorName.split(',')" :key="exeIndex" :style="element.executorColor ? 'background:' + element.executorColor.split(',')[exeIndex] : ''" class="user_name_icon">{{exeItem.length>2?exeItem.substring(exeItem.length-2, exeItem.length):exeItem}}</span>
|
|
</span>
|
|
</span>
|
|
<el-button v-if="!element.executorName" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;position: absolute;z-index: 5;right: 5px;">认领</el-button>
|
|
<el-button v-if="!element.executorName" type="primary" @click.stop.native="addAsMyTask(element)" size="mini" style="float:right;width:38px;padding:5px;position: absolute;z-index: 5;right: 5px;">认领</el-button>
|
|
</div>
|
|
</div>
|
|
@@ -2382,6 +2382,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
|
|
this.displayTable = true;
|
|
this.displayTable = true;
|
|
} ,
|
|
} ,
|
|
groupChange(index, indexPath) {
|
|
groupChange(index, indexPath) {
|
|
|
|
+ console.log('店家了')
|
|
this.groupType = 0;
|
|
this.groupType = 0;
|
|
this.order = "seq";
|
|
this.order = "seq";
|
|
this.isDesc = false;
|
|
this.isDesc = false;
|
|
@@ -2462,10 +2463,17 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
|
|
// return
|
|
// return
|
|
// }
|
|
// }
|
|
var param = JSON.parse(JSON.stringify(this.groupTemplateList.filter(g=>g.selected)))
|
|
var param = JSON.parse(JSON.stringify(this.groupTemplateList.filter(g=>g.selected)))
|
|
- console.log(param)
|
|
|
|
|
|
+ console.log(param, '你看看啊')
|
|
for(var i in param) {
|
|
for(var i in param) {
|
|
delete param[i].stagesList
|
|
delete param[i].stagesList
|
|
}
|
|
}
|
|
|
|
+ if(param.length < 1) {
|
|
|
|
+ this.$message({
|
|
|
|
+ message: '请选择模板',
|
|
|
|
+ type: "error"
|
|
|
|
+ });
|
|
|
|
+ return
|
|
|
|
+ }
|
|
console.log(this.groupList)
|
|
console.log(this.groupList)
|
|
var s = null
|
|
var s = null
|
|
var k = ''
|
|
var k = ''
|