Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/component/device/deviceDialog.vue

@@ -1531,6 +1531,23 @@ export default {
           )
         }
       }
+    },
+    'form.shiFouXiaoZhun': {
+      handler(value) {
+        if (value !== '是') {
+          const arr = [
+            'xiaoZhunZQ',
+            'shiYongKeShi',
+            'yiXiaoRiQi',
+            'xiaoZhunYouXia',
+            'zhengShuBianHa',
+            'jianDingXiao',
+            'zuiDaYunCha',
+            'xiuZhengZhiXiu'
+          ]
+          arr.forEach((t) => (this.form[t] = ''))
+        }
+      }
     }
   },
 
@@ -1758,6 +1775,10 @@ export default {
       if (this.isEdit) {
         const { data } = await getequipmentCard({ id: this.params.id })
         this.form = data
+        console.log(this.form.xiaoZhunZQ)
+        if (!this.form.xiaoZhunZQ) {
+          this.form.xiaoZhunYouXia = ''
+        }
       } else {
         this.isFirstbianZhiBuMen = false
         this.isFirstyiXiaoRiQi = false

src/views/component/sjzlpjjhx/sjzlpjjhx.vue

@@ -390,6 +390,7 @@ export default {
           this.$confirm('选择导出类型', '提示', {
             confirmButtonText: '导出全部数据',
             cancelButtonText: '导出模板',
+            distinguishCancelAndClose: true,
             type: 'success'
           })
             .then(() => {
@@ -406,7 +407,6 @@ export default {
                     userNames.push(result?.userName)
                   }
                   i.canYuRenYuan = userNames.join(',')
-                  console.log(i.canYuRenYuan, 'qqqqqqqqq')
                 }
               }
 
@@ -416,12 +416,14 @@ export default {
                 '参加外部质量评价活动计划项目详情'
               )
             })
-            .catch(() => {
-              this.handleExport(
-                this.getColumns(),
-                [],
-                '参加外部质量评价活动计划项目详情(模板)'
-              )
+            .catch((action) => {
+              if (action === 'cancel') {
+                this.handleExport(
+                  this.getColumns(),
+                  [],
+                  '参加外部质量评价活动计划项目详情(模板)'
+                )
+              }
             })
 
           break