diff --git a/src/api/xm/core/xmWorkload.js b/src/api/xm/core/xmWorkload.js
index 55e076bc..ce6eb49c 100644
--- a/src/api/xm/core/xmWorkload.js
+++ b/src/api/xm/core/xmWorkload.js
@@ -56,10 +56,12 @@ export const listXmWorkloadGroupByTaskIdAndUseridToSet = params => { return axio
export const initDicts = (that) => {
var itemCodes=['taskState','taskType'];//在此添加要加载的字典 如['sex','grade','lvl']
+ var wlBizType=[{id:'1',name:'任务'},{id:'2',name: '缺陷'},{id:'3',name:'测试用例'},{id:'4',name:'执行用例'},{id:'5',name:'需求'}]
var wstatus=[{id:'0',name:'待确认'},{id:'1',name: '已确认'}]
var sstatus=[{id:'0',name:'无需结算'},{id:'1',name: '待结算'},{id:'2',name:'已提交'},{id:'3',name:'已通过'},{id:'4',name:'已结算'}]
that.dicts.wstatus=wstatus
that.dicts.sstatus=sstatus
+ that.dicts.wlBizType=wlBizType
if(itemCodes.length>0){
initSimpleDicts('all',itemCodes).then(res=>{
Object.assign(that.dicts,res.data.data)
diff --git a/src/views/xm/core/xmQuestion/XmQuestionDetail.vue b/src/views/xm/core/xmQuestion/XmQuestionDetail.vue
new file mode 100644
index 00000000..6ebb3e07
--- /dev/null
+++ b/src/views/xm/core/xmQuestion/XmQuestionDetail.vue
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue b/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue
new file mode 100644
index 00000000..6aee547e
--- /dev/null
+++ b/src/views/xm/core/xmTestCase/XmTestCaseDetail.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue
new file mode 100644
index 00000000..438f6ad4
--- /dev/null
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseDetail.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadList.vue b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
index f1d43184..b40ffd7f 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadList.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadList.vue
@@ -20,6 +20,11 @@
{{scope.row.wstatus==='1'?'已确认':'待确认'}}
+
+
+ {{scope.row.bizName}}
+
+
@@ -325,6 +330,11 @@
this.editForm=Object.assign(this.editForm,this.val)
this.editFormBak={...this.editForm}
},
+ goToBizDetail(row){
+ if(row.bizType=='1'){
+
+ }
+ }
},//end methods
mounted() {
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
index 6690b90c..3e438121 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadMng.vue
@@ -62,11 +62,11 @@
-
+
- {{scope.row.taskName}}
+ {{scope.row.bizName}}
diff --git a/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
index ef326237..46deca65 100644
--- a/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmWorkload/XmWorkloadSimpleListForBizDate.vue
@@ -29,16 +29,19 @@
-
-
-
- {{item.name}}
-
-
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
{{scope.row.sbillId?'结算单:'+scope.row.sbillId:'选择结算单'}}
@@ -50,6 +53,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,7 +88,12 @@
export default {
name:'xmWorkloadSimpleListForBizDate',
components: {
- XmTaskSbillSelect
+ XmTaskSbillSelect,
+ "xm-task-detail":()=>import("../xmTask/XmTaskDetail"),
+ "xm-question-detail":()=>import("../xmQuestion/XmQuestionMng"),
+ "xm-test-case-detail":()=>import("../xmTestCase/XmTestCaseDetail"),
+ "xm-test-plan-case-detail":()=>import("../xmTestPlanCase/XmTestPlanCaseDetail"),
+ "xm-menu-detail":()=>import("../xmMenu/XmMenuDetail"),
},
props:[ 'visible','wstatus','sstatus','bizDate','projectId','userid','taskId','bizMonth','detailId','sbillId'],
computed: {
@@ -101,6 +128,7 @@
taskState:[],
wstatus:[],
sstatus:[],
+ wlBizType:[],
//sex: [{id:'1',name:'男'},{id:'2',name:'女'}]
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
addFormVisible: false,//新增xmWorkload界面是否显示
@@ -114,6 +142,11 @@
},
maxTableHeight:300,
sbillVisible:false,
+ taskDetailVisible:false,
+ bugDetailVisible:false,
+ caseDetailVisible:false,
+ planCaseDetailVisible:false,
+ menuDetailVisible:false,
}
},//end data
methods: {
@@ -352,6 +385,19 @@
this.$notify({position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error'});
}).catch( err => this.load.edit=false );
},
+ openDialog(row){
+ if(row.bizType=='1'){
+ this.taskDetailVisible=true
+ }else if(row.bizType=='2'){
+ this.bugDetailVisible=true
+ }else if(this.bizType=='3'){
+ this.caseDetailVisible=true
+ }else if(this.bizType=='4'){
+ this.planCaseDetailVisible=true
+ }else if(this.bizType=='5'){
+ this.menuDetailVisible=true
+ }
+ }
},//end methods
mounted() {