chenrui 3 лет назад
Родитель
Сommit
54a6e5f400

+ 6 - 1
src/views/common/chooseImportModal.vue

@@ -18,6 +18,7 @@
         :rowKey="(record) => record.goodsSn"
         :columns="nowColumns"
         :dataSource="loadData"
+        :loading="loading"
         :scroll="{ y: 200 }"
         :pagination="false"
         bordered>
@@ -32,6 +33,7 @@
         :rowKey="(record) => record.goodsCode"
         :columns="nowUnColumns"
         :dataSource="unLoadData"
+        :loading="loading"
         :scroll="{ y: 200 }"
         :pagination="false"
         bordered>
@@ -157,13 +159,16 @@ export default {
         { title: this.paramsData && this.paramsData.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', dataIndex: 'goodsPrice', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remark', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
-      unLoadData: []
+      unLoadData: [],
+      loading: false
     }
   },
   methods: {
     getData () {
       const _this = this
+      this.loading = true
       promoRuleGoods(this.paramsData).then(res => {
+        this.loading = false
         if (res.status == 200) {
           if (res.data.okGoodsList && res.data.okGoodsList.length > 0) {
             res.data.okGoodsList.map((item, index) => {

+ 4 - 0
src/views/dealerManagement/dealerRelationshipBinding/list.vue

@@ -33,6 +33,7 @@
         @expand="expand"
         :expandedRowKeys="expandedRowKeys"
         :expandRowByClick="true"
+        :loading="loading"
         :scroll="{ y: tableHeight }">
         <a-table
           slot="expandedRowRender"
@@ -82,6 +83,7 @@ export default {
     return {
       tableHeight: 0,
       spinning: false,
+      loading: false,
       formItemLayout: {
         labelCol: { span: 6 },
         wrapperCol: { span: 16 }
@@ -155,7 +157,9 @@ export default {
         pageNo: this.pageNo,
         pageSize: this.pageSize
       }
+      this.loading = true
       dealerRelationList(Object.assign(params, this.queryParam, { dealerLevelList: this.tabInd == 1 ? ['PROVINCE'] : ['PROVINCE', 'CITY'] })).then(res => {
+        this.loading = false
         if (res.status == 200) {
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0

+ 5 - 1
src/views/promotionRulesManagement/promotionRules/detail.vue

@@ -37,6 +37,7 @@
         :rowKey="(record) => record.id"
         :columns="columns"
         :data-source="promoRuleList"
+        :loading="loading"
         :pagination="false"
         bordered>
         <!-- 操作 -->
@@ -134,14 +135,17 @@ export default {
       lookLoadData: [],
       promoRuleList: [],
       nowColumns: [],
-      promoRuleType: '' //  当前查看类型     买产品送产品...
+      promoRuleType: '', //  当前查看类型     买产品送产品...
+      loading: false
     }
   },
   methods: {
     //  详情
     getDetail () {
       const _this = this
+      this.loading = true
       promoActiveDetailD({ sn: this.$route.params.sn }).then(res => {
+        this.loading = false
         if (res.status == 200) {
           _this.detailsData = res.data
           if (_this.detailsData.promoRuleList) {