chenrui пре 4 година
родитељ
комит
ab15158f73

+ 2 - 1
src/api/allocateBill.js

@@ -56,7 +56,8 @@ export const allocateBillExport = (params) => {
   return axios({
     url: '/allocateBill/exportExcel',
     data: params,
-    method: 'post'
+    method: 'post',
+    responseType: 'blob'
   })
 }
 //  调拨管理  明细 列表  分页

+ 2 - 1
src/api/product.js

@@ -42,7 +42,8 @@ export const productExport = (params) => {
   return axios({
     url: '/product/exportExcel',
     data: params,
-    method: 'post'
+    method: 'post',
+    responseType: 'blob'
   })
 }
 //  产品 详情  根据sn查询

+ 9 - 0
src/api/stock.js

@@ -19,6 +19,15 @@ export const stockCount = (params) => {
     method: 'post'
   })
 }
+//  库存 导出
+export const stockExport = (params) => {
+  return axios({
+    url: '/stock/exportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
 //  库存 详情列表  分页
 export const stockDetailList = (params) => {
   const url = `/stock/queryDetailPage/${params.pageNo}/${params.pageSize}`

+ 4 - 3
src/views/allocationManagement/transferOut/list.vue

@@ -49,10 +49,11 @@
           </template>
           <a-col :md="6" :sm="24" style="margin-bottom: 24px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="allocateBillList-refresh">查询</a-button>
-            <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
+            <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="allocateBillList-reset">重置</a-button>
             <a-button
-              style="margin: 0 0 18px 8px"
-              type="danger"
+              style="margin: 0 0 18px 5px"
+              type="primary"
+              class="button-warning"
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"

+ 2 - 2
src/views/common/chooseImportModal.vue

@@ -136,7 +136,7 @@ export default {
       promoSpecialColumns: [ //  特价产品/加价促销品
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'goodsCode', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: this.paramsData && this.paramsData.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', dataIndex: 'goodsPrice', width: 200, align: 'center' }
+        { title: this.paramsData && this.paramsData.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', dataIndex: 'goodsPrice', width: 200, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],
       unColumns: [ //  不可导入产品 正品
@@ -154,7 +154,7 @@ export default {
       unPromoSpecialColumns: [ //  不可导入产品 特价产品/加价促销品
         { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
         { title: '产品编码', dataIndex: 'goodsCode', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: this.paramsData && this.paramsData.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', dataIndex: 'goodsPrice', width: 200, align: 'center' },
+        { title: this.paramsData && this.paramsData.promoRuleType == 'PROMO_PROD' ? '特惠单价(¥)' : '换购单价(¥)', dataIndex: 'goodsPrice', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remark', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ],
       unLoadData: []

+ 6 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -61,6 +61,7 @@
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="inventoryQueryList-reset">重置</a-button>
             <a-button
               type="primary"
+              style="margin-left: 5px"
               class="button-warning"
               @click="handleExport"
               :disabled="disabled"
@@ -110,7 +111,7 @@ import { STable, VSelect } from '@/components'
 import inventoryQueryDetailModal from './detailModal.vue'
 import { productBrandQuery } from '@/api/productBrand'
 import { productTypeQuery } from '@/api/productType'
-import { stockList, stockCount } from '@/api/stock'
+import { stockList, stockCount, stockExport } from '@/api/stock'
 export default {
   components: { STable, VSelect, inventoryQueryDetailModal },
   data () {
@@ -247,10 +248,10 @@ export default {
     handleExport () {
       const params = this.queryParam
       this.exportLoading = true
-      // customerBundleExportDelay(params).then(res => {
-      //   this.exportLoading = false
-      //   this.download(res)
-      // })
+      stockExport(params).then(res => {
+        this.exportLoading = false
+        this.download(res)
+      })
     },
     download (data) {
       if (!data) { return }

+ 4 - 3
src/views/productManagement/productInfo/list.vue

@@ -56,10 +56,11 @@
           </template>
           <a-col :md="6" :sm="24">
             <a-button style="margin-bottom: 18px;" type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
-            <a-button style="margin: 0 0 18px 8px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+            <a-button style="margin: 0 0 18px 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
             <a-button
-              style="margin: 0 0 18px 8px"
-              type="danger"
+              style="margin-left: 5px"
+              type="primary"
+              class="button-warning"
               @click="handleExport"
               :disabled="disabled"
               :loading="exportLoading"