diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 8fca7d19..6b238705 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -1,17 +1,17 @@
-
-
+
-
-
+ v-model="projectVisible">
+
+
-
-
- 项目名称
+
+
+ 项目名称
清空
关闭
@@ -21,17 +21,17 @@
width="400"
v-model="moreVisible"
trigger="manual" >
-
-
- 项目编号:
-
-
+
+
+ 项目编号:
+
+
-
+
- 创建时间:
+ 创建时间:
-
-
+ >
+
+
项目名称:
-
-
-
+
+
+
项目经理:
-
- {{filters.pmUser.username}}
+
+ {{filters.pmUser.username}}
选责任人
我的
关闭查询
-
+
更多条件
-
+
{{scope.row.name}}
-
+
-
-
+
+
{{editForm && editForm.id?editForm.name:'选择项目'}}
-
+
@@ -88,12 +88,12 @@
import util from '@/common/js/util';//全局公共库
//import Sticky from '@/components/Sticky' // 粘性header组件
//import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
- import { listXmProject } from '@/api/xm/core/xmProject';
- import { mapGetters } from 'vuex'
- import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+ import { listXmProject } from '@/api/xm/core/xmProject';
+ import { mapGetters } from 'vuex'
+ import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
const map=new Map();
-
- export default {
+
+ export default {
props:['linkProductId','linkIterationId','autoSelect'],
computed: {
...mapGetters([
@@ -104,7 +104,7 @@
linkIterationId(){
this.initData();
},
-
+
linkProductId(){
this.initData();
}
@@ -115,9 +115,9 @@
beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
- key: '',
+ key: '',
id:'',//项目编号
- pmUser:null,//项目经理
+ pmUser:null,//项目经理
},
xmProjects: [],//查询结果
@@ -131,29 +131,29 @@
},
load:{ list: false, edit: false, del: false, add: false },//查询中...
sels: [],//列表选中数据
- dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
+ dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+
//新增xmProject界面初始化数据
addForm: {
id:'',name:'',branchId:'',remark:''
},
-
+
//编辑xmProject界面初始化数据
editForm: {
id:'',name:'',branchId:'',remark:''
- },
+ },
selectFiltersPmUserVisible:false,
maxTableHeight:300,
- dateRanger: [ ],
+ dateRanger: [ ],
pickerOptions: util.pickerOptions('datarange'),
projectVisible:false,
- moreVisible:false,
+ moreVisible:false,
hadInit:false,
}
},//end data
- methods: {
- handleSizeChange(pageSize) {
- this.pageInfo.pageSize=pageSize;
+ methods: {
+ handleSizeChange(pageSize) {
+ this.pageInfo.pageSize=pageSize;
this.getXmProjects();
},
handleCurrentChange(pageNum) {
@@ -175,9 +175,9 @@
this.getXmProjects();
},
searchXmProjects(){
- this.pageInfo.count=true;
+ this.pageInfo.count=true;
this.getXmProjects();
- },
+ },
//获取列表 XmProject 项目表
getXmProjects() {
let params = {
@@ -188,31 +188,31 @@
};
if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
let orderBys=[];
- for(var i=0;i {
var tips=res.data.tips;
- if(tips.isOk){
+ if(tips.isOk){
this.pageInfo.total = res.data.total;
this.pageInfo.count=false;
this.xmProjects = res.data.data;
@@ -221,46 +221,46 @@
}else if(this.linkProductId){
map.set(this.linkProductId,this.xmProjects)
}
- if(this.autoSelect!==false&&this.xmProjects.length>0 && this.projectVisible==false){
- var row=this.xmProjects[0];
+ if(this.autoSelect!==false&&this.xmProjects.length>0 && this.projectVisible==false){
+ var row=this.xmProjects[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}else{
this.$notify({showClose: true, message: tips.msg, type: 'error' });
- }
+ }
this.load.list = false;
}).catch( err => this.load.list = false );
},
-
+
//选择行xmProject
selsChange: function (sels) {
this.sels = sels;
- },
-
+ },
+
rowClick: function(row, event, column){
this.editForm=row
this.$emit('row-click',row, event, column);// @row-click="rowClick"
- this.selectedProduct(row)
+ this.selectedProduct(row)
this.projectVisible=false;
this.moreVisible=false;
},
selectedProduct:function(row){
this.editForm=row
- this.$emit('selected',row);
+ this.$emit('selected',row);
this.projectVisible=false;
this.moreVisible=false;
},
-
+
/**begin 自定义函数请在下面加**/
clearFiltersPmUser:function(){
this.filters.pmUser=null;
this.searchXmProjects();
- },
+ },
selectFiltersPmUser(){
this.selectFiltersPmUserVisible=true;
},
- onFiltersPmUserSelected(users){
+ onFiltersPmUserSelected(users){
if(users && users.length>0){
this.filters.pmUser=users[0]
}else{
@@ -272,10 +272,10 @@
setFiltersPmUserAsMySelf(){
this.filters.pmUser=this.userInfo;
this.searchXmProjects();
- },
-
+ },
+
tableRowClassName({row, rowIndex}) {
- if (row.id == this.editForm.id) {
+ if (row && this.editForm && row.id == this.editForm.id) {
return 'success-row';
}
return '';
@@ -292,18 +292,18 @@
this.moreVisible=false;
this.$emit("close");
},
-
+
initData(){
-
+
if(this.linkIterationId){
var xmProjects=map.get(this.linkIterationId);
if(xmProjects){
this.xmProjects=xmProjects;
if(this.projectVisible==false){
if(this.autoSelect!==false && this.xmProjects.length>0){
- var row=this.xmProjects[0];
+ var row=this.xmProjects[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}
}else{
@@ -312,12 +312,12 @@
}else if(this.linkProductId){
var xmProjects=map.get(this.linkProductId);
if(xmProjects){
- this.xmProjects=xmProjects;
+ this.xmProjects=xmProjects;
if(this.projectVisible==false){
if(this.autoSelect!==false && this.xmProjects.length>0){
- var row=this.xmProjects[0];
+ var row=this.xmProjects[0];
this.$refs.table.setCurrentRow(row);
- this.rowClick(row);
+ this.rowClick(row);
}
}
}else{
@@ -327,7 +327,7 @@
this.searchXmProjects();
}
},
-
+
referenceClick(){
if(!this.hadInit){
this.initData();
@@ -336,22 +336,22 @@
this.projectVisible=!this.projectVisible;
}
},//end methods
- components: {
+ components: {
UsersSelect,
//在下面添加其它组件
},
- mounted() {
- this.$nextTick(() => {
- this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
+ mounted() {
+ this.$nextTick(() => {
+ this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
if(this.autoSelect!==false){
this.initData();
this.hadInit=true;
}
- });
+ });
}
}
-
+
\ No newline at end of file
+
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 bb96195b..31f091ff 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,10 +104,10 @@
//{ 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: {
@@ -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 @@
+
+
+
@@ -97,12 +100,12 @@
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
addFormVisible: false,//新增xmTaskWorkload界面是否显示
addForm: {
- 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:''
},
editFormVisible: false,//编辑界面是否显示
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,
}