diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 85cf489a..e1ec1c6c 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -5,53 +5,105 @@
width="400"
v-model="iterationVisible"
trigger="manual" >
+
+ 刷新
+ 清空
+
+ 创建迭代
+
+
+
+ 迭代编号:
+
+
+
+ 上线时间:
+
+
+
+ 迭代名称:
+
+
+ 关闭
+ 查询
+
+
+ 更多条件
+
+ 关闭
+
+
+
+ 没有查到与项目【{{
+ linkProjectId
+ }}】关联的迭代,您可以尝试
+ 刷新 重新从后台加载，或者创建迭代
+ ，并自动关联项目【{{
+ linkProjectId
+ }}】。
+
+
+
+ 没有查到相关迭代,您可以尝试
+ 刷新 重新从后台加载，或者创建迭代
+
+
+
-
-
- 迭代
-
- 清空 关闭
-
-
-
- 迭代编号:
-
-
-
- 上线时间:
-
-
-
- 迭代名称:
-
-
- 关闭
- 查询
-
-
- 更多条件
-
-
-
-
-
+
+
{{scope.row.iterationName}} {{calcFinishRate(scope.row)}}%
@@ -61,6 +113,17 @@
{{editForm&&editForm.id?editForm.iterationName:'选择迭代'}}
+
+
+
+
+
+
@@ -72,6 +135,7 @@
const map=new Map();
import { mapGetters } from 'vuex'
+ import XmIterationAdd from "../xmIteration/XmIterationAdd.vue";
export default {
computed: {
@@ -134,6 +198,7 @@
iterationVisible:false,
moreVisible:false,
hadInit:false,
+ addIterationVisible:false,
/**end 自定义属性请在上面加 请加备注**/
}
},//end data
@@ -213,7 +278,7 @@
this.rowClick(row)
}
}else{
- this.clearSelectIteration()
+ this.editForm=null
}
}else{
this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
@@ -293,6 +358,10 @@
this.moreVisible=false;
this.$emit('clear',null );// @row-click="rowClick"
},
+ refreshSelect() {
+ this.searchXmIterations();
+ this.moreVisible = false;
+ },
referenceClick(){
if(!this.hadInit){
this.initData();
@@ -309,8 +378,28 @@
}
})
},
+
+ afterAddSubmit(row) {
+ this.xmIterations.push(row);
+ if (this.productId) {
+ map.set(this.productId, this.xmIterations);
+ } else if (this.linkProjectId) {
+ map.set(this.linkProjectId, this.xmIterations);
+ }
+ if (
+ this.autoSelect !== false &&
+ this.xmIterations.length > 0 &&
+ this.iterationVisible == false
+ ) {
+ var row = this.xmIterations[0];
+ this.$refs.table.setCurrentRow(row);
+ this.rowClick(row);
+ }
+ this.addIterationVisible = false;
+ },
},//end methods
components: {
+ XmIterationAdd,
//在下面添加其它组件
},
mounted() {
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index 28c241d1..1e7dd57f 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -6,7 +6,7 @@
- {{addForm.productName}}
+ {{addForm.productName?addForm.pproductName:addForm.productId}}
@@ -73,16 +73,16 @@
}
var date=val.substr(0,10)
date=date.replaceAll('-','');
- this.addForm.iterationName=date+this.addForm.productName+'V1.0.0'
+ this.addForm.iterationName=date+(this.addForm.productName?this.addForm.productName:'-请修改-')+'V1.0.0'
},
'addForm.productName':function(val){
- var date=this.addForm.endTime
+ var date=this.addForm.onlineTime
if(!date){
return;
}
date=date.substr(0,10)
date=date.replaceAll('-','');
- this.addForm.iterationName=date+this.addForm.productName+'V1.0.0'
+ this.addForm.iterationName=date+(this.addForm.productName?this.addForm.productName:'-请修改-')+'V1.0.0'
}
},
data() {