Merge branch 'dev' into 'master'

添加loading

See merge request !43

src/views/operation/exceptionMessage.vue

@@ -24,6 +24,7 @@
           <el-button
             type="primary"
             size="small"
+            :loading="searchLoading"
             icon="el-icon-search"
             @click="search">
             查询
@@ -33,6 +34,7 @@
           <el-button
             type="warning"
             size="small"
+            :loading="sendLoading"
             icon="el-icon-s-promotion"
             @click="resendMsg()">
             批量发送
@@ -95,6 +97,8 @@ export default {
       pageSize: 50,
       currentPage: 1,
       selection: [],
+      searchLoading: false,
+      sendLoading: false,
       loading: false
     }
   },
@@ -158,6 +162,7 @@ export default {
         const loading = this.$loading({
           background: 'rgba(0, 0, 0, 0.3)'
         })
+        this.sendLoading = true
         try {
           const res = await getMessageReSend(String(ids))
           if (res.code === 200) {
@@ -168,6 +173,7 @@ export default {
             this.$message.error(res.message)
           }
         } finally {
+          this.sendLoading = false
           loading.close()
         }
       } catch {}
@@ -181,6 +187,7 @@ export default {
       }
     },
     async getList() {
+      this.searchLoading = true
       this.loading = true
       const params = {
         currentPage: this.currentPage,
@@ -196,6 +203,7 @@ export default {
       } catch (e) {
         console.error(e)
       } finally {
+        this.searchLoading = false
         this.loading = false
       }
     },

src/views/operation/lossOrder/index.vue

@@ -59,6 +59,7 @@
           <el-button
             type="primary"
             size="small"
+            :loading="searchLoading"
             icon="el-icon-search"
             @click="search">
             查询
@@ -68,6 +69,7 @@
           <el-button
             type="danger"
             size="small"
+            :loading="delLoading"
             icon="el-icon-delete"
             @click="deleteData()">
             删除
@@ -77,6 +79,7 @@
           <el-button
             type="primary"
             size="small"
+            :loading="downloadLoading"
             icon="el-icon-download"
             @click="downloadData()">
             重新下载
@@ -86,6 +89,7 @@
           <el-button
             type="default"
             size="small"
+            :loading="transformLoading"
             icon="el-icon-refresh"
             @click="transformData()">
             重新转化
@@ -164,7 +168,7 @@
           align="center"
           width="180"
           :show-overflow-tooltip="true"></el-table-column>
-          <el-table-column
+        <el-table-column
           label="店铺简称"
           prop="shopShortName"
           header-align="center"
@@ -257,6 +261,10 @@ export default {
       pageSize: 50,
       currentPage: 1,
       loading: false,
+      searchLoading: false,
+      downloadLoading: false,
+      delLoading: false,
+      transformLoading: false,
       selection: [],
       plateformList: []
     }
@@ -268,6 +276,7 @@ export default {
   methods: {
     async getList() {
       this.loading = true
+      this.searchLoading = true
       try {
         const res = await listTableData({
           ...this.searchForm,
@@ -280,9 +289,11 @@ export default {
         })
         this.manageData = res.data.records
         this.total = res.data.total
+        this.searchLoading = this.false
       } catch (e) {
         console.error(e)
       } finally {
+        this.searchLoading = this.false
         this.loading = false
       }
     },
@@ -315,6 +326,7 @@ export default {
       } catch {
         return
       }
+      this.downloadLoading = true
       ids = this.selection.map((item) => item.id)
       ids = ids.join()
       const l = this.$loading({
@@ -328,6 +340,7 @@ export default {
         console.error(e)
       } finally {
         l.close()
+        this.downloadLoading = false
       }
     },
     async transformData(row) {
@@ -352,6 +365,7 @@ export default {
       } catch {
         return
       }
+      this.transformLoading = true
       ids = this.selection.map((item) => item.id)
       ids = ids.join()
       const l = this.$loading({
@@ -364,6 +378,7 @@ export default {
       } catch (e) {
         console.error(e)
       } finally {
+        this.transformLoading = false
         l.close()
       }
     },
@@ -389,6 +404,7 @@ export default {
       } catch {
         return
       }
+      if (!row) this.delLoading = true
       ids = this.selection.map((item) => item.id)
       ids = ids.join()
       const l = this.$loading({
@@ -402,6 +418,7 @@ export default {
         console.error(e)
       } finally {
         l.close()
+        if (!row) this.delLoading = false
       }
     },
     handleSelectionChange(selection) {

src/views/system/category-style.vue

@@ -33,7 +33,9 @@
         </el-button>
       </el-form-item>
       <el-form-item style="margin-bottom: 0px">
-        <el-button type="primary" @click="importExcel">导入</el-button>
+        <el-button :loading="exportLoading" type="primary" @click="importExcel">
+          导入
+        </el-button>
       </el-form-item>
     </el-form>
     <div class="my-table-cont my-flex-1">
@@ -249,6 +251,7 @@ export default {
       is_title: 1,
       sourceData: [],
       dialogVisible: false,
+      exportLoading: false,
       delLoading: false,
       refreshLoading: false,
       addcurrencyform: {
@@ -426,6 +429,7 @@ export default {
 
   methods: {
     importExcel() {
+      this.exportLoading = true
       const input = document.createElement('input')
       input.style.display = 'none'
       input.type = 'file'
@@ -444,6 +448,7 @@ export default {
           this.$message.success('导入成功')
           this.getList()
         }
+        this.exportLoading = false
       }
     },
     onCurrentChange(currentPage) {

src/views/system/sku-manage.vue

@@ -64,6 +64,7 @@
             <el-button
               type="primary"
               @click="search()"
+              :loading="searchLoading"
               icon="el-icon-search"
               native-type="submit">
               查询
@@ -74,10 +75,20 @@
           <el-button type="success" @click="addDialog(1)">新增</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button type="danger" @click="deleteSection()">删除</el-button>
+          <el-button
+            :loading="delLoading"
+            type="danger"
+            @click="deleteSection()">
+            删除
+          </el-button>
         </el-form-item>
         <el-form-item style="margin-bottom: 0px">
-          <el-button type="primary" @click="importExcel">导入</el-button>
+          <el-button
+            :loading="exportLoading"
+            type="primary"
+            @click="importExcel">
+            导入
+          </el-button>
         </el-form-item>
       </el-form>
       <div class="table-wrap" v-loading="loading">
@@ -227,6 +238,9 @@ export default {
       userData: [],
       selection: [],
       dialogVisible: false,
+      searchLoading: false,
+      delLoading: false,
+      exportLoading: false,
       searchForm: {
         cateId: '',
         code: '',
@@ -409,6 +423,7 @@ export default {
       }
     },
     importExcel() {
+      this.exportLoading = true
       const input = document.createElement('input')
       input.style.display = 'none'
       input.type = 'file'
@@ -425,6 +440,7 @@ export default {
           this.$message.success('导入成功')
           this.getList()
         }
+        this.exportLoading = false
       }
     },
     setpaginationOptions(opt) {
@@ -552,6 +568,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          if (!v) this.delLoading = true
           const url = `base/propertyValue/delete?ids=${ids}`
           axios.get(url).then((res) => {
             // eslint-disable-next-line eqeqeq
@@ -562,9 +579,12 @@ export default {
               })
               this.getList(this.currentPage)
             }
+            if (!v) this.delLoading = false
           })
         })
-        .catch(() => {})
+        .catch(() => {
+          if (!v) this.delLoading = false
+        })
     },
     // 选择列表接口
     alllist(url) {

src/views/system/sku-sort.vue

@@ -36,10 +36,12 @@
         <el-button type="success" @click="addDialog(1)">新增</el-button>
       </el-form-item>
       <el-form-item>
-        <el-button type="danger" @click="deleteSection()">删除</el-button>
+        <el-button :loading="delLoading" type="danger" @click="deleteSection()">
+          删除
+        </el-button>
       </el-form-item>
       <el-form-item style="margin-bottom: 0px">
-        <el-button type="primary" @click="importExcel">导入</el-button>
+        <el-button :loading="exportLoading" type="primary" @click="importExcel">导入</el-button>
       </el-form-item>
     </el-form>
     <div class="table_wrap">
@@ -245,6 +247,9 @@ export default {
   data() {
     return {
       propDialogVisible: false,
+      searchLoading: false,
+      delLoading: false,
+      exportLoading: false,
       checkedProps: [],
       productProperties: [],
       is_title: 1,
@@ -400,6 +405,7 @@ export default {
 
   methods: {
     importExcel() {
+      this.exportLoading = true
       const input = document.createElement('input')
       input.style.display = 'none'
       input.type = 'file'
@@ -413,6 +419,7 @@ export default {
           this.$message.success('导入成功')
           this.getList()
         }
+        this.exportLoading = false
       }
     },
     async changeDisableStatus(v, item) {
@@ -577,6 +584,7 @@ export default {
     },
     // 查询
     getList() {
+      this.searchLoading = true
       const { pageSize, currentPage } = this.paginationOptions
       axios
         .get('baseProperty/list_page', {
@@ -596,6 +604,10 @@ export default {
               dangerouslyUseHTMLString: true
             })
           }
+          this.searchLoading = false
+        })
+        .catch(() => {
+          this.searchLoading = false
         })
     },
     // 部门职员查询
@@ -703,6 +715,7 @@ export default {
         type: 'warning'
       })
         .then(() => {
+          if (!v) this.delLoading = true
           const url = `baseProperty/delete?ids=${ids}`
           axios.get(url).then((res) => {
             // eslint-disable-next-line eqeqeq
@@ -717,9 +730,12 @@ export default {
                 dangerouslyUseHTMLString: true
               })
             }
+            if (!v) this.delLoading = false
           })
         })
-        .catch(() => {})
+        .catch(() => {
+          if (!v) this.delLoading = false
+        })
     }
   }
 }