diff --git a/src/views/home-index/components/dataOverviewProject/index.vue b/src/views/home-index/components/dataOverviewProject/index.vue
index 84534fd..c2b3c05 100644
--- a/src/views/home-index/components/dataOverviewProject/index.vue
+++ b/src/views/home-index/components/dataOverviewProject/index.vue
@@ -102,42 +102,36 @@ export default {
// 工程列表
projectList: [
{
- count: 1,
name: '总工程',
icon: 'all-project',
component: 'ItemOne',
dataKey: 'mainProNum',
},
{
- count: 20,
name: '标段工程',
dataKey: 'proNum',
icon: 'lot-project',
component: 'ItemTwo',
},
{
- count: 1,
icon: 'sub-unit',
dataKey: 'subNum',
name: '在用分包单位',
component: 'ItemThree',
},
{
- count: 50,
name: '在用班组',
icon: 'use-teams',
dataKey: 'teamNum',
component: 'ItemFour',
},
{
- count: 1,
name: '在场人员',
dataKey: 'einNum',
component: 'PersonList',
icon: 'on-site-person',
},
{
- count: 80,
name: '今日打卡',
icon: 'clock-in',
dataKey: 'attNum',
@@ -147,21 +141,18 @@ export default {
// 数据预警列表
dataWarningList: [
{
- count: 1,
name: '黄灯人数',
color: '#ff9910',
dataKey: 'yellowNum',
component: 'PersonList',
},
{
- count: 20,
name: '黄灯7天',
color: '#FF0000',
dataKey: 'yellowThanSevenDayNum',
component: 'PersonList',
},
{
- count: 40,
name: '出场未结算',
color: '#8400ff',
dataKey: 'exitNoFileNum',
diff --git a/src/views/synthesize-query/project-count/detail/components/personInfo-card.vue b/src/views/synthesize-query/project-count/detail/components/personInfo-card.vue
index 66d29bd..61e32fc 100644
--- a/src/views/synthesize-query/project-count/detail/components/personInfo-card.vue
+++ b/src/views/synthesize-query/project-count/detail/components/personInfo-card.vue
@@ -101,7 +101,7 @@
累计补卡申请次数(次)
- {{ attendanceData.repairNumHis }}
+ {{ attendanceData.proRepairNum }}
累计补卡天数(人次)
{{
- attendanceData.proRepairNum
+ attendanceData.repairNumHis
}}
diff --git a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue
index b87d46e..2c2b26a 100644
--- a/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue
+++ b/src/views/synthesize-query/three-and-one/detail/components/three-one-table.vue
@@ -314,6 +314,7 @@ export default {
id: row.id,
month: row.tableMonth,
proId: this.projectId,
+ status: row.status,
},
})
},
diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue b/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue
index 2083b6d..dea3224 100644
--- a/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue
+++ b/src/views/synthesize-query/three-and-one/month-detail/components/three-one-table.vue
@@ -15,6 +15,7 @@
@@ -45,6 +46,10 @@ export default {
type: [Number, String],
default: '',
},
+ status: {
+ type: [Number, String],
+ default: '',
+ },
},
data() {
return {
diff --git a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue
index d4417f5..15ca1a7 100644
--- a/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue
+++ b/src/views/synthesize-query/three-and-one/month-detail/components/wage-pay.vue
@@ -62,6 +62,7 @@
:icon="isEdit ? 'el-icon-check' : 'el-icon-edit'"
:type="isEdit ? 'success' : 'primary'"
@click="onHandleEditWagePay"
+ :disabled="status == 2"
>
{{ isEdit ? '保存' : '修改' }}-其中代扣/代缴、实发工资
@@ -138,6 +139,10 @@ export default {
type: [Number, String],
default: '',
},
+ status: {
+ type: [Number, String],
+ default: '',
+ },
},
data() {
return {
diff --git a/src/views/synthesize-query/three-and-one/month-detail/index.vue b/src/views/synthesize-query/three-and-one/month-detail/index.vue
index eb42c6c..44619de 100644
--- a/src/views/synthesize-query/three-and-one/month-detail/index.vue
+++ b/src/views/synthesize-query/three-and-one/month-detail/index.vue
@@ -2,7 +2,7 @@
-
+
@@ -20,12 +20,14 @@ export default {
id: null,
month: null,
proId: null,
+ status: null,
}
},
created() {
this.id = this.$route.query?.id
this.month = this.$route.query?.month
this.proId = this.$route.query?.proId
+ this.status = this.$route.query?.status
},
}
diff --git a/src/views/synthesize-query/wage-count/components/subCompanyCount.vue b/src/views/synthesize-query/wage-count/components/subCompanyCount.vue
index 1ed3520..9ebfd1a 100644
--- a/src/views/synthesize-query/wage-count/components/subCompanyCount.vue
+++ b/src/views/synthesize-query/wage-count/components/subCompanyCount.vue
@@ -46,7 +46,7 @@ export default {
columnData: [
{
label: '分公司名称',
- prop: 'companyName',
+ prop: 'subCompanyName',
},
{
label: '工程数量',