bug 修复

src/components/FilterQueryModel/index.vue

@@ -453,14 +453,16 @@ export default {
                 subComId: '',
             }
 
-            if (query.lightStatus == 3) {
-                this.$set(query, 'lightStatusSeven', 7)
-            }
             this.filterQueryList.forEach((item) => {
                 query[item.queryKey] = item.value
             })
 
-            console.log('query9966996---<insert>', query)
+            // if (query.lightStatus == 3) {
+            //     this.$set(query, 'lightStatusSeven', 7)
+            //     query.lightStatus = 1
+            // }
+
+            // console.log('query9966996---<insert>', query)
 
             // 传递给父组件使用
             this.$emit('handelSettingQuery', query)

src/views/construction-person/attendance-manage/attendance-count/config.js

@@ -69,14 +69,14 @@ export const projectDialogConfig = {
 // 分包班组弹框内列表所需要的字段
 export const subTeamFormLabel = [
     {
-        f_label: '姓名',
+        f_label: '工程名称',
-        f_model: 'name',
+        f_model: 'proName',
         f_type: 'ipt',
         isShow: false, // 是否展示label
     },
     {
-        f_label: '人员身份证',
+        f_label: '分包名称',
-        f_model: 'idNumber',
+        f_model: 'subName',
         f_type: 'ipt',
         isShow: false, // 是否展示label
     },

src/views/construction-person/red-green-light-mange/contract-witness/config.js

@@ -46,7 +46,7 @@ export const formLabel = [
     },
     {
         f_label: '状态',
-        f_model: 'einStatus',
+        f_model: 'isSign',
         f_type: 'sel',
         f_width: '180px',
         isShow: false, // 是否展示label
@@ -57,7 +57,7 @@ export const formLabel = [
             },
             {
                 label: '未签订',
-                value: '2',
+                value: '0',
             },
         ], // 状态列表
     },

src/views/home-index/components/dataOverviewProject/components/item-four.vue

@@ -288,9 +288,8 @@ export default {
             this.queryParams.sex = sex
             this.queryParams.isAtt = isAtt
             this.queryParams.postId = postId
-            console.log('lightStatus9966996--+++', lightStatus)
+
             if (lightStatus == 3) {
-                console.log('lightStatus9966996', lightStatus)
                 this.$set(this.queryParams, 'lightStatusSeven', 7)
                 this.queryParams.lightStatus = 1
             }

src/views/home-index/components/dataOverviewProject/components/item-two.vue

@@ -476,6 +476,11 @@ export default {
         handelSettingQuery(query) {
             console.log('筛选条件', query)
             this.queryParams = query
+
+            if (query.lightStatus == 3) {
+                this.$set(this.queryParams, 'lightStatusSeven', 7)
+                this.queryParams.lightStatus = 1
+            }
         },
 
         // 获取筛选条件 查询工程

src/views/home-index/components/dataOverviewProject/components/person-list.vue

@@ -223,6 +223,11 @@ export default {
             this.queryParams.sex = sex
             this.queryParams.isAtt = isAtt
             this.queryParams.postId = postId
+
+            if (query.lightStatus == 3) {
+                this.$set(this.queryParams, 'lightStatusSeven', 7)
+                this.queryParams.lightStatus = 1
+            }
         },
     },
 
@@ -234,6 +239,17 @@ export default {
             },
             deep: true,
         },
+
+        lightStatus: {
+            handler(newValue) {
+                if (newValue == 3) {
+                    this.queryParams.lightStatus = 1
+                    this.$set(this.queryParams, 'lightStatusSeven', 7)
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
     },
 }
 </script>

src/views/home-index/components/personPresence/index.vue

@@ -216,7 +216,7 @@ export default {
 
         async getPersonPresence() {
             const { data: res } = await getPersonPresenceAPI({
-                companyId: this.selectCompany,
+                subComId: this.selectCompany,
             })
 
             const { feMailNum, mailNum, postMsg, greenNum, yellowNum } = res