From 93274d928a6bf3b4f720ad4bd6fbcf55846abeab Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 13:39:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/diyInfo.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index b93a4939..c0f6586c 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -204,13 +204,13 @@ export default {
     },
     handleDelItem(val) {
       const { item, index } = val
-      console.log('item------', item, this.$refs[`checkbox${item.id}`])
-      const checkList = this.$refs[`checkbox${item.id}`][0].checkedList
+      console.log('item------', item, this.$refs[`checkbox${item.itemGroupId}`])
+      const checkList = this.$refs[`checkbox${item.itemGroupId}`][0].checkedList
       checkList.forEach((n, i) => {
-        if (n == item.itemId) this.$refs[`checkbox${item.id}`][0].checkedList.splice(i, 1)
+        if (n == item.itemId) this.$refs[`checkbox${item.itemGroupId}`][0].checkedList.splice(i, 1)
       })
       this.rightList.forEach((n, i) => {
-        if (n.id === item.id) {
+        if (n.id === item.itemGroupId) {
           n.queryItemList.splice(index, 1)
           if (n.queryItemList.length === 0) this.rightList.splice(i, 1)
         }

From ec1827be3be767d4b9e214d1e83e0898996d89da Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 13:58:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BAloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/checkBox.vue  | 2 +-
 src/views/modules/base/diyInfo.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/components/checkBox.vue b/src/views/components/checkBox.vue
index 4bab4aea..1f2d19a2 100644
--- a/src/views/components/checkBox.vue
+++ b/src/views/components/checkBox.vue
@@ -35,7 +35,7 @@ export default {
       boxList: [],
       checkAll: false,
       checkedList: [],
-      isIndeterminate: true,
+      isIndeterminate: false,
       pid: '',
     }
   },
diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index c0f6586c..af53b5d3 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -87,7 +87,7 @@
           <el-checkbox v-model="form.isSaveTemp">保存为常用模板</el-checkbox>
         </div>
       </div>
-      <el-button class="diy-button--delete" @click="handleExport">导出</el-button>
+      <el-button class="diy-button--delete" :loading="exportLoading" @click="handleExport">导出</el-button>
     </div>
     <el-dialog :visible.sync="diyDialog"
                :close-on-click-modal="false"
@@ -146,6 +146,7 @@ export default {
   },
   data() {
     return {
+      exportLoading: false,
       activeCollapse: ['1'],
       activeName: 'first',
       info: {},
@@ -272,6 +273,7 @@ export default {
     handleExport() {
       if (this.rightList.length === 0) return this.$message.error('请选择导出信息')
       if (this.form.isSaveTemp && !this.form.name) return this.$message.error('请输入模板名称')
+      this.exportLoading = true
       this.exportTemplate()
 
     },
@@ -324,6 +326,7 @@ export default {
             this.$message.success('导出成功')
             this.$emit('close')
           } else this.$message.error('下载失败')
+          this.exportLoading = false
         })
         .catch(err => {
           console.log('err', err)

From 8bad3a59383ed22d74b42b7d1853cdf717a8ac78 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 15:03:31 +0800
Subject: [PATCH 3/4] dd

---
 src/views/modules/base/diyInfo.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/modules/base/diyInfo.vue b/src/views/modules/base/diyInfo.vue
index af53b5d3..ec4a3eb3 100644
--- a/src/views/modules/base/diyInfo.vue
+++ b/src/views/modules/base/diyInfo.vue
@@ -330,6 +330,7 @@ export default {
         })
         .catch(err => {
           console.log('err', err)
+          this.exportLoading = false
           return this.$message.error('网络错误')
         })
     },

From 510664fc7f57ebba070673f41c3fd6b6cd08147b Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 27 Apr 2022 16:32:20 +0800
Subject: [PATCH 4/4] dd

---
 src/views/components/resiSearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components/resiSearch.vue b/src/views/components/resiSearch.vue
index ef2b7fa6..45f56bf3 100644
--- a/src/views/components/resiSearch.vue
+++ b/src/views/components/resiSearch.vue
@@ -712,7 +712,7 @@ export default {
     width: 200px;
   }
   .resi-cell--daterange {
-    width: 200px;
+    max-width: 260px;
   }
   .resi-cell-select {
     width: 200px;