lilei 6 ヶ月 前
コミット
4833a078c8

+ 61 - 22
src/components/VTable/index.vue

@@ -17,10 +17,11 @@
         :row-style-option="{clickHighlight: true}"
         :cellSelectionOption="{enable: false}"
         :virtual-scroll-option="{enable: true}"
+        :sort-option="sortOption"
       />
       <div v-show="localDataSource.length==0" :style="{height:scroll.y+'px'}" class="empty-data"><a-empty description="暂无数据" :image="simpleImage"/></div>
-      <div class="ve-pagination">
-        <div class="ve-page-left"></div>
+      <div class="ve-pagination" :class="'ve-pagination-align-'+pageAlign">
+        <div class="ve-page-left" v-if="pageAlign=='left'"><slot name="page"></slot></div>
         <a-pagination
           v-show="showPagination"
           size="small"
@@ -34,6 +35,7 @@
           show-size-changer
           @showSizeChange="paginationShowSizeChange"
         />
+        <div class="ve-page-right" v-if="pageAlign=='right'"><slot name="page"></slot></div>
       </div>
     </a-spin>
   </div>
@@ -44,40 +46,54 @@ import { Empty } from 'ant-design-vue'
 export default {
   name: 'VTable',
   props: {
+    // 列
     columns: {
       type: Array,
       default: () => []
     },
+    // load data function
     data: {
       type: Function,
       required: true
     },
+    // 默认是否加载表格数据
+    defaultLoadData: {
+      type: Boolean,
+      default: true
+    },
+    // 表格宽度和高度
     scroll: {
       type: Object,
       default: () => ({ x: 0, y: 400 })
     },
+    // 是否显示边框
     bordered: {
       type: Boolean,
       default: true
     },
-    defaultLoadData: {
-      type: Boolean,
-      default: true
-    },
+    // 表格默认key name
     rowKeyName: {
       type: String,
       default: 'id'
     },
+    // 默认隐藏的列,传 filed 值
     defaultHiddenColumnKeys: {
       type: Array,
       default: () => []
     },
+    // 分页配置
     pagination: {
       type: Object
     },
+    // 是否显示分页
     showPagination: {
       type: Boolean,
       default: true
+    },
+    // 分页对齐方式,left ,center,right
+    pageAlign: {
+      type: String,
+      default: 'center'
     }
   },
   computed: {
@@ -105,6 +121,15 @@ export default {
         // default hidden column keys
         defaultHiddenColumnKeys: this.defaultHiddenColumnKeys
       },
+      // 排序
+      sortOption: {
+        // sort always
+        sortAlways: false,
+        sortChange: (params) => {
+          this.sortChange(params)
+        }
+      },
+      // 分页
       localPagination: Object.assign({
         current: 1,
         pageSize: 10,
@@ -126,9 +151,10 @@ export default {
       for (let i = 0; i < columns.length; i++) {
         const item = columns[i]
         ret.push({
-          field: item.dataIndex,
-          key: 'col-' + i,
+          field: item.field || item.dataIndex,
+          key: item.key || 'col-' + i,
           title: item.title,
+          // 自定义头部单元格表头
           renderHeaderCell: ({ column }, h) => {
             if (item.slots) {
               return _this.$scopedSlots[item.slots.title]()
@@ -143,6 +169,7 @@ export default {
           width: item.width.indexOf('%') >= 0 ? item.width.replace('%', '') * 12 : item.width, // 百分比转数字
           align: item.align,
           fixed: item.fixed,
+          sortBy: item.sortBy || item.sorter ? '' : undefined,
           children: item.children ? _this.convertColumns(item.children) : undefined,
           // 自定义单元格
           scopedSlotsKey: item.scopedSlots && item.scopedSlots.customRender,
@@ -184,20 +211,11 @@ export default {
     loadData (pagination, filters, sorter) {
       this.localLoading = true
       const parameter = Object.assign({
-        pageNo: this.showPagination && pagination && pagination.pageSize != this.localPagination.pageSize ? 1 : (pagination && pagination.current) || this.showPagination && this.localPagination.current,
-        pageSize: (pagination && pagination.pageSize) || this.showPagination && this.localPagination.pageSize
+        pageNo: this.showPagination && this.localPagination.current || 1,
+        pageSize: this.showPagination && this.localPagination.pageSize || 10
       },
-      (sorter ? sorter.field && { sortField: sorter.field } : this.sortObj && { sortField: this.sortObj.field }) || {},
-      (sorter ? sorter.order && { sortOrder: sorter.order } : this.sortObj && { sortOrder: this.sortObj.order }) || {},
-      { ...filters }
+      this.sortObj && { sortField: this.sortObj.field, sortOrder: this.sortObj.order } || {}
       )
-      // 缓存排序参数
-      if (sorter) {
-        this.sortObj = {
-          field: sorter.field || '',
-          order: sorter.order || ''
-        }
-      }
       const result = this.data(parameter)
       // 对接自己的通用数据接口需要修改下方代码中的 r.pageNo, r.count, r.data
       if ((typeof result === 'object' || typeof result === 'function') && typeof result.then === 'function') {
@@ -207,7 +225,7 @@ export default {
           this.localPagination = this.showPagination && Object.assign({}, this.localPagination, {
             current: r.pageNo || 1, // 返回结果中的当前分页数
             total: Number(r.count) || 0, // 返回结果中的总记录数
-            pageSize: r.pageSize || (pagination && pagination.pageSize) || this.localPagination.pageSize
+            pageSize: r.pageSize || this.localPagination.pageSize
           }) || false
 
           // 为防止删除数据后导致页面当前页面数据长度为 0 ,自动翻页到上一页
@@ -243,6 +261,19 @@ export default {
       this.localPagination.pageSize = pageSize
       this.loadData()
     },
+    // 排序
+    sortChange (params) {
+      this.sortObj = null
+      for (const a in params) {
+        if (params[a]) {
+          this.sortObj = {
+            field: a,
+            order: params[a] + 'end'
+          }
+        }
+      }
+      this.loadData()
+    },
     /**
      * 表格重新加载方法
      * 如果参数为 true, 则强制刷新到第一页
@@ -300,10 +331,18 @@ export default {
     }
     .ve-pagination{
       display:flex;
-      justify-content: space-between;
       align-items: center;
       padding: 20px 0 10px 0;
     }
+    .ve-pagination-align-right{
+      justify-content: flex-end;
+    }
+    .ve-pagination-align-left{
+      justify-content: flex-start;
+    }
+    .ve-pagination-align-center{
+      justify-content: center;
+    }
     /deep/ .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content tbody.ve-table-body tr.ve-table-body-tr td.ve-table-body-td,
     .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content tbody.ve-table-body tr.ve-table-expand-tr td.ve-table-body-td{
       div:empty::before {

+ 8 - 0
src/components/newThem.less

@@ -31,4 +31,12 @@
 }
 .ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header tr.ve-table-header-tr th.ve-table-header-th{
     font-weight: 900;
+}
+.ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header .ve-table-header-tr .ve-table-header-th .ve-table-sort .ve-table-sort-icon.ve-table-sort-icon-top{
+  font-size: 12px;
+  top: 0;
+}
+.ve-table .ve-table-container .ve-table-content-wrapper table.ve-table-content thead.ve-table-header .ve-table-header-tr .ve-table-header-th .ve-table-sort .ve-table-sort-icon.ve-table-sort-icon-bottom{
+  font-size: 12px;
+  top: 7px;
 }

+ 1 - 1
src/views/common/commonModal.vue

@@ -7,7 +7,7 @@
     :maskClosable="false"
     v-model="isShow"
     :title="modalTit"
-    :bodyStyle="bodyPadding?{padding:bodyPadding}:{padding: modalTit?'25px 32px 20px':'50px 32px 15px'}"
+    :bodyStyle="bodyPadding?{padding:bodyPadding,background:'#f8f8f8'}:{padding: modalTit?'25px 32px 20px':'50px 32px 15px',background:'#f8f8f8'}"
     @cancel="isShow=false"
     :width="width">
     <a-spin :spinning="spinning" tip="Loading...">

+ 1 - 1
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -105,7 +105,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { dispatchlList } from '@/api/dispatch'
 import commonModal from '@/views/common/commonModal.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 export default {

+ 1 - 1
src/views/salesManagement/examineVerify/list.vue

@@ -174,7 +174,7 @@
 import { commonMixin } from '@/utils/mixin'
 import moment from 'moment'
 import commonModal from '@/views/common/commonModal.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import getDate from '@/libs/getDate.js'
 import subarea from '@/views/common/subarea.js'

+ 1 - 1
src/views/salesManagement/matchSendOutOrder/list.vue

@@ -168,7 +168,7 @@ import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import Area from '@/views/common/area.js'
 import { dispatchlList, dispatchCheck } from '@/api/dispatch'
 import commonModal from '@/views/common/commonModal.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'

+ 2 - 2
src/views/salesManagement/pushOrderManagement/list.vue

@@ -181,7 +181,7 @@
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           modalTit="销售单详情"
-          bodyPadding="10px"
+          bodyPadding="0"
           width="70%"
           :showFooter="false"
           :openModal="showDetailModal"
@@ -207,7 +207,7 @@ import Area from '@/views/common/area.js'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import explainInfoModal from './explainInfoModal.vue'
 import { dispatchlList, dispatchQueryCount, dispatchPrintStatus } from '@/api/dispatch'
 import customerService from '@/views/common/customerService'

+ 1 - 1
src/views/salesManagement/salesCollection/list.vue

@@ -203,7 +203,7 @@
         <!-- 查看销售单或备货单详情 -->
         <commonModal
           :modalTit="detailType?'备货单详情':'销售单详情'"
-          bodyPadding="10px"
+          bodyPadding="0"
           width="70%"
           :showFooter="false"
           :openModal="showDetailModal"

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -192,7 +192,7 @@ import Area from '@/views/common/area.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import customerService from '@/views/common/customerService.vue'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import detailModal from '@/views/salesManagement/sendOutOrder/detailModal.vue'
 import { salesOverviewQueryPage } from '@/api/salesNew'

+ 33 - 31
src/views/salesManagement/salesQueryNew/detail.vue

@@ -1,9 +1,9 @@
 <template>
-  <div class="salesDetail-wrap" :style="{paddingBottom:hideFooter?'0px':'45px'}">
+  <div class="salesDetail-wrap" :style="{paddingBottom:hideFooter||bizSn?'0px':'45px'}">
     <a-spin :spinning="spinning" tip="Loading...">
       <a-page-header :ghost="false" :backIcon="false" class="salesDetail-cont">
-        <template slot="subTitle" v-if="!bizSn">
-          <a id="salesDetail-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
+        <template slot="subTitle">
+          <a id="salesDetail-back-btn" href="javascript:;" v-if="!bizSn" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;font-weight: bold;">单号:{{ detailData&&detailData.salesBillNo }}</span>
           <span v-if="detailData&&detailData.salesBillNoSource">(原:{{ detailData&&detailData.salesBillNoSource || '--' }})</span>
           <span style="margin: 0 10px;color: #666;">客户名称:{{ detailData&&detailData.buyerName }}</span>
@@ -66,30 +66,6 @@
         </div>
       </a-card>
       <a-card size="small" :bordered="false" class="pages-wrap" style="margin-bottom: 6px;" >
-        <!-- 统计信息 -->
-        <a-alert type="info" style="margin-bottom: 10px;">
-          <div slot="message">
-            <div>
-              总销售数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
-              已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
-              已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
-              待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;
-              已发货数量:<strong>{{ detailData&&(detailData.totalDispatchQty || detailData.totalDispatchQty==0) ? detailData.totalDispatchQty : '--' }}</strong>;
-              待发货数量:<strong>{{ detailData&&(detailData.totalUndispatchQty || detailData.totalUndispatchQty==0) ? detailData.totalUndispatchQty : '--' }}</strong>;<br/>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_costPrice')">总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_costPrice')">总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? toThousands(detailData.totalDispatchAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')">待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? toThousands(detailData.totalUndispatchAmount) : '--' }}</strong>;</span>
-              <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong>;</span>
-              <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalConvertPromoGiftsAmount" style="color: red;">促销产品转采购额金额:<strong>{{ Number(detailData.totalConvertPromoGiftsAmount).toFixed(2) }}</strong>;</span>
-            </div>
-          </div>
-        </a-alert>
         <!-- 查询 -->
         <div class="table-page-search-wrapper">
           <div style="display: flex;justify-content: space-between;align-items: center;">
@@ -139,6 +115,30 @@
             </div>
           </div>
         </div>
+        <!-- 统计信息 -->
+        <a-alert type="info" style="margin-top: 10px;">
+          <div slot="message">
+            <div>
+              总销售数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;
+              已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;
+              已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;
+              待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;
+              已发货数量:<strong>{{ detailData&&(detailData.totalDispatchQty || detailData.totalDispatchQty==0) ? detailData.totalDispatchQty : '--' }}</strong>;
+              待发货数量:<strong>{{ detailData&&(detailData.totalUndispatchQty || detailData.totalUndispatchQty==0) ? detailData.totalUndispatchQty : '--' }}</strong>;<br/>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_costPrice')">总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_costPrice')">总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? toThousands(detailData.totalDispatchAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')">待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? toThousands(detailData.totalUndispatchAmount) : '--' }}</strong>;</span>
+              <span v-if="isCityPrice">市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong>;</span>
+              <span v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalConvertPromoGiftsAmount" style="color: red;">促销产品转采购额金额:<strong>{{ Number(detailData.totalConvertPromoGiftsAmount).toFixed(2) }}</strong>;</span>
+            </div>
+          </div>
+        </a-alert>
         <!-- 正常产品列表 -->
         <div v-if="!hideNormalTable">
           <detailProductList
@@ -184,7 +184,7 @@
         </detailProductList>
       </a-card>
     </a-spin>
-    <div class="affix-cont" :style="{padding:hideFooter?0:'7px 0 4px'}">
+    <div class="affix-cont" :class="bizSn?'affix-footer-bar':''" :style="{padding:hideFooter?0:'7px 0 4px'}">
       <a-button
         style="width: 100px;"
         :disabled="spinning"
@@ -368,7 +368,7 @@ export default {
     },
     // 表格高度计算
     pageHeight () {
-      if (this.hideNormalTable || this.hideActiveTable || this.activeList.length == 0) {
+      if (!this.bizSn && (this.hideNormalTable || this.hideActiveTable || this.activeList.length == 0)) {
         return window.innerHeight - 330 + (this.hideFooter ? 45 : 0)
       }
       return 'auto'
@@ -454,6 +454,7 @@ export default {
     },
     // 详情
     getDetail () {
+      this.spinning = true
       salesDetailBySn({ salesBillSn: this.bizSn || this.$route.params.sn }).then(res => {
         if (res.status == 200) {
           this.detailData = res.data || null
@@ -473,6 +474,7 @@ export default {
           this.$refs.activeTjList.hasInit = false
         }
       })
+      this.spinning = false
       setTimeout(() => {
         this.resetSearchForm()
       }, 500)
@@ -794,9 +796,9 @@ export default {
       justify-content: space-between;
       align-items: center;
     }
-    .footer-cont{
-      margin-top: 5px;
+    .affix-footer-bar{
       text-align: center;
+      background: #fff;
     }
     .redStyle{
       font-weight: bold;

+ 1 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -498,7 +498,7 @@ export default {
         { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '5%', align: 'right', isShow: false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { 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: 'lastStockUpDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { 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: 'printStatusDictValue', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/salesManagement/stockPrint/list.vue

@@ -228,7 +228,7 @@ import recordModal from './recordModal.vue'
 import commonModal from '@/views/common/commonModal.vue'
 import chooseWarehouse from '@/views/common/chooseWarehouse'
 import customerService from '@/views/common/customerService'
-import salesDetail from '@/views/salesManagement/salesQueryNew/detailAll.vue'
+import salesDetail from '@/views/salesManagement/salesQueryNew/detail.vue'
 import dispatchDetail from '@/views/salesManagement/pushOrderManagement/detail.vue'
 import explainInfoModal from '@/views/salesManagement/pushOrderManagement/explainInfoModal.vue'
 import { dispatchlList, dispatchDetailPrint, dispatchPrintStatus } from '@/api/dispatch'