chenrui 3 роки тому
батько
коміт
1ed52483ef

+ 8 - 0
src/views/allocationManagement/warehouseAllocation/edit.vue

@@ -95,6 +95,7 @@
               :customRow="handleClickRow"
               :customRow="handleClickRow"
               :dataSource="loadData"
               :dataSource="loadData"
               :scroll="{ x: 1880, y: 300 }"
               :scroll="{ x: 1880, y: 300 }"
+              :loading="loading"
               :pagination="paginationProps"
               :pagination="paginationProps"
               bordered>
               bordered>
               <!-- 产品分类 -->
               <!-- 产品分类 -->
@@ -178,6 +179,7 @@
               :columns="chooseColumns"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
               :dataSource="chooseLoadData"
               :scroll="{ x: 1680, y: 300 }"
               :scroll="{ x: 1680, y: 300 }"
+              :loading="chooseLoading"
               :pagination="choosePaginationProps"
               :pagination="choosePaginationProps"
               bordered>
               bordered>
               <!-- 产品分类 -->
               <!-- 产品分类 -->
@@ -243,6 +245,8 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      loading: false,
+      chooseLoading: false,
       queryParam: {
       queryParam: {
         productCode: '',
         productCode: '',
         productName: '',
         productName: '',
@@ -480,11 +484,13 @@ export default {
     // 产品列表数据
     // 产品列表数据
     getProductList (pageNo) {
     getProductList (pageNo) {
       this.disabled = true
       this.disabled = true
+      this.loading = true
       this.pageNo = pageNo || this.pageNo
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       params.enabledFlag = 1
       params.enabledFlag = 1
       params.warehouseSn = this.basicInfoData.outWarehouseSn
       params.warehouseSn = this.basicInfoData.outWarehouseSn
       productQuery(params).then(res => {
       productQuery(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
         if (res.status == 200) {
           const data = res.data
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.total = Number(res.data.count) || 0
@@ -528,12 +534,14 @@ export default {
     getChooseProductList (pageNo) {
     getChooseProductList (pageNo) {
       this.choosePageNo = this.choosePageNo || pageNo
       this.choosePageNo = this.choosePageNo || pageNo
       this.chooseDisabled = true
       this.chooseDisabled = true
+      this.chooseLoading = true
       const params = {
       const params = {
         pageNo: this.choosePageNo,
         pageNo: this.choosePageNo,
         pageSize: this.choosePageSize,
         pageSize: this.choosePageSize,
         allocationWarehouseSn: this.$route.params.sn
         allocationWarehouseSn: this.$route.params.sn
       }
       }
       allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
       allocWarehouseDetailList(Object.assign(params, this.chooseQueryParam)).then(res => {
+        this.chooseLoading = false
         if (res.status == 200) {
         if (res.status == 200) {
           //  合计
           //  合计
           this.getDetailCount(Object.assign(params, this.chooseQueryParam))
           this.getDetailCount(Object.assign(params, this.chooseQueryParam))

+ 8 - 0
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -96,6 +96,7 @@
                 :columns="columns"
                 :columns="columns"
                 :customRow="handleClickRow"
                 :customRow="handleClickRow"
                 :dataSource="loadData"
                 :dataSource="loadData"
+                :loading="loading"
                 :scroll="{ x: 1600, y: 300 }"
                 :scroll="{ x: 1600, y: 300 }"
                 :pagination="paginationProps"
                 :pagination="paginationProps"
                 @change="onTableChange"
                 @change="onTableChange"
@@ -171,6 +172,7 @@
                 :columns="chooseColumns"
                 :columns="chooseColumns"
                 :dataSource="chooseLoadData"
                 :dataSource="chooseLoadData"
                 :scroll="{ x: 1700, y: 300 }"
                 :scroll="{ x: 1700, y: 300 }"
+                :loading="chooseLoading"
                 :pagination="choosePaginationProps"
                 :pagination="choosePaginationProps"
                 @change="onChooseTableChange"
                 @change="onChooseTableChange"
                 bordered>
                 bordered>
@@ -253,6 +255,8 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      loading: false,
+      chooseLoading: false,
       queryParam: {
       queryParam: {
         queryWord: '',
         queryWord: '',
         productBrandSn: undefined,
         productBrandSn: undefined,
@@ -579,6 +583,7 @@ export default {
     // 产品列表数据
     // 产品列表数据
     getDealerProductList (pageNo, sorter) {
     getDealerProductList (pageNo, sorter) {
       this.disabled = true
       this.disabled = true
+      this.loading = true
       this.pageNo = pageNo || this.pageNo
       this.pageNo = pageNo || this.pageNo
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       params.enabledFlag = 1
       params.enabledFlag = 1
@@ -589,6 +594,7 @@ export default {
         params.sortAlias = 'dp'
         params.sortAlias = 'dp'
       }
       }
       dealerProductList(params).then(res => {
       dealerProductList(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
         if (res.status == 200) {
           const data = res.data
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.total = Number(res.data.count) || 0
@@ -626,7 +632,9 @@ export default {
         params.sortOrder = sorter.order
         params.sortOrder = sorter.order
         params.sortAlias = sorter.field == 'brandName' ? 'dp' : 'sppd'
         params.sortAlias = sorter.field == 'brandName' ? 'dp' : 'sppd'
       }
       }
+      this.chooseLoading = true
       sparePartsPurDetailList(params).then(res => {
       sparePartsPurDetailList(params).then(res => {
+        this.chooseLoading = false
         if (res.status == 200) {
         if (res.status == 200) {
           this.getDetailCount(params)
           this.getDetailCount(params)
           const data = res.data
           const data = res.data

+ 8 - 0
src/views/purchasingManagement/purchaseReturn/edit.vue

@@ -46,6 +46,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="columns"
               :columns="columns"
               :dataSource="loadData"
               :dataSource="loadData"
+              :loading="loading"
               :scroll="{ x: 1320, y: 300 }"
               :scroll="{ x: 1320, y: 300 }"
               :pagination="paginationProps"
               :pagination="paginationProps"
               bordered>
               bordered>
@@ -91,6 +92,7 @@
               :rowKey="(record) => record.id"
               :rowKey="(record) => record.id"
               :columns="chooseColumns"
               :columns="chooseColumns"
               :dataSource="chooseLoadData"
               :dataSource="chooseLoadData"
+              :loading="chooseLoading"
               :scroll="{ x: 1420, y: 300 }"
               :scroll="{ x: 1420, y: 300 }"
               :pagination="choosePaginationProps"
               :pagination="choosePaginationProps"
               bordered>
               bordered>
@@ -147,6 +149,8 @@ export default {
   data () {
   data () {
     return {
     return {
       spinning: false,
       spinning: false,
+      loading: false,
+      chooseLoading: false,
       queryParam: {
       queryParam: {
         purchaseBillNo: '',
         purchaseBillNo: '',
         productCode: '',
         productCode: '',
@@ -337,8 +341,10 @@ export default {
     getPurchaseBillDetailList (pageNo) {
     getPurchaseBillDetailList (pageNo) {
       this.pageNo = this.pageNo || pageNo
       this.pageNo = this.pageNo || pageNo
       this.disabled = true
       this.disabled = true
+      this.loading = true
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       const params = Object.assign({ pageNo: this.pageNo, pageSize: this.pageSize }, this.queryParam)
       purchaseReturnPurchaseBillDetailList(params).then(res => {
       purchaseReturnPurchaseBillDetailList(params).then(res => {
+        this.loading = false
         if (res.status == 200) {
         if (res.status == 200) {
           const data = res.data
           const data = res.data
           this.paginationProps.total = Number(res.data.count) || 0
           this.paginationProps.total = Number(res.data.count) || 0
@@ -375,7 +381,9 @@ export default {
         pageSize: this.choosePageSize,
         pageSize: this.choosePageSize,
         purchaseReturnSn: this.$route.params.sn
         purchaseReturnSn: this.$route.params.sn
       }
       }
+      this.chooseLoading = true
       purchaseReturnDetailList(params).then(res => {
       purchaseReturnDetailList(params).then(res => {
+        this.chooseLoading = false
         if (res.status == 200) {
         if (res.status == 200) {
           const data = res.data
           const data = res.data
           this.choosePaginationProps.total = Number(res.data.count) || 0
           this.choosePaginationProps.total = Number(res.data.count) || 0