فهرست منبع

Merge branch 'develop_lcgz' of jianguan-web/jg-ocs-html into master

gitadmin 3 سال پیش
والد
کامیت
a89b55df5b
100فایلهای تغییر یافته به همراه1448 افزوده شده و 735 حذف شده
  1. 18 0
      src/api/checkWarehouse.js
  2. 19 0
      src/api/dispatch.js
  3. 22 0
      src/api/settleReceipt.js
  4. 2 1
      src/components/newThem.less
  5. 38 0
      src/config/router.config.js
  6. 1 1
      src/utils/request.js
  7. 8 5
      src/views/allocationManagement/transferOut/detail.vue
  8. 8 5
      src/views/allocationManagement/transferOut/list.vue
  9. 7 4
      src/views/basicData/transferTypeManagement/list.vue
  10. 8 5
      src/views/basicData/warehouse/list.vue
  11. 8 5
      src/views/basicData/warehouse/storingLocation/list.vue
  12. 8 5
      src/views/common/chooseCustomerModal.vue
  13. 136 0
      src/views/dataExport/exportCheck/list.vue
  14. 9 6
      src/views/dealerManagement/dealerAccountManagement/list.vue
  15. 8 5
      src/views/dealerManagement/marketingDivisionSet/list.vue
  16. 9 6
      src/views/dealerManagement/merchantInfoManagement/list.vue
  17. 10 7
      src/views/dealerManagement/merchantInfoManagement/permissionSetting.vue
  18. 8 5
      src/views/dealerManagement/rebateSettings/list.vue
  19. 68 54
      src/views/financialManagement/financialCollection/list.vue
  20. 36 33
      src/views/financialManagement/inventoryConfirmation/detail.vue
  21. 8 5
      src/views/financialManagement/inventoryConfirmation/list.vue
  22. 8 5
      src/views/financialManagement/returnConfirmation/detailModal.vue
  23. 8 5
      src/views/financialManagement/returnConfirmation/list.vue
  24. 8 5
      src/views/financialManagement/warehousingConfirmation/detailModal.vue
  25. 5 2
      src/views/financialManagement/warehousingConfirmation/list.vue
  26. 8 5
      src/views/inventoryManagement/intelligentReplenishment/import.vue
  27. 6 3
      src/views/inventoryManagement/intelligentReplenishment/list.vue
  28. 7 4
      src/views/inventoryManagement/intelligentReplenishment/productRange.vue
  29. 5 2
      src/views/inventoryManagement/intelligentReplenishment/serviceLevelModal.vue
  30. 17 11
      src/views/inventoryManagement/inventoryCheck/list.vue
  31. 10 7
      src/views/inventoryManagement/inventoryQuery/detailModal.vue
  32. 19 16
      src/views/inventoryManagement/inventoryQuery/list.vue
  33. 13 10
      src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue
  34. 14 11
      src/views/inventoryManagement/inventoryWarning/list.vue
  35. 8 5
      src/views/inventoryManagement/makeInventory/list.vue
  36. 8 5
      src/views/inventoryManagement/supervisionDisk/list.vue
  37. 8 5
      src/views/power/OperateJournal/OperateJournal.vue
  38. 10 6
      src/views/power/role/roleList.vue
  39. 10 6
      src/views/power/user/userList.vue
  40. 8 5
      src/views/productManagement/newProduct/list.vue
  41. 7 4
      src/views/productManagement/newProduct/modal.vue
  42. 9 6
      src/views/productManagement/priceChangeRecord/list.vue
  43. 8 5
      src/views/productManagement/productBrand/list.vue
  44. 11 7
      src/views/productManagement/productCategory/list.vue
  45. 8 5
      src/views/productManagement/productInfo/list.vue
  46. 5 2
      src/views/productManagement/productLaunchAudit/list.vue
  47. 12 9
      src/views/productManagement/productLevel/list.vue
  48. 5 2
      src/views/productManagement/productOfflineAudit/list.vue
  49. 9 6
      src/views/productManagement/productPricing/list.vue
  50. 8 5
      src/views/productManagement/productUniversal/list.vue
  51. 11 8
      src/views/promotionRulesManagement/orderStatistics/detailModal.vue
  52. 14 11
      src/views/promotionRulesManagement/orderStatistics/list.vue
  53. 11 8
      src/views/promotionRulesManagement/productStatistics/detailModal.vue
  54. 9 6
      src/views/promotionRulesManagement/productStatistics/list.vue
  55. 16 13
      src/views/promotionRulesManagement/promotionRules/list.vue
  56. 16 13
      src/views/promotionRulesManagement/promotionRules/rule.vue
  57. 14 11
      src/views/purchasingManagement/bulkWarehousingOrder/detailModal.vue
  58. 10 7
      src/views/purchasingManagement/bulkWarehousingOrder/edit.vue
  59. 8 5
      src/views/purchasingManagement/bulkWarehousingOrder/list.vue
  60. 9 6
      src/views/reportData/actualSalesReport/list.vue
  61. 10 7
      src/views/reportData/allocationDetails/list.vue
  62. 10 7
      src/views/reportData/allocationOrderTotal/list.vue
  63. 9 6
      src/views/reportData/allocationPresentation/list.vue
  64. 9 6
      src/views/reportData/billingReturnReport/list.vue
  65. 12 9
      src/views/reportData/hPriceDifferenceDetailReport/list.vue
  66. 10 7
      src/views/reportData/priceDifferenceDetailReport/list.vue
  67. 10 7
      src/views/reportData/returnGoodsPresentation/list.vue
  68. 9 6
      src/views/reportData/returnSlipReport/list.vue
  69. 9 6
      src/views/reportData/salesAmountReport/list.vue
  70. 9 6
      src/views/reportData/salesDetails/list.vue
  71. 9 6
      src/views/reportData/salesOrderTotal/list.vue
  72. 9 6
      src/views/reportData/salesPresentation/list.vue
  73. 9 6
      src/views/reportData/salesReturnDetailReport/list.vue
  74. 9 6
      src/views/reportData/salesReturnReport/list.vue
  75. 9 6
      src/views/reportData/salesReturnsReport/list.vue
  76. 9 6
      src/views/reportData/salesSlipReport/list.vue
  77. 9 6
      src/views/reportData/warehousingOrder/list.vue
  78. 9 6
      src/views/reportData/warehousingOrderDetail/list.vue
  79. 11 8
      src/views/salesManagement/backorder/detailModal.vue
  80. 8 5
      src/views/salesManagement/backorder/list.vue
  81. 130 0
      src/views/salesManagement/examineVerify/auditRejectModal.vue
  82. 44 15
      src/views/salesManagement/examineVerify/list.vue
  83. 20 11
      src/views/salesManagement/outboundOrder/list.vue
  84. 30 16
      src/views/salesManagement/pushOrderManagement/detail.vue
  85. 21 12
      src/views/salesManagement/pushOrderManagement/list.vue
  86. 9 6
      src/views/salesManagement/salesQuery/chooseActive.vue
  87. 38 32
      src/views/salesManagement/salesQuery/detail.vue
  88. 11 8
      src/views/salesManagement/salesQuery/edit.vue
  89. 20 13
      src/views/salesManagement/salesQuery/list.vue
  90. 15 12
      src/views/salesManagement/salesQuery/queryPart.vue
  91. 8 5
      src/views/salesManagement/salesQuery/queryPromotable.vue
  92. 13 10
      src/views/salesManagement/salesQuery/receivingAddress/chooseAddressModal.vue
  93. 11 8
      src/views/salesManagement/salesReturn/detail.vue
  94. 8 5
      src/views/salesManagement/salesReturn/list.vue
  95. 9 6
      src/views/salesManagement/salesReturn/queryPart.vue
  96. 10 7
      src/views/salesManagement/salesReturn/salesReturnCheck.vue
  97. 11 8
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  98. 11 8
      src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue
  99. 11 8
      src/views/salesManagement/shortageStatisticsC/list.vue
  100. 11 8
      src/views/salesManagement/shortageStatisticsP/list.vue

+ 18 - 0
src/api/checkWarehouse.js

@@ -134,3 +134,21 @@ export const checkWarehouseDetailFinanceList = (params) => {
     method: 'post'
   })
 }
+// 数据导出  导出盘点   盘点列表
+export const checkWarehouseExcelList = (params) => {
+  return axios({
+    url: `/checkWarehouse/excelList`,
+    method: 'get'
+  })
+}
+// 数据导出  导出盘点   盘点列表  导出
+export const checkWarehouseExport = params => {
+  const url = `/checkWarehouse/excel/${params.checkWarehouseSn}`
+  delete params.checkWarehouseSn
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 19 - 0
src/api/dispatch.js

@@ -92,3 +92,22 @@ export const dispatchDetailExcel = params => {
     responseType: 'blob'
   })
 }
+// 备货审核列表分页
+export const dispatchlBhshList = (params) => {
+  const url = `/dispatch/queryBhshPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+// 发货单统计查询
+export const dispatchQueryBhshCount = (params) => {
+  return axios({
+    url: '/dispatch/queryBhshCount',
+    data: params,
+    method: 'post'
+  })
+}

+ 22 - 0
src/api/settleReceipt.js

@@ -0,0 +1,22 @@
+import { axios } from '@/utils/request'
+
+//  财务收款  列表  分页
+export const settleReceiptList = (params) => {
+  const url = `/settleReceipt/queryPage/${params.pageNo}/${params.pageSize}`
+  delete params.pageNo
+  delete params.pageSize
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}
+//  财务收款  收款
+export const settleReceipt = (params) => {
+  const url = `/settleReceipt/receipt/${params.sn}`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 2 - 1
src/components/newThem.less

@@ -6,4 +6,5 @@
 @menu-item-height: 30px;
 @collapse-header-padding: 6px 8px;
 @table-padding-vertical: 5px;
-@table-padding-horizontal: 5px;
+@table-padding-horizontal: 5px;
+@input-disabled-bg: #dedede;

+ 38 - 0
src/config/router.config.js

@@ -1502,6 +1502,44 @@ export const asyncRouterMap = [
           }
         ]
       },
+      // 数据导出
+      {
+        path: '/dataExport',
+        redirect: '/dataExport/exportCheck',
+        component: PageView,
+        meta: {
+          title: '数据导出',
+          icon: 'money-collect',
+          permission: 'M_dataExport'
+        },
+        children: [
+          {
+            path: '/dataExport/exportCheck',
+            redirect: '/dataExport/exportCheck/list',
+            name: 'exportCheck',
+            component: BlankLayout,
+            meta: {
+              title: '导出盘点',
+              icon: 'gold',
+              permission: 'M_exportCheck'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'exportCheckList',
+                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportCheck/list.vue'),
+                meta: {
+                  title: '导出盘点',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'M_exportCheck'
+                }
+              }
+            ]
+          }
+        ]
+      },
       // 产品管理
       {
         path: '/productManagement',

+ 1 - 1
src/utils/request.js

@@ -13,7 +13,7 @@ const service = axios.create({
 })
 
 const err = (error) => {
-  console.log(error.response.data.message, 'error')
+  console.log(error, 'error')
   if (error.response) {
     const status = error.response.status
     if ((status == 503 || status == 500) && window.location.pathname != '/user/login') {

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

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

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

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

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

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

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

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

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

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

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

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

+ 136 - 0
src/views/dataExport/exportCheck/list.vue

@@ -0,0 +1,136 @@
+<template>
+  <a-card size="small" :bordered="false" class="exportCheckList-wrap">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <!-- 搜索条件 -->
+      <div ref="tableSearch" class="table-page-search-wrapper">
+        <a-form-model
+          id="exportCheckList-form"
+          ref="ruleForm"
+          class="form-model-con"
+          layout="inline"
+          :model="queryParam"
+          :rules="rules"
+          :labelCol="labelCol"
+          :wrapperCol="wrapperCol"
+          @keyup.enter.native="handleSearch" >
+          <a-row :gutter="15">
+            <a-col :md="10" :sm="24">
+              <a-form-model-item label="选择盘点单" prop="checkWarehouseSn">
+                <a-select id="exportCheckList-print" v-model="queryParam.checkWarehouseSn" placeholder="请选择盘点单" allowClear>
+                  <a-select-option v-for="item in checkList" :value="item.checkWarehouseSn" :key="item.checkWarehouseSn">
+                    <span>{{ item.financeAuditTime }} - {{ item.checkWarehouseNo }}</span>
+                  </a-select-option>
+                </a-select>
+              </a-form-model-item>
+            </a-col>
+            <a-col :md="6" :sm="24">
+              <a-button
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                :loading="exportLoading"
+                id="exportCheckList-export">导出</a-button>
+            </a-col>
+          </a-row>
+        </a-form-model>
+      </div>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { STable, VSelect } from '@/components'
+import { checkWarehouseExcelList, checkWarehouseExport } from '@/api/checkWarehouse'
+import { hdExportExcel } from '@/libs/exportExcel'
+export default {
+  components: { STable, VSelect },
+  data () {
+    return {
+      spinning: false,
+      tableHeight: 0,
+      labelCol: { span: 8 },
+      wrapperCol: { span: 16 },
+      queryParam: { //  查询条件
+        checkWarehouseSn: undefined
+      },
+      rules: {
+        'checkWarehouseSn': [{ required: true, message: '请选择盘点单', trigger: 'change' }]
+      },
+      disabled: false, //  查询、重置按钮是否可操作
+      exportLoading: false,
+      checkList: []
+    }
+  },
+  methods: {
+    getList () {
+      checkWarehouseExcelList().then(res => {
+        if (res.status == 200) {
+          this.checkList = res.data || []
+        } else {
+          this.checkList = []
+        }
+      })
+    },
+    //  导出
+    handleExport () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          const params = _this.queryParam
+          _this.exportLoading = true
+          _this.spinning = true
+          hdExportExcel(checkWarehouseExport, params, '导出盘点', function () {
+            _this.exportLoading = false
+            _this.spinning = false
+          })
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    pageInit () {
+      const _this = this
+      this.$nextTick(() => { // 页面渲染完成后的回调
+        _this.setTableH()
+      })
+      this.queryParam.checkWarehouseSn = undefined
+      this.$refs.ruleForm.resetFields()
+      this.getList()
+    },
+    setTableH () {
+      const tableSearchH = this.$refs.tableSearch.offsetHeight
+      this.tableHeight = window.innerHeight - tableSearchH - 238
+    }
+  },
+  watch: {
+    '$store.state.app.winHeight' (newValue, oldValue) { //  窗口变更时,需同时更改表格高度
+      this.setTableH()
+    }
+  },
+  mounted () {
+    if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
+      this.pageInit()
+    }
+  },
+  activated () {
+    // 如果是新页签打开,则重置当前页面
+    if (this.$store.state.app.isNewTab) {
+      this.pageInit()
+    }
+    // 仅刷新列表,不重置页面
+    if (this.$store.state.app.updateList) {
+      this.pageInit()
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {})
+  }
+}
+</script>
+<style lang="less">
+  .exportCheckList-wrap{
+    height: 99%;
+  }
+</style>

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

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

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

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

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

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

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

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

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

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

+ 68 - 54
src/views/financialManagement/financialCollection/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="经销商名称">
-                <a-input id="financialCollectionList-buyerName" v-model.trim="queryParam.buyerName" allowClear placeholder="请输入经销商名称"/>
+                <a-input id="financialCollectionList-settleClientName" v-model.trim="queryParam.settleClientName" allowClear placeholder="请输入经销商名称"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -30,9 +30,9 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
                   <v-select
-                    v-model="queryParam.settleStyleSn"
-                    ref="settleStyleSn"
-                    id="financialCollectionList-settleStyleSn"
+                    v-model="queryParam.settleStyle"
+                    ref="settleStyle"
+                    id="financialCollectionList-settleStyle"
                     code="SETTLE_STYLE"
                     placeholder="请选择收款方式"
                     allowClear></v-select>
@@ -49,7 +49,7 @@
                     v-model="queryParam.billStatus"
                     ref="billStatus"
                     id="financialCollectionList-billStatus"
-                    code="SALES_RECEIVE_LIST_STATUS"
+                    code="DISPATCH_BILL_STATUS"
                     placeholder="请选择业务状态"
                     allowClear></v-select>
                 </a-form-item>
@@ -57,9 +57,9 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="财务状态">
                   <v-select
-                    v-model="queryParam.financialStatus"
-                    ref="financialStatus"
-                    id="financialCollectionList-financialStatus"
+                    v-model="queryParam.settleState"
+                    ref="settleState"
+                    id="financialCollectionList-settleState"
                     code="FINANCIAL_RECEIVE_STATUS"
                     placeholder="请选择财务状态"
                     allowClear></v-select>
@@ -122,15 +122,24 @@
         :defaultLoadData="false"
         bordered>
         <!-- 单号 -->
-        <template slot="salesBillNo" slot-scope="text, record">
-          <span :class="$hasPermissions('B_salesDetail')?'active':'common'" @click="handleDetail(record)">{{ record.salesBillNo }}</span>
+        <template slot="bizNo" slot-scope="text, record">
+          <span :class="$hasPermissions('B_salesDetail')?'active':'common'"v-if="$hasPermissions('B_salesDetail')" @click="handleDetail(record)">{{ record.bizNo }}</span>
+        </template>
+        <!-- 下推单号 -->
+        <template slot="dispatchBillNo" slot-scope="text, record">
+          <span :class="$hasPermissions('B_dispatchDetail')?'active':'common'" v-if="$hasPermissions('B_dispatchDetail')" @click="handleBhDetail(record)">{{ record.dispatchBillNo || '--' }}</span>
+          <span v-else>{{ record.dispatchBillNo || '--' }}</span>
+        </template>
+        <!-- 单据状态 -->
+        <template slot="voidFlag" slot-scope="text, record">
+          <span>{{ record.voidFlag==1 ? '作废' : record.voidFlag==0 ? '有效' : '--' }}</span>
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <a-button
             size="small"
             type="link"
-            v-if="record.financialStatus=='WAIT' && $hasPermissions('B_financialCollection_receipt')"
+            v-if="record.settleState=='WAIT' && record.voidFlag!=1 && $hasPermissions('B_financialCollection_receipt')"
             class="button-warning"
             @click="handleAudit(record)"
             id="financialCollectionList-audit-btn">收款</a-button>
@@ -148,7 +157,7 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
-import { salesReceiptList, salesReceipt } from '@/api/sales'
+import { settleReceiptList, settleReceipt } from '@/api/settleReceipt'
 export default {
   components: { STable, VSelect, subarea, rangeDate },
   data () {
@@ -156,16 +165,16 @@ export default {
       spinning: false,
       tableHeight: 0,
       queryParam: { //  查询条件
-        beginAuditDate: getDate.getThreeMonthDays().starttime,
-        endAuditDate: getDate.getCurrMonthDays().endtime,
-        beginSettleDate: '',
-        endSettleDate: '',
-        buyerName: '',
+        beginDate: getDate.getThreeMonthDays().starttime + ' 00:00:00',
+        endDate: getDate.getCurrMonthDays().endtime + ' 23:59:59',
+        beginDateSettle: '',
+        endDateSettle: '',
+        settleClientName: '',
         dealerLevel: undefined,
-        settleStyleSn: undefined,
+        settleStyle: undefined,
         subareaSn: undefined,
         billStatus: undefined,
-        financialStatus: undefined,
+        settleState: undefined,
         dealerProvinceSn: undefined,
         dealerCitySn: undefined,
         dealerCountySn: undefined
@@ -180,14 +189,17 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return salesReceiptList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+        return settleReceiptList(Object.assign(parameter, this.queryParam)).then(res => {
+          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
         })
@@ -202,22 +214,23 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '审核时间', dataIndex: 'auditDate', width: '11.5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '15%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'buyerName', align: 'center', width: '12%', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '商户级别', dataIndex: 'dealerEntity.dealerLevelDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售数量', dataIndex: 'totalQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '订单金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款时间', dataIndex: 'settleDate', width: '11.5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '备注', dataIndex: 'remarks', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'createDate', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', scopedSlots: { customRender: 'bizNo' }, width: '10%', align: 'center' },
+        { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '10%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'settleClientName', align: 'left', width: '9%', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商户级别', dataIndex: 'dealerLevelDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '销售金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '收款时间', dataIndex: 'settleTime', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备注', dataIndex: 'remark', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '财务状态', dataIndex: 'settleStateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据状态', dataIndex: 'voidFlag', scopedSlots: { customRender: 'voidFlag' }, width: '6%', align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '4%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
-        arr.splice(6, 0, { title: '订单金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(6, 0, { title: '销售金额', dataIndex: 'totalAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }
@@ -225,13 +238,13 @@ export default {
   methods: {
     //  审核时间  change
     dateAuditChange (date) {
-      this.queryParam.beginAuditDate = date[0]
-      this.queryParam.endAuditDate = date[1]
+      this.queryParam.beginDate = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDate = date[1] ? date[1] + ' 23:59:59' : ''
     },
     //  收款时间  change
     dateSettleChange (date) {
-      this.queryParam.beginSettleDate = date[0]
-      this.queryParam.endSettleDate = date[1]
+      this.queryParam.beginDateSettle = date[0] ? date[0] + ' 00:00:00' : ''
+      this.queryParam.endDateSettle = date[1] ? date[1] + ' 23:59:59' : ''
     },
     //  重置
     resetSearchForm () {
@@ -239,16 +252,16 @@ export default {
       if (this.advanced) { //  查询条件未展开时,该组件未渲染
         this.$refs.rangeSettleDate.resetDate()
       }
-      this.queryParam.beginAuditDate = getDate.getThreeMonthDays().starttime
-      this.queryParam.endAuditDate = getDate.getCurrMonthDays().endtime
-      this.queryParam.beginSettleDate = ''
-      this.queryParam.endSettleDate = ''
-      this.queryParam.buyerName = ''
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime + ' 00:00:00'
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime + ' 23:59:59'
+      this.queryParam.beginDateSettle = ''
+      this.queryParam.endDateSettle = ''
+      this.queryParam.settleClientName = ''
       this.queryParam.dealerLevel = undefined
-      this.queryParam.settleStyleSn = undefined
+      this.queryParam.settleStyle = undefined
       this.queryParam.subareaSn = undefined
       this.queryParam.billStatus = undefined
-      this.queryParam.financialStatus = undefined
+      this.queryParam.settleState = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined
       this.queryParam.dealerCountySn = undefined
@@ -256,9 +269,10 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      if (this.$hasPermissions('B_salesDetail')) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
-      }
+      this.$router.push({ name: 'salesDetail', params: { sn: row.bizSn, type: 'financialCollection' } })
+    },
+    handleBhDetail (row) {
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'financialCollection' } })
     },
     // 收款
     handleAudit (row) {
@@ -269,7 +283,7 @@ export default {
         centered: true,
         onOk () {
           _this.spinning = true
-          salesReceipt({ sn: row.salesBillSn }).then(res => {
+          settleReceipt({ sn: row.accountReceiptSn }).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)
               _this.$refs.table.refresh()

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 17 - 11
src/views/inventoryManagement/inventoryCheck/list.vue

@@ -116,12 +116,15 @@ export default {
         this.disabled = true
         this.spinning = true
         return checkWarehouseList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -176,13 +179,16 @@ export default {
         this.spinning = false
         if (res.status == 200) {
           if (res.data && res.data.length > 0) {
+            // this.modalHtml = `<div style="width: 100%">
+            //   <h3 style="font-size: 15px;font-weight: bold;margin: 20px 0 5px;text-align: center;">存在以下状态的销售单,无法盘点。</h3>
+            //   <h3 style="font-size: 15px;font-weight: bold;margin-bottom: 25px;text-align: center;">请先检查并处理完以下单据再试。</h3>
+            //   ${res.data.indexOf('WAIT_AUDIT') != -1 ? '<p>销售单-待审核(总部自建)</p>' : ''}
+            //   ${res.data.indexOf('AUDIT_REJECT') != -1 ? '<p>销售单-审核不通过(总部自建)</p>' : ''}
+            //   ${res.data.indexOf('HQ_CHANGE') != -1 ? '<p>销售单-总公司改单</p>' : ''}
+            //   ${res.data.indexOf('WAIT_PUSH') != -1 ? '<p>销售单-待下推</p>' : ''}
+            // </div>`
             this.modalHtml = `<div style="width: 100%">
-              <h3 style="font-size: 15px;font-weight: bold;margin: 20px 0 5px;text-align: center;">存在以下状态的销售单,无法盘点。</h3>
-              <h3 style="font-size: 15px;font-weight: bold;margin-bottom: 25px;text-align: center;">请先检查并处理完以下单据再试。</h3>
-              ${res.data.indexOf('WAIT_AUDIT') != -1 ? '<p>销售单-待审核(总部自建)</p>' : ''}
-              ${res.data.indexOf('AUDIT_REJECT') != -1 ? '<p>销售单-审核不通过(总部自建)</p>' : ''}
-              ${res.data.indexOf('HQ_CHANGE') != -1 ? '<p>销售单-总公司改单</p>' : ''}
-              ${res.data.indexOf('WAIT_PUSH') != -1 ? '<p>销售单-待下推</p>' : ''}
+              ${res.data.indexOf('WAIT_PUSH') != -1 ? '<p>存在“待下推”状态的销售单,无法盘点。</p>' : ''}
             </div>`
             this.openCommonModal = true
           } else {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 130 - 0
src/views/salesManagement/examineVerify/auditRejectModal.vue

@@ -0,0 +1,130 @@
+<template>
+  <a-modal
+    centered
+    class="auditRejectModal-modal"
+    :footer="null"
+    :maskClosable="false"
+    :closable="false"
+    title="备注原因"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="800">
+    <div>
+      <a-spin :spinning="spinning" tip="Loading...">
+        <a-form-model
+          id="auditRejectModal-form"
+          ref="ruleForm"
+          :model="form"
+          :rules="rules"
+          :label-col="formItemLayout.labelCol"
+          :wrapper-col="formItemLayout.wrapperCol"
+        >
+          <a-form-model-item label="备货单号">
+            {{ (itemData && itemData.dispatchBillNo) || '--' }}
+          </a-form-model-item>
+          <a-form-model-item label="原因" prop="remarks">
+            <a-input
+              id="auditRejectModal-remarks"
+              :maxLength="100"
+              type="textarea"
+              v-model="form.remarks"
+              ref="remarks"
+              placeholder="请输入原因(最多100个字符)"
+              allowClear />
+          </a-form-model-item>
+        </a-form-model>
+        <div class="btn-cont">
+          <a-button type="primary" id="auditRejectModal-save" @click="handleSave">提交</a-button>
+          <a-button id="auditRejectModal-cancel" @click="isShow = false" style="margin-left: 15px;">取消</a-button>
+        </div>
+      </a-spin>
+    </div>
+  </a-modal>
+</template>
+
+<script>
+export default {
+  name: 'AuditRejectModal',
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    spinning: {
+      type: Boolean,
+      default: false
+    },
+    itemData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 4 },
+        wrapperCol: { span: 17 }
+      },
+      form: {
+        remarks: ''
+      },
+      rules: {
+        remarks: [
+          { required: false, message: '请输入原因', trigger: 'blur' }
+        ]
+      },
+      detailData: null //  数据详情
+    }
+  },
+  methods: {
+    // 保存
+    handleSave () {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$emit('ok', _this.form.remarks)
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.$refs.ruleForm.resetFields()
+      } else {
+        // 默认首项获取焦点
+        const _this = this
+        setTimeout(() => {
+          if (_this.$refs['remarks']) {
+            _this.$refs['remarks'].focus()
+          }
+        }, 300)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .auditRejectModal-modal{
+    .ant-modal-body {
+      padding: 40px 40px 24px;
+    }
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 30px;
+    }
+  }
+</style>

+ 44 - 15
src/views/salesManagement/examineVerify/list.vue

@@ -120,6 +120,7 @@
     </a-spin>
     <!-- 审核 -->
     <auditModal :openModal="visibleAudit" :spinning="spinningAudit" @close="visibleAudit=false" @ok="auditOrder('OUTING_WAREHOUSE')" @fail="auditOrder('STOCK_UP_REJECT')" />
+    <auditRejectModal :openModal="visibleAuditReject" :spinning="spinningAuditReject" :itemData="auditInfo" @close="visibleAuditReject=false" @ok="auditReject" />
   </a-card>
 </template>
 
@@ -132,9 +133,10 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import { STable, VSelect } from '@/components'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
-import { dispatchlList, dispatchQueryCount, dispatchStockUpAduit } from '@/api/dispatch'
+import auditRejectModal from './auditRejectModal.vue'
+import { dispatchlBhshList, dispatchQueryBhshCount, dispatchStockUpAduit } from '@/api/dispatch'
 export default {
-  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, auditModal, subarea },
+  components: { STable, VSelect, dealerSubareaScopeList, rangeDate, auditModal, subarea, auditRejectModal },
   data () {
     return {
       spinning: false,
@@ -169,24 +171,29 @@ export default {
         this.disabled = true
         this.spinning = true
         // 查询总计
-        dispatchQueryCount(Object.assign(parameter, this.queryParam)).then(res => {
+        dispatchQueryBhshCount(Object.assign(parameter, this.queryParam)).then(res => {
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
-        return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+        return dispatchlBhshList(Object.assign(parameter, this.queryParam)).then(res => {
+          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
         })
       },
       addrProvinceList: [], //  省下拉
       visibleAudit: false,
+      visibleAuditReject: false,
       auditInfo: null,
-      spinningAudit: false
+      spinningAudit: false,
+      spinningAuditReject: false
     }
   },
   computed: {
@@ -243,25 +250,47 @@ export default {
       this.visibleAudit = true
     },
     auditOrder (billStatus) {
+      if (billStatus == 'STOCK_UP_REJECT') { // 审核不通过
+        this.visibleAuditReject = true
+      } else {
+        const params = {
+          dispatchBillSn: this.auditInfo.dispatchBillSn,
+          billStatus: billStatus
+        }
+        this.auditFun(params)
+      }
+    },
+    auditFun (params) {
       this.spinningAudit = true
-      dispatchStockUpAduit({
-        dispatchBillSn: this.auditInfo.dispatchBillSn,
-        billStatus: billStatus
-      }).then(res => {
+      this.spinningAuditReject = true
+      dispatchStockUpAduit(params).then(res => {
         if (res.status == 200) {
           this.visibleAudit = false
+          this.visibleAuditReject = false
           this.$message.success(res.message)
           this.$refs.table.refresh()
           this.spinningAudit = false
+          this.spinningAuditReject = false
         } else {
           this.visibleAudit = false
+          this.visibleAuditReject = false
           this.spinningAudit = false
+          this.spinningAuditReject = false
         }
       })
     },
+    // 审核不通过  提交
+    auditReject (remarks) {
+      const params = {
+        dispatchBillSn: this.auditInfo.dispatchBillSn,
+        billStatus: 'STOCK_UP_REJECT',
+        remarks: remarks
+      }
+      this.auditFun(params)
+    },
     //  详情
     handleDetail (row) {
-      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'examineVerify' } })
     },
     //  省/市/区
     getArea (leve, sn) {

+ 20 - 11
src/views/salesManagement/outboundOrder/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="审核时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -131,7 +131,9 @@
 </template>
 
 <script>
+import moment from 'moment'
 import rangeDate from '@/views/common/rangeDate.vue'
+import getDate from '@/libs/getDate.js'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import pushOrderDetailModal from '@/views/salesManagement/pushOrderManagement/detail.vue'
@@ -145,9 +147,13 @@ export default {
       spinning: false,
       advanced: false, // 高级搜索 展开/关闭
       tableHeight: 0,
+      time: [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ],
       queryParam: { //  查询条件
-        beginDate: '',
-        endDate: '',
+        beginDate: getDate.getThreeMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         demanderName: '', //  客户名称
         outBizType: undefined, //  出库类型
         stockOutNo: '',
@@ -165,12 +171,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
         })
@@ -242,9 +251,9 @@ export default {
     },
     //  重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
+      this.$refs.rangeDate.resetDate(this.time)
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.demanderName = ''
       this.queryParam.outBizType = undefined
       this.queryParam.state = undefined

+ 30 - 16
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -61,6 +61,9 @@
             </span>
             本次下推数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
             <span v-if="$hasPermissions('B_isShowPrice')">本次下推金额:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? detailData.totalAmount : '--' }}</strong>;</span>
+            <span v-if="$route.params.type!='stockOut'">
+              本次下推市级价金额:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? detailData.totalCityAmount : '--' }}</strong>;
+            </span>
           </div>
         </a-alert>
         <!-- 列表 -->
@@ -124,21 +127,24 @@ export default {
       loadData: parameter => {
         this.disabled = true
         return dispatchDetaillList(Object.assign(parameter, { dispatchBillSn: this.outBizSubSn || this.$route.params.sn })).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
-            const productCode = (data.list[i].productEntity && data.list[i].productEntity.code) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.code)
-            const productName = (data.list[i].productEntity && data.list[i].productEntity.name) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.name)
-            const productOrigCode = (data.list[i].productEntity && data.list[i].productEntity.origCode) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.origCode)
-            const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
-            data.list[i].productCode = productCode || '--'
-            data.list[i].productName = productName || '--'
-            data.list[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
-            data.list[i].productOrigUnit = productOrigUnit || '--'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+              const productCode = (data.list[i].productEntity && data.list[i].productEntity.code) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.code)
+              const productName = (data.list[i].productEntity && data.list[i].productEntity.name) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.name)
+              const productOrigCode = (data.list[i].productEntity && data.list[i].productEntity.origCode) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.origCode)
+              const productOrigUnit = (data.list[i].productEntity && data.list[i].productEntity.unit) || (data.list[i].dealerProductEntity && data.list[i].dealerProductEntity.unit)
+              data.list[i].productCode = productCode || '--'
+              data.list[i].productName = productName || '--'
+              data.list[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
+              data.list[i].productOrigUnit = productOrigUnit || '--'
+            }
+            this.localDataSource = data.list
+            this.disabled = false
           }
-          this.localDataSource = data.list
-          this.disabled = false
           return data
         })
       },
@@ -158,13 +164,15 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', width: '19%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productOrigUnit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '销售价格', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '销售数量', dataIndex: 'salesQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '本次下推数', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowPrice')) { //  售价权限
         arr.splice(5, 0, { title: '销售价格', dataIndex: 'price', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(8, 0, { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(6, 0, { title: '市级销售价格', dataIndex: 'cityPrice', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(9, 0, { title: '本次下推金额', dataIndex: 'totalAmount', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }
@@ -172,7 +180,13 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
+      if (this.$route.params.type == 'pushOrder') { // 下推
+        this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'examineVerify') { // 备货审核
+        this.$router.push({ path: '/salesManagement/examineVerify/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'financialCollection') { // 财务收款
+        this.$router.push({ path: '/financialManagement/financialCollection/list', query: { closeLastOldTab: true } })
+      }
     },
     //  详情
     getDetail () {

+ 21 - 12
src/views/salesManagement/pushOrderManagement/list.vue

@@ -7,7 +7,7 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="创建时间">
-                <rangeDate ref="rangeDate" @change="dateChange" />
+                <rangeDate ref="rangeDate" :value="time" @change="dateChange" />
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -101,6 +101,8 @@
 </template>
 
 <script>
+import moment from 'moment'
+import getDate from '@/libs/getDate.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { STable, VSelect } from '@/components'
 import subarea from '@/views/common/subarea.js'
@@ -116,10 +118,14 @@ export default {
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       tableHeight: 0,
+      time: [
+        moment(getDate.getThreeMonthDays().starttime, 'YYYY-MM-DD'),
+        moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
+      ],
       // 查询参数
       queryParam: {
-        beginDate: '',
-        endDate: '',
+        beginDate: getDate.getThreeMonthDays().starttime,
+        endDate: getDate.getCurrMonthDays().endtime,
         buyerSn: undefined, //  客户名称
         salesBillNo: '', //  销售单号
         dispatchBillNo: '', //  备货单号
@@ -141,12 +147,15 @@ export default {
           this.totalData = Object.assign(this.totalData, res.data || {})
         })
         return dispatchlList(Object.assign(parameter, this.queryParam)).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
           }
-          this.disabled = false
           this.spinning = false
           return data
         })
@@ -186,16 +195,16 @@ export default {
     // 详情
     handleDetail (row, type) {
       if (type == 0) {
-        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn, type: 'pushOrder' } })
       } else {
         this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
       }
     },
     // 重置
     resetSearchForm () {
-      this.$refs.rangeDate.resetDate()
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
+      this.$refs.rangeDate.resetDate(this.time)
+      this.queryParam.beginDate = getDate.getThreeMonthDays().starttime
+      this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.buyerSn = undefined
       this.$refs.dealerSubareaScopeList.resetForm()
       this.queryParam.salesBillNo = ''

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

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

+ 38 - 32
src/views/salesManagement/salesQuery/detail.vue

@@ -45,6 +45,10 @@
         <a-collapse :activeKey="['1']">
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions size="small" :column="3">
+              <a-descriptions-item label="销售单号" :span="2">
+                {{ detailData&&detailData.salesBillNo || '--' }}
+                <span v-if="detailData&&detailData.salesBillNoSource">(原:{{ detailData&&detailData.salesBillNoSource || '--' }})</span>
+              </a-descriptions-item>
               <a-descriptions-item label="客户名称">{{ detailData&&detailData.buyerName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货地址" :span="2">{{ shippingAddress }}</a-descriptions-item>
               <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
@@ -53,14 +57,7 @@
               <a-descriptions-item label="审核时间">{{ detailData&&detailData.auditDate || '--' }}</a-descriptions-item>
               <a-descriptions-item label="业务状态">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="备注" :span="3">
-                <!-- 可审核时需显示具体缺货产品的信息 -->
-                <p v-if="detailData&&detailData.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')">
-                  <span v-if="outStockStr || detailData&&detailData.remarks">{{ outStockStr }}{{ detailData&&detailData.remarks }}</span>
-                  <span v-else>--</span>
-                </p>
-                <p v-else>{{ detailData&&detailData.remarks || '--' }}</p>
-              </a-descriptions-item>
+              <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>
@@ -85,6 +82,7 @@
                 <span v-if="$hasPermissions('B_isShowPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? detailData.totalUnpushedAmount : '--' }}</strong>;</span>
                 <span v-if="$hasPermissions('B_isShowPrice')">已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? detailData.totalDispatchAmount : '--' }}</strong>;</span>
                 <span v-if="$hasPermissions('B_isShowPrice')">待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? detailData.totalUndispatchAmount : '--' }}</strong>;</span>
+                <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? detailData.totalCityAmount : '--' }}</strong>;</span>
               </div>
               <a-checkbox v-model="isCityPrice" v-if="$hasPermissions('B_isShowPrice')"><span style="display: inline-block;margin-top: 1px;">市级价</span></a-checkbox>
             </div>
@@ -215,30 +213,33 @@ export default {
           url = salesDetailAllList
         }
         return url(params).then(res => {
-          const data = res.data
-          const no = 0
-          this.outStockStr = ''
-          let str = ''
-          for (var i = 0; i < data.length; i++) {
-            data[i].no = no + i + 1
-            const productCode = (data[i].productEntity && data[i].productEntity.code) || (data[i].dealerProductEntity && data[i].dealerProductEntity.code)
-            const productName = (data[i].productEntity && data[i].productEntity.name) || (data[i].dealerProductEntity && data[i].dealerProductEntity.name)
-            const productOrigCode = (data[i].productEntity && data[i].productEntity.origCode) || (data[i].dealerProductEntity && data[i].dealerProductEntity.origCode)
-            const productOrigUnit = (data[i].productEntity && data[i].productEntity.unit) || (data[i].dealerProductEntity && data[i].dealerProductEntity.unit)
-            data[i].productCode = productCode || '--'
-            data[i].productName = productName || '--'
-            data[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
-            data[i].productOrigUnit = productOrigUnit || '--'
-            if (data[i].unpushedQty && (Number(data[i].stockQty) < Number(data[i].unpushedQty))) {
-              str += data[i].productCode + '、'
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = 0
+            this.outStockStr = ''
+            let str = ''
+            for (var i = 0; i < data.length; i++) {
+              data[i].no = no + i + 1
+              const productCode = (data[i].productEntity && data[i].productEntity.code) || (data[i].dealerProductEntity && data[i].dealerProductEntity.code)
+              const productName = (data[i].productEntity && data[i].productEntity.name) || (data[i].dealerProductEntity && data[i].dealerProductEntity.name)
+              const productOrigCode = (data[i].productEntity && data[i].productEntity.origCode) || (data[i].dealerProductEntity && data[i].dealerProductEntity.origCode)
+              const productOrigUnit = (data[i].productEntity && data[i].productEntity.unit) || (data[i].dealerProductEntity && data[i].dealerProductEntity.unit)
+              data[i].productCode = productCode || '--'
+              data[i].productName = productName || '--'
+              data[i].productOrigCode = productOrigCode == ' ' ? '--' : productOrigCode
+              data[i].productOrigUnit = productOrigUnit || '--'
+              if (data[i].unpushedQty && (Number(data[i].stockQty) < Number(data[i].unpushedQty))) {
+                str += data[i].productCode + '、'
+              }
             }
+            if (str.length > 0) {
+              str = str.substr(0, str.length - 1)
+              this.outStockStr = '产品编号为:' + str + '的产品库存不足;'
+            }
+            this.localDataSource = data
+            this.disabled = false
           }
-          if (str.length > 0) {
-            str = str.substr(0, str.length - 1)
-            this.outStockStr = '产品编号为:' + str + '的产品库存不足;'
-          }
-          this.localDataSource = data
-          this.disabled = false
           return data
         })
       },
@@ -305,8 +306,13 @@ export default {
   methods: {
     //  返回
     handleBack () {
-      this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } }) // 为解决,销售列表=>销售详情=>其他页=>销售详情 时,点击返回列表,此时返回的是其他页的问题
-      // this.$router.go(-1)
+      if (this.$route.params.type == 'pushOrder') { // 下推
+        this.$router.push({ path: '/salesManagement/pushOrderManagement/list', query: { closeLastOldTab: true } })
+      } else if (this.$route.params.type == 'financialCollection') { // 财务收款
+        this.$router.push({ path: '/financialManagement/financialCollection/list', query: { closeLastOldTab: true } })
+      } else {
+        this.$router.push({ path: '/salesManagement/salesQuery/list', query: { closeLastOldTab: true } })
+      }
     },
     // 编辑
     handleEdit () {

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

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

+ 20 - 13
src/views/salesManagement/salesQuery/list.vue

@@ -174,7 +174,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')"
+            v-if="(record.salesBillSource == 'SALES' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT' || record.billStatus == 'HQ_CHANGE'))&&$hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             编辑
@@ -183,7 +183,7 @@
             size="small"
             type="link"
             class="button-info"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE') && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -192,7 +192,7 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesDel')"
+            v-if="(record.salesBillSource == 'SALES' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT' || record.billStatus == 'HQ_CHANGE'))&&$hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             删除
@@ -201,12 +201,16 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesDel')"
+            v-if="record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE') && $hasPermissions('B_salesDel')"
             @click="handleDel(record)"
           >
             取消
           </a-button>
-          <span v-if="!(record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')) && !(record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesEdit')) && !(record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesEdit')) && !(record.salesBillSource != 'PURCHASE' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT')&&$hasPermissions('B_salesDel')) && !(record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT'||record.billStatus == 'HQ_CHANGE')&&$hasPermissions('B_salesDel'))">--</span>
+          <span
+            v-if="!(record.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')) &&
+              !(record.billStatus == 'WAIT_PUSH'&&$hasPermissions('B_salesDispatch')) &&
+              !(record.salesBillSource == 'SALES' && (record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'AUDIT_REJECT' || record.billStatus == 'HQ_CHANGE')&&($hasPermissions('B_salesEdit') || $hasPermissions('B_salesDel'))) &&
+              !(record.salesBillSource == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'HQ_CHANGE') && ($hasPermissions('B_salesEdit') || $hasPermissions('B_salesDel')))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -279,12 +283,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
         })
@@ -298,7 +305,7 @@ export default {
       const arr = [
         { title: '创建时间', dataIndex: 'createDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '7%', align: 'center' },
-        { title: '采购单号', dataIndex: 'purchaseBillNo', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '采购单号', dataIndex: 'purchaseBillNo', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '提交时间', dataIndex: 'submitDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
@@ -309,9 +316,9 @@ export default {
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
-        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务状态', dataIndex: 'billStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '打印次数', dataIndex: 'detailPrintTimes', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '打印次数', dataIndex: 'detailPrintTimes', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
       if (this.showCancelNum) {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -190,15 +190,18 @@ export default {
         const paramsPage = Object.assign(this.queryParam, { pageNo: parameter.pageNo, pageSize: parameter.pageSize }) //  有分页
         const params = Object.assign(parameter, this.queryParam) //  无分页
         return oosBuyerList(params).then(res => {
-          const data = res.data
-          const no = (data.pageNo - 1) * data.pageSize
-          for (var i = 0; i < data.list.length; i++) {
-            data.list[i].no = no + i + 1
+          let data
+          if (res.status == 200) {
+            data = res.data
+            const no = (data.pageNo - 1) * data.pageSize
+            for (var i = 0; i < data.list.length; i++) {
+              data.list[i].no = no + i + 1
+            }
+            this.disabled = false
+            this.getCount(params)
+            this.getCurrentCount(paramsPage)
           }
-          this.disabled = false
           this.spinning = false
-          this.getCount(params)
-          this.getCurrentCount(paramsPage)
           return data
         })
       },
@@ -299,7 +302,7 @@ export default {
     },
     // 详情
     handleDetail (row) {
-      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn, type: 'shortageStatisticsC' } })
     },
     //  导出
     handleExport () {

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

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

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است