diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue index 4fb0e5eb..9c175289 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue @@ -8,8 +8,11 @@ - - 选择项目 + + +
+ +
{{editForm.projectId}} @@ -89,12 +92,14 @@ import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 import { addXmTaskSbill,editXmTaskSbill } from '@/api/xm/core/xmTaskSbill'; import { mapGetters } from 'vuex'; - import SelectXmProject from "./SelectXmProject"; + //import SelectXmProject from "./SelectXmProject"; + import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; export default { components: { //XmTaskSbillEdit, - SelectXmProject, + //SelectXmProject, + XmProjectSelect, }, computed: { @@ -119,8 +124,8 @@ }, data() { return { - currOpType:'add',//add/edit - load:{ list: false, edit: false, del: false, add: false },//查询中... + currOpType:'add',//add/edit + load:{ list: false, edit: false, del: false, add: false },//查询中... dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} editFormRules: { id: [ @@ -196,6 +201,14 @@ this.projSelVisible = false; this.editForm.projectId = obj.projectId; this.editForm.projectName = obj.projectName; + }, + onProjectRowClick(obj){ + this.$set(this.editForm, "projectI", obj[0].projectId); + this.$set(this.editForm, "projectName", obj[0].projectName); + }, + onProjectClear(){ + this.$set(this.editForm, "projectI", null); + this.$set(this.editForm, "projectName", null); } },//end method mounted() { diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue index fc11a22a..6a92a82b 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue @@ -4,7 +4,7 @@ - + @@ -14,21 +14,21 @@ {{xmTask.actWorkload}}  h - + - + {{xmTask.rate}} % - + - +   h - + @@ -37,25 +37,25 @@ - + - + - + - - + + - + - + 取消 提交 @@ -104,14 +104,14 @@ //{ required: true, message: '主键不能为空', trigger: 'blur' } ], bizDate:[ - { required: true, message: '业务日期不能为空', trigger: 'change' } + { required: true, message: '业务日期不能为空', trigger: 'change' } ], workload:[ - { required: true, message: '上班时长不能为空', trigger: 'change' } + { required: true, message: '上班时长不能为空', trigger: 'change' } ] }, editForm: { - userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'' + userid:'',username:'',ctime:'',taskId:'',cuserid:'',bizDate:'',wstatus:'',remark:'',ttype:'',id:'',sbillId:'',stime:'',sstatus:'',amt:'',samt:'',workload:'',rworkload:'',cusername:'',projectId:'' }, maxTableHeight:300, dicts:{ @@ -121,7 +121,7 @@ },//end data methods: { // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听 - handleCancel:function(){ + handleCancel:function(){ this.$emit('cancel'); }, //新增、编辑提交XmTaskWorkload 工时登记表父组件监听@submit="afterEditSubmit" @@ -135,7 +135,7 @@ if(this.currOpType=='edit'){ func=editXmTaskWorkload } - + func(params).then((res) => { this.load.edit=false var tips=res.data.tips; @@ -160,7 +160,7 @@ } if(this.opType=='edit'){ - + }else{ if(this.xmTask){ this.editForm.taskId=this.xmTask.id @@ -175,11 +175,11 @@ },//end method mounted() { - this.$nextTick(() => { + this.$nextTick(() => { initSimpleDicts('all',[ 'taskType' ]).then(res=>{ this.dicts=res.data.data; }) - this.initData() + this.initData() }); } } diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue index 0d49d0e6..bc9d889b 100644 --- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue +++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue @@ -27,6 +27,9 @@ + + +