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

重构预算及成本

master
陈裕财 4 years ago
parent
e7a82becf1
commit
9bd50e2b62
8 changed files with 169 additions and 194 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. 89
      src/views/xm/core/xmBudgetLabor/XmBudgetLaborEdit.vue
  2. 4
      src/views/xm/core/xmBudgetLabor/XmBudgetLaborMng.vue
  3. 79
      src/views/xm/core/xmBudgetNlabor/XmBudgetNlaborEdit.vue
  4. 4
      src/views/xm/core/xmBudgetNlabor/XmBudgetNlaborMng.vue
  5. 108
      src/views/xm/core/xmCostNlabor/XmCostNlaborEdit.vue
  6. 16
      src/views/xm/core/xmCostNlabor/XmCostNlaborMng.vue
  7. 61
      src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailEdit.vue
  8. 2
      src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue

89
src/views/xm/core/xmBudgetLabor/XmBudgetLaborEdit.vue
View File

@ -6,53 +6,36 @@
<!--编辑界面 XmBudgetLabor 项目人力成本预算--> <!--编辑界面 XmBudgetLabor 项目人力成本预算-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef"> <el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef">
<el-form-item label="项目编号" prop="projectId"> <el-form-item label="项目编号" prop="projectId">
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="项目成员编号" prop="userid">
<el-input v-model="editForm.userid" placeholder="项目成员编号" :maxlength="50"></el-input>
</el-form-item>
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50" disabled></el-input>
</el-form-item>
<el-form-item label="用户名称" prop="username">
<el-input v-model="editForm.username" placeholder="用户，如果不确定具体人员，可用岗位代替" ></el-input>
</el-form-item>
<el-form-item label="预算金额/每月" prop="budgetAt"> <el-form-item label="预算金额/每月" prop="budgetAt">
<el-input v-model="editForm.budgetAt" placeholder="预算金额/每月" :maxlength="10"></el-input> <el-input v-model="editForm.budgetAt" placeholder="预算金额/每月" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="主键" prop="id">
<el-input v-model="editForm.id" placeholder="主键" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="用户名" prop="username">
<el-input v-model="editForm.username" placeholder="用户名" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="预算科目编号" prop="subjectId">
<el-input v-model="editForm.subjectId" placeholder="预算科目编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="费用归属周期开始日期" prop="bizSdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizSdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="费用归属周期结束日期" prop="bizEdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizEdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="费用归属月份yyyy-mm" prop="bizMonth">
<el-input v-model="editForm.bizMonth" placeholder="费用归属月份yyyy-mm" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="当前流程实例编号" prop="instId">
<el-input v-model="editForm.instId" placeholder="当前流程实例编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" :maxlength="1"></el-input>
</el-form-item>
<el-form-item label="成本类型0非人力1内部人力2外购人力" prop="costType">
<el-input v-model="editForm.costType" placeholder="成本类型0非人力1内部人力2外购人力" :maxlength="1"></el-input>
</el-form-item>
<el-form-item label="科目名称" prop="subjectName">
<el-input v-model="editForm.subjectName" placeholder="科目名称" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="项目归属机构编号" prop="branchId">
<el-input v-model="editForm.branchId" placeholder="项目归属机构编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="用户归属机构编号-也就是将来的结算对象" prop="ubranchId">
<el-input v-model="editForm.ubranchId" placeholder="用户归属机构编号-也就是将来的结算对象" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="用途说明" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" ></el-input>
</el-form-item>
<el-form-item label="预算科目" prop="subjectId">
<el-select placeholder="预算科目编号" v-model="editForm.subjectId">
<el-option
v-for="(item,i) in dicts.projectSubject"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="预算月份" prop="bizMonth">
<el-date-picker
v-model="editForm.bizMonth"
type="month"
value-format="yyyy-MM"
placeholder="选择年月">
</el-date-picker>
</el-form-item>
</el-form> </el-form>
</el-row> </el-row>
@ -97,10 +80,22 @@
return { return {
currOpType:'add',//add/edit currOpType:'add',//add/edit
load:{ list: false, edit: false, del: false, add: false },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
dicts:{
projectSubject:[],
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: { editFormRules: {
id: [
//{ required: true, message: '主键不能为空', trigger: 'blur' }
subjectId: [
{ required: true, message: '科目不能为空', trigger: 'change' }
],
username: [
{ required: true, message: '姓名不能为空，如果不确定具体人，请填写岗位代替', trigger: 'change' }
],
budgetAt: [
{ required: true, message: '金额不能为空', trigger: 'change' }
],
remark: [
{ required: true, message: '用途说明不能为空', trigger: 'change' }
] ]
}, },
editForm: { editForm: {

4
src/views/xm/core/xmBudgetLabor/XmBudgetLaborMng.vue
View File

@ -79,12 +79,12 @@
</el-row> </el-row>
<el-row> <el-row>
<!--编辑 XmBudgetLabor 项目人力成本预算界面--> <!--编辑 XmBudgetLabor 项目人力成本预算界面-->
<el-drawer title="编辑项目人力成本预算" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="编辑项目人力预算" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-budget-labor-edit op-type="edit" :xm-budget-labor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-budget-labor-edit> <xm-budget-labor-edit op-type="edit" :xm-budget-labor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-budget-labor-edit>
</el-drawer> </el-drawer>
<!--新增 XmBudgetLabor 项目人力成本预算界面--> <!--新增 XmBudgetLabor 项目人力成本预算界面-->
<el-drawer title="新增项目人力成本预算" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="新增项目人力预算" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-budget-labor-add op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-budget-labor-add> <xm-budget-labor-add op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-budget-labor-add>
</el-drawer> </el-drawer>
</el-row> </el-row>

79
src/views/xm/core/xmBudgetNlabor/XmBudgetNlaborEdit.vue
View File

@ -5,45 +5,33 @@
<el-row class="page-main" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table"> <el-row class="page-main" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
<!--编辑界面 XmBudgetNlabor 项目人力成本预算--> <!--编辑界面 XmBudgetNlabor 项目人力成本预算-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef"> <el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef">
<el-form-item label="主键" prop="id">
<el-input v-model="editForm.id" placeholder="主键" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="项目编号" prop="projectId"> <el-form-item label="项目编号" prop="projectId">
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="预算金额" prop="budgetAt">
<el-input v-model="editForm.budgetAt" placeholder="预算金额" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" :maxlength="255"></el-input>
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50" disabled></el-input>
</el-form-item>
<el-form-item label="预算金额/每月" prop="budgetAt">
<el-input v-model="editForm.budgetAt" placeholder="预算金额/每月" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="用途说明" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" ></el-input>
</el-form-item>
<el-form-item label="预算科目" prop="subjectId"> <el-form-item label="预算科目" prop="subjectId">
<el-input v-model="editForm.subjectId" placeholder="预算科目" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="费用归属周期开始日期" prop="bizSdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizSdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="费用归属周期结束日期" prop="bizEdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizEdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="当前流程实例编号" prop="instId">
<el-input v-model="editForm.instId" placeholder="当前流程实例编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" prop="bizFlowState">
<el-input v-model="editForm.bizFlowState" placeholder="当前流程状态0初始1审批中2审批通过3审批不通过4流程取消或者删除" :maxlength="1"></el-input>
</el-form-item>
<el-form-item label="成本类型0非人力1内部人力2外购人力" prop="costType">
<el-input v-model="editForm.costType" placeholder="成本类型0非人力1内部人力2外购人力" :maxlength="1"></el-input>
</el-form-item>
<el-form-item label="费用归属月份yyyy-MM" prop="bizMonth">
<el-input v-model="editForm.bizMonth" placeholder="费用归属月份yyyy-MM" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="科目名称" prop="subjectName">
<el-input v-model="editForm.subjectName" placeholder="科目名称" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="项目归属企业编号" prop="branchId">
<el-input v-model="editForm.branchId" placeholder="项目归属企业编号" :maxlength="50"></el-input>
</el-form-item>
<el-select placeholder="预算科目编号" v-model="editForm.subjectId">
<el-option
v-for="(item,i) in dicts.projectSubject"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="预算月份" prop="bizMonth">
<el-date-picker
v-model="editForm.bizMonth"
type="month"
value-format="yyyy-MM"
placeholder="选择年月">
</el-date-picker>
</el-form-item>
</el-form> </el-form>
</el-row> </el-row>
@ -88,10 +76,23 @@
return { return {
currOpType:'add',//add/edit currOpType:'add',//add/edit
load:{ list: false, edit: false, del: false, add: false },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
dicts:{
projectSubject:[],
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: { editFormRules: {
id: [
//{ required: true, message: '主键不能为空', trigger: 'blur' }
subjectId: [
{ required: true, message: '科目不能为空', trigger: 'change' }
],
username: [
{ required: true, message: '姓名不能为空，如果不确定具体人，请填写岗位代替', trigger: 'change' }
],
budgetAt: [
{ required: true, message: '金额不能为空', trigger: 'change' }
],
remark: [
{ required: true, message: '用途说明不能为空', trigger: 'change' }
] ]
}, },
editForm: { editForm: {

4
src/views/xm/core/xmBudgetNlabor/XmBudgetNlaborMng.vue
View File

@ -74,12 +74,12 @@
</el-row> </el-row>
<el-row> <el-row>
<!--编辑 XmBudgetNlabor 项目人力成本预算界面--> <!--编辑 XmBudgetNlabor 项目人力成本预算界面-->
<el-drawer title="编辑项目人力成本预算" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="编辑项目非人力预算" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-budget-nlabor-edit op-type="edit" :xm-budget-nlabor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-budget-nlabor-edit> <xm-budget-nlabor-edit op-type="edit" :xm-budget-nlabor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-budget-nlabor-edit>
</el-drawer> </el-drawer>
<!--新增 XmBudgetNlabor 项目人力成本预算界面--> <!--新增 XmBudgetNlabor 项目人力成本预算界面-->
<el-drawer title="新增项目人力成本预算" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="新增项目非人力预算" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-budget-nlabor-add op-type="add" :sel-project="selProject" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-budget-nlabor-add> <xm-budget-nlabor-add op-type="add" :sel-project="selProject" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-budget-nlabor-add>
</el-drawer> </el-drawer>
</el-row> </el-row>

108
src/views/xm/core/xmCostNlabor/XmCostNlaborEdit.vue
View File

@ -5,66 +5,36 @@
<el-row class="page-main" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table"> <el-row class="page-main" :style="{overflowX:'auto',height:maxTableHeight+'px'}" ref="table">
<!--编辑界面 XmCostNlabor 项目实际人工成本费用--> <!--编辑界面 XmCostNlabor 项目实际人工成本费用-->
<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef"> <el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editFormRef">
<el-form-item label="项目编号" prop="projectId">
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="用户编号-费用主责人" prop="userid">
<el-input v-model="editForm.userid" placeholder="用户编号-费用主责人" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="创建时间" prop="ctime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="费用发放时间" prop="sendTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.sendTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="用户名称" prop="username">
<el-input v-model="editForm.username" placeholder="用户名称" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
<el-input v-model="editForm.projectName" placeholder="项目名称" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="主键" prop="id">
<el-input v-model="editForm.id" placeholder="主键" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="任务编号" prop="taskId">
<el-input v-model="editForm.taskId" placeholder="任务编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="任务名称" prop="taskName">
<el-input v-model="editForm.taskName" placeholder="任务名称" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="科目编号" prop="subjectId">
<el-input v-model="editForm.subjectId" placeholder="科目编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="费用归属周期开始日期" prop="bizSdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizSdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="费用归属周期结束日期" prop="bizEdate">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.bizEdate" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="实际成本金额" prop="actAt">
<el-input v-model="editForm.actAt" placeholder="实际成本金额" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="成本类型0非人力1内部人力2外购人力,此表都是非人力" prop="costType">
<el-input v-model="editForm.costType" placeholder="成本类型0非人力1内部人力2外购人力,此表都是非人力" :maxlength="1"></el-input>
</el-form-item>
<el-form-item label="业务归属月份yyyy-MM" prop="bizMonth">
<el-input v-model="editForm.bizMonth" placeholder="业务归属月份yyyy-MM" :maxlength="7"></el-input>
</el-form-item>
<el-form-item label="业务归属日期yyyy-MM-dd" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务归属日期yyyy-MM-dd" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="科目名称" prop="subjectName">
<el-input v-model="editForm.subjectName" placeholder="科目名称" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="用户归属机构" prop="ubranchId">
<el-input v-model="editForm.ubranchId" placeholder="用户归属机构" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="项目归属机构" prop="branchId">
<el-input v-model="editForm.branchId" placeholder="项目归属机构" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="项目编号" prop="projectId">
<el-input v-model="editForm.projectId" placeholder="项目编号" :maxlength="50" disabled></el-input>
</el-form-item>
<el-form-item label="费用主责" prop="username">
<el-input v-model="editForm.username" placeholder="费用主责" ></el-input>
</el-form-item>
<el-form-item label="用途说明" prop="remark">
<el-input v-model="editForm.remark" placeholder="用途说明" ></el-input>
</el-form-item>
<el-form-item label="实际金额" prop="actAt">
<el-input v-model="editForm.budgetAt" placeholder="实际金额" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="成本科目" prop="subjectId">
<el-select placeholder="科目编号" v-model="editForm.subjectId">
<el-option
v-for="(item,i) in dicts.projectSubject"
:key="i"
:label="item.name"
:value="item.id">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="发生日期" prop="bizDate">
<el-date-picker
v-model="editForm.bizDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-form> </el-form>
</el-row> </el-row>
@ -109,10 +79,22 @@
return { return {
currOpType:'add',//add/edit currOpType:'add',//add/edit
load:{ list: false, edit: false, del: false, add: false },//查询中... load:{ list: false, edit: false, del: false, add: false },//查询中...
dicts:{},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
dicts:{
projectSubject:[],
},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
editFormRules: { editFormRules: {
id: [
//{ required: true, message: '主键不能为空', trigger: 'blur' }
subjectId: [
{ required: true, message: '科目不能为空', trigger: 'change' }
],
username: [
{ required: true, message: '姓名不能为空', trigger: 'change' }
],
budgetAt: [
{ required: true, message: '金额不能为空', trigger: 'change' }
],
remark: [
{ required: true, message: '用途说明不能为空', trigger: 'change' }
] ]
}, },
editForm: { editForm: {

16
src/views/xm/core/xmCostNlabor/XmCostNlaborMng.vue
View File

@ -24,25 +24,31 @@
<span> {{scope.row.projectName}} </span> <span> {{scope.row.projectName}} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="username" label="费用主责" min-width="80" show-overflow-tooltip>
<template slot-scope="scope">
<span class="cell-text"> {{scope.row.username}} </span>
<span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
</template>
</el-table-column>
<el-table-column prop="remark" label="用途说明" min-width="80" show-overflow-tooltip> <el-table-column prop="remark" label="用途说明" min-width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span class="cell-text"> {{scope.row.remark}} </span> <span class="cell-text"> {{scope.row.remark}} </span>
<span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.remark" placeholder="" @change="editSomeFields(scope.row,'remark',$event)" :maxlength="22"></el-input></span> <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.remark" placeholder="" @change="editSomeFields(scope.row,'remark',$event)" :maxlength="22"></el-input></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="actAt" label="预算金额" min-width="80" show-overflow-tooltip>
<el-table-column prop="actAt" label="实际金额" min-width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span class="cell-text"> {{scope.row.actAt}} </span> <span class="cell-text"> {{scope.row.actAt}} </span>
<span class="cell-bar"><el-input type="number" style="display:inline;" v-model="scope.row.actAt" placeholder="" @change="editSomeFields(scope.row,'actAt',$event)" :maxlength="22"></el-input></span> <span class="cell-bar"><el-input type="number" style="display:inline;" v-model="scope.row.actAt" placeholder="" @change="editSomeFields(scope.row,'actAt',$event)" :maxlength="22"></el-input></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="subjectId" label="预算科目" min-width="80" show-overflow-tooltip>
<el-table-column prop="subjectId" label="成本科目" min-width="80" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell-text"> <div class="cell-text">
{{formaterByDicts(scope.row,'projectSubject',scope.row.subjectId)}} {{formaterByDicts(scope.row,'projectSubject',scope.row.subjectId)}}
</div> </div>
<span class="cell-bar"> <span class="cell-bar">
<el-select v-model="scope.row.subjectId" placeholder="预算科目" style="display:block;" @change="editXmMenuSomeFields(scope.row,'subjectId',$event)">
<el-select v-model="scope.row.subjectId" placeholder="成本科目" style="display:block;" @change="editXmMenuSomeFields(scope.row,'subjectId',$event)">
<el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.projectSubject" :key="index"></el-option> <el-option :value="item.id" :label="item.name" v-for="(item,index) in dicts.projectSubject" :key="index"></el-option>
</el-select> </el-select>
</span> </span>
@ -73,12 +79,12 @@
</el-row> </el-row>
<el-row> <el-row>
<!--编辑 XmCostNlabor 项目实际人工成本费用界面--> <!--编辑 XmCostNlabor 项目实际人工成本费用界面-->
<el-drawer title="编辑项目实际人工成本费用" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="编辑项目非人力费用" :visible.sync="editFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-cost-nlabor-edit op-type="edit" :xm-cost-nlabor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-cost-nlabor-edit> <xm-cost-nlabor-edit op-type="edit" :xm-cost-nlabor="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-cost-nlabor-edit>
</el-drawer> </el-drawer>
<!--新增 XmCostNlabor 项目实际人工成本费用界面--> <!--新增 XmCostNlabor 项目实际人工成本费用界面-->
<el-drawer title="新增项目实际人工成本费用" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<el-drawer title="新增项目非人力费用" :visible.sync="addFormVisible" size="60%" append-to-body :close-on-click-modal="false">
<xm-cost-nlabor-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-cost-nlabor-edit> <xm-cost-nlabor-edit op-type="add" :visible="addFormVisible" @cancel="addFormVisible=false" @submit="afterAddSubmit"></xm-cost-nlabor-edit>
</el-drawer> </el-drawer>
</el-row> </el-row>

61
src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailEdit.vue
View File

@ -13,32 +13,23 @@
</el-form-item> </el-form-item>
<el-form-item label="创建日期" prop="ctime"> <el-form-item label="创建日期" prop="ctime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.ctime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item>
<el-form-item label="业务对象主键任务编号" prop="taskId">
<el-input v-model="editForm.taskId" placeholder="业务对象主键任务编号" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="业务日期yyyy-MM-dd" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务日期yyyy-MM-dd" :maxlength="10"></el-input>
</el-form-item>
<el-form-item label="业务日期" prop="bizDate">
<el-input v-model="editForm.bizDate" placeholder="业务日期" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input v-model="editForm.remark" placeholder="备注" :maxlength="255"></el-input> <el-input v-model="editForm.remark" placeholder="备注" :maxlength="255"></el-input>
</el-form-item>
<el-form-item label="主键" prop="id">
<el-input v-model="editForm.id" placeholder="主键" :maxlength="50"></el-input>
</el-form-item>
<el-form-item label="结算单据编号-来自task_sbill.id" prop="sbillId">
<el-input v-model="editForm.sbillId" placeholder="结算单据编号-来自task_sbill.id" :maxlength="50"></el-input>
</el-form-item>
</el-form-item>
<el-form-item label="结算提交时间" prop="stime"> <el-form-item label="结算提交时间" prop="stime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.stime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.stime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算" prop="sstatus">
<el-input v-model="editForm.sstatus" placeholder="结算状态0-无需结算，1-待结算2-已提交3-已通过4-已结算" :maxlength="1"></el-input>
<el-form-item label="结算状态" prop="sstatus">
<el-input v-model="editForm.sstatus" placeholder="结算状态" :maxlength="1"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工时对应金额" prop="amt"> <el-form-item label="工时对应金额" prop="amt">
<el-input v-model="editForm.amt" placeholder="工时对应金额" :maxlength="10"></el-input> <el-input v-model="editForm.amt" placeholder="工时对应金额" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="结算工时对应结算金额-根据结算方案计算结算金额" prop="samt">
<el-form-item label="结算金额" prop="samt">
<el-input v-model="editForm.samt" placeholder="结算工时对应结算金额-根据结算方案计算结算金额" :maxlength="10"></el-input> <el-input v-model="editForm.samt" placeholder="结算工时对应结算金额-根据结算方案计算结算金额" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报工工时" prop="workload"> <el-form-item label="报工工时" prop="workload">
@ -47,32 +38,32 @@
<el-form-item label="归属项目" prop="projectId"> <el-form-item label="归属项目" prop="projectId">
<el-input v-model="editForm.projectId" placeholder="归属项目" :maxlength="50"></el-input> <el-input v-model="editForm.projectId" placeholder="归属项目" :maxlength="50"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="结算工时，用于结算，默认=workload" prop="sworkload">
<el-input v-model="editForm.sworkload" placeholder="结算工时，用于结算，默认=workload" :maxlength="10"></el-input>
<el-form-item label="结算工时" prop="sworkload">
<el-input v-model="editForm.sworkload" placeholder="结算工时" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="月份yyyy-MM型" prop="bizMonth">
<el-form-item label="月份" prop="bizMonth">
<el-input v-model="editForm.bizMonth" placeholder="月份yyyy-MM型" :maxlength="7"></el-input> <el-input v-model="editForm.bizMonth" placeholder="月份yyyy-MM型" :maxlength="7"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务预算金额-来自task表" prop="budgetAt">
<el-input v-model="editForm.budgetAt" placeholder="任务预算金额-来自task表" :maxlength="10"></el-input>
<el-form-item label="任务预算金额" prop="budgetAt">
<el-input v-model="editForm.budgetAt" placeholder="任务预算金额" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务预算工时-来自task表" prop="budgetWorkload">
<el-input v-model="editForm.budgetWorkload" placeholder="任务预算工时-来自task表" :maxlength="10"></el-input>
<el-form-item label="任务预算工时" prop="budgetWorkload">
<el-input v-model="editForm.budgetWorkload" placeholder="任务预算工时" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务初始工时-来自task表" prop="initWorkload">
<el-input v-model="editForm.initWorkload" placeholder="任务初始工时-来自task表" :maxlength="10"></el-input>
<el-form-item label="任务初始工时" prop="initWorkload">
<el-input v-model="editForm.initWorkload" placeholder="任务初始工时" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报价金额-来自task_execuser表" prop="quoteAt">
<el-input v-model="editForm.quoteAt" placeholder="报价金额-来自task_execuser表" :maxlength="10"></el-input>
<el-form-item label="报价金额" prop="quoteAt">
<el-input v-model="editForm.quoteAt" placeholder="报价金额" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报价工时-来自task_execuser表" prop="quoteWorkload">
<el-input v-model="editForm.quoteWorkload" placeholder="报价工时-来自task_execuser表" :maxlength="10"></el-input>
<el-form-item label="报价工时" prop="quoteWorkload">
<el-input v-model="editForm.quoteWorkload" placeholder="报价工时" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="任务结算方案,来自task表、来自数字字典xmTaskSettleSchemel" prop="sschemel">
<el-input v-model="editForm.sschemel" placeholder="任务结算方案,来自task表、来自数字字典xmTaskSettleSchemel" :maxlength="1"></el-input>
<el-form-item label="任务结算方案" prop="sschemel">
<el-input v-model="editForm.sschemel" placeholder="任务结算方案" :maxlength="1"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="工时单价，来自task表，根据task_out判断取内部还是外部单价" prop="uniPrice">
<el-input v-model="editForm.uniPrice" placeholder="工时单价，来自task表，根据task_out判断取内部还是外部单价" :maxlength="10"></el-input>
<el-form-item label="工时单价" prop="uniPrice">
<el-input v-model="editForm.uniPrice" placeholder="工时单价" :maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="报价结束时间" prop="qendTime"> <el-form-item label="报价结束时间" prop="qendTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.qendTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.qendTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
@ -80,10 +71,10 @@
<el-form-item label="报价开始时间" prop="qstartTime"> <el-form-item label="报价开始时间" prop="qstartTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.qstartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.qstartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="实际完工时间-来自task表" prop="actEndTime">
<el-form-item label="实际完工时间" prop="actEndTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.actEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.actEndTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="实际开始时间-来自task表" prop="actStartTime">
<el-form-item label="实际开始时间" prop="actStartTime">
<el-date-picker type="date" placeholder="选择日期" v-model="editForm.actStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker> <el-date-picker type="date" placeholder="选择日期" v-model="editForm.actStartTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
</el-form-item> </el-form-item>
</el-form> </el-form>

2
src/views/xm/core/xmTaskSbillDetail/XmTaskSbillDetailMng.vue
View File

@ -4,7 +4,7 @@
<el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input> <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"></el-input>
<el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskSbillDetails" icon="el-icon-search">查询</el-button> <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTaskSbillDetails" icon="el-icon-search">查询</el-button>
<span style="float:right;"> <span style="float:right;">
<el-button type="primary" @click="showAdd" icon="el-icon-plus" plain> </el-button>
<!--<el-button type="primary" @click="showAdd" icon="el-icon-plus" plain> </el-button>-->
<el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button> <el-button type="danger" v-loading="load.del" @click="batchDel" :disabled="this.sels.length===0 || load.del==true" icon="el-icon-delete" plain></el-button>
</span> </span>
</el-row> </el-row>

Write Preview
Loading…
Cancel
Save