Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/components/layouts/index.vue

@@ -65,7 +65,6 @@ export default {
         !this.include.includes(to.name) && this.include.push(to.name);
         console.log(this.include,'缓存列表')
       }
-      //includes函数的用法，判断数组中是否包含某个值，返回布尔值
      /**
      * 如果要form(离开)的页面是keepAlive缓存的，
      * 再根据deep来判断是前进还是后退

src/components/nfcPopup/more.vue

@@ -73,6 +73,7 @@ export default {
     visible(val){
       if(!this.visible){
         this.clear();
+        this.$emit('close')
       }
     }
   },

src/utils/globalMixins.js

@@ -64,12 +64,11 @@ export default {
     },
     //调用预览和pdf(内网银行)
     openFilePreview(item) {
-      let system = this.isAndroidOrIos()
       const parms = {
-        url: imgUrl(item.url),
+        url: item.url.indexOf('http') > -1 ? item.url : imgUrl(item.url),
         name: item.name
       }
-      console.log(item)
+      let system = this.isAndroidOrIos();
       if (system === 1) {
         //android
         // 判断当前环境是是否存在 js桥 'sap'

src/views/menu/problemItem/index.vue

@@ -86,6 +86,7 @@ import {dataList} from './api'
 import {mapGetters} from "vuex";
 import {formatDate} from "@/filters/filter";
 export default {
+  name: 'problemItem',
   components: {
     NavBar,
     OrgTree,

src/views/menu/resumption/detail.vue

@@ -770,7 +770,11 @@ export default {
 
         saveTask(data).then(res => {
           this.$toast('提交成功')
-          this.$router.go(-1)
+          this.$router.replace({
+            path: '/resumption',
+            name: 'resumption',
+            params:{event:'refresh'}
+          });
         })
       }catch(e){
         this.nfcs = bakNfcs;

src/views/menu/resumption/list.vue

@@ -141,7 +141,7 @@ import {getDict} from "@/api/toConsult";
 import DateCell from "@/components/dateCell/index.vue";
 
 export default {
-  name: 'lvzhi',
+  name: 'resumption',
   components:{DateCell, NavBar,DatePicker,Empty},
   data(){
     return{
@@ -184,7 +184,9 @@ export default {
   },
   beforeRouteEnter(to,from,next){
     next(vm=>{
-      vm.getDatalist();
+      if(to.params.event === 'refresh'){
+        vm.getDatalist();
+      }
     })
   },
   methods:{

src/views/menu/securityCheckRegister/add.vue

@@ -126,7 +126,7 @@
       <div class="flex-box">
         <van-button type="default"  plain @click="accredit" v-show="showGrantBtn">授权</van-button>
         <van-button type="info"  plain hairline @click="saveData">保存</van-button>
-        <van-button type="info" :disabled="Boolean(!isSubmit)" @click="submitData">提交</van-button>
+        <van-button type="info"  @click="submitData">提交</van-button>
       </div>
     </div>
 
@@ -136,7 +136,7 @@
     <!--    </van-image-preview>-->
 
     <!--  nfc弹窗  -->
-    <nfc-popup v-if="enable" ref="NfcPopup" @checkNFC="checkNFC" @change="changeNfcImg"></nfc-popup>
+    <nfc-popup v-if="enable" ref="NfcPopup" @checkNFC="checkNFC" @close="onClose" @change="changeNfcImg"></nfc-popup>
   </div>
 
   <!--  添加检查内容  -->
@@ -237,6 +237,10 @@ export default {
     window.openNFCScanCallBack = null;
   },
   methods: {
+    onClose(){
+      window.openCameraCallBack = null;
+      window.openNFCScanCallBack = null;
+    },
     //长度校验
     validator(val) {
       let len = val.length;
@@ -438,17 +442,23 @@ export default {
         });
       })
     },
-
+//:disabled="Boolean(!isSubmit)"
     //提交数据
     submitData() {
       //验证必填项
       let pointData = this.checkList.flatMap(v => v.pointList);
-      let allNfcList = pointData.flatMap(v=>v.nfcList);
-      let result = allNfcList.some(v=>v.status != 1);
-      //some函数的用法
-      if(result){
-        this.$toast('请先扫描NFC标签');
-        return;
+      let allNfcList = [];
+      pointData.forEach(v=>{
+        if(v.nfcList && v.nfcList.length > 0){
+          allNfcList.push(...v.nfcList)
+        }
+      })
+      if(allNfcList.length > 0){
+        let result = allNfcList.some(v=>v.status != 1);
+        if(result){
+          this.$toast('请先扫描NFC标签');
+          return;
+        }
       }
       let arr = pointData.filter(v => {
         if (v.status === 1) {
@@ -457,6 +467,7 @@ export default {
       })
       if (arr.length) return this.$toast(`${arr[0].itemName}:该信息不完整请填写`);
       this.taskInfo.isSubmit = 1;
+      console.log(this.taskInfo,'taskInfo')
       registerSubmit(this.taskInfo).then(res => {
         this.$toast('提交成功')
         this.$router.replace({

src/views/menu/securityCheckRegister/addCheck.vue

@@ -123,6 +123,7 @@ export default {
           v.isAdd = 1;
           v.checked = false;
           v.pointId = v.id;
+          if(!v.nfcList) v.nfcList = [];
         });
         this.total = res.total;
         if(this.dataList.length < res.total) {