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

src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue

@@ -8,8 +8,11 @@
 <!--				<el-form-item label="结算单据编号" prop="id">
 					<el-input v-model="editForm.id" placeholder="结算单据编号"></el-input>
 				</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>
         </el-form-item>
         <el-form-item label="项目名称：" prop="projectName">
@@ -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() {

src/views/xm/core/xmTaskWorkload/XmTaskWorkloadEdit.vue

@@ -111,7 +111,7 @@
 					]
 				},
 				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:{

src/views/xm/core/xmTaskWorkload/XmTaskWorkloadMng.vue

@@ -27,6 +27,9 @@
 				<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="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">
 					<template scope="scope">
 						<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:'女'}]}
 				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,
 			}