diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
index bdb26456..a417315d 100644
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
@@ -149,6 +149,18 @@
},
//编辑提交XmTaskSbill 任务结算表父组件监听@submit="afterEditSubmit"
saveSubmit: function () {
+ if(this.currOpType=='add'){
+ if(this.editForm.projectId==null || this.editForm.projectId=='' || this.editForm.projectId==undefined){
+ this.$notify({showClose:true,message:'请选择项目',type:'error'});
+ return;
+ }
+ }
+ if(this.currOpType=='edit'){
+ if(this.editForm.status!='0'){
+ this.$notify({showClose:true,message:'当前状态不能修改',type:'error'});
+ return;
+ }
+ }
this.$refs.editFormRef.validate((valid) => {
if (valid) {
this.$confirm('确认提交吗？', '提示', {}).then(() => {
diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
index 64acc6e5..d2b95da2 100644
--- a/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
+++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillMng.vue
@@ -1,9 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
查询
+
+
+
+ 创建时间:
+
+
+
+ 创建人:
+ {{filters.pmUser.username}}
+ 选择
+ 我的
+
+
+ 关闭查询
+
+
+
+
+
@@ -15,11 +55,27 @@
:cell-style="{'text-align':'center'}">
-
-
+
+
+
+ {{scope.row.id}}
+
+
+
+
+
+
+ {{scope.row.title}}
+
+
+
-
+
+
+ ¥{{scope.row.amt}}
+
+
{{ scope.row.ctime.substr(0, 10) }}
@@ -37,7 +93,11 @@
-->
-
+
+
+ {{scope.row.workload}}h
+
+
@@ -54,11 +114,11 @@
-->
- 待提交
- 已提交
- 已通过
- 已付款
- 已完成
+ 待提交
+ 已提交
+ 已通过
+ 已付款
+ 已完成
@@ -91,6 +151,9 @@
+
+
+
@@ -106,11 +169,15 @@
import {editXmTaskSbill} from "../../../../api/xm/core/xmTaskSbill";
import dateUtil from "../../../../common/js/dateUtil";
import {editXmTaskWorkload} from "../../../../api/xm/core/xmTaskWorkload";
+ import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
+ import XmProjectSelect from "../components/XmProjectSelect";
export default {
components: {
XmTaskSbillEdit,
SelectTaskWorkload,
+ UsersSelect,
+ XmProjectSelect,
},
props:['visible'],
computed: {
@@ -126,9 +193,15 @@
}
},
data() {
+ const beginDate = new Date();
+ const endDate = new Date();
+ beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
return {
filters: {
- key: ''
+ key: '',
+ status:'',
+ bizFlowState:'',
+ pmUser:null,//创建人
},
xmTaskSbills: [],//查询结果
pageInfo:{//分页数据
@@ -157,7 +230,12 @@
taskWorkloadVisible:false,
thisBillRow:{},//添加工时的结算单
projectId:'',//添加工时的项目编号
- }
+ moreVisible:false,
+ pickerOptions: util.pickerOptions('datarange'),
+ dateRanger: [],
+ selectFiltersPmUserVisible:false,
+ selProjectId:'',
+ }
},//end data
methods: {
handleSizeChange(pageSize) {
@@ -208,6 +286,24 @@
if(this.filters.key){
params.key= "%"+ this.filters.key + "%"
}
+ if(this.filters.status){
+ params.status = this.filters.status
+ }
+ if(this.filters.bizFlowState){
+ params.bizFlowState = this.filters.bizFlowState;
+ }
+
+ if(this.filters.pmUser){
+ params.cuserid = this.filters.pmUser.userid;
+ }
+ if(this.dateRanger){
+ params.startTime = this.dateRanger[0];
+ params.endTime = this.dateRanger[1];
+ }
+ if(this.selProjectId){
+ params.projectId = this.selProjectId
+ }
+
this.load.list = true;
listXmTaskSbill(params).then((res) => {
@@ -353,7 +449,85 @@
};
};
return fmt;
- }
+ },
+ clearFiltersPmUser:function(){
+ this.filters.pmUser=null;
+ this.searchXmTaskSbills();
+ },
+ selectFiltersPmUser(){
+ this.selectFiltersPmUserVisible=true;
+ },
+ onFiltersPmUserSelected(users){
+ if(users && users.length>0){
+ this.filters.pmUser=users[0]
+ }else{
+ this.filters.pmUser=null;
+ }
+ this.selectFiltersPmUserVisible=false;
+ this.searchXmTaskSbills();
+ },
+ setFiltersPmUserAsMySelf(){
+ this.filters.pmUser=this.userInfo;
+ this.searchXmTaskSbills();
+ },
+ onProjectConfirm(obj){
+ this.selProjectId = obj.projectId;
+ this.searchXmTaskSbills();
+ },
+ clearProject(){
+ this.selProjectId = null;
+ this.searchXmTaskSbills();
+ },
+
+
+ sendToProcessApprova:function(row){
+ var bizKey="xm_task_sbill";
+ if( row.bizFlowState=='1' ){
+ this.$notify.error("审核中，不允许重复发审");
+ return;
+ }
+ if(row.bizFlowState =='2'){
+ this.$notify.error("已审核通过，请勿重复发审");
+ return;
+ }
+
+ let extVars={
+ shopId:this.userInfo.shopId,
+ branchId:this.userInfo.branchId,
+ sbillId:row.id
+ }
+ let jsonExtVars=JSON.stringify(extVars);
+
+ let currDomain=window.location.protocol+"//"+window.location.host;
+ let fullPath=this.$route.fullPath;
+ let bizUrl=currDomain+'/#'+fullPath+'?extVars='+jsonExtVars
+
+ let mainTitle=''
+ if(bizKey=='xm_task_sbill'){
+ mainTitle='关于工时结算单【'+row.title+"】的审批"
+ }else{
+ this.$notify.error("暂不支持的业务审批");
+ return;
+ }
+ let mainContext=mainTitle;
+
+ let params={
+ mainContext:mainContext,
+ mainTitle:mainTitle,
+ bizKey:bizKey,
+ bizUrl:bizUrl,
+ restUrl:config.getCoreBasePath()+"/xm/core/xmTaskSbill/processApprova",
+ extVars:extVars,
+ flowVars:{
+ subscribeTaskEvent:'PROCESS_STARTED,PROCESS_COMPLETED,PROCESS_CANCELLED',
+ shopId:row.shopId,
+ branchId:row.branchId,
+ grade:row
+ },
+ }
+ let jsonParmas=encodeURIComponent(JSON.stringify(params));//对方要 decodeURIComponent
+ this.$router.push({path:'/mdp/workflow/re/procdef/ProcdefListForBizStart',query:{params:jsonParmas}});
+ },
},//end methods
mounted() {
this.$nextTick(() => {
@@ -373,4 +547,8 @@
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue b/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue
index a6e64a35..71694e8f 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskSbillSelect.vue
@@ -111,7 +111,6 @@ export default {
key: '',
id:'',
pmUser:null,//创建人
-
},
xmTaskSbills: [],//查询结果
pageInfo:{//分页数据
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
index f766af4e..3c86eb49 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
@@ -51,17 +51,21 @@
- {{scope.row.amt}}
- 0
+ ¥{{scope.row.amt}}
+ ¥0
- {{scope.row.samt}}
+ ¥{{ scope.row.samt}}
-
-
+
+
+ {{scope.row.workload}}h
+
+