显示问题

src/views/menu/resumption/detail.vue

@@ -158,6 +158,7 @@
                     inactive-color="#4fc08d"
                     active-color="#ee0a24"
                     size="18"
+                    @change="validateArea(item.areaId)"
                   />
                   <span v-else>
                     <van-tag v-if="point.resValue === 1" type="warning">异常</van-tag>
@@ -190,6 +191,7 @@
                   label="情况描述"
                   type="textarea"
                   :placeholder="enable ? '请输入情况描述' : ''"
+                  @input="validateArea(item.areaId)"
                 />
                 <van-field
                   :readonly="!enable"
@@ -226,6 +228,7 @@
                   name="rectificationDeadline"
                   v-model="point.rectificationDeadline"
                   :data-list="dayList"
+                  @change="validateArea(item.areaId)"
                 />
               </van-cell-group>
             </div>
@@ -504,12 +507,9 @@ export default {
         });
         this.areasMap = obj;
         this.activeArea(this.areas[0], 0)
-
-        /*if (!this.enable) {
-          this.openCollapseItems()
-        }*/
         this.openCollapseItems()
         this.updateNFC(0);
+        this.validateAreaAll();
       })
     },
     openCollapseItems() {
@@ -534,6 +534,12 @@ export default {
       })
       this.openCollapseItems()
     },
+    validateAreaAll() {
+
+      this.areas.forEach((item, index) => {
+        this.validateArea(item.areaId)
+      })
+    },
     changeCurrentSwitch(areaId) {
       this.resumptionData.yesPointNums = this.resumptionData.yesPointNums + 1
       this.resumptionData.noPointNums = this.resumptionData.noPointNums - 1
@@ -553,7 +559,13 @@ export default {
           if (item.areaId === areaId) {
             total++
             if (point.dataStatus === 2) {
-              yes++
+              if(point.resValue === 1){
+                if(point.resRemark !== null && point.resRemark !== "" && point.rectificationDeadline !== null){
+                  yes++;
+                }
+              }else{
+                yes++
+              }
             }
           }
         });
@@ -599,6 +611,11 @@ export default {
           nfcs.push(pro)
         }
         this.$refs.NfcPopup.show(nfcs)
+      }else{
+        this.$toast.fail({
+          message: '该区域没有需要扫描的NFC！',
+          position: 'top'
+        })
       }
     },
     cancelImg(imgItem) {
@@ -727,12 +744,7 @@ export default {
       data.subType = 1
 
       saveTask(data).then(res => {
-        this.$toast('保存成功')
-        this.$router.replace({
-          path: '/resumption',
-          name: 'resumption',
-          params:{event:'refresh'}
-        });
+        this.$toast('保存成功');
       })
     },
     submitResumptionData() {
@@ -837,12 +849,13 @@ export default {
         data.subType = 2
 
         saveTask(data).then(res => {
-          this.$toast('提交成功')
-          this.$router.replace({
+          this.$toast('提交成功');
+          /*this.$router.replace({
             path: '/resumption',
             name: 'resumption',
             params:{event:'refresh'}
-          });
+          });*/
+          this.$router.go(-1);
         })
       }catch(e){
         this.nfcs = bakNfcs;