diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
index 08555c15..7d83d887 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetDayList.vue
@@ -58,7 +58,7 @@
:row-style="{ height: '50px' }"
highlight-current-row
v-loading="load.list"
- @row-click="rowClick"
+ @row-click="rowClick"
border
style="width: 100%"
:header-cell-style="{ 'text-align': 'center' }"
@@ -90,12 +90,14 @@
show-overflow-tooltip
sortable
>
-
-
-
- {{scope.row.workload}}h
-
-
+
+ {{ scope.row.workload }}h
+
-
-
-
-
- {{scope.row.toConfirmWorkload}}h
-
-
+
+ {{ scope.row.toConfirmWorkload }}h
+
-
-
-
-
- {{scope.row.hadConfirmWorkload}}h
-
-
+
+ {{ scope.row.hadConfirmWorkload }}h
+
-
-
-
-
- {{scope.row.notNeedSetWorkload}}h
-
-
+
+ {{ scope.row.notNeedSetWorkload }}h
+
-
-
-
- {{scope.row.toSetSworkload}}h
-
-
-
+ {{ scope.row.toSetSworkload }}h
+
+
-
-
-
-
- {{scope.row.hadCommitSworkload}}h
-
-
-
+
+ {{ scope.row.hadCommitSworkload }}h
+
-
-
-
-
- {{scope.row.hadAgreeSworkload}}h
-
-
-
+
+ {{ scope.row.hadAgreeSworkload }}h
+
+
-
-
-
-
- {{scope.row.hadSetSworkload}}h
-
-
-
+
+ {{ scope.row.hadSetSworkload }}h
+
+
+
+
+
+
@@ -215,10 +249,11 @@ import { mapGetters } from "vuex";
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; //新增界面
import { listProjectWorkloadSetDay } from "@/api/xm/core/xmTaskWorkload";
-import XmTaskWorkloadSimpleListForBizDate from '@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate'
+import XmTaskWorkloadSimpleListForBizDate from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate";
export default {
components: {
- XmProjectSelect,XmTaskWorkloadSimpleListForBizDate,
+ XmProjectSelect,
+ XmTaskWorkloadSimpleListForBizDate,
},
props: ["xmProduct", "xmProject", "queryScope"],
computed: {
@@ -243,8 +278,14 @@ export default {
"待结算",
...this.xmProjectWorkloadSetDays.map((i) => i.toSetSWorkload),
],
- [ "已提交审核", ...this.xmProjectWorkloadSetDays.map((i) => i.hadCommitSworkload), ],
- ['已审核',...this.xmProjectWorkloadSetDays.map(i=>i.hadAgreeSworkload)],
+ [
+ "已提交审核",
+ ...this.xmProjectWorkloadSetDays.map((i) => i.hadCommitSworkload),
+ ],
+ [
+ "已审核",
+ ...this.xmProjectWorkloadSetDays.map((i) => i.hadAgreeSworkload),
+ ],
[
"已结算",
...this.xmProjectWorkloadSetDays.map((i) => i.hadSetSworkload),
@@ -277,8 +318,28 @@ export default {
maxTableHeight: 300,
visible: false,
xmProjectWorkloadSetDays: [],
- editForm:{bizDate:'',toConfirmWorkload:0,hadConfirmWorkload:0,toSetSWorkload:0,hadAgreeSworkload:0,hadCommitSworkload:0},
- columnProp:'',
+ editForm: {
+ bizDate: "",
+ toConfirmWorkload: 0,
+ hadConfirmWorkload: 0,
+ toSetSWorkload: 0,
+ hadAgreeSworkload: 0,
+ hadCommitSworkload: 0,
+ },
+ columnProp: "",
+ workloadDialogVisible: false,
+ wstatus: "",
+ sstatus: "",
+ stateName: {
+ workload: "所有",
+ toConfirmWorkload: "待确认",
+ hadConfirmWorkload: "已确认",
+ notNeedSetWorkload:'无需结算',
+ toSetSworkload: "待结算",
+ hadAgreeSworkload: "已审核待结算",
+ hadCommitSworkload: "已提交待审核",
+ hadSetSworkload: "已结算",
+ },
}; //end return
}, //end data
methods: {
@@ -298,12 +359,12 @@ export default {
if (this.filters.taskId) {
params.taskId = this.filters.taskId;
}
- this.load.list=true
+ this.load.list = true;
listProjectWorkloadSetDay(params).then((res) => {
this.xmProjectWorkloadSetDays = res.data.tips.isOk
? res.data.data
: this.xmProjectWorkloadSetDays;
- this.load.list=false;
+ this.load.list = false;
});
},
initData() {
@@ -389,7 +450,7 @@ export default {
seriesLayoutBy: "row",
smooth: true,
emphasis: { focus: "series" },
- },
+ },
{
name: "已提交审核",
type: "line",
@@ -397,13 +458,14 @@ export default {
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",
@@ -443,12 +505,18 @@ export default {
this.xmProjectWorkloadSetDays = [];
},
- rowClick(row, column, event){
- this.editForm=row
- this.columnProp=column.property
- }
+ rowClick(row, column, event) {
+ this.editForm = row;
+ this.columnProp = column.property;
+ },
+ showPopover(row, fieldName, wstatus, sstatus) {
+ this.editForm = row;
+ this.workloadDialogVisible = true;
+ this.wstatus = wstatus;
+ this.sstatus = sstatus;
+ },
}, //end method
- mounted() {
+ mounted() {
this.initData();
}, //end mounted
};
diff --git a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
index 2e97e8a2..21505b98 100644
--- a/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
+++ b/src/views/xm/core/xmTaskWorkload/WorkloadSetMonthList.vue
@@ -5,7 +5,7 @@
@@ -58,7 +58,7 @@
:row-style="{ height: '50px' }"
highlight-current-row
v-loading="load.list"
- @row-click="rowClick"
+ @row-click="rowClick"
border
style="width: 100%"
:header-cell-style="{ 'text-align': 'center' }"
@@ -90,12 +90,14 @@
show-overflow-tooltip
sortable
>
-
-
-
- {{scope.row.workload}}h
-
-
+
+ {{ scope.row.workload }}h
+
-
-
-
-
- {{scope.row.toConfirmWorkload}}h
-
-
+
+ {{ scope.row.toConfirmWorkload }}h
+
-
-
-
-
- {{scope.row.hadConfirmWorkload}}h
-
-
+
+ {{ scope.row.hadConfirmWorkload }}h
+
-
-
-
-
- {{scope.row.notNeedSetWorkload}}h
-
-
+
+ {{ scope.row.notNeedSetWorkload }}h
+
-
-
-
- {{scope.row.toSetSworkload}}h
-
-
+ {{ scope.row.toSetSworkload }}h
+
-
-
-
-
- {{scope.row.hadCommitSworkload}}h
-
-
-
+
+ {{ scope.row.hadCommitSworkload }}h
+
-
-
-
-
- {{scope.row.hadAgreeSworkload}}h
-
-
-
+
+ {{ scope.row.hadAgreeSworkload }}h
+
+
-
-
-
-
- {{scope.row.hadSetSworkload}}h
-
-
-
+
+ {{ scope.row.hadSetSworkload }}h
+
+
+
+
+
+
@@ -215,10 +249,11 @@ import { mapGetters } from "vuex";
import XmProjectSelect from "@/views/xm/core/components/XmProjectSelect"; //新增界面
import { listProjectWorkloadSetMonth } from "@/api/xm/core/xmTaskWorkload";
-import XmTaskWorkloadSimpleListForBizMonth from '@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate'
+import XmTaskWorkloadSimpleListForBizDate from "@/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate";
export default {
components: {
- XmProjectSelect,XmTaskWorkloadSimpleListForBizMonth,
+ XmProjectSelect,
+ XmTaskWorkloadSimpleListForBizDate,
},
props: ["xmProduct", "xmProject", "queryScope"],
computed: {
@@ -241,10 +276,16 @@ export default {
],
[
"待结算",
- ...this.xmProjectWorkloadSetMonths.map((i) => i.toSetSworkload),
+ ...this.xmProjectWorkloadSetMonths.map((i) => i.toSetSWorkload),
+ ],
+ [
+ "已提交审核",
+ ...this.xmProjectWorkloadSetMonths.map((i) => i.hadCommitSworkload),
+ ],
+ [
+ "已审核",
+ ...this.xmProjectWorkloadSetMonths.map((i) => i.hadAgreeSworkload),
],
- [ "已提交审核", ...this.xmProjectWorkloadSetMonths.map((i) => i.hadCommitSworkload), ],
- ['已审核',...this.xmProjectWorkloadSetMonths.map(i=>i.hadAgreeSworkload)],
[
"已结算",
...this.xmProjectWorkloadSetMonths.map((i) => i.hadSetSworkload),
@@ -277,8 +318,28 @@ export default {
maxTableHeight: 300,
visible: false,
xmProjectWorkloadSetMonths: [],
- editForm:{bizMonth:'',toConfirmWorkload:0,hadConfirmWorkload:0,toSetSWorkload:0,hadAgreeSworkload:0,hadCommitSworkload:0},
- columnProp:'',
+ editForm: {
+ bizMonth: "",
+ toConfirmWorkload: 0,
+ hadConfirmWorkload: 0,
+ toSetSWorkload: 0,
+ hadAgreeSworkload: 0,
+ hadCommitSworkload: 0,
+ },
+ columnProp: "",
+ workloadDialogVisible: false,
+ wstatus: "",
+ sstatus: "",
+ stateName: {
+ workload: "所有",
+ toConfirmWorkload: "待确认",
+ hadConfirmWorkload: "已确认",
+ notNeedSetWorkload:'无需结算',
+ toSetSworkload: "待结算",
+ hadAgreeSworkload: "已审核待结算",
+ hadCommitSworkload: "已提交待审核",
+ hadSetSworkload: "已结算",
+ },
}; //end return
}, //end data
methods: {
@@ -298,12 +359,12 @@ export default {
if (this.filters.taskId) {
params.taskId = this.filters.taskId;
}
- this.load.list=true;
+ this.load.list = true;
listProjectWorkloadSetMonth(params).then((res) => {
this.xmProjectWorkloadSetMonths = res.data.tips.isOk
? res.data.data
: this.xmProjectWorkloadSetMonths;
- this.load.list=false;
+ this.load.list = false;
});
},
initData() {
@@ -322,7 +383,7 @@ export default {
},
drawCharts() {
this.myChart = this.$echarts.init(
- document.getElementById("projectWorkloadSetDayList")
+ document.getElementById("projectWorkloadSetMonthList")
);
var that = this;
this.myChart.on("updateAxisPointer", function (event) {
@@ -397,13 +458,14 @@ export default {
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",
@@ -443,12 +505,18 @@ export default {
this.xmProjectWorkloadSetMonths = [];
},
- rowClick(row, column, event){
- this.editForm=row
- this.columnProp=column.property
- }
+ rowClick(row, column, event) {
+ this.editForm = row;
+ this.columnProp = column.property;
+ },
+ showPopover(row, fieldName, wstatus, sstatus) {
+ this.editForm = row;
+ this.workloadDialogVisible = true;
+ this.wstatus = wstatus;
+ this.sstatus = sstatus;
+ },
}, //end method
- mounted() {
+ mounted() {
this.initData();
}, //end mounted
};
diff --git a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
index f74df629..ec050395 100644
--- a/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
+++ b/src/views/xm/core/xmTaskWorkload/XmTaskWorkloadSimpleListForBizDate.vue
@@ -37,8 +37,8 @@
-
-
+
+
{{scope.row.sbillId?'结算单:'+scope.row.sbillId:'选择结算单'}}
@@ -350,7 +350,7 @@
this.$nextTick(() => {
initDicts(this);
this.initData()
- //this.searchXmTaskWorkloads();
+ this.searchXmTaskWorkloads();
this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTaskWorkloadTable.$el)
});