end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

任务结算-更换项目选择组件、工时增加字段

master
chentaiyu 4 years ago
parent
8338bc9611
commit
0e7b6b3922
3 changed files with 45 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
  2. 42
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
  3. 7
      src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue

25
src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue
View File

@ -8,8 +8,11 @@
<!-- <el-form-item label="结算单据编号" prop="id"> <!-- <el-form-item label="结算单据编号" prop="id">
<el-input v-model="editForm.id" placeholder="结算单据编号"></el-input> <el-input v-model="editForm.id" placeholder="结算单据编号"></el-input>
</el-form-item>--> </el-form-item>-->
<el-form-item label="项目ID：" prop="projectId">
<el-button v-if="!editForm.projectId" type="primary" @click="projSelVisible=true" round>选择项目</el-button>
<el-form-item label="选择项目：" prop="projectId">
<!-- <el-button v-if="!editForm.projectId" type="primary" @click="projSelVisible=true" round>选择项目</el-button>-->
<div v-if="!editForm.projectId">
<xm-project-select style="display:inline;" :auto-select="false" @row-click="onProjectRowClick(arguments)" @clear-select="onProjectClear" ></xm-project-select>
</div>
<span v-else>{{editForm.projectId}}</span> <span v-else>{{editForm.projectId}}</span>
</el-form-item> </el-form-item>
<el-form-item label="项目名称：" prop="projectName"> <el-form-item label="项目名称：" prop="projectName">
@ -89,12 +92,14 @@
import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表 import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
import { addXmTaskSbill,editXmTaskSbill } from '@/api/xm/core/xmTaskSbill'; import { addXmTaskSbill,editXmTaskSbill } from '@/api/xm/core/xmTaskSbill';
import { mapGetters } from 'vuex'; import { mapGetters } from 'vuex';
import SelectXmProject from "./SelectXmProject";
//import SelectXmProject from "./SelectXmProject";
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect";
export default { export default {
components: { components: {
//XmTaskSbillEdit, //XmTaskSbillEdit,
SelectXmProject,
//SelectXmProject,
XmProjectSelect,
}, },
computed: { computed: {
@ -119,8 +124,8 @@
}, },
data() { data() {
return { 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:'女'}]} dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: { editFormRules: {
id: [ id: [
@ -196,6 +201,14 @@
this.projSelVisible = false; this.projSelVisible = false;
this.editForm.projectId = obj.projectId; this.editForm.projectId = obj.projectId;
this.editForm.projectName = obj.projectName; 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 },//end method
mounted() { mounted() {

42
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue
View File

@ -4,7 +4,7 @@
</el-row> </el-row>
<el-row class="page-main" ref="table"> <el-row class="page-main" ref="table">
<!--编辑界面 XmTaskWorkload 工时登记表--> <!--编辑界面 XmTaskWorkload 工时登记表-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef">
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="预估工时" prop="budgetWorkload"> <el-form-item label="预估工时" prop="budgetWorkload">
@ -14,21 +14,21 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="已登工时" prop="actWorkload"> <el-form-item label="已登工时" prop="actWorkload">
{{xmTask.actWorkload}}&nbsp;&nbsp;h {{xmTask.actWorkload}}&nbsp;&nbsp;h
</el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="工时进度" prop="rate"> <el-form-item label="工时进度" prop="rate">
{{xmTask.rate}} % {{xmTask.rate}} %
</el-form-item>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="工作时长" prop="workload"> <el-form-item label="工作时长" prop="workload">
<el-input style="width:80%;" v-model="editForm.workload" placeholder="工作时长"></el-input> &nbsp;&nbsp;h <el-input style="width:80%;" v-model="editForm.workload" placeholder="工作时长"></el-input> &nbsp;&nbsp;h
</el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="剩余工时" prop="rworkload"> <el-form-item label="剩余工时" prop="rworkload">
@ -37,25 +37,25 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="业务日期" prop="bizDate"> <el-form-item label="业务日期" prop="bizDate">
<el-date-picker style="width:80%;" v-model="editForm.bizDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="业务日期"></el-date-picker> <el-date-picker style="width:80%;" v-model="editForm.bizDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="业务日期"></el-date-picker>
</el-form-item>
</el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-col :span="12">
<el-form-item label="任务类型" prop="ttype"> <el-form-item label="任务类型" prop="ttype">
<el-select v-model="editForm.ttype"> <el-select v-model="editForm.ttype">
<el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option> <el-option v-for="i in this.dicts.taskType" :label="i.name" :key="i.id" :value="i.id"></el-option>
</el-select>
</el-form-item>
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item label="工作说明" prop="remark"> <el-form-item label="工作说明" prop="remark">
<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="工作说明，如果报工大于8小时，请填写说明" ></el-input>
<el-input type="textarea" :autosize="{ minRows: 6, maxRows: 20}" v-model="editForm.remark" placeholder="工作说明，如果报工大于8小时，请填写说明" ></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</el-row>
</el-row>
<el-row class="page-bottom bottom-fixed"> <el-row class="page-bottom bottom-fixed">
<el-button @click.native="handleCancel">取消</el-button> <el-button @click.native="handleCancel">取消</el-button>
<el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button> <el-button v-loading="load.edit" type="primary" @click.native="saveSubmit" :disabled="load.edit==true">提交</el-button>
@ -104,14 +104,14 @@
//{ required: true, message: '主键不能为空', trigger: 'blur' } //{ required: true, message: '主键不能为空', trigger: 'blur' }
], ],
bizDate:[ bizDate:[
{ required: true, message: '业务日期不能为空', trigger: 'change' }
{ required: true, message: '业务日期不能为空', trigger: 'change' }
], ],
workload:[ workload:[
{ required: true, message: '上班时长不能为空', trigger: 'change' }
{ required: true, message: '上班时长不能为空', trigger: 'change' }
] ]
}, },
editForm: { 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, maxTableHeight:300,
dicts:{ dicts:{
@ -121,7 +121,7 @@
},//end data },//end data
methods: { methods: {
// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听 // 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
handleCancel:function(){
handleCancel:function(){
this.$emit('cancel'); this.$emit('cancel');
}, },
//新增、编辑提交XmTaskWorkload 工时登记表父组件监听@submit="afterEditSubmit" //新增、编辑提交XmTaskWorkload 工时登记表父组件监听@submit="afterEditSubmit"
@ -135,7 +135,7 @@
if(this.currOpType=='edit'){ if(this.currOpType=='edit'){
func=editXmTaskWorkload func=editXmTaskWorkload
} }
func(params).then((res) => { func(params).then((res) => {
this.load.edit=false this.load.edit=false
var tips=res.data.tips; var tips=res.data.tips;
@ -160,7 +160,7 @@
} }
if(this.opType=='edit'){ if(this.opType=='edit'){
}else{ }else{
if(this.xmTask){ if(this.xmTask){
this.editForm.taskId=this.xmTask.id this.editForm.taskId=this.xmTask.id
@ -175,11 +175,11 @@
},//end method },//end method
mounted() { mounted() {
this.$nextTick(() => {
this.$nextTick(() => {
initSimpleDicts('all',[ 'taskType' ]).then(res=>{ initSimpleDicts('all',[ 'taskType' ]).then(res=>{
this.dicts=res.data.data; this.dicts=res.data.data;
}) })
this.initData()
this.initData()
}); });
} }
} }

7
src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue
View File

@ -27,6 +27,9 @@
<el-table-column prop="amt" label="工时对应金额" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="amt" label="工时对应金额" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="samt" label="结算金额" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="samt" label="结算金额" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="workload" label="工时，一个task_id可多次提交，小时" min-width="80" show-overflow-tooltip></el-table-column> <el-table-column prop="workload" label="工时，一个task_id可多次提交，小时" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="rworkload" label="剩余工时（同一天取最后日期更新到task表rworkload中）" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="cusername" label="创建人姓名" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column prop="projectId" label="归属项目" min-width="80" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="180" fixed="right"> <el-table-column label="操作" width="180" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"></el-button> <el-button type="primary" @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit"></el-button>
@ -97,12 +100,12 @@
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]} },//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
addFormVisible: false,//新增xmTaskWorkload界面是否显示 addFormVisible: false,//新增xmTaskWorkload界面是否显示
addForm: { 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,//编辑界面是否显示 editFormVisible: false,//编辑界面是否显示
editForm: { 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, maxTableHeight:300,
} }

Write Preview
Loading…
Cancel
Save