Переглянути джерело

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

chenrui 3 роки тому
батько
коміт
25781e070e
95 змінених файлів з 1673 додано та 1325 видалено
  1. 21 19
      src/views/allocationManagement/chainTransferIn/detail.vue
  2. 29 27
      src/views/allocationManagement/chainTransferIn/edit.vue
  3. 13 10
      src/views/allocationManagement/chainTransferIn/list.vue
  4. 12 9
      src/views/allocationManagement/chainTransferOut/detail.vue
  5. 15 12
      src/views/allocationManagement/chainTransferOut/list.vue
  6. 10 7
      src/views/allocationManagement/storeTransferOut/detail.vue
  7. 8 5
      src/views/allocationManagement/storeTransferOut/list.vue
  8. 76 68
      src/views/allocationManagement/warehouseAllocation/detail.vue
  9. 8 5
      src/views/allocationManagement/warehouseAllocation/list.vue
  10. 8 5
      src/views/basicData/bulkPartsTypeManagement/list.vue
  11. 8 5
      src/views/basicData/customerTypeManagement/list.vue
  12. 8 6
      src/views/basicData/expenseType/list.vue
  13. 7 4
      src/views/basicData/storeTransferOutTypeManagement/list.vue
  14. 7 4
      src/views/bulkManagement/bulkImport/list.vue
  15. 12 7
      src/views/bulkManagement/bulkReturnGoods/detailModal.vue
  16. 10 5
      src/views/bulkManagement/bulkReturnGoods/list.vue
  17. 13 8
      src/views/bulkManagement/bulkWarehousingOrder/detail.vue
  18. 10 7
      src/views/bulkManagement/bulkWarehousingOrder/list.vue
  19. 9 6
      src/views/customerManagement/customerInfo/list.vue
  20. 65 57
      src/views/financialManagement/companyCollectionPayment/detail.vue
  21. 93 87
      src/views/financialManagement/companyCollectionPayment/list.vue
  22. 69 61
      src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue
  23. 81 73
      src/views/financialManagement/companyReceivablePayable/detail.vue
  24. 82 76
      src/views/financialManagement/companyReceivablePayable/list.vue
  25. 15 12
      src/views/financialManagement/expenseManagement/list.vue
  26. 11 8
      src/views/financialManagement/financialCollection/list.vue
  27. 11 8
      src/views/financialManagement/financialPayment/list.vue
  28. 9 6
      src/views/financialManagement/inventoryCheckAudit/list.vue
  29. 10 7
      src/views/financialManagement/ledgerRecord/list.vue
  30. 11 6
      src/views/financialManagement/warehousingAudit/detail.vue
  31. 9 6
      src/views/financialManagement/warehousingAudit/list.vue
  32. 59 51
      src/views/financialManagement/withdrawalManagement/list.vue
  33. 12 7
      src/views/inventoryManagement/inventoryChecking/detailModal.vue
  34. 8 5
      src/views/inventoryManagement/inventoryChecking/list.vue
  35. 13 10
      src/views/inventoryManagement/inventoryChecking/makeInventory.vue
  36. 9 6
      src/views/inventoryManagement/inventoryChecking/overall.vue
  37. 9 6
      src/views/inventoryManagement/inventoryImport/list.vue
  38. 36 28
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  39. 18 15
      src/views/inventoryManagement/inventoryQuery/list.vue
  40. 102 94
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  41. 14 11
      src/views/inventoryManagement/inventoryWarning/list.vue
  42. 9 4
      src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue
  43. 8 5
      src/views/inventoryManagement/satelliteWarehouseInventory/list.vue
  44. 8 5
      src/views/inventoryManagement/warehouse/list.vue
  45. 8 5
      src/views/inventoryManagement/warehouse/storingLocation/list.vue
  46. 8 5
      src/views/outboundOrderManagement/outboundOrder/list.vue
  47. 10 6
      src/views/power/role/roleList.vue
  48. 10 6
      src/views/power/user/userList.vue
  49. 8 5
      src/views/productManagement/newProduct/list.vue
  50. 7 4
      src/views/productManagement/newProduct/modal.vue
  51. 9 6
      src/views/productManagement/priceChangeRecord/list.vue
  52. 8 5
      src/views/productManagement/productBrand/list.vue
  53. 11 7
      src/views/productManagement/productCategory/list.vue
  54. 13 10
      src/views/productManagement/productInfo/list.vue
  55. 8 5
      src/views/productManagement/productInfoJg/list.vue
  56. 8 5
      src/views/productManagement/productOnlineInfo/list.vue
  57. 11 8
      src/views/purchasingManagement/purchaseOrder/detail.vue
  58. 8 5
      src/views/purchasingManagement/purchaseOrder/list.vue
  59. 7 2
      src/views/purchasingManagement/purchaseOrder/outStockModal.vue
  60. 15 10
      src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue
  61. 23 20
      src/views/purchasingManagement/purchaseOrder/warehousing.vue
  62. 64 58
      src/views/purchasingManagement/purchaseReturn/detail.vue
  63. 8 5
      src/views/purchasingManagement/purchaseReturn/list.vue
  64. 11 8
      src/views/reportData/chainCustomerReport/list.vue
  65. 10 7
      src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue
  66. 10 7
      src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue
  67. 10 7
      src/views/reportData/chainReceivedSendStorageReport/list.vue
  68. 10 7
      src/views/reportData/chainSalesDetailReport/list.vue
  69. 10 7
      src/views/reportData/chainSalesReport/list.vue
  70. 34 26
      src/views/reportData/chainStockReport/detailModal.vue
  71. 10 7
      src/views/reportData/chainStockReport/list.vue
  72. 11 8
      src/views/reportData/customerReport/list.vue
  73. 10 7
      src/views/reportData/inventoryReport/inventoryDetail.vue
  74. 10 9
      src/views/reportData/inventoryReport/inventoryOrder.vue
  75. 10 7
      src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue
  76. 10 7
      src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue
  77. 10 7
      src/views/reportData/receivedSendStorageReport/list.vue
  78. 10 7
      src/views/reportData/salesDetailReport/list.vue
  79. 10 7
      src/views/reportData/salesReport/list.vue
  80. 8 5
      src/views/salesManagement/giftRecord/list.vue
  81. 8 5
      src/views/salesManagement/productPricing/list.vue
  82. 21 18
      src/views/salesManagement/salesQuery/detail.vue
  83. 11 8
      src/views/salesManagement/salesQuery/edit.vue
  84. 8 5
      src/views/salesManagement/salesQuery/list.vue
  85. 19 16
      src/views/salesManagement/salesReturn/detail.vue
  86. 8 5
      src/views/salesManagement/salesReturn/list.vue
  87. 11 8
      src/views/salesManagement/salesReturn/queryPart.vue
  88. 20 17
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  89. 19 16
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  90. 8 5
      src/views/salesManagement/salesman/list.vue
  91. 10 7
      src/views/salesManagement/urgentItemsOffset/detail.vue
  92. 8 5
      src/views/salesManagement/urgentItemsOffset/list.vue
  93. 8 5
      src/views/storeManagement/bind/list.vue
  94. 8 5
      src/views/storeManagement/userAuthorization/list.vue
  95. 13 10
      src/views/supplierManagement/supplierInfo/list.vue

+ 21 - 19
src/views/allocationManagement/chainTransferIn/detail.vue

@@ -48,7 +48,6 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1335 }"
           :defaultLoadData="false"
           bordered>
         </s-table>
@@ -70,31 +69,34 @@ export default {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价(¥)', dataIndex: 'putCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调入数量', dataIndex: 'putQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价(¥)', dataIndex: 'putCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调入数量', dataIndex: 'putQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'warehouseLocationName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         const params = Object.assign(parameter, { allocationLinkagePutSn: this.$route.params.sn })
         this.spinning = true
         return allocLinkagePutDetailList(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].costSubtotal = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getDetailCount(params)
+            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].costSubtotal = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
+            }
+            this.localDataSource = data.list
           }
-          this.getDetailCount(params)
-          this.localDataSource = data.list
           this.spinning = false
           return data
         })

+ 29 - 27
src/views/allocationManagement/chainTransferIn/edit.vue

@@ -77,7 +77,6 @@
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
-          :scroll="{ x: 1110 }"
           bordered>
           <!-- 仓库仓位 -->
           <template slot="warehouse" slot-scope="text, record, index">
@@ -135,15 +134,15 @@ export default {
       warehouseCascadeData: [], //  仓库仓位
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'productCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productOrigCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本价', dataIndex: 'putCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调入数量', dataIndex: 'putQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '成本小计', dataIndex: 'costSubtotal', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: 200, align: 'center' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '18%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调入数量', dataIndex: 'putQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '成本小计', dataIndex: 'costSubtotal', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehouse' }, width: '16%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -151,25 +150,28 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam, { allocationLinkagePutSn: this.$route.params.sn })
         return allocLinkagePutDetailList(params).then(res => {
-          this.getDetailCount(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
-            const warehouseSn = data.list[i].warehouseSn || undefined
-            const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
-            data.list[i].warehouseSnBackups = warehouseSn
-            data.list[i].warehouseLocationSnBackups = warehouseLocationSn
-            if (warehouseSn || warehouseLocationSn) {
-              data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
-            } else {
-              data.list[i].warehouseCascade = undefined
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getDetailCount(params)
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const warehouseSn = data.list[i].warehouseSn || undefined
+              const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
+              data.list[i].warehouseSnBackups = warehouseSn
+              data.list[i].warehouseLocationSnBackups = warehouseLocationSn
+              if (warehouseSn || warehouseLocationSn) {
+                data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
+              } else {
+                data.list[i].warehouseCascade = undefined
+              }
+              // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].costSubtotal = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
             }
-            // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].costSubtotal = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
+            this.localDataSource = data.list || []
+            this.disabled = false
           }
-          this.localDataSource = data.list || []
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 13 - 10
src/views/allocationManagement/chainTransferIn/list.vue

@@ -140,13 +140,13 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '连锁调入单号', scopedSlots: { customRender: 'allocationLinkagePutNo' }, width: '12%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '连锁调入单号', scopedSlots: { customRender: 'allocationLinkagePutNo' }, width: '16%', align: 'center' },
         { title: '调出对象', dataIndex: 'outTenantName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库时间', dataIndex: 'putWarehouseTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库时间', dataIndex: 'putWarehouseTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨产品类型', dataIndex: 'allocationTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'settleStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -157,12 +157,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return allocLinkagePutList(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
         })

+ 12 - 9
src/views/allocationManagement/chainTransferOut/detail.vue

@@ -95,16 +95,19 @@ export default {
         this.disabled = true
         const params = Object.assign(parameter, { allocationLinkageOutSn: this.outBizSn || this.$route.params.sn })
         return allocLinkageOutDetailList(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].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.getDetailCount(params)
+            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].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
+            }
+            this.disabled = false
+            this.localDataSource = data.list
           }
-          this.disabled = false
-          this.getDetailCount(params)
-          this.localDataSource = data.list
           return data
         })
       },

+ 15 - 12
src/views/allocationManagement/chainTransferOut/list.vue

@@ -158,29 +158,32 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '连锁调出单号', scopedSlots: { customRender: 'allocationLinkageOutNo' }, width: '12%', align: 'center' },
+        { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '连锁调出单号', scopedSlots: { customRender: 'allocationLinkageOutNo' }, width: '16%', align: 'center' },
         { title: '调往对象', dataIndex: 'putTenantName', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '总款数', dataIndex: 'productTotalCategory', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总数量', dataIndex: 'productTotalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总成本', dataIndex: 'productTotalCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总成本', dataIndex: 'productTotalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'allocationTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'settleStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '13%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
         return allocLinkageOutList(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/allocationManagement/storeTransferOut/detail.vue

@@ -90,14 +90,17 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return storeCallOutDetailList(Object.assign(parameter, { storeCallOutSn: 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
-            // 成本小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
+          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].costSubtotal = getOperationalPrecision(data.list[i].outCost, data.list[i].outQty)
+            }
+            this.localDataSource = data.list
           }
-          this.localDataSource = data.list
           this.spinning = false
           return data
         })

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

@@ -165,12 +165,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return storeCallOutList(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
         })

+ 76 - 68
src/views/allocationManagement/warehouseAllocation/detail.vue

@@ -1,68 +1,70 @@
 <template>
   <div class="warehouseAllocationDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="warehouseAllocationDetail-back" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle" v-if="!outBizSn">
-        <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <a-button
-          v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
-          type="primary"
-          size="small"
-          style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
-          id="warehouseAllocationEdit-btn"
-          @click.stop="handleEdit">
-          编辑
-        </a-button>
-      </template>
-    </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="调出仓库">{{ (warehouse&&warehouse.outWarehouseName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="调入仓库">{{ (warehouse&&warehouse.putWarehouseName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="调拨单号">{{ (warehouse&&warehouse.allocationWarehouseNo) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="关联单号">{{ (warehouse&&warehouse.relevanceNo) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="单据状态">{{ (warehouse&&warehouse.stateDictValue) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="备注">{{ (warehouse&&warehouse.remark) || '--' }}</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
-      <!-- 总计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          总款数: <strong>{{ productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0) ? productTotal.productTotalCategory : '--' }}</strong> ,
-          总数量: <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
-          总成本: <strong>{{ productTotal&&(productTotal.productTotalCost || productTotal.productTotalCost==0) ? '¥'+productTotal.productTotalCost : '--' }}</strong>
-        </div>
-      </a-alert>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        bordered>
-        <!-- 产品类别 -->
-        <template slot="productType" slot-scope="text, record">
-          <a-tooltip placement="top">
-            <template slot="title">
-              <span>{{ record.productTypeName }}</span>
-            </template>
-            {{ record.productTypeName3 }}
-          </a-tooltip>
-        </template>
-        <!-- 成本小计 -->
-        <template slot="totalCost" slot-scope="text, record">
-          <span>{{ (record.allocationCost * record.allocationQty) || 0 }}</span>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="warehouseAllocationDetail-back" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle" v-if="!outBizSn">
+          <a id="warehouseAllocationDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a-button
+            v-if="warehouse&&warehouse.stateDictValue!='已完结'&&$hasPermissions('B_warehouseAllocationEdit')"
+            type="primary"
+            size="small"
+            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            id="warehouseAllocationEdit-btn"
+            @click.stop="handleEdit">
+            编辑
+          </a-button>
         </template>
-      </s-table>
-    </a-card>
+      </a-page-header>
+      <!-- 基础信息 -->
+      <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions :column="3">
+              <a-descriptions-item label="调出仓库">{{ (warehouse&&warehouse.outWarehouseName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调入仓库">{{ (warehouse&&warehouse.putWarehouseName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="调拨单号">{{ (warehouse&&warehouse.allocationWarehouseNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="关联单号">{{ (warehouse&&warehouse.relevanceNo) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="单据状态">{{ (warehouse&&warehouse.stateDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="备注">{{ (warehouse&&warehouse.remark) || '--' }}</a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
+      <a-card size="small" :bordered="false" class="warehouseAllocationDetail-cont">
+        <!-- 总计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            总款数: <strong>{{ productTotal&&(productTotal.productTotalCategory || productTotal.productTotalCategory==0) ? productTotal.productTotalCategory : '--' }}</strong> ,
+            总数量: <strong>{{ productTotal&&(productTotal.productTotalQty || productTotal.productTotalQty==0) ? productTotal.productTotalQty : '--' }}</strong> ,
+            总成本: <strong>{{ productTotal&&(productTotal.productTotalCost || productTotal.productTotalCost==0) ? '¥'+productTotal.productTotalCost : '--' }}</strong>
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          bordered>
+          <!-- 产品类别 -->
+          <template slot="productType" slot-scope="text, record">
+            <a-tooltip placement="top">
+              <template slot="title">
+                <span>{{ record.productTypeName }}</span>
+              </template>
+              {{ record.productTypeName3 }}
+            </a-tooltip>
+          </template>
+          <!-- 成本小计 -->
+          <template slot="totalCost" slot-scope="text, record">
+            <span>{{ (record.allocationCost * record.allocationQty) || 0 }}</span>
+          </template>
+        </s-table>
+      </a-card>
+    </a-spin>
   </div>
 </template>
 
@@ -79,6 +81,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       exportLoading: false, // 导出loading
       warehouse: null, // 基础信息
       productTotal: null,
@@ -98,14 +101,19 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return allocWarehouseDetailList(Object.assign(parameter, { allocationWarehouseSn: 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
+            this.getProduceTotal()
+            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.getProduceTotal()
-          this.disabled = false
+          this.spinning = false
           return data
         })
       }

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

@@ -151,12 +151,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return allocWarehouseList(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/bulkPartsTypeManagement/list.vue

@@ -69,12 +69,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return sparePartsPutTypeList(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/customerTypeManagement/list.vue

@@ -84,12 +84,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return custTypeList(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 - 6
src/views/basicData/expenseType/list.vue

@@ -78,12 +78,14 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return costTypeAllQuery({}).then(res => {
-          //  递归去除空children
-          this.recursionFun(res.data)
-          if (res.data.length > 0) {
-            this.defaultExpandedRowKeys[0] = res.data[0].id
-          } else {
-            this.defaultExpandedRowKeys = []
+          if (res.status == 200) {
+            //  递归去除空children
+            this.recursionFun(res.data)
+            if (res.data.length > 0) {
+              this.defaultExpandedRowKeys[0] = res.data[0].id
+            } else {
+              this.defaultExpandedRowKeys = []
+            }
           }
           this.spinning = false
           return res.data

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

@@ -71,10 +71,13 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return storeCallOutTypeList(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.spinning = false
           return data

+ 7 - 4
src/views/bulkManagement/bulkImport/list.vue

@@ -102,10 +102,13 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return stockImportList(Object.assign(parameter, { stockImportSn: this.uploadData && this.uploadData.stockImportSn })).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

+ 12 - 7
src/views/bulkManagement/bulkReturnGoods/detailModal.vue

@@ -80,16 +80,21 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         const params = Object.assign(parameter, { sparePartsReturnSn: this.itemSn })
         return sparePartsRetDetailList(params).then(res => {
-          this.getDetailCount(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.getDetailCount(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.dataSource = data.list
+            this.disabled = false
           }
-          this.dataSource = data.list
-          this.disabled = false
+          this.spinning = false
           return data
         })
       },

+ 10 - 5
src/views/bulkManagement/bulkReturnGoods/list.vue

@@ -168,13 +168,18 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return sparePartsRetList(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
         })
       },

+ 13 - 8
src/views/bulkManagement/bulkWarehousingOrder/detail.vue

@@ -121,16 +121,21 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return sparePartsPurDetailList(Object.assign(parameter, { sparePartsPurchaseSn: 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].purchaseAmount = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
+          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].purchaseAmount = getOperationalPrecision(data.list[i].putCost, data.list[i].putQty)
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
+          this.spinning = false
           return data
         })
       },

+ 10 - 7
src/views/bulkManagement/bulkWarehousingOrder/list.vue

@@ -188,15 +188,18 @@ export default {
         this.disabled = true
         this.spinning = true
         return sparePartsPurList(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.dataTotalCount = data.count || 0
           }
-          this.disabled = false
           this.spinning = false
-          this.dataTotalCount = data.count || 0
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 9 - 6
src/views/customerManagement/customerInfo/list.vue

@@ -162,13 +162,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return custList(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].enabledFlag = data.list[i].enabledFlag + '' === '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].enabledFlag = data.list[i].enabledFlag + '' === '1'
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 65 - 57
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -1,56 +1,58 @@
 <template>
   <div class="companyCollectionPaymentDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
-      </template>
-    </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="单位名称">{{ (basicInfoData&&basicInfoData.settleClientName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? basicInfoData.settleAmount : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? discountAmount : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleName) || '--' }}</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 收款明细 -->
-    <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="收款明细">
-          <!-- alert -->
-          <a-alert type="info" style="margin-bottom:10px">
-            <div slot="message">
-              共 <strong>{{ total }}</strong> 条明细,
-              金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,
-              结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? '¥'+basicInfoData.realSettleAmount : '--' }}</strong>
-            </div>
-          </a-alert>
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
-            size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :defaultLoadData="false"
-            bordered>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle">
+          <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">单号:{{ (basicInfoData&&basicInfoData.unitSettleNo) || '--' }}</p>
+        </template>
+      </a-page-header>
+      <!-- 基础信息 -->
+      <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions :column="3">
+              <a-descriptions-item label="单位名称">{{ (basicInfoData&&basicInfoData.settleClientName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="单位类型">{{ (basicInfoData&&basicInfoData.settleClientTypeDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算类型">{{ (basicInfoData&&basicInfoData.settleTypeDictValue) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="应结算金额">{{ (basicInfoData&&(basicInfoData.settleAmount || basicInfoData.settleAmount==0)) ? basicInfoData.settleAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="折让金额">{{ (discountAmount || discountAmount==0) ? discountAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleName) || '--' }}</a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
+      <!-- 收款明细 -->
+      <a-card size="small" :bordered="false" class="companyCollectionPaymentDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="收款明细">
+            <!-- alert -->
+            <a-alert type="info" style="margin-bottom:10px">
+              <div slot="message">
+                共 <strong>{{ total }}</strong> 条明细,
+                金额合计 <strong>{{ (basicInfoData&&(basicInfoData.totalSettleAmount || basicInfoData.totalSettleAmount==0)) ? '¥'+basicInfoData.totalSettleAmount : '--' }}</strong> ,
+                结算金额合计 <strong>{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? '¥'+basicInfoData.realSettleAmount : '--' }}</strong>
+              </div>
+            </a-alert>
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="small"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              :defaultLoadData="false"
+              bordered>
+            </s-table>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
+    </a-spin>
   </div>
 </template>
 
@@ -61,6 +63,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
+      spinning: false,
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', align: 'center', width: '10%' },
@@ -72,14 +75,19 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return settleUnitDetailList(Object.assign(parameter, { unitSettleSn: 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.disabled = false
+            this.total = data.count || 0
           }
-          this.disabled = false
-          this.total = data.count || 0
+          this.spinning = false
           return data
         })
       },

+ 93 - 87
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -1,95 +1,97 @@
 <template>
   <a-card size="small" :bordered="false" class="companyCollectionPaymentList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单位名称">
-              <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单位类型">
-              <v-select
-                v-model="queryParam.settleClientType"
-                ref="settleClientType"
-                id="companyCollectionPaymentList-settleClientType"
-                code="SETTLE_CLIENT_TYPE"
-                placeholder="请选择单位类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="结算类型">
-              <v-select
-                v-model="queryParam.settleType"
-                ref="settleType"
-                id="companyCollectionPaymentList-settleType"
-                code="SETTLE_TYPE"
-                placeholder="请选择结算类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <template v-if="advanced">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
             <a-col :md="6" :sm="24">
-              <a-form-item label="结算单号">
-                <a-input id="companyCollectionPaymentList-unitSettleNo" v-model.trim="queryParam.unitSettleNo" allowClear placeholder="请输入结算单号"/>
+              <a-form-item label="单位名称">
+                <a-input id="companyCollectionPaymentList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="结算时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+              <a-form-item label="单位类型">
+                <v-select
+                  v-model="queryParam.settleClientType"
+                  ref="settleClientType"
+                  id="companyCollectionPaymentList-settleClientType"
+                  code="SETTLE_CLIENT_TYPE"
+                  placeholder="请选择单位类型"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="结算方式">
-                <a-select id="companyCollectionPaymentList-settleStyleSn" v-model="queryParam.settleStyleSn" placeholder="请选择结算方式" allowClear>
-                  <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                </a-select>
+              <a-form-item label="结算类型">
+                <v-select
+                  v-model="queryParam.settleType"
+                  ref="settleType"
+                  id="companyCollectionPaymentList-settleType"
+                  code="SETTLE_TYPE"
+                  placeholder="请选择结算类型"
+                  allowClear></v-select>
               </a-form-item>
             </a-col>
-          </template>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyCollectionPaymentList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyCollectionPaymentList-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message">
-        共 <strong>{{ total }}</strong> 条记录,
-        其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
-        收款金额合计 <strong>{{ (productTotal&&(productTotal.receiptAmount || productTotal.receiptAmount==0)) ? '¥'+productTotal.receiptAmount : '--' }}</strong> ,
-        付款单 <strong>{{ (productTotal&&(productTotal.payCount || productTotal.payCount==0)) ? productTotal.payCount : '--' }}</strong> 条,
-        付款金额合计 <strong>{{ (productTotal&&(productTotal.payAmount || productTotal.payAmount==0)) ? '¥'+productTotal.payAmount : '--' }}</strong>
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="结算单号">
+                  <a-input id="companyCollectionPaymentList-unitSettleNo" v-model.trim="queryParam.unitSettleNo" allowClear placeholder="请输入结算单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="结算时间">
+                  <rangeDate ref="rangeDate" @change="dateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="结算方式">
+                  <a-select id="companyCollectionPaymentList-settleStyleSn" v-model="queryParam.settleStyleSn" placeholder="请选择结算方式" allowClear>
+                    <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </template>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyCollectionPaymentList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyCollectionPaymentList-reset">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
       </div>
-    </a-alert>
-    <!-- 列表 -->
-    <s-table
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ y: tableHeight }"
-      :defaultLoadData="false"
-      bordered>
-      <!-- 结算单号 -->
-      <template slot="unitSettleNo" slot-scope="text, record">
-        <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'active':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
-      </template>
-    </s-table>
+      <!-- alert -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div slot="message">
+          共 <strong>{{ total }}</strong> 条记录,
+          其中收款单 <strong>{{ (productTotal&&(productTotal.receiptCount || productTotal.receiptCount==0)) ? productTotal.receiptCount : '--' }}</strong> 条,
+          收款金额合计 <strong>{{ (productTotal&&(productTotal.receiptAmount || productTotal.receiptAmount==0)) ? '¥'+productTotal.receiptAmount : '--' }}</strong> ,
+          付款单 <strong>{{ (productTotal&&(productTotal.payCount || productTotal.payCount==0)) ? productTotal.payCount : '--' }}</strong> 条,
+          付款金额合计 <strong>{{ (productTotal&&(productTotal.payAmount || productTotal.payAmount==0)) ? '¥'+productTotal.payAmount : '--' }}</strong>
+        </div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 结算单号 -->
+        <template slot="unitSettleNo" slot-scope="text, record">
+          <span :class="$hasPermissions('M_companyCollectionPayment_detail')?'active':'common'" @click="handleDetail(record)">{{ record.unitSettleNo }}</span>
+        </template>
+      </s-table>
+    </a-spin>
   </a-card>
 </template>
 
@@ -102,6 +104,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
+      spinning: false,
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
@@ -132,15 +135,18 @@ export default {
         this.disabled = true
         this.spinning = true
         return settleUnitList(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.total = data.count || 0
           }
-          this.disabled = false
           this.spinning = false
-          this.total = data.count || 0
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 69 - 61
src/views/financialManagement/companyReceivablePayable/chooseBillModal.vue

@@ -8,56 +8,58 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="960">
-    <!-- 搜索条件 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单据号">
-              <a-input id="chooseBillModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单据类型">
-              <v-select
-                v-model="queryParam.bizType"
-                ref="bizType"
-                id="chooseBillModal-bizType"
-                code="SETTLE_BIZ_TYPE"
-                placeholder="请选择单据类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="7" :sm="24">
-            <a-form-item label="审核时间">
-              <rangeDate ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="5" :sm="24">
-            <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 列表 -->
-    <s-table
-      class="sTable"
-      ref="table"
-      size="small"
-      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :showPagination="false"
-      :scroll="{ x: '100%', y: 400 }"
-      :defaultLoadData="false"
-      bordered>
-    </s-table>
-    <div class="btn-cont">
-      <a-button type="primary" id="chooseBillModal-modal-save" @click="handleSave">确定</a-button>
-      <a-button id="chooseBillModal-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
-    </div>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据号">
+                <a-input id="chooseBillModal-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单据类型">
+                <v-select
+                  v-model="queryParam.bizType"
+                  ref="bizType"
+                  id="chooseBillModal-bizType"
+                  code="SETTLE_BIZ_TYPE"
+                  placeholder="请选择单据类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="7" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="5" :sm="24">
+              <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chooseBillModal-refresh">查询</a-button>
+              <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="chooseBillModal-reset">重置</a-button>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :showPagination="false"
+        :scroll="{ x: '100%', y: 400 }"
+        :defaultLoadData="false"
+        bordered>
+      </s-table>
+      <div class="btn-cont">
+        <a-button type="primary" id="chooseBillModal-modal-save" @click="handleSave">确定</a-button>
+        <a-button id="chooseBillModal-modal-back" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+      </div>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -86,6 +88,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       isShow: this.openModal, //  是否打开弹框
       disabled: false,
       queryParam: {
@@ -106,20 +109,25 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return settleInfoAllList(Object.assign(this.queryParam, { settleClientSn: this.settleClientSn, notEqZero: 1 })).then(res => {
-          const data = res.data
-          this.selectedRowKeys = []
-          this.selectedRows = []
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = i + 1
-            data[i].settleAmount = data[i].unsettleAmount
-            const ind = this.nowChoose.findIndex(item => item.id == data[i].id)
-            if (ind != -1) {
-              this.selectedRowKeys.push(data[i].id)
-              this.selectedRows.push(data[i])
+          let data
+          if (res.status == 200) {
+            data = res.data
+            this.selectedRowKeys = []
+            this.selectedRows = []
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = i + 1
+              data[i].settleAmount = data[i].unsettleAmount
+              const ind = this.nowChoose.findIndex(item => item.id == data[i].id)
+              if (ind != -1) {
+                this.selectedRowKeys.push(data[i].id)
+                this.selectedRows.push(data[i])
+              }
             }
+            this.disabled = false
           }
-          this.disabled = false
+          this.spinning = false
           return data
         })
       },

+ 81 - 73
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -1,71 +1,73 @@
 <template>
   <div class="companyCollectionPaymentDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
-      </template>
-    </a-page-header>
-    <a-card>
-      <!-- 搜索条件 -->
-      <div class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据号">
-                <a-input id="companyReceivablePayableDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <span class="table-page-search-submitButtons">
-                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableDetail-refresh">查询</a-button>
-                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
-                <!-- <a-button
-                  type="danger"
-                  style="margin-left: 8px"
-                  @click="handleExport"
-                  :disabled="disabled"
-                  :loading="exportLoading"
-                  id="companyReceivablePayableDetail-export-btn">导出</a-button> -->
-              </span>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- alert -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div slot="message">
-          共 <strong>{{ total }}</strong> 条明细,
-          金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,
-          余额合计 <strong>{{ (productTotal&&(productTotal.unsettleAmount || productTotal.unsettleAmount==0)) ? '¥'+productTotal.unsettleAmount : '--' }}</strong>
-        </div>
-      </a-alert>
-      <!-- 列表 -->
-      <s-table
-        class="sTable"
-        ref="table"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 采购数量 -->
-        <template slot="purchaseNum" slot-scope="text, record">
-          <span>{{ record.purchaseNum }}</span>
-        </template>
-        <!-- 缺货数量 -->
-        <template slot="outOfStockNum" slot-scope="text, record">
-          <span>{{ record.outOfStockNum }}</span>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle">
+          <a id="companyCollectionPaymentDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <p style=" display: inline-block;margin: 0 0 0 60px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name || '--' }}</p>
         </template>
-      </s-table>
-    </a-card>
+      </a-page-header>
+      <a-card>
+        <!-- 搜索条件 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="单据号">
+                  <a-input id="companyReceivablePayableDetail-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入单据号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="审核时间">
+                  <rangeDate ref="rangeDate" @change="dateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <span class="table-page-search-submitButtons">
+                  <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableDetail-refresh">查询</a-button>
+                  <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="companyReceivablePayableDetail-reset">重置</a-button>
+                  <!-- <a-button
+                    type="danger"
+                    style="margin-left: 8px"
+                    @click="handleExport"
+                    :disabled="disabled"
+                    :loading="exportLoading"
+                    id="companyReceivablePayableDetail-export-btn">导出</a-button> -->
+                </span>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- alert -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            共 <strong>{{ total }}</strong> 条明细,
+            金额合计 <strong>{{ (productTotal&&(productTotal.totalAmount || productTotal.totalAmount==0)) ? '¥'+productTotal.totalAmount : '--' }}</strong> ,
+            余额合计 <strong>{{ (productTotal&&(productTotal.unsettleAmount || productTotal.unsettleAmount==0)) ? '¥'+productTotal.unsettleAmount : '--' }}</strong>
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 采购数量 -->
+          <template slot="purchaseNum" slot-scope="text, record">
+            <span>{{ record.purchaseNum }}</span>
+          </template>
+          <!-- 缺货数量 -->
+          <template slot="outOfStockNum" slot-scope="text, record">
+            <span>{{ record.outOfStockNum }}</span>
+          </template>
+        </s-table>
+      </a-card>
+    </a-spin>
   </div>
 </template>
 
@@ -78,6 +80,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
+      spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
       // 查询参数
       queryParam: {
@@ -98,16 +101,21 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         const params = Object.assign(parameter, this.queryParam, { settleClientSn: this.$route.params.sn })
         return settleInfoList(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
+            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
+            }
+            this.disabled = false
+            this.total = data.count || 0
           }
-          this.disabled = false
-          this.total = data.count || 0
-          this.getTotal(params)
+          this.spinning = false
           return data
         })
       },
@@ -152,7 +160,7 @@ export default {
       //   this.exportLoading = false
 	  // downloadExcel(res, '单位应收应付')
       // })
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 82 - 76
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -1,73 +1,75 @@
 <template>
   <a-card size="small" :bordered="false" class="companyReceivablePayableList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单位名称">
-              <a-input id="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <a-form-item label="单位类型">
-              <v-select
-                v-model="queryParam.settleClientType"
-                ref="settleClientType"
-                id="companyReceivablePayableList-settleClientType"
-                code="SETTLE_CLIENT_TYPE"
-                placeholder="请选择单位类型"
-                allowClear></v-select>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableList-reset">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- alert -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div slot="message">
-        共 <strong>{{ total }}</strong> 条记录,
-        应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,
-        应付金额合计 <strong>¥{{ (productTotal&&productTotal.pay) ? Math.abs(productTotal.pay) : 0 }}</strong>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单位名称">
+                <a-input id="companyReceivablePayableList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入单位名称"/>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="单位类型">
+                <v-select
+                  v-model="queryParam.settleClientType"
+                  ref="settleClientType"
+                  id="companyReceivablePayableList-settleClientType"
+                  code="SETTLE_CLIENT_TYPE"
+                  placeholder="请选择单位类型"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="companyReceivablePayableList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="companyReceivablePayableList-reset">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
       </div>
-    </a-alert>
-    <!-- 列表 -->
-    <s-table
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ y: tableHeight }"
-      :defaultLoadData="false"
-      bordered>
-      <!-- 操作 -->
-      <template slot="action" slot-scope="text, record">
-        <a-button
-          v-if="$hasPermissions('M_collectionPayment')"
-          size="small"
-          type="link"
-          class="button-info"
-          @click="handleCollectionPayment(record)"
-          id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
-        <a-button
-          v-if="$hasPermissions('M_companyReceivablePayable_detail')"
-          size="small"
-          type="link"
-          class="button-success"
-          @click="handleDetail(record)"
-          id="companyReceivablePayableList-detail-btn">详情</a-button>
-        <span v-if="!$hasPermissions('M_collectionPayment') && !$hasPermissions('M_companyReceivablePayable_detail')">--</span>
-      </template>
-    </s-table>
+      <!-- alert -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div slot="message">
+          共 <strong>{{ total }}</strong> 条记录,
+          应收金额合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? '¥'+productTotal.receipt : '--' }}</strong> ,
+          应付金额合计 <strong>¥{{ (productTotal&&productTotal.pay) ? Math.abs(productTotal.pay) : 0 }}</strong>
+        </div>
+      </a-alert>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: tableHeight }"
+        :defaultLoadData="false"
+        bordered>
+        <!-- 操作 -->
+        <template slot="action" slot-scope="text, record">
+          <a-button
+            v-if="$hasPermissions('M_collectionPayment')"
+            size="small"
+            type="link"
+            class="button-info"
+            @click="handleCollectionPayment(record)"
+            id="companyReceivablePayableList-collectionPayment-btn">收付款</a-button>
+          <a-button
+            v-if="$hasPermissions('M_companyReceivablePayable_detail')"
+            size="small"
+            type="link"
+            class="button-success"
+            @click="handleDetail(record)"
+            id="companyReceivablePayableList-detail-btn">详情</a-button>
+          <span v-if="!$hasPermissions('M_collectionPayment') && !$hasPermissions('M_companyReceivablePayable_detail')">--</span>
+        </template>
+      </s-table>
+    </a-spin>
   </a-card>
 </template>
 
@@ -78,6 +80,7 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
+      spinning: false,
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
       // 查询参数
@@ -99,17 +102,20 @@ export default {
         this.disabled = true
         this.spinning = true
         return settleUnitClientList(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].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
+          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
+              // 应付金额  值为负,应显示为正
+              data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
+            }
+            this.disabled = false
+            this.total = data.count || 0
           }
-          this.disabled = false
           this.spinning = false
-          this.total = data.count || 0
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 15 - 12
src/views/financialManagement/expenseManagement/list.vue

@@ -165,20 +165,23 @@ export default {
         this.disabled = true
         this.spinning = true
         return settleExpenseQuery(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
+            // 费用类型
+            if (this.costTypeList.length == 0) {
+              this.getCostTypeList()
+            }
+            // 汇总
+            this.totalData.count = data.count
+            this.settleExpenseQuerySum(Object.assign(parameter, this.queryParam))
           }
-          this.disabled = false
           this.spinning = false
-          // 费用类型
-          if (this.costTypeList.length == 0) {
-            this.getCostTypeList()
-          }
-          // 汇总
-          this.totalData.count = data.count
-          this.settleExpenseQuerySum(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 11 - 8
src/views/financialManagement/financialCollection/list.vue

@@ -170,16 +170,19 @@ export default {
         this.disabled = true
         this.spinning = true
         return settleReceiptQuery(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.totalData.count = data.count || 0
+            // 查询总计
+            this.settleReceiptQuerySum(Object.assign(parameter, this.queryParam))
           }
-          this.disabled = false
           this.spinning = false
-          this.totalData.count = data.count || 0
-          // 查询总计
-          this.settleReceiptQuerySum(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 11 - 8
src/views/financialManagement/financialPayment/list.vue

@@ -169,16 +169,19 @@ export default {
         this.disabled = true
         this.spinning = true
         return settlePayQuery(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.totalData.count = data.count || 0
+            // 查询总计
+            this.settlePayQuerySum(Object.assign(parameter, this.queryParam))
           }
-          this.disabled = false
           this.spinning = false
-          this.totalData.count = data.count || 0
-          // 查询总计
-          this.settlePayQuerySum(Object.assign(parameter, this.queryParam))
           return data
         })
       },

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

@@ -107,13 +107,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseAuditList(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].financeFinishTime = data.list[i].financeAuditTime
+          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].financeFinishTime = data.list[i].financeAuditTime
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 10 - 7
src/views/financialManagement/ledgerRecord/list.vue

@@ -109,15 +109,18 @@ export default {
         this.disabled = true
         this.spinning = true
         return satelliteWHSeparateList(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.total = data.count || 0
+            this.getTotal(Object.assign(parameter, this.queryParam))
           }
-          this.disabled = false
           this.spinning = false
-          this.total = data.count || 0
-          this.getTotal(Object.assign(parameter, this.queryParam))
           return data
         })
       },

+ 11 - 6
src/views/financialManagement/warehousingAudit/detail.vue

@@ -81,14 +81,19 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return receivingDetailList(Object.assign(parameter, { receivingBillSn: 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.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
+          this.spinning = false
           return data
         })
       },

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

@@ -138,14 +138,17 @@ export default {
         this.spinning = true
         const params = Object.assign(parameter, this.queryParam)
         return receivingList(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
+            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
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
-          this.getTotal(params)
           return data
         })
       },

+ 59 - 51
src/views/financialManagement/withdrawalManagement/list.vue

@@ -1,51 +1,53 @@
 <template>
   <a-card size="small" :bordered="false" class="withdrawalManagementList-wrap">
-    <!-- 搜索条件 -->
-    <div ref="tableSearch" class="table-page-search-wrapper">
-      <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="6" :sm="24">
-            <a-form-item label="提现时间">
-              <rangeDateTime ref="rangeDate" @change="dateChange" />
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="24">
-            <span class="table-page-search-submitButtons">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="withdrawalManagementList-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="withdrawalManagementList-reset">重置</a-button>
-            </span>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 操作按钮 -->
-    <div class="table-operator">
-      <a-button v-if="$hasPermissions('B_withdrawalManagement_cashOut')" id="withdrawalManagementList-tx" type="primary" class="button-warning" @click="handleCashOut">申请提现</a-button>
-      <div style="display: inline-block;margin-left: 80px;">可提现余额: <strong>{{ accountInfo&&(accountInfo.balance || accountInfo.balance==0) ? '¥'+accountInfo.balance : '--' }}</strong> 元</div>
-    </div>
-    <!-- 列表 -->
-    <s-table
-      class="sTable fixPagination"
-      ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ x: 1320 }"
-      :defaultLoadData="false"
-      bordered>
-    </s-table>
-    <!-- 提现说明 -->
-    <div class="descriptions">
-      <p class="descriptions-tit">提现说明:</p>
-      <ul class="descriptions-list">
-        <li><em>1、</em>提现手续费为元/笔,从可提现余额中扣除。</li>
-        <li><em>2、</em>提现到账时间正常为T+1工作日(例如当天提现,则第二天到账。如果遇到周末或法定节假日,则依次顺延)。</li>
-        <li><em>3、</em>页面上的【可提现余额】包含当天收款但支付公司未清算金额,该部分金额只能在第二天清算后才可提现,如果提示【提现失败】和【账户余额不足】,则表明【可提现金额】中会存在该部分金额,遇到这种情况时,请减少当日提现金额或在次日进行提现。</li>
-        <li><em>4、</em>提现账户为申请开通支付结算账户时所提供的账户信息。</li>
-      </ul>
-    </div>
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-row :gutter="15">
+            <a-col :md="6" :sm="24">
+              <a-form-item label="提现时间">
+                <rangeDateTime ref="rangeDate" @change="dateChange" />
+              </a-form-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <span class="table-page-search-submitButtons">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="withdrawalManagementList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm()" :disabled="disabled" id="withdrawalManagementList-reset">重置</a-button>
+              </span>
+            </a-col>
+          </a-row>
+        </a-form>
+      </div>
+      <!-- 操作按钮 -->
+      <div class="table-operator">
+        <a-button v-if="$hasPermissions('B_withdrawalManagement_cashOut')" id="withdrawalManagementList-tx" type="primary" class="button-warning" @click="handleCashOut">申请提现</a-button>
+        <div style="display: inline-block;margin-left: 80px;">可提现余额: <strong>{{ accountInfo&&(accountInfo.balance || accountInfo.balance==0) ? '¥'+accountInfo.balance : '--' }}</strong> 元</div>
+      </div>
+      <!-- 列表 -->
+      <s-table
+        class="sTable fixPagination"
+        ref="table"
+        :style="{ height: tableHeight+84.5+'px' }"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ x: 1320 }"
+        :defaultLoadData="false"
+        bordered>
+      </s-table>
+      <!-- 提现说明 -->
+      <div class="descriptions">
+        <p class="descriptions-tit">提现说明:</p>
+        <ul class="descriptions-list">
+          <li><em>1、</em>提现手续费为元/笔,从可提现余额中扣除。</li>
+          <li><em>2、</em>提现到账时间正常为T+1工作日(例如当天提现,则第二天到账。如果遇到周末或法定节假日,则依次顺延)。</li>
+          <li><em>3、</em>页面上的【可提现余额】包含当天收款但支付公司未清算金额,该部分金额只能在第二天清算后才可提现,如果提示【提现失败】和【账户余额不足】,则表明【可提现金额】中会存在该部分金额,遇到这种情况时,请减少当日提现金额或在次日进行提现。</li>
+          <li><em>4、</em>提现账户为申请开通支付结算账户时所提供的账户信息。</li>
+        </ul>
+      </div>
+    </a-spin>
     <!-- 申请提现 -->
     <cashOutModal :openModal="openModal" :nowData="accountInfo" @ok="handleOk" @close="closeModal" />
   </a-card>
@@ -60,6 +62,7 @@ export default {
   components: { STable, VSelect, rangeDateTime, cashOutModal },
   data () {
     return {
+      spinning: false,
       advanced: true, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
@@ -82,13 +85,18 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return satelliteWHWithdrawalList(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
         })
       },

+ 12 - 7
src/views/inventoryManagement/inventoryChecking/detailModal.vue

@@ -190,19 +190,24 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         const params = Object.assign(parameter, this.queryParam, { checkWarehouseSn: this.itemSn })
         if (this.isPrice) {
           params.profitLossFlag = 1
         }
         return checkWarehouseDetailList(params).then(res => {
-          this.getDetailCount(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.getDetailCount(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.localDataSource = data.list || []
+            this.disabled = false
           }
-          this.localDataSource = data.list || []
-          this.disabled = false
+          this.spinning = false
           return data
         })
       },

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

@@ -155,12 +155,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
         })

+ 13 - 10
src/views/inventoryManagement/inventoryChecking/makeInventory.vue

@@ -196,15 +196,18 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseDetailList(Object.assign(parameter, this.queryParam, { checkWarehouseSn: 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
-            data.list[i].checkQtyBackups = data.list[i].checkQty
+          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].checkQtyBackups = data.list[i].checkQty
+            }
+            this.localDataSource = data.list || []
+            this.getProduceTotal()
+            this.disabled = false
           }
-          this.localDataSource = data.list || []
-          this.getProduceTotal()
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -404,7 +407,7 @@ export default {
           reader.readAsText(res)
         } else {
           if (this.nowType == 'export' || this.nowType == 'typeExport') {
-			downloadExcel(res, '库存盘点')
+            downloadExcel(res, '库存盘点')
           } else {
             this.print(res, objs.type)
           }
@@ -423,7 +426,7 @@ export default {
         window.frames['printficm'].focus()
         window.frames['printficm'].print()
       }
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

+ 9 - 6
src/views/inventoryManagement/inventoryChecking/overall.vue

@@ -108,13 +108,16 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseDetailList(Object.assign(parameter, this.queryParam, { checkWarehouseSn: 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.getProduceTotal()
+            this.disabled = false
           }
-          this.getProduceTotal()
-          this.disabled = false
           this.spinning = false
           return data
         })

+ 9 - 6
src/views/inventoryManagement/inventoryImport/list.vue

@@ -96,13 +96,16 @@ export default {
       loadData: parameter => {
         this.spinning = true
         return stockImportList(Object.assign(parameter, { stockImportSn: this.uploadData && this.uploadData.stockImportSn })).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
+            }
+            const ret = data.list.filter(item => item.isError == 1)
+            this.isAllError = ret.length == data.count
           }
-          const ret = data.list.filter(item => item.isError == 1)
-          this.isAllError = ret.length == data.count
           this.spinning = false
           return data
         })

+ 36 - 28
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -8,28 +8,30 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="960">
-    <!-- 合计 -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div class="ftext" slot="message">
-        可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
-        可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>。
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 合计 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div class="ftext" slot="message">
+          可用库存总数量(个):<strong>{{ currentStock&&(currentStock.currentStockQty || currentStock.currentStockQty==0) ? currentStock.currentStockQty : '--' }}</strong>;
+          可用库存总成本(¥):<strong>{{ currentStock&&(currentStock.currentStockCost || currentStock.currentStockCost==0) ? currentStock.currentStockCost : '--' }}</strong>。
+        </div>
+      </a-alert>
+      <!-- 库存详情 -->
+      <s-table
+        v-if="openModal"
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        :scroll="{ y: 500 }"
+        bordered>
+      </s-table>
+      <div class="btn-cont">
+        <a-button id="inventoryQueryDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
       </div>
-    </a-alert>
-    <!-- 库存详情 -->
-    <s-table
-      v-if="openModal"
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      :scroll="{ y: 500 }"
-      bordered>
-    </s-table>
-    <div class="btn-cont">
-      <a-button id="inventoryQueryDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
-    </div>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -58,6 +60,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       isShow: this.openModal, //  是否打开弹框
       // 表头
       columns: [
@@ -75,15 +78,20 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return stockDetailList(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' })).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.nowData && this.nowData.stockSn || '', isSellOut: '0' }))
           }
-          this.disabled = false
-          // 总计
-          this.getTotal(Object.assign(parameter, { stockSn: this.nowData && this.nowData.stockSn || '', isSellOut: '0' }))
+          this.spinning = false
           return data
         })
       },

+ 18 - 15
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -186,23 +186,26 @@ 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
+          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(params)
+            // 产品分类
+            if (this.typeData.length == 0) {
+              this.getProductType()
+            }
+            // 产品品牌
+            if (this.brandData.length == 0) {
+              this.getProductBrand()
+            }
           }
-          this.disabled = false
           this.spinning = false
-          // 总计
-          this.getTotal(params)
-          // 产品分类
-          if (this.typeData.length == 0) {
-            this.getProductType()
-          }
-          // 产品品牌
-          if (this.brandData.length == 0) {
-            this.getProductBrand()
-          }
           return data
         })
       },

+ 102 - 94
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -1,96 +1,98 @@
 <template>
   <div class="inventoryQueryWarehouseDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="inventoryQueryWarehouseDetail-back">
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle">
-        <a id="inventoryQueryWarehouseDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-      </template>
-    </a-page-header>
-    <a-card size="small" :bordered="false" class="inventoryQueryWarehouseDetail-cont">
-      <!-- 搜索条件 -->
-      <div ref="tableSearch" class="table-page-search-wrapper">
-        <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-          <a-row :gutter="15">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="变动类型">
-                <v-select
-                  v-model="queryParam.flowType"
-                  ref="flowType"
-                  id="warehousingAuditList-flowType"
-                  code="STOCK_FLOW_TYPE"
-                  placeholder="请选择变动类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="单据类型">
-                <v-select
-                  v-model="queryParam.bizType"
-                  ref="bizType"
-                  id="inventoryQueryWarehouseDetail-bizType"
-                  code="STOCK_FLOW_BIZ_TYPE"
-                  placeholder="请选择单据类型"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="仓库">
-                <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
-                  <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </a-form-item>
-            </a-col>
-            <template v-if="advanced">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="inventoryQueryWarehouseDetail-back">
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle">
+          <a id="inventoryQueryWarehouseDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        </template>
+      </a-page-header>
+      <a-card size="small" :bordered="false" class="inventoryQueryWarehouseDetail-cont">
+        <!-- 搜索条件 -->
+        <div ref="tableSearch" class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="变动类型">
+                  <v-select
+                    v-model="queryParam.flowType"
+                    ref="flowType"
+                    id="warehousingAuditList-flowType"
+                    code="STOCK_FLOW_TYPE"
+                    placeholder="请选择变动类型"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据审核时间">
-                  <rangeDate ref="rangeDate" @change="dateChange" />
+                <a-form-item label="单据类型">
+                  <v-select
+                    v-model="queryParam.bizType"
+                    ref="bizType"
+                    id="inventoryQueryWarehouseDetail-bizType"
+                    code="STOCK_FLOW_BIZ_TYPE"
+                    placeholder="请选择单据类型"
+                    allowClear></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单位名称">
-                  <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
+                <a-form-item label="仓库">
+                  <a-select id="inventoryQueryWarehouseDetail-warehouseSn" placeholder="请选择仓库" allowClear v-model="queryParam.warehouseSn" >
+                    <a-select-option v-for="item in warehouseList" :key="item.warehouseSn" :value="item.warehouseSn">{{ item.name }}</a-select-option>
+                  </a-select>
                 </a-form-item>
               </a-col>
-            </template>
-            <a-col :md="6" :sm="24">
-              <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
-              <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
-              <a @click="advanced=!advanced" style="margin-left: 8px">
-                {{ advanced ? '收起' : '展开' }}
-                <a-icon :type="advanced ? 'up' : 'down'"/>
-              </a>
-            </a-col>
-          </a-row>
-        </a-form>
-      </div>
-      <!-- 合计 -->
-      <a-alert type="info" style="margin-bottom:10px">
-        <div class="ftext" slot="message">
-          当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}</strong>;
-          当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? productTotal.currentStockCost : '--' }}</strong>。
+              <template v-if="advanced">
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单据审核时间">
+                    <rangeDate ref="rangeDate" @change="dateChange" />
+                  </a-form-item>
+                </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="单位名称">
+                    <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
+                  </a-form-item>
+                </a-col>
+              </template>
+              <a-col :md="6" :sm="24">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryWarehouseDetail-reset">重置</a-button>
+                <a @click="advanced=!advanced" style="margin-left: 8px">
+                  {{ advanced ? '收起' : '展开' }}
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
+                </a>
+              </a-col>
+            </a-row>
+          </a-form>
         </div>
-      </a-alert>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+84.5+'px' }"
-        size="small"
-        :rowKey="(record) => record.id"
-        :columns="columns"
-        :data="loadData"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 数量 -->
-        <template slot="qty" slot-scope="text, record">
-          <p :class="record.flowType=='PUT' ? 'green':'red'" style="margin: 0;">
-            <span v-if="record.qty!=0">{{ record.flowType=='PUT' ? '+':'-' }}</span>
-            {{ record.qty }}
-          </p>
-        </template>
-      </s-table>
-    </a-card>
+        <!-- 合计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div class="ftext" slot="message">
+            当前库存总数量(个):<strong>{{ (productTotal&&(productTotal.currentStockQty || productTotal.currentStockQty==0)) ? productTotal.currentStockQty : '--' }}</strong>;
+            当前库存总成本(¥):<strong>{{ (productTotal&&(productTotal.currentStockCost || productTotal.currentStockCost==0)) ? productTotal.currentStockCost : '--' }}</strong>。
+          </div>
+        </a-alert>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+84.5+'px' }"
+          size="small"
+          :rowKey="(record) => record.id"
+          :columns="columns"
+          :data="loadData"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 数量 -->
+          <template slot="qty" slot-scope="text, record">
+            <p :class="record.flowType=='PUT' ? 'green':'red'" style="margin: 0;">
+              <span v-if="record.qty!=0">{{ record.flowType=='PUT' ? '+':'-' }}</span>
+              {{ record.qty }}
+            </p>
+          </template>
+        </s-table>
+      </a-card>
+    </a-spin>
   </div>
 </template>
 
@@ -104,6 +106,7 @@ export default {
   components: { STable, VSelect, rangeDate },
   data () {
     return {
+      spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
       queryParam: { //  查询条件
@@ -133,20 +136,25 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        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
+            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.getTotal(params)
           }
-          this.disabled = false
-          this.getTotal(params)
+          this.spinning = false
           return data
         })
       },

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

@@ -225,20 +225,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
         })

+ 9 - 4
src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue

@@ -94,12 +94,17 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        this.spinning = true
         return satelliteWHSupplyList(Object.assign(parameter, { customerSn: this.nowData.customerSn })).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/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -105,12 +105,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return satelliteWHStockList(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/inventoryManagement/warehouse/list.vue

@@ -91,12 +91,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/inventoryManagement/warehouse/storingLocation/list.vue

@@ -94,12 +94,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/outboundOrderManagement/outboundOrder/list.vue

@@ -166,12 +166,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
         })

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

@@ -121,14 +121,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

@@ -112,14 +112,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

@@ -150,12 +150,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

@@ -150,13 +150,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

@@ -95,12 +95,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerProductBrandList(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 dealerProductTypeList({}).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: [], //  树形数据默认展开项

+ 13 - 10
src/views/productManagement/productInfo/list.vue

@@ -179,16 +179,19 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerProductList(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 productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
-            const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
-            const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
-            data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
+          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 productTypeName1 = data.list[i].productTypeName1 ? data.list[i].productTypeName1 : ''
+              const productTypeName2 = data.list[i].productTypeName2 ? ' > ' + data.list[i].productTypeName2 : ''
+              const productTypeName3 = data.list[i].productTypeName3 ? ' > ' + data.list[i].productTypeName3 : ''
+              data.list[i].productTypeName = productTypeName1 + productTypeName2 + productTypeName3
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -286,7 +289,7 @@ export default {
       dealerProductExport(this.queryParam).then(res => {
         this.exportLoading = false
         this.spinning = false
-		downloadExcel(res, '自建产品列表')
+        downloadExcel(res, '自建产品列表')
       })
     },
     //  产品品牌  列表

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

@@ -143,12 +143,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
         })

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

@@ -153,12 +153,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
         })

+ 11 - 8
src/views/purchasingManagement/purchaseOrder/detail.vue

@@ -166,13 +166,16 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return purchaseDetailList(Object.assign(parameter, { purchaseBillSn: 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.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },
@@ -228,10 +231,10 @@ export default {
           })
           reader.readAsText(res)
         } else {
-			downloadExcel(res, '采购产品')
+          downloadExcel(res, '采购产品')
         }
       })
-    },
+    }
   },
   mounted () {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用

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

@@ -201,12 +201,15 @@ export default {
         // 获取统计数据
         this.getTotalData(Object.assign(parameter, this.queryParam))
         return purchaseList(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 - 2
src/views/purchasingManagement/purchaseOrder/outStockModal.vue

@@ -88,9 +88,14 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return purchaseDetailCancelList(parameter).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
         })
       },

+ 15 - 10
src/views/purchasingManagement/purchaseOrder/receivingAddress/chooseAddressModal.vue

@@ -110,18 +110,23 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
+        this.spinning = true
         return shippingAddressQuery(Object.assign(parameter, this.queryParam)).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
+          this.spinning = false
           return data
         })
       },

+ 23 - 20
src/views/purchasingManagement/purchaseOrder/warehousing.vue

@@ -107,30 +107,33 @@ export default {
         this.disabled = true
         this.queryParam.receivingBillSn = parameter.tableId
         return receivingDetail(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].shippedQty = data.list[i].putQty
-            const warehouseSn = data.list[i].warehouseSn || undefined
-            const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
-            if (warehouseSn || warehouseLocationSn) {
-              data.list[i].warehouseSnBackups = warehouseSn
-              data.list[i].warehouseLocationSnBackups = warehouseLocationSn
-              data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
-            } else {
-              //  设置默认仓库
-              if (this.defaultWarehouseCascade.length > 0) {
-                data.list[i].warehouseCascade = this.defaultWarehouseCascade
-                data.list[i].warehouseSn = this.defaultWarehouseCascade[0]
-                data.list[i].warehouseLocationSn = this.defaultWarehouseCascade[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].shippedQty = data.list[i].putQty
+              const warehouseSn = data.list[i].warehouseSn || undefined
+              const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
+              if (warehouseSn || warehouseLocationSn) {
+                data.list[i].warehouseSnBackups = warehouseSn
+                data.list[i].warehouseLocationSnBackups = warehouseLocationSn
+                data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
               } else {
-                data.list[i].warehouseCascade = undefined
+                //  设置默认仓库
+                if (this.defaultWarehouseCascade.length > 0) {
+                  data.list[i].warehouseCascade = this.defaultWarehouseCascade
+                  data.list[i].warehouseSn = this.defaultWarehouseCascade[0]
+                  data.list[i].warehouseLocationSn = this.defaultWarehouseCascade[1]
+                } else {
+                  data.list[i].warehouseCascade = undefined
+                }
               }
             }
+            this.disabled = false
+            this.chooseLoadData[parameter.index] = data.list
           }
-          this.disabled = false
-          this.chooseLoadData[parameter.index] = data.list
           return data
         })
       }

+ 64 - 58
src/views/purchasingManagement/purchaseReturn/detail.vue

@@ -1,56 +1,58 @@
 <template>
   <div class="purchaseReturnDetail-wrap">
-    <a-page-header :ghost="false" :backIcon="false" class="purchaseReturnDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
-      <!-- 自定义的二级文字标题 -->
-      <template slot="subTitle" v-if="!outBizSn">
-        <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
-        <a-button
-          v-if="isEdit"
-          type="primary"
-          size="small"
-          style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
-          id="purchaseReturnDetail-edit-btn"
-          @click.stop="handleEdit">编辑</a-button>
-      </template>
-      <!-- 操作区,位于 title 行的行尾 -->
-      <template slot="extra" v-if="$hasPermissions('B_purchaseReturnPrint')">
-        <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
-      </template>
-    </a-page-header>
-    <!-- 基础信息 -->
-    <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="基础信息">
-          <a-descriptions :column="3">
-            <a-descriptions-item label="客户名称">{{ basicInfoData&&basicInfoData.returnTargetName || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="采退单号">{{ basicInfoData&&basicInfoData.purchaseReturnNo || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="创建时间">{{ basicInfoData&&basicInfoData.createDate || '--' }}</a-descriptions-item>
-            <a-descriptions-item label="退货数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="坏件数量">{{ basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty == 0) ? basicInfoData.totalBadQty : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="返库数量">{{ basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty == 0) ? basicInfoData.totalBackStockQty : '--' }}</a-descriptions-item>
-            <a-descriptions-item label="退货金额">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount == 0) ? basicInfoData.totalAmount : '--' }}</a-descriptions-item>
-          </a-descriptions>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
-    <!-- 产品详情 -->
-    <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
-      <a-collapse :activeKey="['1']">
-        <a-collapse-panel key="1" header="产品详情">
-          <!-- 列表 -->
-          <s-table
-            class="sTable"
-            ref="table"
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-page-header :ghost="false" :backIcon="false" class="purchaseReturnDetail-cont" :style="{ padding: !outBizSn ? '16px 24px' : '0px 24px' }" >
+        <!-- 自定义的二级文字标题 -->
+        <template slot="subTitle" v-if="!outBizSn">
+          <a id="purchaseReturnDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+          <a-button
+            v-if="isEdit"
+            type="primary"
             size="small"
-            :rowKey="(record) => record.id"
-            :columns="columns"
-            :data="loadData"
-            :defaultLoadData="false"
-            bordered>
-          </s-table>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-card>
+            style="background-color: #1890ff;margin-left: 20px;border: #1890ff;"
+            id="purchaseReturnDetail-edit-btn"
+            @click.stop="handleEdit">编辑</a-button>
+        </template>
+        <!-- 操作区,位于 title 行的行尾 -->
+        <template slot="extra" v-if="$hasPermissions('B_purchaseReturnPrint')">
+          <Print :disabled="dataSource.length==0" @handlePrint="handlePrint"></Print>
+        </template>
+      </a-page-header>
+      <!-- 基础信息 -->
+      <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="基础信息">
+            <a-descriptions :column="3">
+              <a-descriptions-item label="客户名称">{{ basicInfoData&&basicInfoData.returnTargetName || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="采退单号">{{ basicInfoData&&basicInfoData.purchaseReturnNo || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="创建时间">{{ basicInfoData&&basicInfoData.createDate || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货数量">{{ basicInfoData&&(basicInfoData.totalQty || basicInfoData.totalQty==0) ? basicInfoData.totalQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="坏件数量">{{ basicInfoData&&(basicInfoData.totalBadQty || basicInfoData.totalBadQty == 0) ? basicInfoData.totalBadQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="返库数量">{{ basicInfoData&&(basicInfoData.totalBackStockQty || basicInfoData.totalBackStockQty == 0) ? basicInfoData.totalBackStockQty : '--' }}</a-descriptions-item>
+              <a-descriptions-item label="退货金额">{{ basicInfoData&&(basicInfoData.totalAmount || basicInfoData.totalAmount == 0) ? basicInfoData.totalAmount : '--' }}</a-descriptions-item>
+            </a-descriptions>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
+      <!-- 产品详情 -->
+      <a-card size="small" :bordered="false" class="purchaseReturnDetail-cont">
+        <a-collapse :activeKey="['1']">
+          <a-collapse-panel key="1" header="产品详情">
+            <!-- 列表 -->
+            <s-table
+              class="sTable"
+              ref="table"
+              size="small"
+              :rowKey="(record) => record.id"
+              :columns="columns"
+              :data="loadData"
+              :defaultLoadData="false"
+              bordered>
+            </s-table>
+          </a-collapse-panel>
+        </a-collapse>
+      </a-card>
+    </a-spin>
   </div>
 </template>
 
@@ -70,6 +72,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
@@ -89,15 +92,18 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return purchaseReturnDetailList(Object.assign(parameter, { purchaseReturnSn: 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
-            // 采购金额  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].purchaseReturnAmount = getOperationalPrecision(data.list[i].cost, 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].purchaseReturnAmount = getOperationalPrecision(data.list[i].cost, data.list[i].qty)
+            }
+            this.disabled = false
+            this.dataSource = data.list
           }
-          this.disabled = false
-          this.dataSource = data.list
           return data
         })
       },

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

@@ -151,12 +151,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return purchaseReturnList(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/reportData/chainCustomerReport/list.vue

@@ -158,15 +158,18 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportBigCustomerLinkageList(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
-              data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
+            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
+                data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
+              }
+              this.disabled = false
             }
-            this.disabled = false
             this.spinning = false
             return data
           })

+ 10 - 7
src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptDetail.vue

@@ -152,14 +152,17 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportChainReceivingBillDetailList(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.$emit('spinning', false)
             return data
           })

+ 10 - 7
src/views/reportData/chainPurchaseReceiptReport/purchaseReceiptOrder.vue

@@ -114,14 +114,17 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportChainReceivingBillList(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.$emit('spinning', false)
             return data
           })

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

@@ -184,14 +184,17 @@ export default {
         if (this.queryParam.auditDate && this.queryParam.tenantId) {
           params.auditDate = this.queryParam.auditDate + '-01'
           return linkageReportPageList(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/chainSalesDetailReport/list.vue

@@ -251,14 +251,17 @@ export default {
         delete params.time
         delete params.warehouseCascade
         return reportChainSalesBillDetailList(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/chainSalesReport/list.vue

@@ -184,14 +184,17 @@ export default {
         this.spinning = true
         delete params.time
         return reportChainSalesBillList(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
         })

+ 34 - 26
src/views/reportData/chainStockReport/detailModal.vue

@@ -8,27 +8,29 @@
     v-model="isShow"
     @cancle="isShow=false"
     :width="960">
-    <!-- 合计 -->
-    <a-alert type="info" style="margin-bottom:10px">
-      <div class="ftext" slot="message">
-        可用库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
-        可用库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 合计 -->
+      <a-alert type="info" style="margin-bottom:10px">
+        <div class="ftext" slot="message">
+          可用库存总数量(个):<strong> {{ (currentStock && currentStock.totalQty) || 0 }} </strong>;
+          可用库存总成本(¥):<strong> {{ (currentStock && currentStock.totalCost) || 0 }} </strong>。
+        </div>
+      </a-alert>
+      <!-- 详情 -->
+      <s-table
+        v-if="openModal"
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.id"
+        :columns="columns"
+        :data="loadData"
+        bordered>
+      </s-table>
+      <div class="btn-cont">
+        <a-button id="chainStockReportDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
       </div>
-    </a-alert>
-    <!-- 详情 -->
-    <s-table
-      v-if="openModal"
-      class="sTable"
-      ref="table"
-      size="small"
-      :rowKey="(record) => record.id"
-      :columns="columns"
-      :data="loadData"
-      bordered>
-    </s-table>
-    <div class="btn-cont">
-      <a-button id="chainStockReportDetail-detail-modal-back" @click="isShow = false">返回列表</a-button>
-    </div>
+    </a-spin>
   </a-modal>
 </template>
 
@@ -59,6 +61,7 @@ export default {
   },
   data () {
     return {
+      spinning: false,
       isShow: this.openModal, //  是否打开弹框
       // 表头
       columns: [
@@ -74,15 +77,20 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        this.spinning = true
         const params = Object.assign(parameter, { productSn: this.productSn, stockSn: this.stockSn })
         return reportStockDetailList(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.getCount(params)
           }
-          // 总计
-          this.getCount(params)
+          this.spinning = false
           return data
         })
       },

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

@@ -159,14 +159,17 @@ export default {
         this.spinning = true
         if (params.tenantId) {
           return reportStockList(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/reportData/customerReport/list.vue

@@ -141,15 +141,18 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportBigCustomerList(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
-              data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
+            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
+                data.list[i].percentageUnit = data.list[i].percentage ? data.list[i].percentage + '%' : undefined
+              }
+              this.disabled = false
             }
-            this.disabled = false
             this.spinning = false
             return data
           })

+ 10 - 7
src/views/reportData/inventoryReport/inventoryDetail.vue

@@ -128,14 +128,17 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportCheckWarehouseDetailList(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.$emit('spinning', false)
             return data
           })

+ 10 - 9
src/views/reportData/inventoryReport/inventoryOrder.vue

@@ -88,20 +88,21 @@ export default {
       loadData: parameter => {
         this.disabled = true
         const params = Object.assign(parameter, this.queryParam)
-        // this.spinning = true
         this.$emit('spinning', true)
         delete params.time
         if (params.beginDate) {
           return reportCheckWarehouseList(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
             this.$emit('spinning', false)
             return data
           })

+ 10 - 7
src/views/reportData/purchaseReceiptReport/purchaseReceiptDetail.vue

@@ -136,14 +136,17 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportReceivingBillDetailList(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.$emit('spinning', false)
             return data
           })

+ 10 - 7
src/views/reportData/purchaseReceiptReport/purchaseReceiptOrder.vue

@@ -98,14 +98,17 @@ export default {
         delete params.time
         if (params.beginDate) {
           return reportReceivingBillList(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.$emit('spinning', false)
             return data
           })

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

@@ -168,14 +168,17 @@ export default {
         this.spinning = true
         if (this.queryParam.beginDate) {
           return reportPageList(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/salesDetailReport/list.vue

@@ -245,14 +245,17 @@ export default {
         delete params.time
         delete params.warehouseCascade
         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
         })

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

@@ -178,14 +178,17 @@ export default {
         this.spinning = true
         delete params.time
         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
         })

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

@@ -100,12 +100,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return giftsDetailList(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/productPricing/list.vue

@@ -95,12 +95,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return dealerProductPriceList(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
         })

+ 21 - 18
src/views/salesManagement/salesQuery/detail.vue

@@ -120,25 +120,28 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return salesDetailList(Object.assign(parameter, { salesBillSn: 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
-            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 || '--'
-            data.list[i].productOrigUnit = productOrigUnit || '--'
-            data.list[i].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
-            data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
-            // 售价小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
-            data.list[i].salePriceSubtotal = 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
+              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 || '--'
+              data.list[i].productOrigUnit = productOrigUnit || '--'
+              data.list[i].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
+              data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
+              // 售价小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].salePriceSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },

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

@@ -211,15 +211,18 @@ export default {
         this.disabled = true
         this.productForm.salesBillSn = this.$route.params.sn
         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
-            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.dataSource = data.list || []
           }
-          this.disabled = false
-          this.dataSource = data.list || []
           return data
         })
       },

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

@@ -247,12 +247,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
         })

+ 19 - 16
src/views/salesManagement/salesReturn/detail.vue

@@ -96,23 +96,26 @@ export default {
         const params = Object.assign(parameter, { salesReturnBillSn: this.$route.params.sn })
         this.getQueryCount(params)
         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
-            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)
-            data.list[i].productCode = productCode || '--'
-            data.list[i].productName = productName || '--'
-            data.list[i].productOrigCode = productOrigCode || '--'
-            // 退货数量和入库数量取值同一个字段,因表格使用统一字段会报错,因此重新定义
-            data.list[i].rkqty = data.list[i].qty || 0
-            // 折后退货金额小计  由于数据库内小数位数为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
+              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)
+              data.list[i].productCode = productCode || '--'
+              data.list[i].productName = productName || '--'
+              data.list[i].productOrigCode = productOrigCode || '--'
+              // 退货数量和入库数量取值同一个字段,因表格使用统一字段会报错,因此重新定义
+              data.list[i].rkqty = data.list[i].qty || 0
+              // 折后退货金额小计  由于数据库内小数位数为4位,页面则需显示2位。因此会做小数运算精度处理
+              data.list[i].saleReturnSubtotal = getOperationalPrecision(data.list[i].price, data.list[i].qty)
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },

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

@@ -174,12 +174,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
         })

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

@@ -119,16 +119,19 @@ export default {
           this.queryParam.salePriceType = this.priceType
         }
         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
-            if (this.grabFlag == 0) {
-              data.list[i].putCost = data.list[i].lastStockCost
+          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.grabFlag == 0) {
+                data.list[i].putCost = data.list[i].lastStockCost
+              }
             }
+            this.listData = data.list || []
+            this.disabled = false
           }
-          this.listData = data.list || []
-          this.disabled = false
           return data
         })
       },

+ 20 - 17
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -238,25 +238,28 @@ export default {
         this.productForm.salesReturnBillSn = this.$route.params.sn
         this.getQueryCount(Object.assign(parameter, this.productForm))
         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].celQtyBackups = data.list[i].celQty
-            data.list[i].priceBackups = data.list[i].price
-            const warehouseSn = data.list[i].warehouseSn || undefined
-            const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
-            if (warehouseSn || warehouseLocationSn) {
-              data.list[i].warehouseSnBackups = warehouseSn
-              data.list[i].warehouseLocationSnBackups = warehouseLocationSn
-              data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
-            } else {
-              data.list[i].warehouseCascade = undefined
+          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].celQtyBackups = data.list[i].celQty
+              data.list[i].priceBackups = data.list[i].price
+              const warehouseSn = data.list[i].warehouseSn || undefined
+              const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
+              if (warehouseSn || warehouseLocationSn) {
+                data.list[i].warehouseSnBackups = warehouseSn
+                data.list[i].warehouseLocationSnBackups = warehouseLocationSn
+                data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
+              } else {
+                data.list[i].warehouseCascade = undefined
+              }
             }
+            this.disabled = false
+            this.chooseLoadData = data.list
           }
-          this.disabled = false
-          this.chooseLoadData = data.list
           return data
         })
       },

+ 19 - 16
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -229,24 +229,27 @@ export default {
         this.productForm.salesReturnBillSn = this.$route.params.sn
         this.getQueryCount(Object.assign(parameter, this.productForm))
         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].celQtyBackups = data.list[i].celQty
-            const warehouseSn = data.list[i].warehouseSn || undefined
-            const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
-            if (warehouseSn || warehouseLocationSn) {
-              data.list[i].warehouseSnBackups = warehouseSn
-              data.list[i].warehouseLocationSnBackups = warehouseLocationSn
-              data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
-            } else {
-              data.list[i].warehouseCascade = undefined
+          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].celQtyBackups = data.list[i].celQty
+              const warehouseSn = data.list[i].warehouseSn || undefined
+              const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
+              if (warehouseSn || warehouseLocationSn) {
+                data.list[i].warehouseSnBackups = warehouseSn
+                data.list[i].warehouseLocationSnBackups = warehouseLocationSn
+                data.list[i].warehouseCascade = [warehouseSn, warehouseLocationSn]
+              } else {
+                data.list[i].warehouseCascade = undefined
+              }
             }
+            this.disabled = false
+            this.chooseLoadData = data.list
           }
-          this.disabled = false
-          this.chooseLoadData = data.list
           return data
         })
       },

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

@@ -105,12 +105,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return employeeList(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/salesManagement/urgentItemsOffset/detail.vue

@@ -110,14 +110,17 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return urgentDetailList(Object.assign(parameter, { urgentBillSn: 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
-            data.list[i].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
-            data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
+          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].warehouseName = data.list[i].warehouseEntity && data.list[i].warehouseEntity.name || '--'
+              data.list[i].warehouseLocationName = data.list[i].warehouseLocationEntity && data.list[i].warehouseLocationEntity.name || '--'
+            }
+            this.disabled = false
           }
-          this.disabled = false
           return data
         })
       },

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

@@ -113,12 +113,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return urgentList(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/storeManagement/bind/list.vue

@@ -88,12 +88,15 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return jxsorgRelationList(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
         })
       },

+ 8 - 5
src/views/storeManagement/userAuthorization/list.vue

@@ -99,12 +99,15 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return userOrgList(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
         })
       },

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

@@ -89,17 +89,20 @@ export default {
         this.disabled = true
         this.spinning = true
         return supplierList(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 provinceName = data.list[i].provinceName ? data.list[i].provinceName : ''
-            const cityName = data.list[i].cityName ? data.list[i].cityName : ''
-            const countyName = data.list[i].countyName ? data.list[i].countyName : ''
-            const supplierAddress = data.list[i].supplierAddress ? data.list[i].supplierAddress : ''
-            data.list[i].address = provinceName + cityName + countyName + supplierAddress
+          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 provinceName = data.list[i].provinceName ? data.list[i].provinceName : ''
+              const cityName = data.list[i].cityName ? data.list[i].cityName : ''
+              const countyName = data.list[i].countyName ? data.list[i].countyName : ''
+              const supplierAddress = data.list[i].supplierAddress ? data.list[i].supplierAddress : ''
+              data.list[i].address = provinceName + cityName + countyName + supplierAddress
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })