|
|
@@ -175,9 +175,9 @@
|
|
|
<el-link class="sub_task_num" @click.stop.native="showSubTaskList(element)"><i class="iconfont firerock-icontree" ></i><span style="margin-left:5px;">{{element.finishRefTaskCount}}/{{element.refTaskList.length}}</span></el-link>
|
|
|
</el-tooltip>
|
|
|
</div> -->
|
|
|
- <div v-if="element.taskType == 1 && element.refTaskList.length != 0" class="taskCardCircleBox">
|
|
|
- <el-progress type="circle" :percentage="(element.finishRefTaskCount/element.refTaskList.length) * 100" width="16" :show-text="false" stroke-linecap="butt" stroke-width="8"></el-progress>
|
|
|
- <span style="margin-left:5px;font-size:12px">{{element.finishRefTaskCount}}/{{element.refTaskList.length}}</span>
|
|
|
+ <div v-if="element.taskType == 1 && !(element.refTaskList == null || element.refTaskList.length == 0)" class="taskCardCircleBox">
|
|
|
+ <el-progress type="circle" :percentage="(element.finishRefTaskCount/(element.refTaskList ? element.refTaskList.length : 0)) * 100" width="16" :show-text="false" stroke-linecap="butt" stroke-width="8"></el-progress>
|
|
|
+ <span style="margin-left:5px;font-size:12px">{{element.finishRefTaskCount}}/{{(element.refTaskList ? element.refTaskList.length : 0)}}</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
</draggable>
|
|
|
@@ -825,11 +825,11 @@
|
|
|
<el-form-item label="1. 请先下载模板并填写后上传" >
|
|
|
<el-link type="primary" :underline="false" href="./upload/项目任务导入模板.xlsx" download="项目任务导入模板.xlsx">项目任务模板下载</el-link>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="2. 选择要导入的任务列表">
|
|
|
+ <!-- <el-form-item label="2. 选择要导入的任务列表" v-if="false">
|
|
|
<el-select v-model="importToStageId" placeholder="任务列表" style="width:350px;">
|
|
|
<el-option v-for="item in stageList" :label="item.stagesName" :value="item.id" :key="item.id"></el-option>
|
|
|
</el-select>
|
|
|
- </el-form-item>
|
|
|
+ </el-form-item> -->
|
|
|
<div><span style="font-size:12px;color:#999;">如导入的任务属于多个列表，可在导入后拖拽来更改所属列表</span></div>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -1585,7 +1585,7 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
|
|
|
formData.append("file", item.file);
|
|
|
formData.append("projectId", this.curProjectId);
|
|
|
formData.append("groupId", this.selectedGroup.id);
|
|
|
- formData.append("stagesId", this.importToStageId);
|
|
|
+ // formData.append("stagesId", this.importToStageId);
|
|
|
this.http.uploadFile('/task/importTask', formData,
|
|
|
res => {
|
|
|
this.$refs.upload.clearFiles();
|
|
|
@@ -2356,13 +2356,15 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
|
|
|
this.times = `${Y}-${M}-${D}`
|
|
|
},
|
|
|
addStagePost() {
|
|
|
+ console.log('新增任务列表');
|
|
|
let param = JSON.parse(JSON.stringify(this.stageForm));
|
|
|
param.taskList = [];
|
|
|
this.http.post('/stages/save',param,
|
|
|
res => {
|
|
|
if (res.code == "ok") {
|
|
|
- this.stageList = res.data;
|
|
|
this.addStageDialog = false;
|
|
|
+ this.stageList = res.data;
|
|
|
+
|
|
|
} else {
|
|
|
this.$message({
|
|
|
message: res.msg,
|
ggooalice