diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7b1129a..c3b9ff7 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -803,6 +803,7 @@ height: auto;
font-size: 28rpx;
color: #999999;
line-height: 40rpx;
+margin-left: 20rpx;
}
.Information_test4{
width: auto;
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
index ee6e5ce..e46df00 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.js
@@ -113,6 +113,11 @@ Page({
beforeFlag: res.data[0].checkResultFlag
})
console.log(this.data.beforeFlag);
+ }else{
+ this.setData({
+ beforeFlag: res.data[0].checkResultFlag
+ })
+ console.log(this.data.beforeFlag)
}
})
},
@@ -176,27 +181,29 @@ Page({
})
}
- if (this.data.hazardDesc2) {
+
+ if (this.data.newContent) {
let newArr = this.data.addHiddenDangeList.concat({
- hazardDesc: this.data.hazardDesc2,
- hazardStatus: 2
+ hazardDesc: this.data.newContent,
+ hazardStatus: 0
});
console.log(newArr)
this.setData({
addHiddenDangeList: newArr,
+ newContent:''
});
}
- if (this.data.newContent) {
+ console.log(this.data.addHiddenDangeList);
+ if (this.data.hazardDesc2) {
let newArr = this.data.addHiddenDangeList.concat({
- hazardDesc: this.data.newContent,
- hazardStatus: 0
+ hazardDesc: this.data.hazardDesc2,
+ hazardStatus: 2
});
console.log(newArr)
this.setData({
addHiddenDangeList: newArr,
});
}
- console.log(this.data.addHiddenDangeList);
let form={
companyId: this.data.companyId,
checkTime: this.getCurrentDateTime(),
@@ -208,6 +215,9 @@ Page({
remark: this.data.remarks,
reviewAddress:this.data.addressContent
}
+ this.setData({
+ checkboxValue:''
+ })
// if (!this.data.reviewTime) {
// form.reviewTime=null
// }
@@ -389,13 +399,14 @@ Page({
});
},
addAnother() {
- let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 0, requirements:this.data.hazardDesc2});
- console.log()
- this.setData({
- addHiddenDangeList: newArr,
- newContent: '', // 清空输入框的值
- });
- console.log('添加后的数组:', this.data.addHiddenDangeList);
+ let newArr = this.data.addHiddenDangeList.concat({ hazardDesc: this.data.newContent, hazardStatus: 2});
+ console.log()
+ this.setData({
+ addHiddenDangeList: newArr,
+ newContent: '', // 清空输入框的值
+ });
+ console.log('添加后的数组:', this.data.addHiddenDangeList);
+
},
pickerChange: function (e) {
this.setData({
diff --git a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
index 0549506..c7ae42c 100644
--- a/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
+++ b/subpages/InspectionReport/pages/InspectionReport/InspectionReport.wxml
@@ -39,12 +39,29 @@
+
+
+ *
+
+
+ 检查结论
+
+
+ {{checkResultName?checkResultName:'请选择'}}
+
+
+
+
+
+
+
+
*
- {{beforeFlag == 1?'隐患明细':'未整改隐患'}}
+ {{ beforeFlag ?'隐患明细':'未整改隐患'}}
@@ -68,7 +85,7 @@
-
+
@@ -81,23 +98,7 @@
-
- *
-
-
- 检查结论
-
-
- {{checkResultName?checkResultName:'请选择'}}
-
-
-
-
-
-
-
-
-
+
*
diff --git a/subpages/securityCheck/pages/securityCheck.wxml b/subpages/securityCheck/pages/securityCheck.wxml
index 19f4a9f..d41e48d 100644
--- a/subpages/securityCheck/pages/securityCheck.wxml
+++ b/subpages/securityCheck/pages/securityCheck.wxml
@@ -46,11 +46,11 @@
{{item.name}}
- 检查时间: {{item.orderDate}}
+ 检查时间: {{item.createdTime}}
检查人员: {{item.checkPersons}}
检查结论: 合格
- 合格时间: {{item.reviewTime}}
+ 合格时间: {{item.orderDate}}