From 1aa122c2d88da80b12f66ae4fefa44e66765979d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 29 Mar 2022 18:07:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=99=BB=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xmTaskWorkload/XmTaskWorkloadEdit.vue | 124 ++++---- .../xmTaskWorkload/XmTaskWorkloadList.vue | 272 ++++++++++++++++++ .../xmTaskWorkload/XmTaskWorkloadRecord.vue | 144 ++++++++++ .../XmTaskWorkloadRecordDialog.vue | 69 +++++ src/views/xm/core/xmWorkItem/XmSubBugList.vue | 12 + .../xm/core/xmWorkItem/XmSubTaskList.vue | 25 +- 6 files changed, 584 insertions(+), 62 deletions(-) create mode 100644 src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue create mode 100644 src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue create mode 100644 src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecordDialog.vue diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue index bd501905..05a702d4 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue @@ -2,60 +2,60 @@
- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {{xmTask.budgetWorkload}}  h + + + + + {{xmTask.actWorkload}}  h + + + + + + {{xmTask.rate}} % + + + + + + + +   h + + + + +   h + + + + + + + + + + + + + + + + + + + + - - + 取消 提交 @@ -79,7 +79,7 @@ ...mapGetters([ 'userInfo' ]), }, - props:['xmTaskWorkload','visible','opType'], + props:['xmTask','xmTaskWorkload','visible','opType'], watch: { 'xmTaskWorkload':function( xmTaskWorkload ) { @@ -108,6 +108,9 @@ userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'' }, maxTableHeight:300, + dicts:{ + taskType:[], + } }//end return },//end data methods: { @@ -127,6 +130,7 @@ if(this.currOpType=='edit'){ func=editXmTaskWorkload } + func(params).then((res) => { this.load.edit=false var tips=res.data.tips; @@ -151,18 +155,22 @@ } if(this.opType=='edit'){ - + }else{ - + if(this.xmTask){ + this.editForm.taskId=this.xmTask.id + this.editForm.ttype=this.xmTask.taskType + } } }, },//end method mounted() { - this.$nextTick(() => { - //initSimpleDicts('all',['sex','gradeLvl']).then(res=>this.dicts=res.data.data); - this.initData() - this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el) + this.$nextTick(() => { + initSimpleDicts('all',[ 'taskType' ]).then(res=>{ + this.dicts=res.data.data; + }) + this.initData() }); } } diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue new file mode 100644 index 00000000..71a50fc8 --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadList.vue @@ -0,0 +1,272 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue new file mode 100644 index 00000000..aca69a93 --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecord.vue @@ -0,0 +1,144 @@ + + + + + diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecordDialog.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecordDialog.vue new file mode 100644 index 00000000..49d3006d --- /dev/null +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadRecordDialog.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/xm/core/xmWorkItem/XmSubBugList.vue b/src/views/xm/core/xmWorkItem/XmSubBugList.vue index ca2eafa8..92a40456 100644 --- a/src/views/xm/core/xmWorkItem/XmSubBugList.vue +++ b/src/views/xm/core/xmWorkItem/XmSubBugList.vue @@ -18,6 +18,7 @@ + + + + + + + + + + @@ -79,6 +91,7 @@ import treeTool from "@/common/js/treeTool"; //全局公共库 import XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面 import { mapGetters } from 'vuex' +import XmTaskWorkloadRecordDialog from '../xmTaskWorkload/XmTaskWorkloadRecordDialog.vue'; export default { computed: { @@ -143,7 +156,9 @@ export default { } }) }, - + workloadRecord(row){ + this.$refs.workloadRecordDialog.open(row) + }, initData(){ this.xmTasks=[] if(!this.parentXmMenu || !this.parentXmMenu.menuId){ @@ -340,10 +355,12 @@ export default { } }, + afterWorkloadSubmit(xmTask){ + + } }, //end methods - components: { - - XmGroupDialog, + components: { + XmTaskWorkloadRecordDialog, }, mounted() { this.initData(); From 97a06a35e622bc129d8837a6361b83b990e68dea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 29 Mar 2022 18:18:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue index 05a702d4..fc11a22a 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue @@ -102,6 +102,12 @@ editFormRules: { id: [ //{ required: true, message: '主键不能为空', trigger: 'blur' } + ], + bizDate:[ + { required: true, message: '业务日期不能为空', trigger: 'change' } + ], + workload:[ + { required: true, message: '上班时长不能为空', trigger: 'change' } ] }, editForm: { @@ -115,8 +121,7 @@ },//end data methods: { // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听 - handleCancel:function(){ - this.$refs['editFormRef'].resetFields(); + handleCancel:function(){ this.$emit('cancel'); }, //新增、编辑提交XmTaskWorkload 工时登记表父组件监听@submit="afterEditSubmit" @@ -161,6 +166,10 @@ this.editForm.taskId=this.xmTask.id this.editForm.ttype=this.xmTask.taskType } + this.editForm.bizDate=util.getDate(); + if(!this.editForm.ttype){ + this.editForm.ttype="4" + } } },