diff --git a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
index f5034a9..d7e633a 100644
--- a/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
+++ b/pages/application/hotwork_cfd/hotwork-accept/hotwork-accept-detail.vue
@@ -544,7 +544,7 @@ export default {
},
methods: {
updateRadioValue(key, event) {
- this.pd[key] = event.detail.value;
+ this.pd[key] = event.detail.value || '0';
},
goToDetail(e) {
uni.navigateTo({
@@ -619,10 +619,10 @@ export default {
this.buttonloading = true; // 开始加载
if (STATUS == 8) {
- if (_this.pd.FIRE_COMPLETED === "0") {
+ if (_this.pd.FIRE_COMPLETED === "0" || _this.pd.FIRE_COMPLETED === undefined) {
uni.showModal({
title: "提示",
- content: "动火已完成为“否”,不允许通过。",
+ content: "动火是否完成未确认,不允许通过。",
showCancel: false,
confirmText: "知道了"
});
@@ -630,10 +630,10 @@ export default {
uni.hideLoading(); // 隐藏加载动画
return;
}
- if (_this.pd.SITE_CLEANED === "0") {
+ if (_this.pd.SITE_CLEANED === "0" || _this.pd.SITE_CLEANED === undefined) {
uni.showModal({
title: "提示",
- content: "作业现场已清理为“否”,不允许通过。",
+ content: "作业现场已清理未完成,不允许通过。",
showCancel: false,
confirmText: "知道了"
});
@@ -641,10 +641,10 @@ export default {
uni.hideLoading(); // 隐藏加载动画
return;
}
- if (_this.pd.NO_REMAINING_EMBERS === "0") {
+ if (_this.pd.NO_REMAINING_EMBERS === "0" || _this.pd.NO_REMAINING_EMBERS === undefined) {
uni.showModal({
title: "提示",
- content: "无遗留火种为“否”,不允许通过。",
+ content: "无遗留火种为未确定,不允许通过。",
showCancel: false,
confirmText: "知道了"
});
diff --git a/pages/basics/home.vue b/pages/basics/home.vue
index 48eca6e..757e0b8 100644
--- a/pages/basics/home.vue
+++ b/pages/basics/home.vue
@@ -378,7 +378,6 @@
hdCount:{},
today :'',
triggered: false,
-
totalList:[],
isGoodsEdit: false, // 是否加载编辑后的数据
downOption:{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7d92aa2..a0d6940 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -23,7 +23,6 @@
{{mesCount}}
通知
-
@@ -112,7 +111,6 @@
// this.checkUpdate("android");
},
onShow() {
- console.log(this.$refs.basics,1515)
// 刷新数据
if(this.$refs.basics){
this.$refs.basics.getSumCount()