Merge branch 'dev-fangyi' into test

src/views/modules/base/epidemic/natInfo/natForm.vue

@@ -134,7 +134,8 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item class="block"
+        <el-form-item v-if=" formType!=='detail' || (formType=='detail'&&fileList.length>0)"
+                      class="block"
                       label-width="150px"
                       style="display: block"
                       label="添加图片"
@@ -273,6 +274,7 @@ export default {
       uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile',
       dialogImageUrl: '',
       dialogVisible: false,
+      imgLoading: false,
 
     }
   },
@@ -420,6 +422,13 @@ export default {
     },
 
     async addNat () {
+      // if (this.imgLoading) {
+      //   this.$message({
+      //     type: 'warning',
+      //     message: '正在上传图片，请稍候重试'
+      //   })
+      //   return false;
+      // }
       const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码
       if (regPhone.test(this.formData.mobile) === false) {
         this.btnDisable = false
@@ -523,6 +532,8 @@ export default {
       ) {
         this.$message.error('只能上传jpg、png、gif文件！')
         return false
+      } else {
+        this.btnDisable = true
       }
       // if (!isLt1M) {
       //   this.$message.error('上传文件大小不能超过 5MB!')
@@ -544,7 +555,11 @@ export default {
         file.attachmentFormat = fileType
         file.attachmentSize = file.size
 
-      } else this.$message.error(res.msg)
+
+      } else {
+        this.$message.error(res.msg)
+      }
+      this.btnDisable = false
     },
 
     resetData () {

src/views/modules/base/epidemic/natInfo/natList.vue

@@ -526,7 +526,7 @@ export default {
     },
 
     async attentionNat (row) {
-      const url = "/epmetuser/icNat/cancelsynchro"
+      const url = "/epmetuser/icNat/synchro"
       // const url = "http://yapi.elinkservice.cn/mock/245/epmetuser/icNat/synchro"
 
       let params = {
@@ -564,7 +564,6 @@ export default {
       // this.loadTable()
     },
 
-
     handleSizeChange (val) {
       this.pageSize = val
       this.pageNo = 1
@@ -585,8 +584,6 @@ export default {
         url,
         this.formData,
         (data, rspMsg) => {
-
-
           this.download(data, title + '.xlsx')
         },
         (rspMsg, data) => {