Преглед на файлове

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

陈瑞 преди 3 години
родител
ревизия
8221274ef6

+ 11 - 0
src/api/dispatch.js

@@ -81,3 +81,14 @@ export const dispatchDetailType = (params) => {
     method: 'get'
   })
 }
+// 下推 详情  导出Excel
+export const dispatchDetailExcel = params => {
+  const url = `/dispatch/excel/${params.printType}`
+  delete params.printType
+  return axios.request({
+    url: url,
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 72 - 0
src/api/reportData.js

@@ -151,3 +151,75 @@ export const reportRebateExport = (params) => {
     responseType: 'blob'
   })
 }
+// 销售退货单 导出
+export const salesReturnsExport = (params) => {
+  return axios({
+    url: '/report/reportSalesReturn/exportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 销售退货明细 导出
+export const salesReturnDetailExport = (params) => {
+  return axios({
+    url: '/report/reportRebate/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 开单销售单 导出
+export const salesSlipExport = (params) => {
+  return axios({
+    url: '/report/salesBillReport/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 开单退货单 导出
+export const returnSlipExport = (params) => {
+  return axios({
+    url: 'report/salesReturnBillReport/returnBillExportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 开单销售 导出
+export const salesAmountExport = (params) => {
+  return axios({
+    url: '/report/reportRebate/export',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 实售销售 导出
+export const actualSalesExport = (params) => {
+  return axios({
+    url: '/report/',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 开单退货 导出
+export const billingReturnExport = (params) => {
+  return axios({
+    url: '/report/salesReturnBillReport/returnExportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+// 实售退货 导出
+export const salesReturnExport = (params) => {
+  return axios({
+    url: '/report/salesReturnBillReport/returnRebateExportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}

+ 8 - 6
src/views/allocationManagement/transferOut/edit.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="allocateBillEdit-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
+    <!-- <a-spin :spinning="spinning" tip="Loading..."> -->
+    <div class="ant-spin-nested-loading">
       <a-page-header :ghost="false" :backIcon="false" class="allocateBillEdit-back" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
@@ -42,7 +43,7 @@
       <!-- 选择产品 -->
       <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
         <a-collapse :activeKey="['1']">
-          <a-collapse-panel key="1" forceRender header="选择产品">
+          <a-collapse-panel key="1" :forceRender="true" header="选择产品">
             <!-- 筛选条件 -->
             <div class="table-page-search-wrapper">
               <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
@@ -94,7 +95,7 @@
       <!-- 已选产品 -->
       <a-card size="small" :bordered="false" class="allocateBillEdit-cont">
         <a-collapse :activeKey="['2']">
-          <a-collapse-panel key="2" forceRender header="已选产品">
+          <a-collapse-panel key="2" :forceRender="true" header="已选产品">
             <!-- 总计 -->
             <a-alert type="info" style="margin-bottom:10px">
               <div slot="message">
@@ -187,7 +188,8 @@
           </a-collapse-panel>
         </a-collapse>
       </a-card>
-    </a-spin>
+    <!-- </a-spin> -->
+    </div>
     <div class="affix-cont">
       <a-button
         type="primary"
@@ -241,7 +243,8 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel })).then(res => {
+        const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
+        return queryStockProductPage(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
@@ -575,7 +578,6 @@ export default {
   .allocateBillEdit-wrap{
     position: relative;
     height: 100%;
-    padding-bottom: 51px;
     box-sizing: border-box;
     >.ant-spin-nested-loading{
       overflow-y: scroll;

+ 19 - 4
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -52,6 +52,17 @@
                     <a-input id="inventoryQueryWarehouseDetail-unitName" v-model.trim="queryParam.unitName" allowClear placeholder="请输入单位名称"/>
                   </a-form-item>
                 </a-col>
+                <a-col :md="6" :sm="24">
+                  <a-form-item label="出入库状态">
+                    <v-select
+                      v-model="queryParam.state"
+                      ref="state"
+                      id="inventoryQueryWarehouseDetail-state"
+                      code="STOCK_FLOW_STATE"
+                      placeholder="请选择出入库状态"
+                      allowClear></v-select>
+                  </a-form-item>
+                </a-col>
               </template>
               <a-col :md="6" :sm="24">
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="inventoryQueryWarehouseDetail-refresh">查询</a-button>
@@ -80,7 +91,7 @@
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :scroll="{ x: 1590, y: tableHeight }"
+          :scroll="{ x: 1870, y: tableHeight }"
           :defaultLoadData="false"
           bordered>
           <!-- 数量 -->
@@ -114,7 +125,8 @@ export default {
         bizType: undefined,
         flowType: undefined,
         unitName: '',
-        warehouseSn: undefined
+        warehouseSn: undefined,
+        state: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       // 加载数据方法 必须为 Promise 对象
@@ -152,15 +164,17 @@ export default {
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'stockBatchNo', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据类型', dataIndex: 'bizTypeDictValue', width: 80, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'bizNo', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单据审核时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位名称', dataIndex: 'unitName', width: 180, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 100, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '数量', scopedSlots: { customRender: 'qty' }, width: 80, align: 'center' },
+        { title: '出入库状态', dataIndex: 'stateDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总售价', dataIndex: 'totalPrice', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       if (this.$hasPermissions('B_isShowCost')) {
-        arr.splice(11, 0, { title: '总成本', dataIndex: 'totalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(13, 0, { title: '总成本', dataIndex: 'totalCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }
@@ -192,6 +206,7 @@ export default {
       this.queryParam.flowType = undefined
       this.queryParam.unitName = ''
       this.queryParam.warehouseSn = undefined
+      this.queryParam.state = undefined
       this.$refs.table.refresh(true)
     },
     //  返回列表
@@ -217,7 +232,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 230 - 52
+      this.tableHeight = window.innerHeight - tableSearchH - 230 - 62
     }
   },
   watch: {

+ 32 - 12
src/views/purchasingManagement/bulkWarehousingOrder/list.vue

@@ -28,7 +28,7 @@
       <div class="table-operator">
         <a-button v-if="$hasPermissions('B_sparePartsNew')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
         <a-button
-          v-if="$hasPermissions('B_sparePartsAudit')"
+          v-if="$hasPermissions('B_sparePartsBatchAudit')"
           id="bulkWarehousingOrderList-batchAudit"
           type="primary"
           class="button-warning"
@@ -49,7 +49,7 @@
         :rowKey="(record) => record.sparePartsSn"
         :columns="columns"
         :data="loadData"
-        :scroll="{ x: 1350, y: tableHeight }"
+        :scroll="{ x: 1390, y: tableHeight }"
         :defaultLoadData="false"
         bordered>
         <!-- 入库单号 -->
@@ -58,6 +58,13 @@
         </template>
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
+          <a-button
+            size="small"
+            type="link"
+            v-if="record.state == 'WAIT_AUDIT' && $hasPermissions('B_sparePartsAudit')"
+            class="button-warning"
+            @click="handleAudit(record)"
+            id="allocateBillList-examine-btn">审核</a-button>
           <a-button
             size="small"
             type="link"
@@ -72,7 +79,7 @@
             @click="handleDel(record)"
             class="button-error"
             id="bulkWarehousingOrderList-del-btn">删除</a-button>
-          <span v-if="record.state != 'WAIT_AUDIT'||(!$hasPermissions('B_sparePartsEdit') && !$hasPermissions('B_sparePartsDel'))">--</span>
+          <span v-if="!(record.state == 'WAIT_AUDIT'&&($hasPermissions('B_sparePartsEdit') || $hasPermissions('B_sparePartsDel') || $hasPermissions('B_sparePartsAudit')))">--</span>
         </template>
       </s-table>
     </a-spin>
@@ -112,7 +119,7 @@ export default {
         { title: '金蝶单号', dataIndex: 'kingdeeNo', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', dataIndex: 'stateDictValue', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'remark', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: 140, align: 'center', fixed: 'right' }
       ],
       selectedRowKeys: [], // Check here to configure the default column
       selectedRows: [],
@@ -141,7 +148,7 @@ export default {
       return this.selectedRowKeys.length > 0
     },
     rowSelection () {
-      if (this.$hasPermissions('B_sparePartsAudit')) {
+      if (this.$hasPermissions('B_sparePartsBatchAudit')) {
         return {
           selectedRowKeys: this.selectedRowKeys,
           onChange: (selectedRowKeys, selectedRows) => {
@@ -244,20 +251,25 @@ export default {
       this.queryParam.relationNo = ''
       this.$refs.table.refresh(true)
     },
-    // 批量审核
-    handleBatchAudit () {
+    //  单条审核
+    handleAudit (row, isBatch) {
       const _this = this
-      if (_this.selectedRowKeys.length < 1) {
-        _this.$message.warning('请在列表勾选后再进行批量操作!')
-        return
+      let content = ''
+      let params = []
+      if (isBatch) { //  批量
+        content = '确认要批量审核吗?'
+        params = row
+      } else { //  单条
+        content = '确认要审核通过吗?'
+        params = [row.sparePartsSn]
       }
       this.$confirm({
         title: '提示',
-        content: '确认要批量审核吗?',
+        content: content,
         centered: true,
         onOk () {
           _this.spinning = true
-          sparePartsAudit(_this.selectedRowKeys).then(res => {
+          sparePartsAudit(params).then(res => {
             if (res.status == 200) {
               _this.selectedRowKeys = []
               _this.selectedRows = []
@@ -271,6 +283,14 @@ export default {
         }
       })
     },
+    // 批量审核
+    handleBatchAudit () {
+      if (this.selectedRowKeys.length < 1) {
+        this.$message.warning('请在列表勾选后再进行批量操作!')
+        return
+      }
+      this.handleAudit(this.selectedRowKeys, 'batch')
+    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 8 - 8
src/views/reportData/actualSalesReport/list.vue

@@ -114,6 +114,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -121,7 +122,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">实售销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -273,6 +273,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -326,13 +333,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '实售销售合计金额', width: 200, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }

+ 12 - 12
src/views/reportData/billingReturnReport/list.vue

@@ -70,14 +70,14 @@
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="billingReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="billingReturnReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="billingReturnReportList-export">导出</a-button> -->
+                id="billingReturnReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -114,6 +114,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -121,7 +122,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">开单退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -140,7 +140,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
-import { salesReportReturnList, salesReportReturnCount } from '@/api/reportData'
+import { salesReportReturnList, salesReportReturnCount, billingReturnExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, custList, subarea, rangeDate },
   data () {
@@ -276,6 +276,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -329,13 +336,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '开单退货合计金额', width: 200, dataIndex: 'sumAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
@@ -372,7 +372,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      reportSalesReturnDetailExport(params).then(res => {
+      billingReturnExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

+ 12 - 12
src/views/reportData/returnSlipReport/list.vue

@@ -75,14 +75,14 @@
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="returnSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="returnSlipReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="returnSlipReportList-export">导出</a-button> -->
+                id="returnSlipReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -119,6 +119,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -126,7 +127,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">开单退货单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -145,7 +145,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
-import { salesReportReturnBillList, salesReportReturnBillCount } from '@/api/reportData'
+import { salesReportReturnBillList, salesReportReturnBillCount, returnSlipExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, custList, subarea, rangeDate },
   data () {
@@ -283,6 +283,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -336,13 +343,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '开单退货单合计金额', width: 200, dataIndex: 'sumAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
@@ -378,7 +378,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      reportSalesReturnDetailExport(params).then(res => {
+      returnSlipExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

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

@@ -114,6 +114,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -121,7 +122,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">开单销售合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -141,6 +141,7 @@ import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { salesBillReportGroupByBuyerList, salesBillReportCount } from '@/api/salesBillReport'
+import { salesAmountExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, subarea, custList },
   data () {
@@ -273,6 +274,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -326,13 +334,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '开单销售合计金额', width: 200, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
@@ -371,7 +372,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      reportSalesReturnDetailExport(params).then(res => {
+      salesAmountExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

+ 12 - 11
src/views/reportData/salesReturnReport/list.vue

@@ -70,14 +70,14 @@
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="salesReturnReportList-export">导出</a-button> -->
+                id="salesReturnReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -114,6 +114,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -121,7 +122,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">实售退货合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -141,6 +141,7 @@ import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { salesReportReturnRebateList, salesReportReturnRebateCount } from '@/api/reportData'
+import { salesReturnExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, custList, subarea, rangeDate },
   data () {
@@ -276,6 +277,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -329,13 +337,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '实售退货合计金额', width: 200, dataIndex: 'sumAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
@@ -372,7 +373,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      reportSalesReturnDetailExport(params).then(res => {
+      salesReturnExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

+ 4 - 4
src/views/reportData/salesReturnsReport/list.vue

@@ -81,14 +81,14 @@
                 id="salesReturnsReportList-stockDate">盘点区间日期</a-button>
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesReturnsReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesReturnsReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="salesReturnsReportList-export">导出</a-button> -->
+                id="salesReturnsReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -142,7 +142,7 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import custList from '@/views/common/custList.vue'
 import { getArea } from '@/api/data'
-import { reportSalesReturnList, reportSalesReturnCount } from '@/api/reportData'
+import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 import moment from 'moment'
 export default {
   components: { STable, VSelect, rangeDate, subarea, custList },
@@ -221,7 +221,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      oosDetailExport(params).then(res => {
+      salesReturnsExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

+ 12 - 11
src/views/reportData/salesSlipReport/list.vue

@@ -75,14 +75,14 @@
             <a-col :md="6" :sm="24">
               <a-button type="primary" @click="handleSearch" :disabled="disabled" id="salesSlipReportList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="salesSlipReportList-reset">重置</a-button>
-              <!-- <a-button
+              <a-button
                 style="margin-left: 10px"
                 type="primary"
                 class="button-warning"
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                id="salesSlipReportList-export">导出</a-button> -->
+                id="salesSlipReportList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -119,6 +119,7 @@
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
                 <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
                 <a-col span="4">飞利浦:{{ (totalData && (totalData.flpAmount || totalData.flpAmount==0)) ? totalData.flpAmount : '--' }}</a-col>
                 <a-col span="4">车仆:{{ (totalData && (totalData.cpAmount || totalData.cpAmount==0)) ? totalData.cpAmount : '--' }}</a-col>
@@ -126,7 +127,6 @@
                 <a-col span="4">雷贝斯托:{{ (totalData && (totalData.lbstAmount || totalData.lbstAmount==0)) ? totalData.lbstAmount : '--' }}</a-col>
                 <a-col span="4">德尔福:{{ (totalData && (totalData.defAmount || totalData.defAmount==0)) ? totalData.defAmount : '--' }}</a-col>
                 <a-col span="4">巴诺德:{{ (totalData && (totalData.bndAmount || totalData.bndAmount==0)) ? totalData.bndAmount : '--' }}</a-col>
-                <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="6">开单销售单合计金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
               </a-row>
             </a-col>
@@ -146,6 +146,7 @@ import custList from '@/views/common/custList.vue'
 import subarea from '@/views/common/subarea.js'
 import { getArea } from '@/api/data'
 import { salesBillReportList, salesBillReportCount } from '@/api/salesBillReport'
+import { salesSlipExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate, subarea, custList },
   data () {
@@ -280,6 +281,13 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+            },
+            {
+              title: '布瑞斯',
+              dataIndex: 'brsAmount',
+              align: 'center',
+              width: 100,
+              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '代理品牌',
@@ -333,13 +341,6 @@ export default {
               align: 'center',
               width: 100,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
-            {
-              title: '布瑞斯',
-              dataIndex: 'brsAmount',
-              align: 'center',
-              width: 100,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             }
           ] },
         { title: '开单销售单合计金额', width: 200, dataIndex: 'totalAmount', align: 'center', customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' } }
@@ -378,7 +379,7 @@ export default {
       const params = this.queryParam
       this.exportLoading = true
       _this.spinning = true
-      reportSalesReturnDetailExport(params).then(res => {
+      salesSlipExport(params).then(res => {
         this.exportLoading = false
         _this.spinning = false
         if (res.type == 'application/json') {

+ 27 - 3
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -6,6 +6,13 @@
           <a href="javascript:;" @click="handleBack"><a-icon type="left"></a-icon> 返回列表</a>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_dispatchPrint')">
+          <a-button
+            key="3"
+            type="primary"
+            class="button-warning"
+            id="purchaseOrderDetail-export-btn"
+            :disabled="localDataSource.length==0"
+            @click="openExcelModal=true">导出Excel</a-button>
           <a-button
             key="2"
             type="primary"
@@ -79,6 +86,8 @@
     </a-spin>
     <!-- 分类打印 -->
     <choose-type-modal :openModal="openModal" :outBizSubSn="outBizSubSn" @ok="handleOk" @close="openModal=false" />
+    <!-- 导出Excel -->
+    <export-excel-modal :openModal="openExcelModal" :itemData="detailData" @ok="handleExcelOk" @close="openExcelModal=false" />
     <!-- 打印 -->
     <div id="print"></div>
   </div>
@@ -87,10 +96,12 @@
 <script>
 import { STable, VSelect } from '@/components'
 import chooseTypeModal from './chooseTypeModal.vue'
-import { dispatchDetaillList, dispatchFindBySn, dispatchDetailPrint } from '@/api/dispatch'
+import exportExcelModal from './exportExcelModal.vue'
+import { hdExportExcel } from '@/libs/exportExcel'
+import { dispatchDetaillList, dispatchFindBySn, dispatchDetailPrint, dispatchDetailExcel } from '@/api/dispatch'
 export default {
   name: 'SalesDetail',
-  components: { STable, VSelect, chooseTypeModal },
+  components: { STable, VSelect, chooseTypeModal, exportExcelModal },
   props: {
     outBizSubSn: { //  有值则为弹框,无值则为页面
       type: [Number, String],
@@ -146,7 +157,8 @@ export default {
       detailData: null, //  详情数据
       openModal: false,
       localDataSource: [],
-      nowPrintType: '' //  当前打印类型
+      nowPrintType: '', //  当前打印类型
+      openExcelModal: false
     }
   },
   methods: {
@@ -164,6 +176,18 @@ export default {
         }
       })
     },
+    // 导出Excel
+    handleExcelOk(priceType){
+      const _this = this
+      const params = {
+        dispatchBillSn: this.outBizSubSn || this.$route.params.sn,
+        printType: priceType
+      }
+      this.spinning = true
+      hdExportExcel(dispatchDetailExcel, params, '下推产品', function () {
+        _this.spinning = false
+      })
+    },
     // 分类选择
     handleOk (obj) {
       this.requestFun(obj)

+ 109 - 0
src/views/salesManagement/pushOrderManagement/exportExcelModal.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-modal
+    centered
+    :footer="null"
+    :maskClosable="false"
+    class="export-excel-modal"
+    title="导出Excel"
+    v-model="isShow"
+    @cancle="isShow=false"
+    :width="600">
+    <a-spin :spinning="spinning" tip="Loading...">
+      <a-form-model
+        id="export-excel-form"
+        ref="ruleForm"
+        :model="form"
+        :rules="rules"
+        :label-col="formItemLayout.labelCol"
+        :wrapper-col="formItemLayout.wrapperCol"
+      >
+        <a-form-model-item label="销售单号">{{ itemData&&itemData.salesBillNo || '--' }}</a-form-model-item>
+        <a-form-model-item label="客户名称">{{ itemData&&itemData.buyerName || '--' }}</a-form-model-item>
+        <a-form-model-item label="产品售价" prop="priceType">
+          <a-radio-group v-model="form.priceType">
+            <a-radio value="DISPATCH_BILL_PRICE">导出</a-radio>
+            <a-radio value="DISPATCH_BILL">不导出</a-radio>
+          </a-radio-group>
+        </a-form-model-item>
+      </a-form-model>
+      <div class="btn-cont">
+        <a-button type="primary" id="export-excel-save" @click="handleSave()">导出</a-button>
+        <a-button id="export-excel-back" @click="handleCancel" style="margin-left: 15px;">取消</a-button>
+      </div>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+export default {
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    },
+    itemData: {
+      type: Object,
+      default: () => {
+        return null
+      }
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      form: {
+        priceType: undefined
+      },
+      rules: {
+        priceType: [{ required: true, message: '请选择产品售价', trigger: 'change' }]
+      },
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 18 }
+      },
+      spinning: false
+    }
+  },
+  methods: {
+    // 确认
+    handleSave (isPrint) {
+      const _this = this
+      this.$refs.ruleForm.validate(valid => {
+        if (valid) {
+          _this.$emit('ok', _this.form.priceType)
+          _this.isShow = false
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
+    },
+    // 取消选择分类
+    handleCancel () {
+      this.isShow = false
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
+        this.$refs.ruleForm.resetFields()
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less">
+  .export-excel-modal{
+    .btn-cont {
+      text-align: center;
+      margin: 35px 0 10px;
+    }
+  }
+</style>

+ 8 - 8
src/views/salesManagement/waitDispatch/edit.vue

@@ -52,7 +52,7 @@
           :columns="columns"
           :data="loadData"
           :showPagination="false"
-          :scroll="{ x:650, y: 300 }"
+          :scroll="{ y: 300 }"
           :defaultLoadData="false"
           bordered>
           <!-- 产品编码 -->
@@ -128,13 +128,13 @@ export default {
       selectedRows: [],
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 120, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '剩余待下推', dataIndex: 'surplusQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: 100, align: 'center' },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '操作', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '26%', align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '29%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '剩余待下推', dataIndex: 'surplusQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次下推数', scopedSlots: { customRender: 'salesNums' }, width: '11%', align: 'center' },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 16 - 16
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -90,7 +90,7 @@
       :columns="columns"
       :showPagination="false"
       :data="loadData"
-      :scroll="{ x: 1340, y: 300 }"
+      :scroll="{ y: 300 }"
       :defaultLoadData="false"
       bordered>
       <!-- 取消数量 -->
@@ -102,6 +102,7 @@
             :precision="0"
             :min="0"
             :max="999999"
+            style="width: 100%;"
             placeholder="请输入" />
         </div>
         <div v-else>--</div>
@@ -169,7 +170,6 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.queryParam.salesBillSn = this.salesBillSn
-        console.log(this.salesBillSn, 'this.salesBillSn')
         return salesDetailAllList(Object.assign(parameter, this.queryParam)).then(res => {
           let data = res.data
           if (data) {
@@ -205,22 +205,22 @@ export default {
   computed: {
     columns () {
       const arr = [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: 120, align: 'center' },
-        { title: '产品名称', dataIndex: 'productEntity.name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售价', dataIndex: 'price', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '可用库存', dataIndex: 'stockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售数量', dataIndex: 'qty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已取消', dataIndex: 'cancelQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '已下推', dataIndex: 'pushedQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '剩余待下推', dataIndex: 'surplusQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: 100, align: 'center' },
-        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: 80, align: 'center', fixed: 'right' }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '产品编码', dataIndex: 'productEntity.code', scopedSlots: { customRender: 'productCode' }, width: '12%', align: 'center' },
+        { title: '产品名称', dataIndex: 'productEntity.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productEntity.origCode', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售价', dataIndex: 'price', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '可用库存', dataIndex: 'stockQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售数量', dataIndex: 'qty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消', dataIndex: 'cancelQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已下推', dataIndex: 'pushedQty', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '剩余待下推', dataIndex: 'surplusQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '取消数量', dataIndex: 'cancelNums', scopedSlots: { customRender: 'nums' }, width: '7%', align: 'center' },
+        { title: '操作', dataIndex: 'action', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.$hasPermissions('B_isShowCost')) {
-        arr.splice(4, 0, { title: '成本价', dataIndex: 'showCost', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(4, 0, { title: '成本价', dataIndex: 'showCost', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.188:8602/ocs-admin',
-        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        // target: 'http://192.168.16.188:8602/ocs-admin',
+        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         // target: 'http://ocs-admin.360arrow.com/ocs-admin', //  Éú²ú
         ws: false,
         changeOrigin: true,