From b5468e5dbbcb1f6ba061ecd693c07534a705478b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 7 Jul 2022 17:08:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmTaskWorkload/WorkloadSetMonthList.vue   | 706 +++++++++++-------
 .../XmTaskWorkloadSimpleListForBizDate.vue    |  23 +-
 2 files changed, 455 insertions(+), 274 deletions(-)

diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
index 511208c2..f57d39fc 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
@@ -1,213 +1,404 @@
 <template>
-	<section  class="padding"> 
-			<el-row :gutter="5">
-				<el-col :span="18"> 
-					<div> 
-						<div class="main" id="projectWorkloadSetMonthList" style="width:100%;height:600px;margin:0 auto;"></div> 
-					</div>
-				</el-col>
-				<el-col :span="6" class="border padding">
-					<el-form   :model="filters"> 
-					<el-form-item label="归属项目" v-if="!xmProject">
-							 <xm-project-select  v-if="!xmProject"  ref="xmProjectSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProjectSelected"   @clear="onProjectClear"></xm-project-select>
-  					</el-form-item>  
-					<el-form-item label="人员编号" v-if="queryScope!=='my'">
-							<el-input v-model="filters.userid"></el-input>
-  					</el-form-item>  
-					  
-					<el-form-item label="任务编号编号">
-							<el-input v-model="filters.taskId"></el-input>
-  					</el-form-item>  
-					<el-form-item label="日期区间">
-						<br>
-							<date-range v-model="filters"   value-format="yyyy-MM-dd" start-key="startBizDate" end-key="endBizDate"></date-range>
-  					</el-form-item>  
-					<el-form-item>
-						 <el-button type="primary" icon="el-icon-search" @click="listProjectWorkloadSetMonth">查询</el-button>
-					</el-form-item>  
-					</el-form>
-				</el-col>
-			</el-row> 
-	</section>
+  <section class="padding">
+    <el-row :gutter="5">
+      <el-col :span="18">
+        <div>
+          <div
+            class="main"
+            id="projectWorkloadSetDayList"
+            style="width: 100%; height: 600px; margin: 0 auto"
+          ></div>
+        </div>
+      </el-col>
+      <el-col :span="6" class="border padding">
+        <el-form :model="filters">
+          <el-form-item label="归属项目" v-if="!xmProject">
+            <xm-project-select
+              v-if="!xmProject"
+              ref="xmProjectSelect"
+              style="display: inline"
+              :auto-select="false"
+              :link-project-id="xmProject ? xmProject.id : null"
+              @row-click="onProjectSelected"
+              @clear="onProjectClear"
+            ></xm-project-select>
+          </el-form-item>
+          <el-form-item label="人员编号" v-if="queryScope !== 'my'">
+            <el-input v-model="filters.userid"></el-input>
+          </el-form-item>
+
+          <el-form-item label="任务编号编号">
+            <el-input v-model="filters.taskId"></el-input>
+          </el-form-item>
+          <el-form-item label="日期区间">
+            <br />
+            <date-range
+              v-model="filters"
+              value-format="yyyy-MM-dd"
+              start-key="startBizDate"
+              end-key="endBizDate"
+            ></date-range>
+          </el-form-item>
+          <el-form-item>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              @click="listProjectWorkloadSetMonth"
+              >查询</el-button
+            >
+          </el-form-item>
+        </el-form>
+      </el-col>
+    </el-row>
+    <el-row class="padding-top">
+      <!--列表 XmTaskWorkload 工时登记表-->
+      <el-table
+        ref="xmTaskWorkloadTable"
+        :data="xmProjectWorkloadSetMonths"
+        :row-style="{ height: '50px' }"
+        highlight-current-row
+        v-loading="load.list"
+		@row-click="rowClick"
+        border
+        style="width: 100%"
+        :header-cell-style="{ 'text-align': 'center' }"
+        :cell-style="{ 'text-align': 'center' }"
+      >
+        <el-table-column
+          sortable
+          type="index"
+          width="55"
+          show-overflow-tooltip
+          fixed="left"
+        ></el-table-column>
+        <el-table-column
+          prop="bizMonth"
+          label="工时日期"
+          width="120"
+          show-overflow-tooltip
+          sortable
+          fixed="left"
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.bizMonth }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="workload"
+          label="登记工时"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">  
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】所有工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'"   :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.workload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column>
+        <el-table-column
+          prop="toConfirmWorkload"
+          label="待确认"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">  
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【待确认】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='toConfirmWorkload'"  wstatus="0" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toConfirmWorkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column>
+        <el-table-column
+          prop="hadConfirmWorkload"
+          label="已确认"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope"> 
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已确认】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadConfirmWorkload'"  wstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadConfirmWorkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column>
+        <el-table-column
+          prop="notNeedSetWorkload"
+          label="无须结算"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope"> 
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【无须结算】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='notNeedSetWorkload'" wstatus="1" sstatus="0"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.notNeedSetWorkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column>
+        <el-table-column
+          prop="toSetSworkload"
+          label="待结算"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【待结算】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='toSetSworkload'" wstatus="1" sstatus="1"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.toSetSworkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column>
+		<!--
+        <el-table-column
+          prop="hadCommitSworkload"
+          label="已提交审核"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">  
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已提交审核】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='workload'" wstatus="1" sstatus="2"  :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadCommitSworkload}}h</el-link>
+               </el-popover>
+			
+		</template>
+        </el-table-column>
+        <el-table-column
+          prop="hadAgreeSworkload"
+          label="已审核"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">  
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已审核】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadAgreeSworkload'"  wstatus="1" sstatus="3" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadAgreeSworkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column> 
+		-->
+        <el-table-column
+          prop="hadSetSworkload"
+          label="已结算"
+          min-width="120"
+          show-overflow-tooltip
+          sortable
+        >
+          <template slot-scope="scope">  
+		  	
+		  	<el-popover :title="'【'+ scope.row.bizMonth + '】【已结算】工时记录'">
+                   <xm-task-workload-simple-list-for-biz-month v-if="scope.row.bizMonth==editForm.bizMonth && columnProp=='hadSetSworkload'"  wstatus="1" sstatus="4" :task-id="filters.taskId" :project-id="filters.project?filters.project.id:null"  ref="xmTaskWorkloadSimpleList2" :biz-month="scope.row.bizMonth"></xm-task-workload-simple-list-for-biz-month>
+                        <el-link type="primary" slot="reference" style="display:inline;">{{scope.row.hadSetSworkload}}h</el-link>
+               </el-popover>
+		  </template>
+        </el-table-column> 
+      </el-table>
+    </el-row>
+  </section>
 </template>
 
 <script>
-	import util from '@/common/js/util';//全局公共库
-	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询  
-	import { mapGetters } from 'vuex'	 
-	
-	import  XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//新增界面
-	import { listProjectWorkloadSetMonth } from '@/api/xm/core/xmTaskWorkload';
-	export default { 
-        
-		components: {  
-			XmProjectSelect, 
-		},
-        props:['xmProduct','xmProject','queryScope'],
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-		    ]),  
-			dataSetCpd(){
-				return [
-					['日期',...this.xmProjectWorkloadSetMonths.map(i=>i.bizMonth)],
-					['登记工时',...this.xmProjectWorkloadSetMonths.map(i=>i.workload)],
-					['待确认',...this.xmProjectWorkloadSetMonths.map(i=>i.toConfirmWorkload)],
-					['已确认',...this.xmProjectWorkloadSetMonths.map(i=>i.hadConfirmWorkload)],
-					['待结算',...this.xmProjectWorkloadSetMonths.map(i=>i.toSetWorkload)],
-					['已提交审核',...this.xmProjectWorkloadSetMonths.map(i=>i.hadCommitSworkload)],
-					//['已审核',...this.xmProjectWorkloadSetMonths.map(i=>i.hadAgreeSworkload)],
-					['已结算',...this.xmProjectWorkloadSetMonths.map(i=>i.hadSetSworkload)]
-				]
-			}
-			
-        }, 
-		watch: {  
-			dataSetCpd(){ 
-				this.$nextTick(()=>{
-					this.drawCharts();
-				})
-				
-			}
-	    },
-		data() {
-			return {
-                filters:{
-                    category:'', 
-                    product:null,
-                    iteration:null,
-                    project:null,
-					startBizDate:'',
-					endBizDate:'',
-					userid:'',
-					taskId:''
-                },
-				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
-				load:{ list: false, edit: false, del: false, add: false },//查询中... 
-				dateRanger:[], 
-                maxTableHeight:300, 
-                visible:false,
-				xmProjectWorkloadSetMonths:[],
+import util from "@/common/js/util"; //全局公共库
+import { initSimpleDicts } from "@/api/mdp/meta/item"; //下拉框数据查询
+import { mapGetters } from "vuex";
 
-			}//end return
-		},//end data
-		methods: {  
-			listProjectWorkloadSetMonth(){ 
-				var params={}
-				if(this.filters.project){
-					params.projectId=this.filters.project.id
-				} 
-				if(this.filters.startBizDate && this.filters.endBizDate){
-					params.startBizDate=this.filters.startBizDate;
-					params.endBizDate=this.filters.endBizDate;
-				}
-				
-				if(this.filters.userid){
-					params.userid=this.filters.userid
-				}
-				if(this.filters.taskId){
-					params.taskId=this.filters.taskId
-				}
-				listProjectWorkloadSetMonth(params).then(res=>{ 
-					this.xmProjectWorkloadSetMonths=res.data.tips.isOk?res.data.data:this.xmProjectWorkloadSetMonths;
-				})
-			},
-			initData(){
-				this.visible=true;
-				this.filters.product=this.xmProduct
-				this.filters.project=this.xmProject
-				this.filters.iteration=this.xmIteration
-				this.xmProjectWorkloadSetMonths=[]
-				
-				if(this.queryScope=='my'){
-					this.filters.userid=this.userInfo.userid
-				}
-				this.$nextTick(()=>{
-					if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect();
-					this.listProjectWorkloadSetMonth();
-				})
-				
-			},
-			drawCharts() {
-				this.myChart = this.$echarts.init(document.getElementById("projectWorkloadSetMonthList")); 
-				var that=this;
-				this.myChart.on('updateAxisPointer', function (event) {
-					const xAxisInfo = event.axesInfo[0];
-					if (xAxisInfo) {
-					const dimension = xAxisInfo.value + 1;
-					that.myChart.setOption({
-						series: {
-						id: 'pie',
-						label: {
-							formatter: '{b}: {@[' + dimension + ']} ({d}%)'
-						},
-						encode: {
-							value: dimension,
-							tooltip: dimension
-						}
-						}
-					});
-					}
-				});
-				this.myChart.setOption({
-					title: {
-						text: '工时月报表',
-					},
-					tooltip: {
-						trigger: 'axis',
-      					showContent: false
-					},
-					legend: { 
-					},
+import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; //新增界面
+import { listProjectWorkloadSetMonth } from "@/api/xm/core/xmTaskWorkload";
+import XmTaskWorkloadSimpleListForBizMonth from '@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate'
+export default {
+  components: {
+    XmProjectSelect,XmTaskWorkloadSimpleListForBizMonth,
+  },
+  props: ["xmProduct", "xmProject", "queryScope"],
+  computed: {
+    ...mapGetters(["userInfo", "roles"]),
+    dataSetCpd() {
+      return [
+        ["日期", ...this.xmProjectWorkloadSetMonths.map((i) => i.bizMonth)],
+        //['登记工时',...this.xmProjectWorkloadSetMonths.map(i=>i.workload)],
+        [
+          "待确认",
+          ...this.xmProjectWorkloadSetMonths.map((i) => i.toConfirmWorkload),
+        ],
+        [
+          "已确认",
+          ...this.xmProjectWorkloadSetMonths.map((i) => i.hadConfirmWorkload),
+        ],
+        [
+          "无需结算",
+          ...this.xmProjectWorkloadSetMonths.map((i) => i.notNeedSetWorkload),
+        ],
+        [
+          "待结算",
+          ...this.xmProjectWorkloadSetMonths.map((i) => i.toSetSworkload),
+        ],
+        //[  "已提交审核",  ...this.xmProjectWorkloadSetMonths.map((i) => i.hadCommitSworkload), ],
+        //['已审核',...this.xmProjectWorkloadSetMonths.map(i=>i.hadAgreeSworkload)],
+        [
+          "已结算",
+          ...this.xmProjectWorkloadSetMonths.map((i) => i.hadSetSworkload),
+        ],
+      ];
+    },
+  },
+  watch: {
+    dataSetCpd() {
+      this.$nextTick(() => {
+        this.drawCharts();
+      });
+    },
+  },
+  data() {
+    return {
+      filters: {
+        category: "",
+        product: null,
+        iteration: null,
+        project: null,
+        startBizDate: "",
+        endBizDate: "",
+        userid: "",
+        taskId: "",
+      },
+      dicts: {}, //下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
+      load: { list: false, edit: false, del: false, add: false }, //查询中...
+      dateRanger: [],
+      maxTableHeight: 300,
+      visible: false,
+      xmProjectWorkloadSetMonths: [],
+	  editForm:{bizMonth:'',toConfirmWorkload:0,hadConfirmWorkload:0,toSetSWorkload:0,hadAgreeSworkload:0,hadCommitSworkload:0},
+	  columnProp:'',
+    }; //end return
+  }, //end data
+  methods: {
+    listProjectWorkloadSetMonth() {
+      var params = {};
+      if (this.filters.project) {
+        params.projectId = this.filters.project.id;
+      }
 
-					dataset: {
-						source:  this.dataSetCpd
-					},
-					xAxis: {
-						type: 'category', 
-					},
-					yAxis: { gridIndex: 0 },
-    				grid: { top: '55%' },
-					series: [
-						{ 	name:'登记工时',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true, 
-        					emphasis: { focus: 'series' }, 
-						},
-						{ 	name:'待确认',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true, 
-        					emphasis: { focus: 'series' }, 
-						},
-						{ 
-							name:'已确认',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true,
-        					emphasis: { focus: 'series' }, 
-						},
-						{ 
-							name:'无需结算',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true,
-        					emphasis: { focus: 'series' }, 
-						},
-						{ 	name:'待结算',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true,
-        					emphasis: { focus: 'series' },  
-						},
-						{ 	name:'已提交审核',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true,
-        					emphasis: { focus: 'series' },  
-						},
-						/**
+      if (this.filters.startBizDate && this.filters.endBizDate) {
+        params.startBizDate = this.filters.startBizDate;
+        params.endBizDate = this.filters.endBizDate;
+      }
+      if (this.filters.userid) {
+        params.userid = this.filters.userid;
+      }
+      if (this.filters.taskId) {
+        params.taskId = this.filters.taskId;
+      }
+      listProjectWorkloadSetMonth(params).then((res) => {
+        this.xmProjectWorkloadSetMonths = res.data.tips.isOk
+          ? res.data.data
+          : this.xmProjectWorkloadSetMonths;
+      });
+    },
+    initData() {
+      this.filters.product = this.xmProduct;
+      this.filters.project = this.xmProject;
+      this.filters.iteration = this.xmIteration;
+      this.xmProjectWorkloadSetMonths = [];
+      if (this.queryScope == "my") {
+        this.filters.userid = this.userInfo.userid;
+      }
+      this.$nextTick(() => {
+        if (this.$refs["xmProjectSelect"])
+          this.$refs["xmProjectSelect"].clearSelect();
+        this.listProjectWorkloadSetMonth();
+      });
+    },
+    drawCharts() {
+      this.myChart = this.$echarts.init(
+        document.getElementById("projectWorkloadSetDayList")
+      );
+      var that = this;
+      this.myChart.on("updateAxisPointer", function (event) {
+        const xAxisInfo = event.axesInfo[0];
+        if (xAxisInfo) {
+          const dimension = xAxisInfo.value + 1;
+          that.myChart.setOption({
+            series: {
+              id: "pie",
+              label: {
+                formatter: "{b}: {@[" + dimension + "]} ({d}%)",
+              },
+              encode: {
+                value: dimension,
+                tooltip: dimension,
+              },
+            },
+          });
+        }
+      });
+      this.myChart.setOption({
+        title: {
+          text: "工时日报表",
+        },
+        tooltip: {
+          trigger: "axis",
+          showContent: false,
+        },
+        legend: {},
+
+        dataset: {
+          source: that.dataSetCpd,
+        },
+        xAxis: {
+          type: "category",
+        },
+        yAxis: { gridIndex: 0 },
+        grid: { top: "55%" },
+        series: [
+          {
+            name: "待确认",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+          {
+            name: "已确认",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+          {
+            name: "无需结算",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+          {
+            name: "待结算",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+		  /**
+          {
+            name: "已提交审核",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+          
 						{ 	name:'已审核',
 							type: 'line',
         					seriesLayoutBy: 'row',
@@ -215,64 +406,59 @@
         					emphasis: { focus: 'series' },  
 						},
 						 */
-						{ 	name:'已结算',
-							type: 'line',
-        					seriesLayoutBy: 'row',
-							smooth:true,
-        					emphasis: { focus: 'series' },  
-						},
-						{
-							type: 'pie',
-							id: 'pie',
-							radius: '30%',
-							center: ['50%', '25%'],
-							emphasis: {
-								focus: 'self'
-							},
-							label: {
-								formatter: '{b}: {@日期} ({d}%)'
-							},
-							encode: {
-								itemName: '日期',
-								value: '日期',
-								tooltip: '日期'
-							}
-						}
-					]
-				}); 
-			},
-			
-			onProjectSelected(project){
-				this.filters.project=project
-				this.xmProjectWorkloadSetMonths=[];
-				this.listProjectWorkloadSetMonth();
-			},
-			
-			onProjectClear(){
-				this.filters.project=null
-				
-				this.xmProjectWorkloadSetMonths=[];
-				
-			},
-		},//end method
-		mounted() {
-			/**
- 			initSimpleDicts('all',['planType','xmTaskSettleSchemel','taskType','priority','taskState'] ).then(res=>{
-				this.dicts=res.data.data;
-			}) 
-             */
-			//this.charts();
-			//this.drawCharts();
-			this.initData();
-			
-		}//end mounted
-	}
+          {
+            name: "已结算",
+            type: "line",
+            seriesLayoutBy: "row",
+            smooth: true,
+            emphasis: { focus: "series" },
+          },
+          {
+            type: "pie",
+            id: "pie",
+            radius: "30%",
+            center: ["50%", "25%"],
+            emphasis: {
+              focus: "self",
+            },
+            label: {
+              formatter: "{b}: {@日期} ({d}%)",
+            },
+            encode: {
+              itemName: "日期",
+              value: "日期",
+              tooltip: "日期",
+            },
+          },
+        ],
+      });
+    },
+
+    onProjectSelected(project) {
+      this.filters.project = project;
+      this.xmProjectWorkloadSetMonths = [];
+      this.listProjectWorkloadSetMonth();
+    },
 
+    onProjectClear() {
+      this.filters.project = null;
+
+      this.xmProjectWorkloadSetMonths = [];
+    },
+	rowClick(row, column, event){ 
+		this.editForm=row 
+		this.columnProp=column.property
+	}
+  }, //end method
+  mounted() { 
+    this.initData();
+  }, //end mounted
+};
 </script>
 
 <style scoped>
-   .image {
-    width: 100%;
-    display: block;
-  }
+.image {
+  width: 100%;
+  display: block;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
index cb975380..58d28516 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
@@ -51,26 +51,19 @@
 	import config from '@/common/config';//全局公共库
 	import { getDicts,initSimpleDicts,initComplexDicts } from '@/api/mdp/meta/item';//字典表
 	import { listXmTaskWorkload, delXmTaskWorkload, batchDelXmTaskWorkload,editXmTaskWorkloadSomeFields,initDicts } from '@/api/xm/core/xmTaskWorkload';
-	import  XmTaskWorkloadEdit from './XmTaskWorkloadEdit';//新增修改界面
 	import { mapGetters } from 'vuex'
 
 	export default {
 	    name:'xmTaskWorkloadSimpleListForBizDate',
 		components: {
-		    XmTaskWorkloadEdit,
 		},
-		props:[ 'visible','wstatus','sstatus','bizDate','projectId','userid','taskId'],
+		props:[ 'wstatus','sstatus','bizDate','projectId','userid','taskId','bizMonth'],
 		computed: {
 		    ...mapGetters(['userInfo']),
 
 		},
 		watch:{
-            visible(val){
-                if(val==true){
-                    this.initData();
-                    this.searchXmTaskWorkloads()
-                }
-            }
+             
 		},
 		data() {
 			return {
@@ -206,6 +199,10 @@
 				if(this.sstatus){
 					params.sstatus=this.sstatus
 				}
+
+				if(this.bizMonth){
+					params.bizMonth=this.bizMonth
+				}
 				
 				if(this.bizDate){
 					params.bizDate=this.bizDate
@@ -302,11 +299,9 @@
 		},//end methods
 		mounted() {
 			this.$nextTick(() => { 
-				initDicts(this);
-				if(this.visible==true){ 
-					this.initData()
-					this.searchXmTaskWorkloads();
-				}
+				initDicts(this); 
+				this.initData() 
+				this.searchXmTaskWorkloads(); 
                 this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el)
 
         	});