浏览代码

列表接口状态正常判断 res.status==200

chenrui 3 年之前
父节点
当前提交
ae696285da
共有 98 个文件被更改,包括 987 次插入691 次删除
  1. 8 5
      src/views/allocationManagement/transferOut/detail.vue
  2. 8 5
      src/views/allocationManagement/transferOut/list.vue
  3. 7 4
      src/views/basicData/transferTypeManagement/list.vue
  4. 8 5
      src/views/basicData/warehouse/list.vue
  5. 8 5
      src/views/basicData/warehouse/storingLocation/list.vue
  6. 8 5
      src/views/common/chooseCustomerModal.vue
  7. 9 6
      src/views/dealerManagement/dealerAccountManagement/list.vue
  8. 8 5
      src/views/dealerManagement/marketingDivisionSet/list.vue
  9. 9 6
      src/views/dealerManagement/merchantInfoManagement/list.vue
  10. 10 7
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  11. 8 5
      src/views/dealerManagement/rebateSettings/list.vue
  12. 9 6
      src/views/financialManagement/financialCollection/list.vue
  13. 36 33
      src/views/financialManagement/inventoryConfirmation/detail.vue
  14. 8 5
      src/views/financialManagement/inventoryConfirmation/list.vue
  15. 8 5
      src/views/financialManagement/returnConfirmation/detailModal.vue
  16. 8 5
      src/views/financialManagement/returnConfirmation/list.vue
  17. 8 5
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  18. 5 2
      src/views/financialManagement/warehousingConfirmation/list.vue
  19. 8 5
      src/views/inventoryManagement/intelligentReplenishment/import.vue
  20. 6 3
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  21. 7 4
      src/views/inventoryManagement/intelligentReplenishment/productRange.vue
  22. 5 2
      src/views/inventoryManagement/intelligentReplenishment/serviceLevelModal.vue
  23. 8 5
      src/views/inventoryManagement/inventoryCheck/list.vue
  24. 10 7
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  25. 19 16
      src/views/inventoryManagement/inventoryQuery/list.vue
  26. 13 10
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  27. 14 11
      src/views/inventoryManagement/inventoryWarning/list.vue
  28. 8 5
      src/views/inventoryManagement/makeInventory/list.vue
  29. 8 5
      src/views/inventoryManagement/supervisionDisk/list.vue
  30. 8 5
      src/views/power/OperateJournal/OperateJournal.vue
  31. 10 6
      src/views/power/role/roleList.vue
  32. 10 6
      src/views/power/user/userList.vue
  33. 8 5
      src/views/productManagement/newProduct/list.vue
  34. 7 4
      src/views/productManagement/newProduct/modal.vue
  35. 9 6
      src/views/productManagement/priceChangeRecord/list.vue
  36. 8 5
      src/views/productManagement/productBrand/list.vue
  37. 11 7
      src/views/productManagement/productCategory/list.vue
  38. 8 5
      src/views/productManagement/productInfo/list.vue
  39. 5 2
      src/views/productManagement/productLaunchAudit/list.vue
  40. 12 9
      src/views/productManagement/productLevel/list.vue
  41. 5 2
      src/views/productManagement/productOfflineAudit/list.vue
  42. 9 6
      src/views/productManagement/productPricing/list.vue
  43. 8 5
      src/views/productManagement/productUniversal/list.vue
  44. 11 8
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  45. 14 11
      src/views/promotionRulesManagement/orderStatistics/list.vue
  46. 11 8
      src/views/promotionRulesManagement/productStatistics/detailModal.vue
  47. 9 6
      src/views/promotionRulesManagement/productStatistics/list.vue
  48. 16 13
      src/views/promotionRulesManagement/promotionRules/list.vue
  49. 16 13
      src/views/promotionRulesManagement/promotionRules/rule.vue
  50. 14 11
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  51. 10 7
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  52. 8 5
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  53. 9 6
      src/views/reportData/actualSalesReport/list.vue
  54. 10 7
      src/views/reportData/allocationDetails/list.vue
  55. 10 7
      src/views/reportData/allocationOrderTotal/list.vue
  56. 9 6
      src/views/reportData/allocationPresentation/list.vue
  57. 9 6
      src/views/reportData/billingReturnReport/list.vue
  58. 12 9
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  59. 10 7
      src/views/reportData/priceDifferenceDetailReport/list.vue
  60. 10 7
      src/views/reportData/returnGoodsPresentation/list.vue
  61. 9 6
      src/views/reportData/returnSlipReport/list.vue
  62. 9 6
      src/views/reportData/salesAmountReport/list.vue
  63. 9 6
      src/views/reportData/salesDetails/list.vue
  64. 9 6
      src/views/reportData/salesOrderTotal/list.vue
  65. 9 6
      src/views/reportData/salesPresentation/list.vue
  66. 9 6
      src/views/reportData/salesReturnDetailReport/list.vue
  67. 9 6
      src/views/reportData/salesReturnReport/list.vue
  68. 9 6
      src/views/reportData/salesReturnsReport/list.vue
  69. 9 6
      src/views/reportData/salesSlipReport/list.vue
  70. 9 6
      src/views/reportData/warehousingOrder/list.vue
  71. 9 6
      src/views/reportData/warehousingOrderDetail/list.vue
  72. 11 8
      src/views/salesManagement/backorder/detailModal.vue
  73. 8 5
      src/views/salesManagement/backorder/list.vue
  74. 8 5
      src/views/salesManagement/examineVerify/list.vue
  75. 8 5
      src/views/salesManagement/outboundOrder/list.vue
  76. 17 14
      src/views/salesManagement/pushOrderManagement/detail.vue
  77. 8 5
      src/views/salesManagement/pushOrderManagement/list.vue
  78. 9 6
      src/views/salesManagement/salesQuery/chooseActive.vue
  79. 25 22
      src/views/salesManagement/salesQuery/detail.vue
  80. 11 8
      src/views/salesManagement/salesQuery/edit.vue
  81. 8 5
      src/views/salesManagement/salesQuery/list.vue
  82. 15 12
      src/views/salesManagement/salesQuery/queryPart.vue
  83. 8 5
      src/views/salesManagement/salesQuery/queryPromotable.vue
  84. 13 10
      src/views/salesManagement/salesQuery/receivingAddress/chooseAddressModal.vue
  85. 11 8
      src/views/salesManagement/salesReturn/detail.vue
  86. 8 5
      src/views/salesManagement/salesReturn/list.vue
  87. 9 6
      src/views/salesManagement/salesReturn/queryPart.vue
  88. 10 7
      src/views/salesManagement/salesReturn/salesReturnCheck.vue
  89. 11 8
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  90. 11 8
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  91. 10 7
      src/views/salesManagement/shortageStatisticsC/list.vue
  92. 11 8
      src/views/salesManagement/shortageStatisticsP/list.vue
  93. 10 7
      src/views/salesManagement/waitDispatch/edit.vue
  94. 25 23
      src/views/salesManagement/waitDispatch/queryPart.vue
  95. 12 9
      src/views/setting/noticeManagement/list.vue
  96. 8 5
      src/views/supplierManagement/associatedProduct/add.vue
  97. 8 5
      src/views/supplierManagement/associatedProductDetails/list.vue
  98. 10 7
      src/views/supplierManagement/supplierInfo/list.vue

+ 8 - 5
src/views/allocationManagement/transferOut/detail.vue

@@ -107,12 +107,15 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return allocateBillDetailList(Object.assign(parameter, { allocateSn: this.outBizSn || this.$route.params.sn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.localDataSource = data.list
           }
-          this.localDataSource = data.list
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/allocationManagement/transferOut/list.vue

@@ -154,12 +154,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 7 - 4
src/views/basicData/transferTypeManagement/list.vue

@@ -68,10 +68,13 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return allocateTypeList(Object.assign(parameter, {})).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
           }
           this.spinning = false
           return data

+ 8 - 5
src/views/basicData/warehouse/list.vue

@@ -89,12 +89,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return warehouseList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/basicData/warehouse/storingLocation/list.vue

@@ -92,12 +92,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return warehouseLocList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/common/chooseCustomerModal.vue

@@ -122,12 +122,15 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return dealerQueryList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       },

+ 9 - 6
src/views/dealerManagement/dealerAccountManagement/list.vue

@@ -122,13 +122,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerUserList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].loginFlag = Number(data.list[i].loginFlag)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].loginFlag = Number(data.list[i].loginFlag)
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/dealerManagement/marketingDivisionSet/list.vue

@@ -76,12 +76,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return subareaQueryIncludeAreaAll(parameter).then(res => {
-          const data = res.data
-          const no = 0
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/dealerManagement/merchantInfoManagement/list.vue

@@ -148,13 +148,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerQueryList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          this.total = data.count || 0
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            this.total = data.count || 0
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue

@@ -117,14 +117,17 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerScopeList(Object.assign(parameter, this.queryParam, { dealerSn: this.$route.params.sn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const goodsType = data.list[i].goodsType
-            data.list[i].type = goodsType == 'PRODUCT' ? '产品' : goodsType == 'BRAND' ? '品牌' : goodsType == 'CATEGORY' ? '分类' : '--'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const goodsType = data.list[i].goodsType
+              data.list[i].type = goodsType == 'PRODUCT' ? '产品' : goodsType == 'BRAND' ? '品牌' : goodsType == 'CATEGORY' ? '分类' : '--'
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/dealerManagement/rebateSettings/list.vue

@@ -97,12 +97,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return queryRebatePage(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/financialManagement/financialCollection/list.vue

@@ -181,13 +181,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return salesReceiptList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.total = data.count || 0
+            this.disabled = false
           }
-          this.total = data.count || 0
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 36 - 33
src/views/financialManagement/inventoryConfirmation/detail.vue

@@ -34,15 +34,15 @@
           <div slot="message" style="display: flex;">
             盘盈数量:<strong :style="{ color: productTotal && productTotal.profitQty>0?'red':productTotal && productTotal.profitQty<0?'green':'' }">{{ productTotal && (productTotal.profitQty || productTotal.profitQty==0) ? productTotal.profitQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-				盘盈金额:<strong :style="{ color: productTotal && productTotal.profitCost>0?'red':productTotal && productTotal.profitCost<0?'green':'' }">{{ productTotal && (productTotal.profitCost || productTotal.profitCost==0) ? productTotal.profitCost : '--' }}</strong>,
-			</div>
+              盘盈金额:<strong :style="{ color: productTotal && productTotal.profitCost>0?'red':productTotal && productTotal.profitCost<0?'green':'' }">{{ productTotal && (productTotal.profitCost || productTotal.profitCost==0) ? productTotal.profitCost : '--' }}</strong>,
+            </div>
             盘亏数量:<strong :style="{ color: productTotal && productTotal.lossQty>0?'red':productTotal && productTotal.lossQty<0?'green':'' }">{{ productTotal && (productTotal.lossQty || productTotal.lossQty==0) ? productTotal.lossQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-            盘亏金额:<strong :style="{ color: productTotal && productTotal.lossCost>0?'red':productTotal && productTotal.lossCost<0?'green':'' }">{{ productTotal && (productTotal.lossCost || productTotal.lossCost==0) ? productTotal.lossCost : '--' }}</strong>,
+              盘亏金额:<strong :style="{ color: productTotal && productTotal.lossCost>0?'red':productTotal && productTotal.lossCost<0?'green':'' }">{{ productTotal && (productTotal.lossCost || productTotal.lossCost==0) ? productTotal.lossCost : '--' }}</strong>,
             </div>
             盈亏总数量:<strong :style="{ color: productTotal && productTotal.profitLossQty>0?'red':productTotal && productTotal.profitLossQty<0?'green':'' }">{{ productTotal && (productTotal.profitLossQty	|| productTotal.profitLossQty ==0) ? productTotal.profitLossQty : '--' }}</strong>,
             <div v-if="$hasPermissions('B_isShowCost')">
-            盈亏总金额:<strong :style="{ color: productTotal && productTotal.profitLossCost>0?'red':productTotal && productTotal.profitLossCost<0?'green':'' }">{{ productTotal && (productTotal.profitLossCost || productTotal.profitLossCost==0) ? productTotal.profitLossCost : '--' }}</strong>
+              盈亏总金额:<strong :style="{ color: productTotal && productTotal.profitLossCost>0?'red':productTotal && productTotal.profitLossCost<0?'green':'' }">{{ productTotal && (productTotal.profitLossCost || productTotal.profitLossCost==0) ? productTotal.profitLossCost : '--' }}</strong>
             </div>
           </div>
         </a-alert>
@@ -114,20 +114,23 @@ export default {
         profitLossFlag: undefined,
         productCode: ''
       },
-      
+
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam, { checkWarehouseSn: this.$route.params.sn })
         return checkWarehouseDetailFinanceList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -137,30 +140,30 @@ export default {
       productTotal: null //  合计
     }
   },
-  computed:{
-    columns(){
-      const arr=[
-      { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-      { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-      { title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-      { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-      { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-      { title: '入库时间', dataIndex: 'lastStockTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-      { title: '批次', dataIndex: 'stockBatchNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-      { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-      { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-      { title: '盘点数量', dataIndex: 'checkQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-      { title: '监盘数量', dataIndex: 'checkSuperviseQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-      // { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-      { title: '盈亏数量', dataIndex: 'profitLossQty', scopedSlots: { customRender: 'profitLossQty' }, width: '6%', align: 'center' },
+  computed: {
+    columns () {
+      const arr = [
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', width: '11%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'productUnit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '入库时间', dataIndex: 'lastStockTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '批次', dataIndex: 'stockBatchNo', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '库存数量', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盘点数量', dataIndex: 'checkQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '监盘数量', dataIndex: 'checkSuperviseQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '盈亏数量', dataIndex: 'profitLossQty', scopedSlots: { customRender: 'profitLossQty' }, width: '6%', align: 'center' }
       // { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' }
-    ]
-    if(this.$hasPermissions('B_isShowCost')){ //成本价权限
-       arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-       arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' })
+      ]
+      if (this.$hasPermissions('B_isShowCost')) { // 成本价权限
+        arr.splice(11, 0, { title: '单价', dataIndex: 'checkCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(13, 0, { title: '盈亏金额', dataIndex: 'profitLossCost', scopedSlots: { customRender: 'profitLossCost' }, width: '6%', align: 'center' })
+      }
+      return arr
     }
-    return arr
-    } 
   },
   methods: {
     //  返回列表

+ 8 - 5
src/views/financialManagement/inventoryConfirmation/list.vue

@@ -86,12 +86,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/financialManagement/returnConfirmation/detailModal.vue

@@ -69,12 +69,15 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return salesReturnFinancialDetailList(Object.assign(parameter, { salesReturnBillSn: this.itemSn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       },

+ 8 - 5
src/views/financialManagement/returnConfirmation/list.vue

@@ -116,12 +116,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return salesReturnFinancialList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/financialManagement/warehousingConfirmation/detailModal.vue

@@ -58,12 +58,15 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return stockPutDetailList(Object.assign(parameter, { sn: this.itemSn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       }

+ 5 - 2
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -112,8 +112,11 @@ export default {
         this.disabled = true
         this.spinning = true
         return stockPutList(Object.assign(parameter, this.queryParam, { confirm: true })).then(res => {
-          const data = res.data
-          this.disabled = false
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.disabled = false
+          }
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/inventoryManagement/intelligentReplenishment/import.vue

@@ -75,12 +75,15 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return predictProductInfoGoods({ path: JSON.parse(this.$cookies.get('REPLENISHMENT_PATH')) }).then(res => {
-          const data = res.data
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = i + 1
-            this.errorFlag.push(data.list[i].errorFlag)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = i + 1
+              this.errorFlag.push(data.list[i].errorFlag)
+            }
+            this.listData = data.list
           }
-          this.listData = data.list
           return data
         })
       },

+ 6 - 3
src/views/inventoryManagement/intelligentReplenishment/list.vue

@@ -83,9 +83,12 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return predictList({}).then(res => {
-          const data = res.data
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = i + 1
+            }
           }
           this.spinning = false
           return data

+ 7 - 4
src/views/inventoryManagement/intelligentReplenishment/productRange.vue

@@ -74,11 +74,14 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return predictRangeList({ 'sn': this.itemSn }).then(res => {
-          const data = res.data
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = i + 1
+            }
+            this.listData = data
           }
-          this.listData = data
           return data
         })
       },

+ 5 - 2
src/views/inventoryManagement/intelligentReplenishment/serviceLevelModal.vue

@@ -56,8 +56,11 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return predictTrendList({}).then(res => {
-          const data = res.data
-          this.listData = data
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.listData = data
+          }
           return data
         })
       },

+ 8 - 5
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -116,12 +116,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -56,14 +56,17 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return stockDetailList(Object.assign(parameter, { stockSn: this.itemId })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+            // 总计
+            this.getTotal(Object.assign(parameter, { stockSn: this.itemId }))
           }
-          this.disabled = false
-          // 总计
-          this.getTotal(Object.assign(parameter, { stockSn: this.itemId }))
           return data
         })
       },

+ 19 - 16
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -169,22 +169,25 @@ export default {
           params.zeroQtyFlag = ''
         }
         return stockList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-          }
-          this.disabled = false
-          this.spinning = false
-          // 总计
-          this.getTotal(params)
-          // 产品分类
-          if (this.productTypeList.length == 0) {
-            this.getProductType()
-          }
-          // 产品品牌
-          if (this.productBrandList.length == 0) {
-            this.getProductBrand()
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+            this.spinning = false
+            // 总计
+            this.getTotal(params)
+            // 产品分类
+            if (this.productTypeList.length == 0) {
+              this.getProductType()
+            }
+            // 产品品牌
+            if (this.productBrandList.length == 0) {
+              this.getProductBrand()
+            }
           }
           return data
         })

+ 13 - 10
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -145,19 +145,22 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam, { productSn: this.$route.params.sn })
         return stockFlowList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            if (data.list[i].flowType == 'PUT') {
-              data.list[i].qty = data.list[i].putQty
-            } else if (data.list[i].flowType == 'OUT') {
-              data.list[i].qty = data.list[i].outQty
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getTotal(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              if (data.list[i].flowType == 'PUT') {
+                data.list[i].qty = data.list[i].putQty
+              } else if (data.list[i].flowType == 'OUT') {
+                data.list[i].qty = data.list[i].outQty
+              }
             }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
-          this.getTotal(params)
           return data
         })
       },

+ 14 - 11
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -204,20 +204,23 @@ export default {
         this.disabled = true
         this.spinning = true
         return stockWarnList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            if (this.selectedRowKeys) { //  处理切换页码后 上页已选已输数据保留
-              const ind = this.selectedRowKeys.indexOf(data.list[i].id)
-              if (ind >= 0) {
-                data.list[i].inTransit = this.selectedRows[ind].inTransit
-                data.list[i].upperLimit = this.selectedRows[ind].upperLimit
-                data.list[i].lowerLimit = this.selectedRows[ind].lowerLimit
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              if (this.selectedRowKeys) { //  处理切换页码后 上页已选已输数据保留
+                const ind = this.selectedRowKeys.indexOf(data.list[i].id)
+                if (ind >= 0) {
+                  data.list[i].inTransit = this.selectedRows[ind].inTransit
+                  data.list[i].upperLimit = this.selectedRows[ind].upperLimit
+                  data.list[i].lowerLimit = this.selectedRows[ind].lowerLimit
+                }
               }
             }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/inventoryManagement/makeInventory/list.vue

@@ -75,12 +75,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseList(Object.assign(parameter, this.queryParam, { state: 'WAIT_CHECK' })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/inventoryManagement/supervisionDisk/list.vue

@@ -78,12 +78,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseList(Object.assign(parameter, this.queryParam, { state: 'WAIT_SUPERVISE_CHECK' })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/power/OperateJournal/OperateJournal.vue

@@ -83,12 +83,15 @@ export default {
         this.queryParam.beginDate = this.queryParam.beginDate + ' 00:00:00'
         this.queryParam.endDate = this.queryParam.endDate + ' 23:59:59'
         return journalList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       }

+ 10 - 6
src/views/power/role/roleList.vue

@@ -123,14 +123,18 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return getPowerRoleList(Object.assign(parameter, this.queryParam)).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-            _item.isEnable = _item.isEnable + '' === '1'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (let i = 0; i < data.list.length; i++) {
+              const _item = data.list[i]
+              _item.no = no + i + 1
+              _item.isEnable = _item.isEnable + '' === '1'
+            }
           }
           this.spinning = false
-          return res.data
+          return data
         })
       },
       optionAlertShow: false

+ 10 - 6
src/views/power/user/userList.vue

@@ -121,14 +121,18 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return getPowerUserList(Object.assign(parameter, this.queryParam)).then(res => {
-          const no = (res.data.pageNo - 1) * res.data.pageSize
-          for (let i = 0; i < res.data.list.length; i++) {
-            const _item = res.data.list[i]
-            _item.no = no + i + 1
-            _item.loginFlag = _item.loginFlag + '' === '1'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (let i = 0; i < data.list.length; i++) {
+              const _item = data.list[i]
+              _item.no = no + i + 1
+              _item.loginFlag = _item.loginFlag + '' === '1'
+            }
           }
           this.spinning = false
-          return res.data
+          return data
         })
       },
       optionAlertShow: false

+ 8 - 5
src/views/productManagement/newProduct/list.vue

@@ -142,12 +142,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return queryNewProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: this.$route.params.onlineFalg })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 7 - 4
src/views/productManagement/newProduct/modal.vue

@@ -41,10 +41,13 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return queryNewProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: this.onlineFalg })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
           }
           this.spinning = false
           return data

+ 9 - 6
src/views/productManagement/priceChangeRecord/list.vue

@@ -145,13 +145,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return productPriceChangeList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.total = data.count || 0
+            this.disabled = false
           }
-          this.total = data.count || 0
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/productManagement/productBrand/list.vue

@@ -127,12 +127,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return productBrandList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 11 - 7
src/views/productManagement/productCategory/list.vue

@@ -79,14 +79,18 @@ export default {
           this.tableHeight = window.innerHeight - 190
         }
         return productTypeQuery({}).then(res => {
-          //  递归去除空children
-          this.recursionFun(res.data)
-          if (res.data.length > 0) {
-            this.defaultExpandedRowKeys[0] = res.data[0].id
-          } else {
-            this.defaultExpandedRowKeys = []
+          let data
+          if (res.status == 200) {
+            data = res.data
+            //  递归去除空children
+            this.recursionFun(data)
+            if (data.length > 0) {
+              this.defaultExpandedRowKeys[0] = data[0].id
+            } else {
+              this.defaultExpandedRowKeys = []
+            }
           }
-          return res.data
+          return data
         })
       },
       defaultExpandedRowKeys: [], //  树形数据默认展开项

+ 8 - 5
src/views/productManagement/productInfo/list.vue

@@ -235,12 +235,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return productList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 5 - 2
src/views/productManagement/productLaunchAudit/list.vue

@@ -106,8 +106,11 @@ export default {
         this.disabled = true
         this.spinning = true
         return productOnlineList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          this.disabled = false
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.disabled = false
+          }
           this.spinning = false
           return data
         })

+ 12 - 9
src/views/productManagement/productLevel/list.vue

@@ -133,16 +133,19 @@ export default {
         this.disabled = true
         this.spinning = true
         return productLevelList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const packQty = (data.list[i].packQty || data.list[i].packQty == 0) ? data.list[i].packQty : '--'
-            const unit = data.list[i].unit || '--'
-            const packQtyUnit = data.list[i].packQtyUnit || '--'
-            data.list[i].packQtyV = packQty + unit + '/' + packQtyUnit
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const packQty = (data.list[i].packQty || data.list[i].packQty == 0) ? data.list[i].packQty : '--'
+              const unit = data.list[i].unit || '--'
+              const packQtyUnit = data.list[i].packQtyUnit || '--'
+              data.list[i].packQtyV = packQty + unit + '/' + packQtyUnit
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 5 - 2
src/views/productManagement/productOfflineAudit/list.vue

@@ -155,8 +155,11 @@ export default {
         this.disabled = true
         this.spinning = true
         return productOfflineList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          this.disabled = false
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.disabled = false
+          }
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/productManagement/productPricing/list.vue

@@ -138,13 +138,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return productPricingList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.total = data.count || 0
+            this.disabled = false
           }
-          this.total = data.count || 0
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/productManagement/productUniversal/list.vue

@@ -127,12 +127,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return productUniversalCodeList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 11 - 8
src/views/promotionRulesManagement/orderStatistics/detailModal.vue

@@ -56,14 +56,17 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return salesDetailList(Object.assign(parameter, { salesBillSn: this.itemSn, promotionFlag: 1 })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const origPrice = data.list[i].origPrice || 0
-            const qty = data.list[i].qty || 0
-            // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].priceSubtotal = getOperationalPrecision(origPrice, qty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const origPrice = data.list[i].origPrice || 0
+              const qty = data.list[i].qty || 0
+              // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].priceSubtotal = getOperationalPrecision(origPrice, qty)
+            }
           }
           return data
         })

+ 14 - 11
src/views/promotionRulesManagement/orderStatistics/list.vue

@@ -127,19 +127,22 @@ export default {
         this.disabled = true
         this.spinning = true
         return salesPromoList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const promotionActivityNameList = data.list[i].promotionActivityNameList || []
-            data.list[i].promoName = promotionActivityNameList.join(',')
-            const totalPromoAmount = data.list[i].totalPromoAmount || 0
-            const totalEconomizeAmount = data.list[i].totalEconomizeAmount || 0
-            data.list[i].promoTotal = Number(totalPromoAmount) + Number(totalEconomizeAmount)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getTotal(Object.assign(parameter, this.queryParam))
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const promotionActivityNameList = data.list[i].promotionActivityNameList || []
+              data.list[i].promoName = promotionActivityNameList.join(',')
+              const totalPromoAmount = data.list[i].totalPromoAmount || 0
+              const totalEconomizeAmount = data.list[i].totalEconomizeAmount || 0
+              data.list[i].promoTotal = Number(totalPromoAmount) + Number(totalEconomizeAmount)
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 11 - 8
src/views/promotionRulesManagement/productStatistics/detailModal.vue

@@ -58,14 +58,17 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return salesDetailPromoProductList(Object.assign(parameter, { productSn: this.itemSn, promotionFlag: 1 })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const origPrice = data.list[i].origPrice || 0
-            const qty = data.list[i].qty || 0
-            // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].priceSubtotal = getOperationalPrecision(origPrice, qty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const origPrice = data.list[i].origPrice || 0
+              const qty = data.list[i].qty || 0
+              // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].priceSubtotal = getOperationalPrecision(origPrice, qty)
+            }
           }
           return data
         })

+ 9 - 6
src/views/promotionRulesManagement/productStatistics/list.vue

@@ -126,14 +126,17 @@ export default {
         this.disabled = true
         this.spinning = true
         return salesDetailPromoList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getTotal(Object.assign(parameter, this.queryParam))
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 16 - 13
src/views/promotionRulesManagement/promotionRules/list.vue

@@ -127,20 +127,23 @@ export default {
         this.disabled = true
         this.spinning = true
         return promoActiveList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            let str = ''
-            const promoBuyerList = data.list[i].promoBuyerList ? data.list[i].promoBuyerList : []
-            promoBuyerList.map(item => {
-              str += item.buyerName + ','
-            })
-            str = str.substr(0, str.length - 1)
-            data.list[i].promoBuyerName = str || '全部客户'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              let str = ''
+              const promoBuyerList = data.list[i].promoBuyerList ? data.list[i].promoBuyerList : []
+              promoBuyerList.map(item => {
+                str += item.buyerName + ','
+              })
+              str = str.substr(0, str.length - 1)
+              data.list[i].promoBuyerName = str || '全部客户'
+            }
+            this.total = data.count || 0
+            this.disabled = false
           }
-          this.total = data.count || 0
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 16 - 13
src/views/promotionRulesManagement/promotionRules/rule.vue

@@ -70,22 +70,25 @@ export default {
         this.disabled = true
         this.spinning = true
         return promoRuleQueryList({ promoActiveSn: this.$route.params.sn }).then(res => {
-          const data = res.data
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = i + 1
-            if (data[i].promoRuleType == 'BUY_PROD_GIVE_PROD') { //  买产品送产品
-              data[i].promoRule = '购买满' + data[i].orderGoodsQty + '个正价产品,送' + data[i].promoQty + '个促销品'
-            } else if (data[i].promoRuleType == 'BUY_PROD_GIVE_MONEY') { //  买产品送采购额
-              if (data[i].promoType == 'promo_amount') {
-                data[i].promoRule = '购买满' + data[i].orderAmount + '元正价产品,送' + data[i].promoAmount + '元采购额可用于购买促销品'
-              } else if (data[i].promoType == 'promo_amount_per') {
-                data[i].promoRule = '购买满' + data[i].orderAmount + '元正价产品可以返正价产品采购额的' + data[i].promoAmountPer * 100 + '%用于购买促销品'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = i + 1
+              if (data[i].promoRuleType == 'BUY_PROD_GIVE_PROD') { //  买产品送产品
+                data[i].promoRule = '购买满' + data[i].orderGoodsQty + '个正价产品,送' + data[i].promoQty + '个促销品'
+              } else if (data[i].promoRuleType == 'BUY_PROD_GIVE_MONEY') { //  买产品送采购额
+                if (data[i].promoType == 'promo_amount') {
+                  data[i].promoRule = '购买满' + data[i].orderAmount + '元正价产品,送' + data[i].promoAmount + '元采购额可用于购买促销品'
+                } else if (data[i].promoType == 'promo_amount_per') {
+                  data[i].promoRule = '购买满' + data[i].orderAmount + '元正价产品可以返正价产品采购额的' + data[i].promoAmountPer * 100 + '%用于购买促销品'
+                }
+              } else if (data[i].promoRuleType == 'ADD_PRICE_PURCH') { //  加价换购
+                data[i].promoRule = '购买满' + data[i].orderGoodsQty + '个正价产品,可以以换购价购买任意1个换购产品'
               }
-            } else if (data[i].promoRuleType == 'ADD_PRICE_PURCH') { //  加价换购
-              data[i].promoRule = '购买满' + data[i].orderGoodsQty + '个正价产品,可以以换购价购买任意1个换购产品'
             }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 14 - 11
src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue

@@ -75,14 +75,17 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return sparePartsDetailList(Object.assign(parameter, { sparePartsSn: this.itemSn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            // 小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].subtotal = getOperationalPrecision(data.list[i].productCost || 0, data.list[i].productQty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.itemSn }))
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              // 小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].subtotal = getOperationalPrecision(data.list[i].productCost || 0, data.list[i].productQty)
+            }
           }
-          this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.itemSn }))
           return data
         })
       },
@@ -94,14 +97,14 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName',width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '单位', dataIndex: 'unit',width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单位', dataIndex: 'unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '入库单价', dataIndex: 'productCost',width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '小计', dataIndex: 'subtotal',width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '小计', dataIndex: 'subtotal', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('B_isShowCost')) { //  成本价权限
-        arr.splice(5, 0, { title: '入库单价', dataIndex: 'productCost',width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(5, 0, { title: '入库单价', dataIndex: 'productCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }

+ 10 - 7
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -119,14 +119,17 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         return sparePartsDetailList(Object.assign(parameter, this.queryParam, { sparePartsSn: this.$route.params.sn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            // 小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].subtotal = getOperationalPrecision(data.list[i].productCost || 0, data.list[i].productQty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              // 小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].subtotal = getOperationalPrecision(data.list[i].productCost || 0, data.list[i].productQty)
+            }
+            this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.$route.params.sn }))
           }
-          this.getDetailCount(Object.assign(parameter, { sparePartsSn: this.$route.params.sn }))
           return data
         })
       },

+ 8 - 5
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -128,12 +128,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return sparePartsList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/actualSalesReport/list.vue

@@ -181,13 +181,16 @@ export default {
         }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return salesBillRealAmountQueryPageList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/reportData/allocationDetails/list.vue

@@ -207,14 +207,17 @@ export default {
         this.spinning = true
         if (params.beginDate) {
           return allocateReportDetailList(params).then(res => {
-            // 总计
-            this.getCount(params)
-            const data = res.data
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
+            let data
+            if (res.status == 200) {
+              data = res.data
+              // 总计
+              this.getCount(params)
+              const no = (data.pageNo - 1) * data.pageSize
+              for (var i = 0; i < data.list.length; i++) {
+                data.list[i].no = no + i + 1
+              }
+              this.disabled = false
             }
-            this.disabled = false
             this.spinning = false
             return data
           })

+ 10 - 7
src/views/reportData/allocationOrderTotal/list.vue

@@ -129,14 +129,17 @@ export default {
         delete params.time
         this.spinning = true
         return allocateReportList(params).then(res => {
-          // 总计
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            // 总计
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/allocationPresentation/list.vue

@@ -170,13 +170,16 @@ export default {
         this.spinning = true
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return reportAllocateDbjdReportList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/billingReturnReport/list.vue

@@ -182,13 +182,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam) //  无分页
         delete params.time
         return salesReportReturnList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 12 - 9
src/views/reportData/hPriceDifferenceDetailReport/list.vue

@@ -170,17 +170,20 @@ export default {
         delete params.time
         this.spinning = true
         return headRebateDetailReportList(params).then(res => {
-          // 总计
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            if (data.list[i].bizType) {
-              data.list[i].bizTypeValue = data.list[i].bizType == 'SALES' ? '采购差价' : data.list[i].bizType == 'SALES_RETURN' ? '退货差价' : ''
+          let data
+          if (res.status == 200) {
+            data = res.data
+            // 总计
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              if (data.list[i].bizType) {
+                data.list[i].bizTypeValue = data.list[i].bizType == 'SALES' ? '采购差价' : data.list[i].bizType == 'SALES_RETURN' ? '退货差价' : ''
+              }
             }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/reportData/priceDifferenceDetailReport/list.vue

@@ -112,14 +112,17 @@ export default {
         delete params.time
         this.spinning = true
         return reportRebateReportList(params).then(res => {
-          // 总计
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            // 总计
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/reportData/returnGoodsPresentation/list.vue

@@ -177,13 +177,16 @@ export default {
         this.spinning = true
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return reportSalesReturnThjdReportList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -370,7 +373,7 @@ export default {
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ]
-        },
+        }
         // { title: '开单退货单合计金额', width: 90, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限

+ 9 - 6
src/views/reportData/returnSlipReport/list.vue

@@ -188,13 +188,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam) //  无分页
         delete params.time
         return salesReportReturnBillList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesAmountReport/list.vue

@@ -181,13 +181,16 @@ export default {
         }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return salesBillReportGroupByBuyerList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesDetails/list.vue

@@ -211,13 +211,16 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         return reportSalesBillDetailList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesOrderTotal/list.vue

@@ -164,13 +164,16 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         return reportSalesBillList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesPresentation/list.vue

@@ -178,13 +178,16 @@ export default {
         this.spinning = true
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return reportDispatchReportList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesReturnDetailReport/list.vue

@@ -215,13 +215,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
         return reportSalesReturnDetailList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesReturnReport/list.vue

@@ -183,13 +183,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam) //  无分页
         delete params.time
         return salesReportReturnRebateList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesReturnsReport/list.vue

@@ -167,13 +167,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
         return reportSalesReturnList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/salesSlipReport/list.vue

@@ -187,13 +187,16 @@ export default {
         }
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         return salesBillReportList(paramsPage).then(res => {
-          this.getCount(paramsPage)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(paramsPage)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/warehousingOrder/list.vue

@@ -129,13 +129,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
         return reportStockPutList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/reportData/warehousingOrderDetail/list.vue

@@ -146,13 +146,16 @@ export default {
         const params = Object.assign(parameter, this.queryParam)
         delete params.time
         return reportStockPutDetailList(params).then(res => {
-          this.getCount(params)
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 11 - 8
src/views/salesManagement/backorder/detailModal.vue

@@ -75,13 +75,16 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return oosDetailList(Object.assign(parameter, this.queryParam, { oosBillSn: this.itemSn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },
@@ -96,10 +99,10 @@ export default {
         { title: '产品名称', dataIndex: 'productEntity.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '缺货数量', dataIndex: 'qty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '8%', align: 'center', customRender: function (text) { return text || '--' } }
         // { title: '缺货金额', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
-      if (this.$hasPermissions('B_isShowPrice')) {  //  售价权限
+      if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(6, 0, { title: '缺货金额', dataIndex: 'totalAmount', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr

+ 8 - 5
src/views/salesManagement/backorder/list.vue

@@ -69,12 +69,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return oosList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/salesManagement/examineVerify/list.vue

@@ -173,12 +173,15 @@ export default {
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/salesManagement/outboundOrder/list.vue

@@ -165,12 +165,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return stockOutList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 17 - 14
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -124,21 +124,24 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return dispatchDetaillList(Object.assign(parameter, { dispatchBillSn: this.outBizSubSn || this.$route.params.sn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const productCode = (data.list[i].productEntity && data.list[i].productEntity.code) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.code)
-            const productName = (data.list[i].productEntity && data.list[i].productEntity.name) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.name)
-            const productOrigCode = (data.list[i].productEntity && data.list[i].productEntity.origCode) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.origCode)
-            const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
-            data.list[i].productCode = productCode || '--'
-            data.list[i].productName = productName || '--'
-            data.list[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
-            data.list[i].productOrigUnit = productOrigUnit || '--'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const productCode = (data.list[i].productEntity && data.list[i].productEntity.code) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.code)
+              const productName = (data.list[i].productEntity && data.list[i].productEntity.name) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.name)
+              const productOrigCode = (data.list[i].productEntity && data.list[i].productEntity.origCode) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.origCode)
+              const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
+              data.list[i].productCode = productCode || '--'
+              data.list[i].productName = productName || '--'
+              data.list[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
+              data.list[i].productOrigUnit = productOrigUnit || '--'
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },

+ 8 - 5
src/views/salesManagement/pushOrderManagement/list.vue

@@ -141,12 +141,15 @@ export default {
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -87,12 +87,15 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return getPromoGoodsList(Object.assign(parameter, { salesBillDetailSn: this.nowData.salesBillDetailSn || undefined, buyerSn: this.buyerSn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qty = 1
-            data.list[i].promotionSourceSn = this.nowData.salesBillDetailSn
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qty = 1
+              data.list[i].promotionSourceSn = this.nowData.salesBillDetailSn
+            }
           }
           this.spinning = false
           return data

+ 25 - 22
src/views/salesManagement/salesQuery/detail.vue

@@ -215,30 +215,33 @@ export default {
           url = salesDetailAllList
         }
         return url(params).then(res => {
-          const data = res.data
-          const no = 0
-          this.outStockStr = ''
-          let str = ''
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
-            const productCode = (data[i].productEntity && data[i].productEntity.code) || (data[i].dealerProductEntity && data[i].dealerProductEntity.code)
-            const productName = (data[i].productEntity && data[i].productEntity.name) || (data[i].dealerProductEntity && data[i].dealerProductEntity.name)
-            const productOrigCode = (data[i].productEntity && data[i].productEntity.origCode) || (data[i].dealerProductEntity && data[i].dealerProductEntity.origCode)
-            const productOrigUnit = (data[i].productEntity && data[i].productEntity.unit) || (data[i].dealerProductEntity && data[i].dealerProductEntity.unit)
-            data[i].productCode = productCode || '--'
-            data[i].productName = productName || '--'
-            data[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
-            data[i].productOrigUnit = productOrigUnit || '--'
-            if (data[i].unpushedQty && (Number(data[i].stockQty) < Number(data[i].unpushedQty))) {
-              str += data[i].productCode + '、'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            this.outStockStr = ''
+            let str = ''
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              const productCode = (data[i].productEntity && data[i].productEntity.code) || (data[i].dealerProductEntity && data[i].dealerProductEntity.code)
+              const productName = (data[i].productEntity && data[i].productEntity.name) || (data[i].dealerProductEntity && data[i].dealerProductEntity.name)
+              const productOrigCode = (data[i].productEntity && data[i].productEntity.origCode) || (data[i].dealerProductEntity && data[i].dealerProductEntity.origCode)
+              const productOrigUnit = (data[i].productEntity && data[i].productEntity.unit) || (data[i].dealerProductEntity && data[i].dealerProductEntity.unit)
+              data[i].productCode = productCode || '--'
+              data[i].productName = productName || '--'
+              data[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
+              data[i].productOrigUnit = productOrigUnit || '--'
+              if (data[i].unpushedQty && (Number(data[i].stockQty) < Number(data[i].unpushedQty))) {
+                str += data[i].productCode + '、'
+              }
             }
+            if (str.length > 0) {
+              str = str.substr(0, str.length - 1)
+              this.outStockStr = '产品编号为:' + str + '的产品库存不足;'
+            }
+            this.localDataSource = data
+            this.disabled = false
           }
-          if (str.length > 0) {
-            str = str.substr(0, str.length - 1)
-            this.outStockStr = '产品编号为:' + str + '的产品库存不足;'
-          }
-          this.localDataSource = data
-          this.disabled = false
           return data
         })
       },

+ 11 - 8
src/views/salesManagement/salesQuery/edit.vue

@@ -220,15 +220,18 @@ export default {
         this.disabled = true
         this.productForm.salesBillSn = this.$route.params.sn
         return salesDetailStockList(Object.assign(parameter, this.productForm, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qtyBackups = data.list[i].qty
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qtyBackups = data.list[i].qty
+            }
+            this.disabled = false
+            this.dataSource = data.list
+            this.$refs.promotable.getData(this.salesBillSn)
           }
-          this.disabled = false
-          this.dataSource = data.list
-          this.$refs.promotable.getData(this.salesBillSn)
           return data
         })
       },

+ 8 - 5
src/views/salesManagement/salesQuery/list.vue

@@ -279,12 +279,15 @@ export default {
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return salesList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 15 - 12
src/views/salesManagement/salesQuery/queryPart.vue

@@ -130,19 +130,22 @@ export default {
         this.disabled = true
         this.queryParam.dealerSn = this.buyerSn
         return queryStockProductPage(Object.assign(parameter, this.queryParam, { onlineFalg: '1' })).then(res => {
-          const data = res.data
-          data.list = data.list.filter(item => item != null)
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].salesNums = 1
-            data.list[i].currentStockQty = data.list[i].currentStockQty || 0
-            const productPackQty = (data.list[i].productPackQty || data.list[i].productPackQty == 0) ? data.list[i].productPackQty : '--'
-            const productUnit = data.list[i].productUnit || '--'
-            const productPackQtyUnit = data.list[i].productPackQtyUnit || '--'
-            data.list[i].packQtyV = productPackQty + productUnit + '/' + productPackQtyUnit
+          let data
+          if (res.status == 200) {
+            data = res.data
+            data.list = data.list.filter(item => item != null)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].salesNums = 1
+              data.list[i].currentStockQty = data.list[i].currentStockQty || 0
+              const productPackQty = (data.list[i].productPackQty || data.list[i].productPackQty == 0) ? data.list[i].productPackQty : '--'
+              const productUnit = data.list[i].productUnit || '--'
+              const productPackQtyUnit = data.list[i].productPackQtyUnit || '--'
+              data.list[i].packQtyV = productPackQty + productUnit + '/' + productPackQtyUnit
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       }

+ 8 - 5
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -56,11 +56,14 @@ export default {
       loadData: parameter => {
         this.productForm.salesBillSn = this.salesBillSn
         return salesDetailList(Object.assign(parameter, this.productForm)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qtyBackups = data.list[i].qty
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qtyBackups = data.list[i].qty
+            }
           }
           return data
         })

+ 13 - 10
src/views/salesManagement/salesQuery/receivingAddress/chooseAddressModal.vue

@@ -111,17 +111,20 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return dealerRecevieAddrQuery({ dealerSn: this.paramsData }).then(res => {
-          const data = res.data
-          const no = 0
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
-            const provinceName = data[i].provinceName ? (data[i].provinceName + '-') : ''
-            const cityName = data[i].cityName ? (data[i].cityName + '-') : ''
-            const countyName = data[i].countyName ? (data[i].countyName + '-') : ''
-            const addr = data[i].addr || ''
-            data[i].address = provinceName + cityName + countyName + addr
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              const provinceName = data[i].provinceName ? (data[i].provinceName + '-') : ''
+              const cityName = data[i].cityName ? (data[i].cityName + '-') : ''
+              const countyName = data[i].countyName ? (data[i].countyName + '-') : ''
+              const addr = data[i].addr || ''
+              data[i].address = provinceName + cityName + countyName + addr
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       },

+ 11 - 8
src/views/salesManagement/salesReturn/detail.vue

@@ -120,15 +120,18 @@ export default {
         this.disabled = true
         const params = Object.assign(parameter, { salesReturnBillSn: this.$route.params.sn })
         return salesReturnDetailList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            // 折后退货金额小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].saleReturnSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              // 折后退货金额小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].saleReturnSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
+            }
+            this.chooseLoadData = data.list
+            this.disabled = false
           }
-          this.chooseLoadData = data.list
-          this.disabled = false
           return data
         })
       },

+ 8 - 5
src/views/salesManagement/salesReturn/list.vue

@@ -219,12 +219,15 @@ export default {
         // 查询总计
         this.getQueryCount(Object.assign(parameter, this.queryParam))
         return salesReturnList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/salesManagement/salesReturn/queryPart.vue

@@ -111,13 +111,16 @@ export default {
         }
         const fun = [queryStockProductPage, salesQueryByReturn]
         return fun[this.grabFlag](Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qty = 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qty = 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       }

+ 10 - 7
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -94,14 +94,17 @@ export default {
         // 查询总计
         this.productForm.salesReturnBillSn = this.$route.params.sn
         return salesReturnDetailList(Object.assign(parameter, this.productForm)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].backStockQtyBackups = data.list[i].backStockQty
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].backStockQtyBackups = data.list[i].backStockQty
+            }
+            this.disabled = false
+            this.chooseLoadData = data.list
           }
-          this.disabled = false
-          this.chooseLoadData = data.list
           return data
         })
       }

+ 11 - 8
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -140,15 +140,18 @@ export default {
         // 查询总计
         this.productForm.salesReturnBillSn = this.$route.params.sn
         return salesReturnDetailList(Object.assign(parameter, this.productForm)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qtyBackups = data.list[i].qty
-            data.list[i].priceBackups = data.list[i].price
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qtyBackups = data.list[i].qty
+              data.list[i].priceBackups = data.list[i].price
+            }
+            this.disabled = false
+            this.chooseLoadData = data.list
           }
-          this.disabled = false
-          this.chooseLoadData = data.list
           return data
         })
       },

+ 11 - 8
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -134,15 +134,18 @@ export default {
         // 查询总计
         this.productForm.salesReturnBillSn = this.$route.params.sn
         return salesReturnDetailList(Object.assign(parameter, this.productForm)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].qtyBackups = data.list[i].qty
-            data.list[i].priceBackups = data.list[i].price
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].qtyBackups = data.list[i].qty
+              data.list[i].priceBackups = data.list[i].price
+            }
+            this.disabled = false
+            this.chooseLoadData = data.list
           }
-          this.disabled = false
-          this.chooseLoadData = data.list
           return data
         })
       },

+ 10 - 7
src/views/salesManagement/shortageStatisticsC/list.vue

@@ -190,15 +190,18 @@ export default {
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         const params = Object.assign(parameter, this.queryParam) //  无分页
         return oosBuyerList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+            this.getCount(params)
+            this.getCurrentCount(paramsPage)
           }
-          this.disabled = false
           this.spinning = false
-          this.getCount(params)
-          this.getCurrentCount(paramsPage)
           return data
         })
       },

+ 11 - 8
src/views/salesManagement/shortageStatisticsP/list.vue

@@ -98,15 +98,18 @@ export default {
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         const params = Object.assign(parameter, this.queryParam) //  无分页
         return oosProductList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+            this.spinning = false
+            this.getCount(params)
+            this.getCurrentCount(paramsPage)
           }
-          this.disabled = false
-          this.spinning = false
-          this.getCount(params)
-          this.getCurrentCount(paramsPage)
           return data
         })
       },

+ 10 - 7
src/views/salesManagement/waitDispatch/edit.vue

@@ -144,14 +144,17 @@ export default {
         // 查询统计
         this.getTotalData()
         return waitDispatchDetailAllList(Object.assign(parameter, this.productForm)).then(res => {
-          const data = res.data
-          const no = 0
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
-            data[i].qtyBackups = data[i].qty
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              data[i].qtyBackups = data[i].qty
+            }
+            this.disabled = false
+            this.dataSource = data
           }
-          this.disabled = false
-          this.dataSource = data
           return data
         })
       },

+ 25 - 23
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -171,32 +171,34 @@ export default {
         this.disabled = true
         this.queryParam.salesBillSn = this.salesBillSn
         return salesDetailAllStockList(Object.assign(parameter, this.queryParam)).then(res => {
-          let data = res.data
-          if (data) {
-            // 根据类型过滤数据
-            data = data.filter(item => {
-              if (this.queryParam.ptype == '1') {
-                return item != null && item.surplusQty > 0
+          let data
+          if (res.status == 200) {
+            data = res.data
+            if (data) {
+              // 根据类型过滤数据
+              data = data.filter(item => {
+                if (this.queryParam.ptype == '1') {
+                  return item != null && item.surplusQty > 0
+                }
+                if (this.queryParam.ptype == '2') {
+                  return item != null && item.surplusQty > 0 && item.surplusQty <= item.stockQty
+                }
+                if (this.queryParam.ptype == '3') {
+                  return item != null && item.surplusQty > item.stockQty
+                }
+                if (this.queryParam.ptype == '0') {
+                  return item != null
+                }
+              })
+              // 增加编号
+              const no = 0
+              for (var i = 0; i < data.length; i++) {
+                data[i].no = no + i + 1
+                data[i].cancelNums = data[i].surplusQty
               }
-              if (this.queryParam.ptype == '2') {
-                return item != null && item.surplusQty > 0 && item.surplusQty <= item.stockQty
-              }
-              if (this.queryParam.ptype == '3') {
-                return item != null && item.surplusQty > item.stockQty
-              }
-              if (this.queryParam.ptype == '0') {
-                return item != null
-              }
-            })
-            // 增加编号
-            const no = 0
-            for (var i = 0; i < data.length; i++) {
-              data[i].no = no + i + 1
-              data[i].cancelNums = data[i].surplusQty
+              this.disabled = false
             }
-            this.disabled = false
           }
-
           return data
         })
       }

+ 12 - 9
src/views/setting/noticeManagement/list.vue

@@ -112,16 +112,19 @@ export default {
         this.disabled = true
         this.spinning = true
         return noticeList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].typeDictValue = data.list[i].type == 'notity' ? '公告' : data.list[i].type == 'news_company' ? '企业新闻' : data.list[i].type == 'news_trade' ? '行业咨询' : '--'
-            data.list[i].sendStatusDictValue = data.list[i].sendStatus == 1 ? '已发布' : data.list[i].sendStatus == 0 ? '未发布' : '--'
-            data.list[i].toAppNameDictValue = data.list[i].toAppName == '1,2' ? '所有' : data.list[i].toAppName == '2' ? '经销商' : data.list[i].toAppName == '1' ? '总部' : '--'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].typeDictValue = data.list[i].type == 'notity' ? '公告' : data.list[i].type == 'news_company' ? '企业新闻' : data.list[i].type == 'news_trade' ? '行业咨询' : '--'
+              data.list[i].sendStatusDictValue = data.list[i].sendStatus == 1 ? '已发布' : data.list[i].sendStatus == 0 ? '未发布' : '--'
+              data.list[i].toAppNameDictValue = data.list[i].toAppName == '1,2' ? '所有' : data.list[i].toAppName == '2' ? '经销商' : data.list[i].toAppName == '1' ? '总部' : '--'
+            }
+            this.total = data.count || 0
+            this.disabled = false
           }
-          this.total = data.count || 0
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/supplierManagement/associatedProduct/add.vue

@@ -137,12 +137,15 @@ export default {
         this.spinning = true
         this.queryParam.supplierSn = this.$route.params.sn
         return supplierProductList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 8 - 5
src/views/supplierManagement/associatedProductDetails/list.vue

@@ -95,12 +95,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return supplierProductList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/supplierManagement/supplierInfo/list.vue

@@ -89,14 +89,17 @@ export default {
         this.disabled = true
         this.spinning = true
         return supplierList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          this.total = data.count || 0
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            data.list[i].enableFlag = data.list[i].enableFlag + '' === '1'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.total = data.count || 0
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              data.list[i].enableFlag = data.list[i].enableFlag + '' === '1'
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })